Skip to content

Commit fd770a7

Browse files
authored
Merging changes from the internal fork (#6508)
2 parents 691f361 + 2481e9e commit fd770a7

20 files changed

+907
-220
lines changed

eng/Version.Details.xml

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

eng/Versions.props

Lines changed: 61 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
<!--
1212
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1313
-->
14-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
14+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
1515
<!--
1616
When DotNetFinalVersionKind is set to 'release' (only for the release branches),
1717
the build will produce stable outputs for 'Shipping' packages.
1818
1919
This is used by the Arcade SDK (Publish.proj) to determine if the build is a release build or not.
2020
-->
21-
<DotNetFinalVersionKind />
21+
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
2222
<!-- Enabling this rule will cause build failures on undocumented public APIs. -->
2323
<SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
2424
</PropertyGroup>
@@ -34,55 +34,55 @@
3434
-->
3535
<PropertyGroup Label="Automated Maestro dependency updates">
3636
<!-- Packages from dotnet/runtime -->
37-
<MicrosoftBclAsyncInterfacesVersion>9.0.5</MicrosoftBclAsyncInterfacesVersion>
38-
<MicrosoftBclTimeProviderVersion>9.0.5</MicrosoftBclTimeProviderVersion>
39-
<MicrosoftExtensionsCachingAbstractionsVersion>9.0.5</MicrosoftExtensionsCachingAbstractionsVersion>
40-
<MicrosoftExtensionsCachingMemoryVersion>9.0.5</MicrosoftExtensionsCachingMemoryVersion>
41-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
42-
<MicrosoftExtensionsConfigurationBinderVersion>9.0.5</MicrosoftExtensionsConfigurationBinderVersion>
43-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.5</MicrosoftExtensionsConfigurationJsonVersion>
44-
<MicrosoftExtensionsConfigurationVersion>9.0.5</MicrosoftExtensionsConfigurationVersion>
45-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.5</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
46-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.5</MicrosoftExtensionsDependencyInjectionVersion>
47-
<MicrosoftExtensionsDiagnosticsVersion>9.0.5</MicrosoftExtensionsDiagnosticsVersion>
48-
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.5</MicrosoftExtensionsHostingAbstractionsVersion>
49-
<MicrosoftExtensionsHostingVersion>9.0.5</MicrosoftExtensionsHostingVersion>
50-
<MicrosoftExtensionsHttpVersion>9.0.5</MicrosoftExtensionsHttpVersion>
51-
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.5</MicrosoftExtensionsLoggingAbstractionsVersion>
52-
<MicrosoftExtensionsLoggingConfigurationVersion>9.0.5</MicrosoftExtensionsLoggingConfigurationVersion>
53-
<MicrosoftExtensionsLoggingConsoleVersion>9.0.5</MicrosoftExtensionsLoggingConsoleVersion>
54-
<MicrosoftExtensionsLoggingVersion>9.0.5</MicrosoftExtensionsLoggingVersion>
55-
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.5</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
56-
<MicrosoftExtensionsOptionsVersion>9.0.5</MicrosoftExtensionsOptionsVersion>
57-
<MicrosoftNETCoreAppRefVersion>9.0.5</MicrosoftNETCoreAppRefVersion>
58-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.5</MicrosoftNETCoreAppRuntimewinx64Version>
59-
<SystemCollectionsImmutableVersion>9.0.5</SystemCollectionsImmutableVersion>
60-
<SystemConfigurationConfigurationManagerVersion>9.0.5</SystemConfigurationConfigurationManagerVersion>
61-
<SystemDiagnosticsDiagnosticSourceVersion>9.0.5</SystemDiagnosticsDiagnosticSourceVersion>
62-
<SystemDiagnosticsPerformanceCounterVersion>9.0.5</SystemDiagnosticsPerformanceCounterVersion>
63-
<SystemIOHashingVersion>9.0.5</SystemIOHashingVersion>
64-
<SystemIOPipelinesVersion>9.0.5</SystemIOPipelinesVersion>
65-
<SystemMemoryDataVersion>9.0.5</SystemMemoryDataVersion>
66-
<SystemNetHttpJsonVersion>9.0.5</SystemNetHttpJsonVersion>
67-
<SystemRuntimeCachingVersion>9.0.5</SystemRuntimeCachingVersion>
68-
<SystemSecurityCryptographyPkcsVersion>9.0.5</SystemSecurityCryptographyPkcsVersion>
69-
<SystemSecurityCryptographyXmlVersion>9.0.5</SystemSecurityCryptographyXmlVersion>
70-
<SystemTextEncodingsWebVersion>9.0.5</SystemTextEncodingsWebVersion>
71-
<SystemNumericsTensorsVersion>9.0.5</SystemNumericsTensorsVersion>
72-
<SystemTextJsonVersion>9.0.5</SystemTextJsonVersion>
73-
<SystemThreadingChannelsVersion>9.0.5</SystemThreadingChannelsVersion>
37+
<MicrosoftBclAsyncInterfacesVersion>9.0.6</MicrosoftBclAsyncInterfacesVersion>
38+
<MicrosoftBclTimeProviderVersion>9.0.6</MicrosoftBclTimeProviderVersion>
39+
<MicrosoftExtensionsCachingAbstractionsVersion>9.0.6</MicrosoftExtensionsCachingAbstractionsVersion>
40+
<MicrosoftExtensionsCachingMemoryVersion>9.0.6</MicrosoftExtensionsCachingMemoryVersion>
41+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.6</MicrosoftExtensionsConfigurationAbstractionsVersion>
42+
<MicrosoftExtensionsConfigurationBinderVersion>9.0.6</MicrosoftExtensionsConfigurationBinderVersion>
43+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.6</MicrosoftExtensionsConfigurationJsonVersion>
44+
<MicrosoftExtensionsConfigurationVersion>9.0.6</MicrosoftExtensionsConfigurationVersion>
45+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.6</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
46+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.6</MicrosoftExtensionsDependencyInjectionVersion>
47+
<MicrosoftExtensionsDiagnosticsVersion>9.0.6</MicrosoftExtensionsDiagnosticsVersion>
48+
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.6</MicrosoftExtensionsHostingAbstractionsVersion>
49+
<MicrosoftExtensionsHostingVersion>9.0.6</MicrosoftExtensionsHostingVersion>
50+
<MicrosoftExtensionsHttpVersion>9.0.6</MicrosoftExtensionsHttpVersion>
51+
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.6</MicrosoftExtensionsLoggingAbstractionsVersion>
52+
<MicrosoftExtensionsLoggingConfigurationVersion>9.0.6</MicrosoftExtensionsLoggingConfigurationVersion>
53+
<MicrosoftExtensionsLoggingConsoleVersion>9.0.6</MicrosoftExtensionsLoggingConsoleVersion>
54+
<MicrosoftExtensionsLoggingVersion>9.0.6</MicrosoftExtensionsLoggingVersion>
55+
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.6</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
56+
<MicrosoftExtensionsOptionsVersion>9.0.6</MicrosoftExtensionsOptionsVersion>
57+
<MicrosoftNETCoreAppRefVersion>9.0.6</MicrosoftNETCoreAppRefVersion>
58+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.6</MicrosoftNETCoreAppRuntimewinx64Version>
59+
<SystemCollectionsImmutableVersion>9.0.6</SystemCollectionsImmutableVersion>
60+
<SystemConfigurationConfigurationManagerVersion>9.0.6</SystemConfigurationConfigurationManagerVersion>
61+
<SystemDiagnosticsDiagnosticSourceVersion>9.0.6</SystemDiagnosticsDiagnosticSourceVersion>
62+
<SystemDiagnosticsPerformanceCounterVersion>9.0.6</SystemDiagnosticsPerformanceCounterVersion>
63+
<SystemIOHashingVersion>9.0.6</SystemIOHashingVersion>
64+
<SystemIOPipelinesVersion>9.0.6</SystemIOPipelinesVersion>
65+
<SystemMemoryDataVersion>9.0.6</SystemMemoryDataVersion>
66+
<SystemNetHttpJsonVersion>9.0.6</SystemNetHttpJsonVersion>
67+
<SystemRuntimeCachingVersion>9.0.6</SystemRuntimeCachingVersion>
68+
<SystemSecurityCryptographyPkcsVersion>9.0.6</SystemSecurityCryptographyPkcsVersion>
69+
<SystemSecurityCryptographyXmlVersion>9.0.6</SystemSecurityCryptographyXmlVersion>
70+
<SystemTextEncodingsWebVersion>9.0.6</SystemTextEncodingsWebVersion>
71+
<SystemNumericsTensorsVersion>9.0.6</SystemNumericsTensorsVersion>
72+
<SystemTextJsonVersion>9.0.6</SystemTextJsonVersion>
73+
<SystemThreadingChannelsVersion>9.0.6</SystemThreadingChannelsVersion>
7474
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
75-
<MicrosoftAspNetCoreAppRefVersion>9.0.5</MicrosoftAspNetCoreAppRefVersion>
76-
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.5</MicrosoftAspNetCoreAppRuntimewinx64Version>
77-
<MicrosoftAspNetCoreMvcTestingVersion>9.0.5</MicrosoftAspNetCoreMvcTestingVersion>
78-
<MicrosoftAspNetCoreTestHostVersion>9.0.5</MicrosoftAspNetCoreTestHostVersion>
79-
<MicrosoftExtensionsCachingSqlServerVersion>9.0.5</MicrosoftExtensionsCachingSqlServerVersion>
80-
<MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.5</MicrosoftExtensionsCachingStackExchangeRedisVersion>
81-
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.5</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
82-
<MicrosoftExtensionsHttpPollyVersion>9.0.5</MicrosoftExtensionsHttpPollyVersion>
83-
<MicrosoftExtensionsObjectPoolVersion>9.0.5</MicrosoftExtensionsObjectPoolVersion>
75+
<MicrosoftAspNetCoreAppRefVersion>9.0.6</MicrosoftAspNetCoreAppRefVersion>
76+
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.6</MicrosoftAspNetCoreAppRuntimewinx64Version>
77+
<MicrosoftAspNetCoreMvcTestingVersion>9.0.6</MicrosoftAspNetCoreMvcTestingVersion>
78+
<MicrosoftAspNetCoreTestHostVersion>9.0.6</MicrosoftAspNetCoreTestHostVersion>
79+
<MicrosoftExtensionsCachingSqlServerVersion>9.0.6</MicrosoftExtensionsCachingSqlServerVersion>
80+
<MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.6</MicrosoftExtensionsCachingStackExchangeRedisVersion>
81+
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.6</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
82+
<MicrosoftExtensionsHttpPollyVersion>9.0.6</MicrosoftExtensionsHttpPollyVersion>
83+
<MicrosoftExtensionsObjectPoolVersion>9.0.6</MicrosoftExtensionsObjectPoolVersion>
8484
<!-- Dependencies from https://github.com/dotnet/efcore -->
85-
<MicrosoftEntityFrameworkCoreSqliteVersion>9.0.5</MicrosoftEntityFrameworkCoreSqliteVersion>
85+
<MicrosoftEntityFrameworkCoreSqliteVersion>9.0.6</MicrosoftEntityFrameworkCoreSqliteVersion>
8686
<!-- Dependencies from https://github.com/dotnet/arcade -->
8787
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25271.1</MicrosoftDotNetBuildTasksTemplatingVersion>
8888
</PropertyGroup>
@@ -108,8 +108,8 @@
108108
<MicrosoftExtensionsLoggingLTSVersion>8.0.1</MicrosoftExtensionsLoggingLTSVersion>
109109
<MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>
110110
<MicrosoftExtensionsOptionsLTSVersion>8.0.2</MicrosoftExtensionsOptionsLTSVersion>
111-
<MicrosoftNETCoreAppRefLTSVersion>8.0.16</MicrosoftNETCoreAppRefLTSVersion>
112-
<MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.16</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
111+
<MicrosoftNETCoreAppRefLTSVersion>8.0.17</MicrosoftNETCoreAppRefLTSVersion>
112+
<MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.17</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
113113
<SystemCollectionsImmutableLTSVersion>8.0.0</SystemCollectionsImmutableLTSVersion>
114114
<SystemConfigurationConfigurationManagerLTSVersion>8.0.1</SystemConfigurationConfigurationManagerLTSVersion>
115115
<SystemDiagnosticsDiagnosticSourceLTSVersion>8.0.1</SystemDiagnosticsDiagnosticSourceLTSVersion>
@@ -126,17 +126,17 @@
126126
<SystemTextJsonLTSVersion>8.0.5</SystemTextJsonLTSVersion>
127127
<SystemThreadingChannelsLTSVersion>8.0.0</SystemThreadingChannelsLTSVersion>
128128
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
129-
<MicrosoftAspNetCoreAppRefLTSVersion>8.0.16</MicrosoftAspNetCoreAppRefLTSVersion>
130-
<MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.16</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
131-
<MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.16</MicrosoftAspNetCoreMvcTestingLTSVersion>
132-
<MicrosoftAspNetCoreTestHostLTSVersion>8.0.16</MicrosoftAspNetCoreTestHostLTSVersion>
133-
<MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.16</MicrosoftExtensionsCachingSqlServerLTSVersion>
134-
<MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.16</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
135-
<MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.16</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
136-
<MicrosoftExtensionsHttpPollyLTSVersion>8.0.16</MicrosoftExtensionsHttpPollyLTSVersion>
137-
<MicrosoftExtensionsObjectPoolLTSVersion>8.0.16</MicrosoftExtensionsObjectPoolLTSVersion>
129+
<MicrosoftAspNetCoreAppRefLTSVersion>8.0.17</MicrosoftAspNetCoreAppRefLTSVersion>
130+
<MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.17</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
131+
<MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.17</MicrosoftAspNetCoreMvcTestingLTSVersion>
132+
<MicrosoftAspNetCoreTestHostLTSVersion>8.0.17</MicrosoftAspNetCoreTestHostLTSVersion>
133+
<MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.17</MicrosoftExtensionsCachingSqlServerLTSVersion>
134+
<MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.17</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
135+
<MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.17</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
136+
<MicrosoftExtensionsHttpPollyLTSVersion>8.0.17</MicrosoftExtensionsHttpPollyLTSVersion>
137+
<MicrosoftExtensionsObjectPoolLTSVersion>8.0.17</MicrosoftExtensionsObjectPoolLTSVersion>
138138
<!-- Dependencies from https://github.com/dotnet/efcore -->
139-
<MicrosoftEntityFrameworkCoreSqliteLTSVersion>8.0.16</MicrosoftEntityFrameworkCoreSqliteLTSVersion>
139+
<MicrosoftEntityFrameworkCoreSqliteLTSVersion>8.0.17</MicrosoftEntityFrameworkCoreSqliteLTSVersion>
140140
</PropertyGroup>
141141
<!--
142142

0 commit comments

Comments
 (0)