Skip to content

Commit bac31da

Browse files
Update .NET SDK to 10.0.100-preview.3.25122.1 (#60564)
* Update .NET SDK Update .NET SDK to version 10.0.100-preview.3.25122.1. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Remove unnecessary package references (cherry picked from commit ab38a29) * Restore the host for the given platform in vcxprojs * Cleanup * fix * Try PackageReference instead of PackageDownload * Fix ProjectReference to PackageReference in props file * Use correct architecture for host * Fix hopefully * More fixes? --------- Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 00b6dbe commit bac31da

File tree

34 files changed

+26
-53
lines changed

34 files changed

+26
-53
lines changed

Directory.Build.props

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -195,18 +195,13 @@
195195
limitations in the way the .NET SDK finds shared frameworks and targeting packs. It allows
196196
tests to use the shared frameworks and targeting packs that were just built.
197197
198-
However, source-build needs this to not happen while building projects that rely on the
199-
AppHost framework pack. Source-build installs an SDK in a custom location outside this
198+
However, the VMR needs this to not happen while building projects that rely on the
199+
AppHost framework pack. The VMR installs an SDK in a custom location outside this
200200
repository, and setting NetCoreTargetingPackRoot to a different location causes source-build
201201
to restore the AppHost pack as a prebuilt rather than using the one that's present in the SDK.
202-
Source-build doesn't run tests, so the property is simply conditioned out.
202+
The dotnet product build doesn't run tests, so the property is simply conditioned out.
203203
-->
204204
<NetCoreTargetingPackRoot Condition="'$(DotNetBuild)' != 'true'">$(LocalDotNetRoot)packs\</NetCoreTargetingPackRoot>
205-
<!-- This is not correct and needs attention eventually. This is primarily used to find the nethost headers in the apphost pack.
206-
These should be coming from a restored apphost pack, rather than a hard-coded local SDK. In fact, aspnetcore
207-
should not rely on a local SDK or mutating one to build. -->
208-
<NetCoreTargetingPackRoot Condition="'$(DotNetBuild)' == 'true'">$(DotNetRoot)packs\</NetCoreTargetingPackRoot>
209-
210205
</PropertyGroup>
211206

212207
<Import Project="eng\tools\RepoTasks\RepoTasks.tasks" Condition="'$(MSBuildProjectName)' != 'RepoTasks' AND '$(DesignTimeBuild)' != 'true'" />

eng/tools/GenerateFiles/Directory.Build.props.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
<DefaultNetCoreTargetFramework>${DefaultNetCoreTargetFramework}</DefaultNetCoreTargetFramework>
44
<ArtifactsShippingPackagesDir>${ArtifactsShippingPackagesDir}</ArtifactsShippingPackagesDir>
55
<TreatWarningsAsErrors Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</TreatWarningsAsErrors>
6-
<LibNetHostAppPackVersion Condition=" '$(LibNetHostAppPackVersion)' == '' ">${LibNetHostAppPackVersion}</LibNetHostAppPackVersion>
7-
6+
87
<!-- Temporarily hardcoded to true -->
98
<SuppressGenerateILCompilerExplicitPackageReferenceWarning>true</SuppressGenerateILCompilerExplicitPackageReferenceWarning>
109
</PropertyGroup>

eng/tools/GenerateFiles/GenerateFiles.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
MicrosoftNETCoreAppRefVersion=$(MicrosoftNETCoreAppRefVersion);
2626
MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
2727
MicrosoftPlaywrightCLIVersion=$(MicrosoftPlaywrightCLIVersion);
28-
LibNetHostAppPackVersion=$(BundledNETCoreAppPackageVersion);
2928
SupportedRuntimeIdentifiers=$([MSBuild]::Escape($(SupportedRuntimeIdentifiers)));
3029
ArtifactsShippingPackagesDir=$(ArtifactsShippingPackagesDir)
3130
</_TemplateProperties>

eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
45
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
@@ -35,15 +36,13 @@
3536
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
3637
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
3738
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
38-
<!-- Manually updated version to address CVE-2024-38095 -->
39-
<PackageReference Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
4039
</ItemGroup>
4140

4241
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
4342
<PackageReference Include="Microsoft.IO.Redist" Version="$(MicrosoftIoRedistVersion)" />
4443
<PackageReference Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
45-
<PackageReference Include="System.Net.Http" Version="4.3.4" />
4644

45+
<Reference Include="System.Net.Http" />
4746
<Reference Include="Microsoft.Build" />
4847
<Reference Include="Microsoft.Build.Framework" />
4948
<Reference Include="Microsoft.Build.Tasks.v4.0" />

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.2.25109.3"
3+
"version": "10.0.100-preview.3.25122.1"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-preview.2.25109.3",
6+
"dotnet": "10.0.100-preview.3.25122.1",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

src/Components/Samples/BlazorUnitedApp.Client/BlazorUnitedApp.Client.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
<ItemGroup>
1111
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
12-
<Reference Include="System.Net.Http.Json" />
1312
</ItemGroup>
1413

1514
<ItemGroup>

src/Components/WebAssembly/Samples/HostedBlazorWebassemblyApp/Client/HostedBlazorWebassemblyApp.Client.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
<ItemGroup>
1010
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
11-
<Reference Include="System.Net.Http.Json" />
1211
</ItemGroup>
1312

1413
<ItemGroup>

src/Components/WebAssembly/WebAssembly.Authentication/test/Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
1010
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" />
1111
<Reference Include="Microsoft.CodeAnalysis.CSharp" />
12-
<Reference Include="System.Text.Json" />
1312
</ItemGroup>
1413

1514
<ItemGroup>

src/Components/WebAssembly/WebAssembly/test/Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<ItemGroup>
88
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
99
<Reference Include="Microsoft.CodeAnalysis.CSharp" />
10-
<Reference Include="System.Text.Json" />
1110
</ItemGroup>
1211

1312
</Project>

src/Components/WebAssembly/testassets/CustomBasePathApp/CustomBasePathApp.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
<ItemGroup>
99
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
10-
<Reference Include="System.Net.Http.Json" />
1110
</ItemGroup>
1211

1312
</Project>

0 commit comments

Comments
 (0)