Skip to content

Commit 5294f7d

Browse files
authored
Correctly define versions for runtime dependencies (#74060)
System.ComponentModel.Composition and System.IO.Hashing were missing Versions.props and Version.Details.xml entries. This is necessary so that the VMR can upgrade the dependencies when building all dependencies live. Similar to c74b31b Unblocks runtime dependency flow: dotnet/sdk#41616
1 parent 33ce96d commit 5294f7d

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

eng/Directory.Packages.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,10 @@
190190
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
191191
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
192192
<PackageVersion Include="System.Composition" Version="$(SystemCompositionVersion)" />
193-
<PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
193+
<PackageVersion Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" />
194194
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
195195
<PackageVersion Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogVersion)" />
196-
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
196+
<PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingVersion)" />
197197
<PackageVersion Include="System.IO.Pipelines" Version="$(SystemIOPipelinesVersion)" />
198198
<PackageVersion Include="System.IO.Pipes.AccessControl" Version="5.0.0" />
199199
<PackageVersion Include="System.Memory" Version="4.5.5" />

eng/Version.Details.xml

+8
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,18 @@
6464
<Uri>https://github.com/dotnet/runtime</Uri>
6565
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
6666
</Dependency>
67+
<Dependency Name="System.ComponentModel.Composition" Version="8.0.0">
68+
<Uri>https://github.com/dotnet/runtime</Uri>
69+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
70+
</Dependency>
6771
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="8.0.0">
6872
<Uri>https://github.com/dotnet/runtime</Uri>
6973
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
7074
</Dependency>
75+
<Dependency Name="System.IO.Hashing" Version="8.0.0">
76+
<Uri>https://github.com/dotnet/runtime</Uri>
77+
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
78+
</Dependency>
7179
<Dependency Name="System.IO.Pipelines" Version="8.0.0">
7280
<Uri>https://github.com/dotnet/runtime</Uri>
7381
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>

eng/Versions.props

+2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
<SystemConfigurationConfigurationManagerVersion>8.0.0</SystemConfigurationConfigurationManagerVersion>
2626
<SystemDiagnosticsEventLogVersion>8.0.0</SystemDiagnosticsEventLogVersion>
2727
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
28+
<SystemComponentModelCompositionVersion>8.0.0</SystemComponentModelCompositionVersion>
2829
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0</SystemDiagnosticsDiagnosticSourceVersion>
30+
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
2931
<SystemIOPipelinesVersion>8.0.0</SystemIOPipelinesVersion>
3032
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
3133
<SystemResourcesExtensionsVersion>8.0.0</SystemResourcesExtensionsVersion>

src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="System.ComponentModel.Composition" Version="$(SystemComponentModelCompositionVersion)" />
30+
<PackageReference Include="System.ComponentModel.Composition" />
3131
</ItemGroup>
3232

3333
<ItemGroup>

0 commit comments

Comments
 (0)