Skip to content

Commit 735dda6

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.1xx'
2 parents 47cf12a + ab72377 commit 735dda6

File tree

12 files changed

+103
-85
lines changed

12 files changed

+103
-85
lines changed

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<DefineConstants Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefineConstants);DOT_NET_BUILD_FROM_SOURCE</DefineConstants>
3636

3737
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
38+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
3839
</PropertyGroup>
3940

4041
<PropertyGroup Condition="'$(IsTestProject)' == 'true'">

‎Directory.Packages.props‎

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

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</NETStandardLibraryNETFrameworkVersion>
3131
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
3232
<StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
33-
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
33+
<SystemCollectionsImmutablePackageVersion>7.0.0</SystemCollectionsImmutablePackageVersion>
3434
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3535
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
3636
<MicrosoftDotNetSignToolVersion>8.0.0-beta.23422.1</MicrosoftDotNetSignToolVersion>

‎src/Layout/toolset-tasks/toolset-tasks.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<PackageReference Include="Microsoft.Build.Utilities.Core" VersionOverride="15.7.179" />
1111
<PackageReference Include="Newtonsoft.Json" />
1212
<PackageReference Include="NuGet.Versioning" />
13-
<PackageReference Include="System.Reflection.Metadata" VersionOverride="1.4.2" />
13+
<PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutablePackageVersion)" />
14+
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
1415
</ItemGroup>
1516

1617
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<ItemGroup>
3939
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
4040
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
41-
<PackageReference Include="System.Reflection.Metadata" Condition="'$(TargetFramework)'=='net472'" />
41+
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFramework)'=='net472'" />
4242
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" />
4343
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
4444
</ItemGroup>

‎src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<Reference Include="System" />
9292
<Reference Include="System.Core" />
9393
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" PrivateAssets="All" ExcludeAssets="Runtime" />
94-
<PackageReference Include="System.Collections.Immutable" />
94+
<PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutablePackageVersion)" />
9595
</ItemGroup>
9696

9797
<ItemGroup>

‎src/Resolvers/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver/Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver.csproj‎

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

3434
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
3535
<ProjectReference Include="..\Microsoft.DotNet.SdkResolver\Microsoft.DotNet.SdkResolver.csproj" />
36-
<PackageReference Include="System.Collections.Immutable" />
36+
<PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutablePackageVersion)" />
3737
</ItemGroup>
3838

3939
<Target Name="WriteFullFrameworkResolverManifest" AfterTargets="AfterBuild" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<ItemGroup>
3939
<PackageReference Include="Microsoft.Build.Framework" ExcludeAssets="Runtime" />
4040
<PackageReference Include="Microsoft.Build.Utilities.Core" ExcludeAssets="Runtime" />
41-
<PackageReference Include="System.Reflection.Metadata" Condition="'$(TargetFramework)'=='net472'" />
41+
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFramework)'=='net472'" />
4242
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)'=='net472'" />
4343
<PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
4444
<PackageReference Include="Microsoft.Css.Parser" />

‎src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/Microsoft.NET.Build.Tasks.UnitTests.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
<PackageReference Include="Microsoft.Build.Utilities.Core" />
2121
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
2222
<PackageReference Include="NuGet.ProjectModel" />
23-
<PackageReference Include="System.Reflection.Metadata" />
23+
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
24+
<PackageReference Include="System.Reflection.MetadataLoadContext" VersionOverride="$(SystemReflectionMetadataVersion)" />
2425
<PackageReference Include="System.Security.Cryptography.X509Certificates" />
2526
</ItemGroup>
2627

‎src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<ProjectReference Include="..\..\Microsoft.DotNet.ApiSymbolExtensions\Microsoft.DotNet.ApiSymbolExtensions.csproj" OutputItemType="ReferenceCopyLocalPaths" ReferenceOutputAssembly="false" />
6161
</ItemGroup>
6262

63-
6463
<!-- Packages that are in-box for .NET Core, so we only need to reference them for .NET Framework -->
6564
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework' and '$(DotNetBuildFromSource)' != 'true'">
6665
<!--
@@ -69,8 +68,9 @@
6968
the same System.Reflection.Metadata assembly and their types can unify. See the following link for the MSBuild binding redirect config.
7069
https://github.com/dotnet/msbuild/blob/5d102ae37163fc1f22610bb433c3ab9a2fff91f0/src/MSBuild/app.config#L59
7170
-->
72-
<PackageReference Include="System.Collections.Immutable" />
73-
<PackageReference Include="System.Reflection.Metadata" />
71+
<PackageReference Include="System.Collections.Immutable" VersionOverride="$(SystemCollectionsImmutablePackageVersion)" />
72+
<PackageReference Include="System.Reflection.Metadata" VersionOverride="$(SystemReflectionMetadataVersion)" />
73+
<PackageReference Include="System.Reflection.MetadataLoadContext" VersionOverride="$(SystemReflectionMetadataVersion)" />
7474
</ItemGroup>
7575

7676
<!-- These are loaded from the CLI's copy on .NET Core, we don't need to duplicate them on disk -->

0 commit comments

Comments
 (0)