Skip to content

Commit 402bfbb

Browse files
akoeplingerakoeplinger
authored
Fix Microsoft.Extensions.Caching.Hybrid repo origin and CoherentParentDependency (#62663)
* Fix Microsoft.Extensions.Caching.Hybrid repo origin in Version.Details.xml That package is built in dotnet/extensions. It's also a toolset dependency (we can only use it in tests) so move it to the appropriate section. * Remove CoherentParentDependency from optimization packages
1 parent 3673f71 commit 402bfbb

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@
5151
<Uri>https://github.com/dotnet/dotnet</Uri>
5252
<Sha>23101ed07a38169d3e59d63b9d4d33e6d1d609bb</Sha>
5353
</Dependency>
54-
<Dependency Name="Microsoft.Extensions.Caching.Hybrid" Version="10.0.0-alpha.2.24462.2">
55-
<Uri>https://github.com/dotnet/dotnet</Uri>
56-
<Sha>f485d74550db5bd91617accc1bb548ae6013756b</Sha>
57-
</Dependency>
5854
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.7.25358.102">
5955
<Uri>https://github.com/dotnet/dotnet</Uri>
6056
<Sha>23101ed07a38169d3e59d63b9d4d33e6d1d609bb</Sha>
@@ -400,13 +396,17 @@
400396
<Uri>https://github.com/dotnet/dotnet</Uri>
401397
<Sha>23101ed07a38169d3e59d63b9d4d33e6d1d609bb</Sha>
402398
</Dependency>
403-
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.6.0-preview.1.25271.2">
399+
<Dependency Name="Microsoft.Extensions.Caching.Hybrid" Version="9.8.0-preview.1.25358.1">
400+
<Uri>https://github.com/dotnet/extensions</Uri>
401+
<Sha>23c62b80989f7baf55dc394829895b636f960fdc</Sha>
402+
</Dependency>
403+
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.8.0-preview.1.25358.1">
404404
<Uri>https://github.com/dotnet/extensions</Uri>
405-
<Sha>6f29ab505709370fc9b72bf4bb7e004a7662f69f</Sha>
405+
<Sha>23c62b80989f7baf55dc394829895b636f960fdc</Sha>
406406
</Dependency>
407-
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.6.0-preview.1.25271.2">
407+
<Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.8.0-preview.1.25358.1">
408408
<Uri>https://github.com/dotnet/extensions</Uri>
409-
<Sha>6f29ab505709370fc9b72bf4bb7e004a7662f69f</Sha>
409+
<Sha>23c62b80989f7baf55dc394829895b636f960fdc</Sha>
410410
</Dependency>
411411
<Dependency Name="NuGet.Frameworks" Version="6.2.4">
412412
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -420,25 +420,25 @@
420420
<Uri>https://github.com/nuget/nuget.client</Uri>
421421
<Sha>8fef55f5a55a3b4f2c96cd1a9b5ddc51d4b927f8</Sha>
422422
</Dependency>
423-
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25217.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
423+
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
424424
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
425-
<Sha>bff9b4a349cfa7e3d83264d8953613d98a7b04eb</Sha>
425+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
426426
</Dependency>
427-
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25217.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
427+
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
428428
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
429-
<Sha>bff9b4a349cfa7e3d83264d8953613d98a7b04eb</Sha>
429+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
430430
</Dependency>
431-
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25217.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
431+
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
432432
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
433-
<Sha>bff9b4a349cfa7e3d83264d8953613d98a7b04eb</Sha>
433+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
434434
</Dependency>
435-
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25217.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
435+
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
436436
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
437-
<Sha>bff9b4a349cfa7e3d83264d8953613d98a7b04eb</Sha>
437+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
438438
</Dependency>
439-
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25217.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
439+
<Dependency Name="optimization.linux-arm64.MIBC.Runtime" Version="1.0.0-prerelease.25324.1">
440440
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
441-
<Sha>bff9b4a349cfa7e3d83264d8953613d98a7b04eb</Sha>
441+
<Sha>86968b14b5c2ba5104d205665c76c22544c067f6</Sha>
442442
</Dependency>
443443
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
444444
<Dependency Name="Microsoft.Build" Version="17.12.36">

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<MicrosoftNETCoreBrowserDebugHostTransportVersion>10.0.0-preview.7.25358.102</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7575
<MicrosoftExtensionsCachingAbstractionsVersion>10.0.0-preview.7.25358.102</MicrosoftExtensionsCachingAbstractionsVersion>
7676
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.7.25358.102</MicrosoftExtensionsCachingMemoryVersion>
77-
<MicrosoftExtensionsCachingHybridVersion>10.0.0-alpha.2.24462.2</MicrosoftExtensionsCachingHybridVersion>
7877
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.7.25358.102</MicrosoftExtensionsConfigurationAbstractionsVersion>
7978
<MicrosoftExtensionsConfigurationBinderVersion>10.0.0-preview.7.25358.102</MicrosoftExtensionsConfigurationBinderVersion>
8079
<MicrosoftExtensionsConfigurationCommandLineVersion>10.0.0-preview.7.25358.102</MicrosoftExtensionsConfigurationCommandLineVersion>
@@ -144,8 +143,9 @@
144143
<SystemNumericsTensorsVersion>10.0.0-preview.7.25358.102</SystemNumericsTensorsVersion>
145144
<SystemRuntimeCachingVersion>10.0.0-preview.7.25358.102</SystemRuntimeCachingVersion>
146145
<!-- Packages from dotnet/extensions -->
147-
<MicrosoftExtensionsDiagnosticsTestingVersion>9.6.0-preview.1.25271.2</MicrosoftExtensionsDiagnosticsTestingVersion>
148-
<MicrosoftExtensionsTimeProviderTestingVersion>9.6.0-preview.1.25271.2</MicrosoftExtensionsTimeProviderTestingVersion>
146+
<MicrosoftExtensionsCachingHybridVersion>9.8.0-preview.1.25358.1</MicrosoftExtensionsCachingHybridVersion>
147+
<MicrosoftExtensionsDiagnosticsTestingVersion>9.8.0-preview.1.25358.1</MicrosoftExtensionsDiagnosticsTestingVersion>
148+
<MicrosoftExtensionsTimeProviderTestingVersion>9.8.0-preview.1.25358.1</MicrosoftExtensionsTimeProviderTestingVersion>
149149
<!-- Packages from dotnet/efcore -->
150150
<dotnetefVersion>10.0.0-preview.7.25358.102</dotnetefVersion>
151151
<MicrosoftEntityFrameworkCoreInMemoryVersion>10.0.0-preview.7.25358.102</MicrosoftEntityFrameworkCoreInMemoryVersion>
@@ -182,11 +182,11 @@
182182
<!-- Packages from dotnet/xdt -->
183183
<MicrosoftWebXdtVersion>3.2.0-preview.25358.102</MicrosoftWebXdtVersion>
184184
<!-- dotnet-optimization dependencies -->
185-
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25217.3</optimizationwindows_ntx64MIBCRuntimeVersion>
186-
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25217.3</optimizationwindows_ntx86MIBCRuntimeVersion>
187-
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25217.3</optimizationwindows_ntarm64MIBCRuntimeVersion>
188-
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25217.3</optimizationlinuxx64MIBCRuntimeVersion>
189-
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25217.3</optimizationlinuxarm64MIBCRuntimeVersion>
185+
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationwindows_ntx64MIBCRuntimeVersion>
186+
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationwindows_ntx86MIBCRuntimeVersion>
187+
<optimizationwindows_ntarm64MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationwindows_ntarm64MIBCRuntimeVersion>
188+
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationlinuxx64MIBCRuntimeVersion>
189+
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.25324.1</optimizationlinuxarm64MIBCRuntimeVersion>
190190
</PropertyGroup>
191191
<!--
192192

0 commit comments

Comments
 (0)