Skip to content

Commit b26a4a2

Browse files
committed
Add separate properties for keep-in-sync versions
1 parent e6dbaba commit b26a4a2

File tree

10 files changed

+17
-10
lines changed

10 files changed

+17
-10
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,10 @@
321321
<Uri>https://github.com/dotnet/runtime</Uri>
322322
<Sha>205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45</Sha>
323323
</Dependency>
324+
<Dependency Name="System.Reflection.Metadata" Version="9.0.0-alpha.1.24072.1">
325+
<Uri>https://github.com/dotnet/runtime</Uri>
326+
<Sha>205ef031e0fe5152dede0bd9f99d0f6f9e7f1e45</Sha>
327+
</Dependency>
324328
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.24077.1">
325329
<Uri>https://github.com/dotnet/xharness</Uri>
326330
<Sha>f49b5c0db06528a9580686a5b63b0e5b4aba566b</Sha>

eng/Versions.props

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,16 @@
123123
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
124124
<StyleCopAnalyzersVersion>1.2.0-beta.507</StyleCopAnalyzersVersion>
125125
<SystemBuffersVersion>4.5.1</SystemBuffersVersion>
126+
<!-- we need to keep the toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
126127
<SystemCollectionsImmutableVersion>7.0.0</SystemCollectionsImmutableVersion>
127128
<SystemComponentModelAnnotationsVersion>5.0.0</SystemComponentModelAnnotationsVersion>
128129
<SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>
129130
<SystemDrawingCommonVersion>8.0.0</SystemDrawingCommonVersion>
130131
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
131132
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
132-
<SystemReflectionMetadataVersion>7.0.0</SystemReflectionMetadataVersion>
133+
<SystemReflectionMetadataVersion>9.0.0-alpha.1.24072.1</SystemReflectionMetadataVersion>
134+
<!-- we need to keep the toolset versions in sync with dotnet/msbuild and dotnet/sdk -->
135+
<SystemReflectionMetadataToolsetVersion>7.0.0</SystemReflectionMetadataToolsetVersion>
133136
<SystemReflectionMetadataLoadContextVersion>7.0.0</SystemReflectionMetadataLoadContextVersion>
134137
<SystemSecurityAccessControlVersion>6.0.0</SystemSecurityAccessControlVersion>
135138
<SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>

src/coreclr/tools/aot/ILCompiler.Build.Tasks/ILCompiler.Build.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
1616
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
17-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
17+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" />
1818
</ItemGroup>
1919

2020
</Project>

src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj

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

2121
<ItemGroup>
2222
<!-- we need to keep the version of System.Reflection.Metadata in sync with dotnet/msbuild and dotnet/sdk -->
23-
<PackageReference Include="System.Reflection.Metadata" Version="6.0.0" />
23+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" />
2424
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
2525
</ItemGroup>
2626

src/tasks/AotCompilerTask/MonoAOTCompiler.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
1616
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
17-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
17+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<Compile Include="MonoAOTCompiler.cs" />

src/tasks/Microsoft.NET.WebAssembly.Webcil/Microsoft.NET.WebAssembly.Webcil.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<ItemGroup>
1818
<!-- we need to keep the version of System.Reflection.Metadata in sync with dotnet/msbuild and dotnet/sdk -->
1919
<PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" />
20-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
20+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" />
2121
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
2222
</ItemGroup>
2323

src/tasks/MonoTargetsTasks/MonoTargetsTasks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkForNETCoreTasks)'">
99
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
1010
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
11-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
11+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" />
1212
</ItemGroup>
1313
<ItemGroup Condition="'$(TargetFramework)' == '$(TargetFrameworkForNETFrameworkTasks)'">
1414
<!-- On .NET Framework, make sure we don't include a copy of the MSBuild assemblies with the task. The NETCore version doesn't do it already. -->
1515
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" IncludeAssets="compile" />
1616
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" IncludeAssets="compile" />
17-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" PrivateAssets="All" />
17+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" PrivateAssets="All" />
1818
<!-- These versions should not be newer than what Visual Studio MSBuild uses -->
1919
<PackageReference Include="System.Threading.Tasks.Extensions" Version="$(SystemThreadingTasksExtensionsVersion)" PrivateAssets="all" />
2020
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />

src/tasks/WasmAppBuilder/WasmAppBuilder.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildVersion)" />
2727
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
2828
<!-- FIXME: is this the correct version of SRM to use when building for .NET Framework? -->
29-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
29+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" />
3030
<PackageReference Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
3131
</ItemGroup>
3232

src/tasks/installer.tasks/installer.tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
19-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
19+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" />
2020
<Reference Include="Microsoft.Build.Framework" />
2121
<Reference Include="Microsoft.Build.Utilities.v4.0" />
2222
<Reference Include="Microsoft.Build" />

src/tools/illink/src/ILLink.Tasks/ILLink.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<PackageReference Include="Microsoft.DotNet.Cecil" Version="$(MicrosoftDotNetCecilVersion)" />
5252
<PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" ExcludeAssets="runtime" />
5353
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" ExcludeAssets="runtime" />
54-
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
54+
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataToolsetVersion)" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" />
5555
</ItemGroup>
5656

5757
<ItemGroup>

0 commit comments

Comments
 (0)