Skip to content

Commit d0f0901

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/5.0] Update dependencies from dotnet/efcore dotnet/runtime (#28087)
[release/5.0] Update dependencies from dotnet/efcore dotnet/runtime - Merge branch 'release/5.0' into darc-release/5.0-d4478e43-6d04-47a1-8a7c-c6c2dcd90d64 - Tweak tests - Remove Extensions.Internal.Transport from Runtime - Microsoft.AspNetCore.App.Runtime project does not expect compilation-only references - !fixup! Rearrange a `Condition` - slight change to 49cc13c workaround - Do not compile against assemblies with newer assembly versions - avoid problems with e.g. System.Extensions.DependencyInjection in 5.0.1 - Revert "Remove package version pinning for ref/ assemblies in servicing (#25851)" - dotnet/runtime assembly versions are unexpectedly changing in servicing This reverts commit bfc1ec6. - Update `SharedFxTests` to handle dotnet/runtime version changes - assemblies with non-0.0 versions end up in Microsoft.AspNetCore.App - future-proofs these tests because more dotnet/runtime versions may change - !fixup! Revert of bfc1ec6 messed up `RepoTasks` - need the RTM-versioned packages on all platforms - we only target `net472` on Windows
1 parent 5c1f6ff commit d0f0901

File tree

10 files changed

+195
-36
lines changed

10 files changed

+195
-36
lines changed

‎NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-efcore -->
7-
<add key="darc-pub-dotnet-efcore-240223e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-240223ef/nuget/v3/index.json" />
7+
<add key="darc-pub-dotnet-efcore-e08026a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-efcore-e08026a6/nuget/v3/index.json" />
88
<!-- End: Package sources from dotnet-efcore -->
99
<!-- Begin: Package sources from dotnet-runtime -->
10-
<add key="darc-pub-dotnet-runtime-9ecbcd7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-9ecbcd74/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-runtime-b02e13a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b02e13ab/nuget/v3/index.json" />
1111
<!-- End: Package sources from dotnet-runtime -->
1212
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1313
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />

‎eng/Dependencies.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ and are generated based on the last package release.
7373
<LatestPackageReference Include="System.Reflection.Metadata" />
7474
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" />
7575
<LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
76+
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. -->
77+
<LatestPackageReference Include="System.Security.AccessControl" />
7678
<LatestPackageReference Include="System.Security.Cryptography.Cng" />
7779
<LatestPackageReference Include="System.Security.Cryptography.Pkcs" />
7880
<LatestPackageReference Include="System.Security.Cryptography.Xml" />
@@ -195,6 +197,11 @@ and are generated based on the last package release.
195197
<!-- Get versions. -->
196198
<LatestPackageReference Update="@(LatestPackageReference)">
197199
<Version>$(%(VersionName)PackageVersion)</Version>
200+
<RTMVersion>$(%(VersionName)V0PackageVersion)</RTMVersion>
201+
202+
<!-- Remove excess metadata. -->
203+
<RTMVersion Condition=" '%(Version)' == '%(RTMVersion)' " />
204+
<VersionName />
198205
</LatestPackageReference>
199206

200207
<!--

‎eng/Version.Details.xml

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@
1111
<ProductDependencies>
1212
<Dependency Name="dotnet-ef" Version="5.0.1">
1313
<Uri>https://github.com/dotnet/efcore</Uri>
14-
<Sha>240223ef37a9bb44688f93ebab203c2c8f3c3e95</Sha>
14+
<Sha>e08026a638e684e6d3eabbd65702251e8c0febea</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.1">
1717
<Uri>https://github.com/dotnet/efcore</Uri>
18-
<Sha>240223ef37a9bb44688f93ebab203c2c8f3c3e95</Sha>
18+
<Sha>e08026a638e684e6d3eabbd65702251e8c0febea</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.1">
2121
<Uri>https://github.com/dotnet/efcore</Uri>
22-
<Sha>240223ef37a9bb44688f93ebab203c2c8f3c3e95</Sha>
22+
<Sha>e08026a638e684e6d3eabbd65702251e8c0febea</Sha>
2323
</Dependency>
2424
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.1">
2525
<Uri>https://github.com/dotnet/efcore</Uri>
26-
<Sha>240223ef37a9bb44688f93ebab203c2c8f3c3e95</Sha>
26+
<Sha>e08026a638e684e6d3eabbd65702251e8c0febea</Sha>
2727
</Dependency>
2828
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.1">
2929
<Uri>https://github.com/dotnet/efcore</Uri>
30-
<Sha>240223ef37a9bb44688f93ebab203c2c8f3c3e95</Sha>
30+
<Sha>e08026a638e684e6d3eabbd65702251e8c0febea</Sha>
3131
</Dependency>
3232
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.1">
3333
<Uri>https://github.com/dotnet/efcore</Uri>
34-
<Sha>240223ef37a9bb44688f93ebab203c2c8f3c3e95</Sha>
34+
<Sha>e08026a638e684e6d3eabbd65702251e8c0febea</Sha>
3535
</Dependency>
3636
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.1">
3737
<Uri>https://github.com/dotnet/efcore</Uri>
38-
<Sha>240223ef37a9bb44688f93ebab203c2c8f3c3e95</Sha>
38+
<Sha>e08026a638e684e6d3eabbd65702251e8c0febea</Sha>
3939
</Dependency>
4040
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.1">
4141
<Uri>https://github.com/dotnet/efcore</Uri>
42-
<Sha>240223ef37a9bb44688f93ebab203c2c8f3c3e95</Sha>
42+
<Sha>e08026a638e684e6d3eabbd65702251e8c0febea</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -93,9 +93,9 @@
9393
<Uri>https://github.com/dotnet/runtime</Uri>
9494
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
9595
</Dependency>
96-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0">
96+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.1">
9797
<Uri>https://github.com/dotnet/runtime</Uri>
98-
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
98+
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
9999
</Dependency>
100100
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0">
101101
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -209,9 +209,9 @@
209209
<Uri>https://github.com/dotnet/runtime</Uri>
210210
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
211211
</Dependency>
212-
<Dependency Name="System.IO.Pipelines" Version="5.0.0">
212+
<Dependency Name="System.IO.Pipelines" Version="5.0.1">
213213
<Uri>https://github.com/dotnet/runtime</Uri>
214-
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
214+
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
215215
</Dependency>
216216
<Dependency Name="System.Net.Http.Json" Version="5.0.0">
217217
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -237,14 +237,19 @@
237237
<Uri>https://github.com/dotnet/runtime</Uri>
238238
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
239239
</Dependency>
240-
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0">
240+
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. -->
241+
<Dependency Name="System.Security.AccessControl" Version="5.0.0">
241242
<Uri>https://github.com/dotnet/runtime</Uri>
242243
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
243244
</Dependency>
244-
<Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0">
245+
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0">
245246
<Uri>https://github.com/dotnet/runtime</Uri>
246247
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
247248
</Dependency>
249+
<Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.1">
250+
<Uri>https://github.com/dotnet/runtime</Uri>
251+
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
252+
</Dependency>
248253
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0">
249254
<Uri>https://github.com/dotnet/runtime</Uri>
250255
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
@@ -291,15 +296,15 @@
291296
-->
292297
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.1">
293298
<Uri>https://github.com/dotnet/runtime</Uri>
294-
<Sha>9ecbcd746c9648d00d4bf98bf15f31e21e01db6e</Sha>
299+
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
295300
</Dependency>
296-
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.1-servicing.20570.12">
301+
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.1-servicing.20575.16">
297302
<Uri>https://github.com/dotnet/runtime</Uri>
298-
<Sha>9ecbcd746c9648d00d4bf98bf15f31e21e01db6e</Sha>
303+
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
299304
</Dependency>
300-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.1-servicing.20570.12">
305+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="5.0.1-servicing.20575.16">
301306
<Uri>https://github.com/dotnet/runtime</Uri>
302-
<Sha>9ecbcd746c9648d00d4bf98bf15f31e21e01db6e</Sha>
307+
<Sha>b02e13abab3d6f499751af2ad1ae6333fb4e633d</Sha>
303308
</Dependency>
304309
</ProductDependencies>
305310
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
<PropertyGroup Label="Automated">
5959
<!-- Packages from dotnet/runtime -->
6060
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
61-
<MicrosoftNETCoreAppInternalPackageVersion>5.0.1-servicing.20570.12</MicrosoftNETCoreAppInternalPackageVersion>
61+
<MicrosoftNETCoreAppInternalPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreAppInternalPackageVersion>
6262
<MicrosoftNETCoreAppRefPackageVersion>5.0.0</MicrosoftNETCoreAppRefPackageVersion>
6363
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
64-
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.1-servicing.20570.12</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
64+
<MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>5.0.1-servicing.20575.16</MicrosoftNETCoreBrowserDebugHostTransportPackageVersion>
6565
<MicrosoftWin32RegistryPackageVersion>5.0.0</MicrosoftWin32RegistryPackageVersion>
6666
<MicrosoftWin32SystemEventsPackageVersion>5.0.0</MicrosoftWin32SystemEventsPackageVersion>
6767
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsCachingAbstractionsPackageVersion>
@@ -77,7 +77,7 @@
7777
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
7878
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0</MicrosoftExtensionsConfigurationXmlPackageVersion>
7979
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
80-
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0</MicrosoftExtensionsDependencyInjectionPackageVersion>
80+
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
8181
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
8282
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0</MicrosoftExtensionsFileProvidersCompositePackageVersion>
8383
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
@@ -104,15 +104,17 @@
104104
<SystemDiagnosticsEventLogPackageVersion>5.0.0</SystemDiagnosticsEventLogPackageVersion>
105105
<SystemDirectoryServicesProtocolsPackageVersion>5.0.0</SystemDirectoryServicesProtocolsPackageVersion>
106106
<SystemDrawingCommonPackageVersion>5.0.0</SystemDrawingCommonPackageVersion>
107-
<SystemIOPipelinesPackageVersion>5.0.0</SystemIOPipelinesPackageVersion>
107+
<SystemIOPipelinesPackageVersion>5.0.1</SystemIOPipelinesPackageVersion>
108108
<SystemNetHttpJsonPackageVersion>5.0.0</SystemNetHttpJsonPackageVersion>
109109
<SystemNetHttpWinHttpHandlerPackageVersion>5.0.0</SystemNetHttpWinHttpHandlerPackageVersion>
110110
<SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0</SystemNetWebSocketsWebSocketProtocolPackageVersion>
111111
<SystemReflectionMetadataPackageVersion>5.0.0</SystemReflectionMetadataPackageVersion>
112112
<SystemResourcesExtensionsPackageVersion>5.0.0</SystemResourcesExtensionsPackageVersion>
113113
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0</SystemRuntimeCompilerServicesUnsafePackageVersion>
114+
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. -->
115+
<SystemSecurityAccessControlPackageVersion>5.0.0</SystemSecurityAccessControlPackageVersion>
114116
<SystemSecurityCryptographyCngPackageVersion>5.0.0</SystemSecurityCryptographyCngPackageVersion>
115-
<SystemSecurityCryptographyPkcsPackageVersion>5.0.0</SystemSecurityCryptographyPkcsPackageVersion>
117+
<SystemSecurityCryptographyPkcsPackageVersion>5.0.1</SystemSecurityCryptographyPkcsPackageVersion>
116118
<SystemSecurityCryptographyXmlPackageVersion>5.0.0</SystemSecurityCryptographyXmlPackageVersion>
117119
<SystemSecurityPermissionsPackageVersion>5.0.0</SystemSecurityPermissionsPackageVersion>
118120
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion>
@@ -151,6 +153,36 @@
151153
-->
152154
<MicrosoftNETCoreAppRuntimeVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimeVersion>
153155
</PropertyGroup>
156+
<!--
157+
We ship ref/ assemblies for runtime packages in our targeting targeting pack. When servicing that targeting pack,
158+
these assemblies must not change. Must also compile our assemblies against the initial ref/ assemblies for runtime
159+
packages. But, need to test against the latest implementation assemblies and ship them in our shared framework.
160+
Upshot is we need Major.Minor.0 runtime packages for compilation and the targeting pack and Major.Minor.Latest
161+
runtime packages for everything else. This is not an issue for assemblies available in Microsoft.NETCore.App.Ref or
162+
Microsoft.Extensions.Internal.Transport because it is next to impossible we would service those packages.
163+
164+
System.Security.AccessControl should only be referenced in Dependencies.props and RepoTasks.csproj. Because
165+
it's a transitive reference, we reship the ref/ assembly in Microsoft.AspNetCore.App.Ref. dotnet/runtime ships
166+
the implementation assemblies in Microsoft.NETCore.App.Runtime.* packages.
167+
168+
If testing this configuration prior to servicing, update the versions of dependencies too. E.g. change
169+
`$(SystemSecurityPrincipalWindowsV0PackageVersion)` if you change `$(SystemSecurityAccessControlV0PackageVersion)`
170+
because System.Security.AccessControl will otherwise be loadable. This should not be necessary in servicing.
171+
-->
172+
<PropertyGroup Condition=" '$(IsServicingBuild)' == 'true' ">
173+
<MicrosoftWin32RegistryV0PackageVersion>$(MicrosoftWin32RegistryPackageVersion.Split('.')[0]).$(MicrosoftWin32RegistryPackageVersion.Split('.')[1]).0</MicrosoftWin32RegistryV0PackageVersion>
174+
<MicrosoftWin32SystemEventsV0PackageVersion>$(MicrosoftWin32SystemEventsPackageVersion.Split('.')[0]).$(MicrosoftWin32SystemEventsPackageVersion.Split('.')[1]).0</MicrosoftWin32SystemEventsV0PackageVersion>
175+
<SystemDiagnosticsEventLogV0PackageVersion>$(SystemDiagnosticsEventLogPackageVersion.Split('.')[0]).$(SystemDiagnosticsEventLogPackageVersion.Split('.')[1]).0</SystemDiagnosticsEventLogV0PackageVersion>
176+
<SystemDrawingCommonV0PackageVersion>$(SystemDrawingCommonPackageVersion.Split('.')[0]).$(SystemDrawingCommonPackageVersion.Split('.')[1]).0</SystemDrawingCommonV0PackageVersion>
177+
<SystemIOPipelinesV0PackageVersion>$(SystemIOPipelinesPackageVersion.Split('.')[0]).$(SystemIOPipelinesPackageVersion.Split('.')[1]).0</SystemIOPipelinesV0PackageVersion>
178+
<SystemSecurityAccessControlV0PackageVersion>$(SystemSecurityAccessControlPackageVersion.Split('.')[0]).$(SystemSecurityAccessControlPackageVersion.Split('.')[1]).0</SystemSecurityAccessControlV0PackageVersion>
179+
<SystemSecurityCryptographyCngV0PackageVersion>$(SystemSecurityCryptographyCngPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyCngPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyCngV0PackageVersion>
180+
<SystemSecurityCryptographyPkcsV0PackageVersion>$(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyPkcsPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyPkcsV0PackageVersion>
181+
<SystemSecurityCryptographyXmlV0PackageVersion>$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[0]).$(SystemSecurityCryptographyXmlPackageVersion.Split('.')[1]).0</SystemSecurityCryptographyXmlV0PackageVersion>
182+
<SystemSecurityPermissionsV0PackageVersion>$(SystemSecurityPermissionsPackageVersion.Split('.')[0]).$(SystemSecurityPermissionsPackageVersion.Split('.')[1]).0</SystemSecurityPermissionsV0PackageVersion>
183+
<SystemSecurityPrincipalWindowsV0PackageVersion>$(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[0]).$(SystemSecurityPrincipalWindowsPackageVersion.Split('.')[1]).0</SystemSecurityPrincipalWindowsV0PackageVersion>
184+
<SystemWindowsExtensionsV0PackageVersion>$(SystemWindowsExtensionsPackageVersion.Split('.')[0]).$(SystemWindowsExtensionsPackageVersion.Split('.')[1]).0</SystemWindowsExtensionsV0PackageVersion>
185+
</PropertyGroup>
154186
<PropertyGroup Label="Manual">
155187
<MicrosoftNetCompilersToolsetPackageVersion>3.8.0-3.20458.6</MicrosoftNetCompilersToolsetPackageVersion>
156188
<!-- DiagnosticAdapter package pinned temporarily until migrated/deprecated -->

0 commit comments

Comments
 (0)