Skip to content

Commit bf6f782

Browse files
[main] Update dependencies from dotnet/sdk (#18457)
1 parent 66f3b38 commit bf6f782

10 files changed

+114
-308
lines changed

eng/Version.Details.xml

Lines changed: 84 additions & 84 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@
4848
</PropertyGroup>
4949
<PropertyGroup>
5050
<!-- Dependency from https://github.com/dotnet/winforms -->
51-
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.2.24078.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
51+
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>9.0.0-preview.2.24108.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
5252
</PropertyGroup>
5353
<PropertyGroup>
5454
<!-- Dependency from https://github.com/dotnet/wpf -->
55-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.2.24079.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
55+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-preview.2.24108.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
5656
</PropertyGroup>
5757
<PropertyGroup>
5858
<!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -73,49 +73,49 @@
7373
</PropertyGroup>
7474
<PropertyGroup>
7575
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
76-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.2.24079.10</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
77-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.2.24079.10</MicrosoftAspNetCoreAppRefPackageVersion>
78-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.2.24079.10</MicrosoftAspNetCoreAppRefInternalPackageVersion>
79-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.2.24079.10</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
80-
<dotnetdevcertsPackageVersion>9.0.0-preview.2.24079.10</dotnetdevcertsPackageVersion>
81-
<dotnetuserjwtsPackageVersion>9.0.0-preview.2.24079.10</dotnetuserjwtsPackageVersion>
82-
<dotnetusersecretsPackageVersion>9.0.0-preview.2.24079.10</dotnetusersecretsPackageVersion>
76+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.2.24109.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
77+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.2.24109.2</MicrosoftAspNetCoreAppRefPackageVersion>
78+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.2.24109.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
79+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.2.24109.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
80+
<dotnetdevcertsPackageVersion>9.0.0-preview.2.24109.2</dotnetdevcertsPackageVersion>
81+
<dotnetuserjwtsPackageVersion>9.0.0-preview.2.24109.2</dotnetuserjwtsPackageVersion>
82+
<dotnetusersecretsPackageVersion>9.0.0-preview.2.24109.2</dotnetusersecretsPackageVersion>
8383
</PropertyGroup>
8484
<PropertyGroup>
8585
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
8686
</PropertyGroup>
8787
<PropertyGroup>
8888
<!-- Dependencies from https://github.com/dotnet/sdk -->
89-
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.2.24080.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
90-
<MicrosoftNETSdkPackageVersion>9.0.100-preview.2.24080.4</MicrosoftNETSdkPackageVersion>
91-
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.2.24080.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
89+
<MicrosoftDotNetCommonItemTemplatesPackageVersion>9.0.100-preview.2.24109.17</MicrosoftDotNetCommonItemTemplatesPackageVersion>
90+
<MicrosoftNETSdkPackageVersion>9.0.100-preview.2.24109.17</MicrosoftNETSdkPackageVersion>
91+
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>9.0.100-preview.2.24109.17</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
9292
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
9393
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
9494
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
9595
</PropertyGroup>
9696
<PropertyGroup>
9797
<!-- Dependencies from https://github.com/dotnet/roslyn -->
98-
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-1.24067.21</MicrosoftNetCompilersToolsetPackageVersion>
98+
<MicrosoftNetCompilersToolsetPackageVersion>4.10.0-2.24109.6</MicrosoftNetCompilersToolsetPackageVersion>
9999
</PropertyGroup>
100100
<PropertyGroup>
101101
<!-- Dependencies from https://github.com/dotnet/corefx -->
102-
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.2.24080.1</MicrosoftNETCorePlatformsPackageVersion>
102+
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.2.24109.4</MicrosoftNETCorePlatformsPackageVersion>
103103
</PropertyGroup>
104104
<PropertyGroup>
105105
<!-- Dependencies from https://github.com/dotnet/core-setup -->
106-
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.2.24080.1</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
107-
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.2.24080.1</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
108-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.2.24080.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
109-
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.2.24080.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
110-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.2.24080.1</MicrosoftNETCoreAppRefPackageVersion>
106+
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.2.24109.4</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
107+
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.2.24109.4</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
108+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.2.24109.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
109+
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.2.24109.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
110+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.2.24109.4</MicrosoftNETCoreAppRefPackageVersion>
111111
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
112112
</PropertyGroup>
113113
<PropertyGroup>
114114
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
115-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.2.24079.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
116-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.2.24079.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
117-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.2.24079.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
118-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.2.24079.1</MicrosoftWindowsDesktopAppRefPackageVersion>
115+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.2.24109.1</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
116+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.2.24109.1</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
117+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.2.24109.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
118+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.2.24109.1</MicrosoftWindowsDesktopAppRefPackageVersion>
119119
</PropertyGroup>
120120
<PropertyGroup>
121121
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
@@ -131,7 +131,7 @@
131131
</PropertyGroup>
132132
<!-- Dependencies from https://github.com/dotnet/deployment-tools -->
133133
<PropertyGroup>
134-
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24075.2</MicrosoftDeploymentDotNetReleasesVersion>
134+
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24101.1</MicrosoftDeploymentDotNetReleasesVersion>
135135
</PropertyGroup>
136136
<PropertyGroup>
137137
<!-- Automated versions for asp.net templates -->
@@ -245,7 +245,7 @@
245245
<PropertyGroup>
246246
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
247247
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
248-
<MicrosoftNETTestSdkVersion>17.10.0-preview-24078-03</MicrosoftNETTestSdkVersion>
248+
<MicrosoftNETTestSdkVersion>17.10.0-preview-24107-02</MicrosoftNETTestSdkVersion>
249249
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-alpha.1.24058.10</MicrosoftExtensionsLoggingConsoleVersion>
250250
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.24057.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
251251
</PropertyGroup>
@@ -261,7 +261,7 @@
261261
<XamarinMacOSWorkloadManifestVersion>14.0.9712-net9-p1</XamarinMacOSWorkloadManifestVersion>
262262
<XamarinTvOSWorkloadManifestVersion>17.0.9712-net9-p1</XamarinTvOSWorkloadManifestVersion>
263263
<!-- Workloads from dotnet/emsdk -->
264-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.2.24076.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
264+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>9.0.0-preview.2.24105.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion>
265265
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
266266
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
267267
<EmscriptenWorkloadFeatureBand>9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>

src/SourceBuild/content/repo-projects/Directory.Build.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
3535
<RepositoryReference Remove="roslyn" />
3636
<RepositoryReference Remove="msbuild" />
37+
<RepositoryReference Remove="sdk" />
38+
<RepositoryReference Remove="wpf" />
39+
<RepositoryReference Remove="roslyn-analyzers" />
3740
<RepositoryReference Remove="aspnetcore" />
3841
<RepositoryReference Remove="razor" />
3942
<RepositoryReference Remove="deployment-tools" />
@@ -43,7 +46,6 @@
4346
<RepositoryReference Remove="test-templates" />
4447
<RepositoryReference Remove="fsharp" />
4548
<RepositoryReference Remove="vstest" />
46-
<RepositoryReference Remove="sdk" />
4749
<RepositoryReference Remove="aspire" />
4850
<RepositoryReference Remove="installer" />
4951
</ItemGroup>

src/SourceBuild/content/repo-projects/runtime.proj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
3939
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_X" Version="%24(MicrosoftCodeAnalysisVersion)" />
4040
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_4" Version="%24(MicrosoftCodeAnalysisVersion)" />
41+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_4_8" Version="%24(MicrosoftCodeAnalysisVersion)" />
4142
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftCodeAnalysisVersion_LatestVS" Version="%24(MicrosoftCodeAnalysisVersion)" />
4243
</ItemGroup>
4344

src/SourceBuild/patches/aspnetcore/0001-Enable-use-of-RestoreConfigFile-property-in-source-b.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/SourceBuild/patches/razor/0001-Add-missing-SDK-dependency-to-global.json.patch

Lines changed: 0 additions & 34 deletions
This file was deleted.

src/SourceBuild/patches/roslyn/0001-Set-NetRoslyn-value-for-VMR-build.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/SourceBuild/patches/runtime/0001-Short-stack-and-nuget-config-changes.patch

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/SourceBuild/patches/sdk/0001-Use-net9.0-for-tool-dependencies.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)