Skip to content

Commit 6fd1b5c

Browse files
[release/9.0.3xx] Update dependencies from dotnet/msbuild (#48005)
[release/9.0.3xx] Update dependencies from dotnet/msbuild - Fix build failure - Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-3f4a1dd1-ab01-4a37-86b4-c2c5a7bc3491 - Merge branch 'release/9.0.3xx' into darc-release/9.0.3xx-3f4a1dd1-ab01-4a37-86b4-c2c5a7bc3491 - Merge branch 'release/9.0.3xx' into darc-release/9.0.3xx-3f4a1dd1-ab01-4a37-86b4-c2c5a7bc3491 - Add VersionOverride to the Razor and StaticWebAssert Tasks dependencies of System.Text.Json. - Revert "Fix build failure" This reverts commit 728a9c6. - Use "toolset" versions of MSBuild transitive deps Reference specific old versions of these packages at compile time, which will be moved forward to the VS- delivered versions at runtime. This avoids pinning them to the old versions for the whole repo, allowing MSBuild to move forward without breaking SDK. Partial backport of 9cf989b. - Merge branch 'release/9.0.3xx' into darc-release/9.0.3xx-3f4a1dd1-ab01-4a37-86b4-c2c5a7bc3491 - Update Microsoft.NET.Sdk.Razor.Tasks to pattern used in main - Baseline maintenance-packages transitives from MSBuild/netfx - Merge branch 'darc-release/9.0.3xx-3f4a1dd1-ab01-4a37-86b4-c2c5a7bc3491' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-3f4a1dd1-ab01-4a37-86b4-c2c5a7bc3491
1 parent cc1c5c6 commit 6fd1b5c

File tree

8 files changed

+29
-34
lines changed

8 files changed

+29
-34
lines changed

Directory.Packages.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="$(MicrosoftExtensionsObjectPoolPackageVersion)" />
4646
<PackageVersion Include="Microsoft.FSharp.Compiler" Version="$(MicrosoftFSharpCompilerPackageVersion)" />
4747
<PackageVersion Include="Microsoft.Net.Compilers.Toolset.Framework" Version="$(MicrosoftNetCompilersToolsetFrameworkPackageVersion)" />
48-
<PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistPackageVersion)" />
4948
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
5049
<PackageVersion Include="Microsoft.NET.HostModel" Version="$(MicrosoftNETHostModelVersion)" />
5150
<PackageVersion Include="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)" />
@@ -93,9 +92,6 @@
9392
<PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
9493
<PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
9594
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
96-
<PackageVersion Include="System.Buffers" Version="$(SystemBuffersVersion)" />
97-
<PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
98-
<PackageVersion Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" />
9995
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
10096
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
10197
<PackageVersion Include="System.CommandLine.Rendering" Version="$(SystemCommandLineRenderingVersion)" />

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<!-- Begin: Package sources from dotnet-emsdk -->
2929
<!-- End: Package sources from dotnet-emsdk -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31+
<add key="darc-pub-DotNet-msbuild-Trusted-fc19b05" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-fc19b051/nuget/v3/index.json" />
3132
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3233
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3334
<!-- End: Package sources from dotnet-roslyn-analyzers -->

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@
4141
<!-- Transitive dependencies from MSBuild -->
4242
<UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
4343
<UsagePattern IdentityGlob="System.Formats.Nrbf/*9.0.0*" />
44+
<UsagePattern IdentityGlob="System.Buffers/*4.6.0*" />
45+
<UsagePattern IdentityGlob="System.Memory/*4.6.0*" />
46+
<UsagePattern IdentityGlob="System.Numerics.Vectors/*4.6.0*" />
4447

4548
<!-- Transitive dependencies from roslyn -->
4649
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>78be8cdf4f0bfd93018fd7a87f8282a41d041298</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25177-05">
72+
<Dependency Name="Microsoft.Build" Version="17.14.4">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>903614e1646f45dfcf0e21ad1969e7935d01bba8</Sha>
74+
<Sha>fc19b05155b893f7f77eddf1fb53e6646b53d51a</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25177-05">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.4-preview-25207-08">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>903614e1646f45dfcf0e21ad1969e7935d01bba8</Sha>
78+
<Sha>fc19b05155b893f7f77eddf1fb53e6646b53d51a</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25177-05">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.4-preview-25207-08">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>903614e1646f45dfcf0e21ad1969e7935d01bba8</Sha>
83+
<Sha>fc19b05155b893f7f77eddf1fb53e6646b53d51a</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25181.1">

eng/Versions.props

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,10 @@
123123
<SystemTextJsonPackageVersion>9.0.4</SystemTextJsonPackageVersion>
124124
<!-- This is a minimum version for various projects to work. It's used for netfx-targeted components that run in Visual Studio
125125
because in those cases, Visual Studio is providing System.Text.Json, and we should work with whichever version it ships. -->
126+
<SystemBuffersToolsetPackageVersion>4.5.1</SystemBuffersToolsetPackageVersion>
127+
<SystemMemoryToolsetPackageVersion>4.5.5</SystemMemoryToolsetPackageVersion>
126128
<SystemTextJsonToolsetPackageVersion>8.0.4</SystemTextJsonToolsetPackageVersion>
129+
<SystemThreadingTasksExtensionsToolsetPackageVersion>4.5.4</SystemThreadingTasksExtensionsToolsetPackageVersion>
127130
<SystemWindowsExtensionsPackageVersion>9.0.4</SystemWindowsExtensionsPackageVersion>
128131
<SystemFormatsAsn1Version>9.0.4</SystemFormatsAsn1Version>
129132
</PropertyGroup>
@@ -179,8 +182,8 @@
179182
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
180183
181184
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
182-
<MicrosoftBuildVersion>17.14.0-preview-25177-05</MicrosoftBuildVersion>
183-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25177-05</MicrosoftBuildLocalizationVersion>
185+
<MicrosoftBuildVersion>17.14.4</MicrosoftBuildVersion>
186+
<MicrosoftBuildLocalizationVersion>17.14.4-preview-25207-08</MicrosoftBuildLocalizationVersion>
184187
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
185188
<MinimumVSVersion>17.12</MinimumVSVersion>
186189
</PropertyGroup>
@@ -283,20 +286,6 @@
283286
<MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24617.1</MicrosoftSourceLinkGitLabVersion>
284287
<MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24617.1</MicrosoftSourceLinkBitbucketGitVersion>
285288
</PropertyGroup>
286-
<!--
287-
Dependencies to support netstandard2.0 targets.
288-
Versions need to be conditionally selected: due to https://github.com/dotnet/sdk/issues/45155
289-
-->
290-
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
291-
<SystemBuffersVersion>4.6.1</SystemBuffersVersion>
292-
<SystemMemoryVersion>4.6.2</SystemMemoryVersion>
293-
<SystemThreadingTasksExtensionsVersion>4.6.2</SystemThreadingTasksExtensionsVersion>
294-
</PropertyGroup>
295-
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
296-
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
297-
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
298-
<SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
299-
</PropertyGroup>
300289
<!-- Get .NET Framework reference assemblies from NuGet packages -->
301290
<PropertyGroup>
302291
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>

src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,14 @@
2323
</PropertyGroup>
2424

2525
<ItemGroup>
26-
<!-- netstandard2.0 polyfills -->
27-
<PackageReference Include="System.Buffers" />
28-
<PackageReference Include="System.Memory" />
29-
<PackageReference Include="System.Threading.Tasks.Extensions" />
30-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" />
26+
<!-- netstandard2.0 polyfills
27+
Since this code may be run in Visual Studio / full framework MSBuild, these packages need to use the "toolset" package versions so they
28+
don't depend on higher versions of the packages than are available in those environments.
29+
-->
30+
<PackageReference Include="System.Buffers" VersionOverride="$(SystemBuffersToolsetPackageVersion)" />
31+
<PackageReference Include="System.Memory" VersionOverride="$(SystemMemoryToolsetPackageVersion)" />
32+
<PackageReference Include="System.Threading.Tasks.Extensions" VersionOverride="$(SystemThreadingTasksExtensionsToolsetPackageVersion)" />
33+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="$(MicrosoftBclAsyncInterfacesToolsetPackageVersion)"/>
3134
</ItemGroup>
3235

3336
<!-- Make sure the shared source files do not require any global usings -->

src/RazorSdk/Tasks/Microsoft.NET.Sdk.Razor.Tasks.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,14 @@
4141
<ItemGroup>
4242
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
4343
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
44-
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFramework)'=='net472'" />
45-
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" />
4644
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
4745
</ItemGroup>
4846

47+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
48+
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
49+
<PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonToolsetPackageVersion)" />
50+
</ItemGroup>
51+
4952
<ItemGroup>
5053
<AdditionalContent Include="$(RazorSdkRoot)Targets\**\*.*">
5154
<Pack>true</Pack>

src/StaticWebAssetsSdk/Tasks/Microsoft.NET.Sdk.StaticWebAssets.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
4444
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
45-
<PackageReference Include="System.Text.Json" />
45+
<PackageReference Include="System.Text.Json" VersionOverride="$(SystemTextJsonToolsetPackageVersion)" />
4646
</ItemGroup>
4747

4848
<!-- Only include these files in the outer build to avoid double writes. -->

0 commit comments

Comments
 (0)