Skip to content

Commit f9edff2

Browse files
authored
Merge internal changes (#5631)
2 parents d468173 + c94cd35 commit f9edff2

File tree

13 files changed

+164
-149
lines changed

13 files changed

+164
-149
lines changed

eng/Version.Details.xml

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

eng/Versions.props

Lines changed: 63 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@
22
<PropertyGroup Label="Version settings">
33
<MajorVersion>9</MajorVersion>
44
<MinorVersion>0</MinorVersion>
5-
<PatchVersion>0</PatchVersion>
5+
<PatchVersion>1</PatchVersion>
66
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
7-
<PreReleaseVersionIteration>9</PreReleaseVersionIteration>
7+
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
88
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
99
<ValidateBaseline>true</ValidateBaseline>
1010
<AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
1111
<!--
1212
When DotNetFinalVersionKind is set to 'release', this branch will produce stable outputs for 'Shipping' packages
13+
14+
In 8.0, we shipped this package as stable even when it was in the dev stage, so we
15+
keep it as stable for compatiblity.
1316
-->
14-
<DotNetFinalVersionKind />
17+
<DotNetFinalVersionKind Condition="'$(DotNetFinalVersionKind)' == '' And ('$(Stage)' != 'dev' Or '$(Stage)' != 'preview' Or '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.Testing')">release</DotNetFinalVersionKind>
1518
<!-- Enabling this rule will cause build failures on undocumented public APIs. -->
1619
<SkipArcadeNoWarnCS1591>true</SkipArcadeNoWarnCS1591>
1720
</PropertyGroup>
@@ -27,52 +30,52 @@
2730
-->
2831
<PropertyGroup Label="Automated">
2932
<!-- Packages from dotnet/runtime -->
30-
<MicrosoftBclAsyncInterfacesVersion>9.0.0-rc.2.24473.5</MicrosoftBclAsyncInterfacesVersion>
31-
<MicrosoftBclTimeProviderVersion>9.0.0-rc.2.24473.5</MicrosoftBclTimeProviderVersion>
32-
<MicrosoftExtensionsCachingAbstractionsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsCachingAbstractionsVersion>
33-
<MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsCachingMemoryVersion>
34-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
35-
<MicrosoftExtensionsConfigurationBinderVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsConfigurationBinderVersion>
36-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsConfigurationJsonVersion>
37-
<MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsConfigurationVersion>
38-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
39-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsDependencyInjectionVersion>
40-
<MicrosoftExtensionsDiagnosticsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsDiagnosticsVersion>
41-
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsHostingAbstractionsVersion>
42-
<MicrosoftExtensionsHostingVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsHostingVersion>
43-
<MicrosoftExtensionsHttpVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsHttpVersion>
44-
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsLoggingAbstractionsVersion>
45-
<MicrosoftExtensionsLoggingConfigurationVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsLoggingConfigurationVersion>
46-
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsLoggingConsoleVersion>
47-
<MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsLoggingVersion>
48-
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
49-
<MicrosoftExtensionsOptionsVersion>9.0.0-rc.2.24473.5</MicrosoftExtensionsOptionsVersion>
50-
<MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24473.5</MicrosoftNETCoreAppRefVersion>
51-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24473.5</MicrosoftNETCoreAppRuntimewinx64Version>
52-
<SystemCollectionsImmutableVersion>9.0.0-rc.2.24473.5</SystemCollectionsImmutableVersion>
53-
<SystemConfigurationConfigurationManagerVersion>9.0.0-rc.2.24473.5</SystemConfigurationConfigurationManagerVersion>
54-
<SystemDiagnosticsDiagnosticSourceVersion>9.0.0-rc.2.24473.5</SystemDiagnosticsDiagnosticSourceVersion>
55-
<SystemDiagnosticsPerformanceCounterVersion>9.0.0-rc.2.24473.5</SystemDiagnosticsPerformanceCounterVersion>
56-
<SystemIOHashingVersion>9.0.0-rc.2.24473.5</SystemIOHashingVersion>
57-
<SystemIOPipelinesVersion>9.0.0-rc.2.24473.5</SystemIOPipelinesVersion>
58-
<SystemMemoryDataVersion>9.0.0-rc.2.24473.5</SystemMemoryDataVersion>
59-
<SystemNetHttpJsonVersion>9.0.0-rc.2.24473.5</SystemNetHttpJsonVersion>
60-
<SystemRuntimeCachingVersion>9.0.0-rc.2.24473.5</SystemRuntimeCachingVersion>
61-
<SystemSecurityCryptographyPkcsVersion>9.0.0-rc.2.24473.5</SystemSecurityCryptographyPkcsVersion>
62-
<SystemSecurityCryptographyXmlVersion>9.0.0-rc.2.24473.5</SystemSecurityCryptographyXmlVersion>
63-
<SystemTextEncodingsWebVersion>9.0.0-rc.2.24473.5</SystemTextEncodingsWebVersion>
64-
<SystemNumericsTensorsVersion>9.0.0-rc.2.24473.5</SystemNumericsTensorsVersion>
65-
<SystemTextJsonVersion>9.0.0-rc.2.24473.5</SystemTextJsonVersion>
33+
<MicrosoftBclAsyncInterfacesVersion>9.0.0</MicrosoftBclAsyncInterfacesVersion>
34+
<MicrosoftBclTimeProviderVersion>9.0.0</MicrosoftBclTimeProviderVersion>
35+
<MicrosoftExtensionsCachingAbstractionsVersion>9.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
36+
<MicrosoftExtensionsCachingMemoryVersion>9.0.0</MicrosoftExtensionsCachingMemoryVersion>
37+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
38+
<MicrosoftExtensionsConfigurationBinderVersion>9.0.0</MicrosoftExtensionsConfigurationBinderVersion>
39+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0</MicrosoftExtensionsConfigurationJsonVersion>
40+
<MicrosoftExtensionsConfigurationVersion>9.0.0</MicrosoftExtensionsConfigurationVersion>
41+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.0</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
42+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0</MicrosoftExtensionsDependencyInjectionVersion>
43+
<MicrosoftExtensionsDiagnosticsVersion>9.0.0</MicrosoftExtensionsDiagnosticsVersion>
44+
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.0</MicrosoftExtensionsHostingAbstractionsVersion>
45+
<MicrosoftExtensionsHostingVersion>9.0.0</MicrosoftExtensionsHostingVersion>
46+
<MicrosoftExtensionsHttpVersion>9.0.0</MicrosoftExtensionsHttpVersion>
47+
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0</MicrosoftExtensionsLoggingAbstractionsVersion>
48+
<MicrosoftExtensionsLoggingConfigurationVersion>9.0.0</MicrosoftExtensionsLoggingConfigurationVersion>
49+
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0</MicrosoftExtensionsLoggingConsoleVersion>
50+
<MicrosoftExtensionsLoggingVersion>9.0.0</MicrosoftExtensionsLoggingVersion>
51+
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
52+
<MicrosoftExtensionsOptionsVersion>9.0.0</MicrosoftExtensionsOptionsVersion>
53+
<MicrosoftNETCoreAppRefVersion>9.0.0</MicrosoftNETCoreAppRefVersion>
54+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
55+
<SystemCollectionsImmutableVersion>9.0.0</SystemCollectionsImmutableVersion>
56+
<SystemConfigurationConfigurationManagerVersion>9.0.0</SystemConfigurationConfigurationManagerVersion>
57+
<SystemDiagnosticsDiagnosticSourceVersion>9.0.0</SystemDiagnosticsDiagnosticSourceVersion>
58+
<SystemDiagnosticsPerformanceCounterVersion>9.0.0</SystemDiagnosticsPerformanceCounterVersion>
59+
<SystemIOHashingVersion>9.0.0</SystemIOHashingVersion>
60+
<SystemIOPipelinesVersion>9.0.0</SystemIOPipelinesVersion>
61+
<SystemMemoryDataVersion>9.0.0</SystemMemoryDataVersion>
62+
<SystemNetHttpJsonVersion>9.0.0</SystemNetHttpJsonVersion>
63+
<SystemRuntimeCachingVersion>9.0.0</SystemRuntimeCachingVersion>
64+
<SystemSecurityCryptographyPkcsVersion>9.0.0</SystemSecurityCryptographyPkcsVersion>
65+
<SystemSecurityCryptographyXmlVersion>9.0.0</SystemSecurityCryptographyXmlVersion>
66+
<SystemTextEncodingsWebVersion>9.0.0</SystemTextEncodingsWebVersion>
67+
<SystemNumericsTensorsVersion>9.0.0</SystemNumericsTensorsVersion>
68+
<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>
6669
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
67-
<MicrosoftAspNetCoreAppRefVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreAppRefVersion>
68-
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreAppRuntimewinx64Version>
69-
<MicrosoftAspNetCoreMvcTestingVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreMvcTestingVersion>
70-
<MicrosoftAspNetCoreTestHostVersion>9.0.0-rc.2.24474.3</MicrosoftAspNetCoreTestHostVersion>
71-
<MicrosoftExtensionsCachingSqlServerVersion>9.0.0-rc.2.24474.3</MicrosoftExtensionsCachingSqlServerVersion>
72-
<MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0-rc.2.24474.3</MicrosoftExtensionsCachingStackExchangeRedisVersion>
73-
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0-rc.2.24474.3</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
74-
<MicrosoftExtensionsHttpPollyVersion>9.0.0-rc.2.24474.3</MicrosoftExtensionsHttpPollyVersion>
75-
<MicrosoftExtensionsObjectPoolVersion>9.0.0-rc.2.24474.3</MicrosoftExtensionsObjectPoolVersion>
70+
<MicrosoftAspNetCoreAppRefVersion>9.0.0</MicrosoftAspNetCoreAppRefVersion>
71+
<MicrosoftAspNetCoreAppRuntimewinx64Version>9.0.0</MicrosoftAspNetCoreAppRuntimewinx64Version>
72+
<MicrosoftAspNetCoreMvcTestingVersion>9.0.0</MicrosoftAspNetCoreMvcTestingVersion>
73+
<MicrosoftAspNetCoreTestHostVersion>9.0.0</MicrosoftAspNetCoreTestHostVersion>
74+
<MicrosoftExtensionsCachingSqlServerVersion>9.0.0</MicrosoftExtensionsCachingSqlServerVersion>
75+
<MicrosoftExtensionsCachingStackExchangeRedisVersion>9.0.0</MicrosoftExtensionsCachingStackExchangeRedisVersion>
76+
<MicrosoftExtensionsDiagnosticsHealthChecksVersion>9.0.0</MicrosoftExtensionsDiagnosticsHealthChecksVersion>
77+
<MicrosoftExtensionsHttpPollyVersion>9.0.0</MicrosoftExtensionsHttpPollyVersion>
78+
<MicrosoftExtensionsObjectPoolVersion>9.0.0</MicrosoftExtensionsObjectPoolVersion>
7679
</PropertyGroup>
7780
<PropertyGroup Label="Manual">
7881
<!-- Packages from dotnet/runtime -->
@@ -96,8 +99,8 @@
9699
<MicrosoftExtensionsLoggingLTSVersion>8.0.1</MicrosoftExtensionsLoggingLTSVersion>
97100
<MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>8.0.0</MicrosoftExtensionsOptionsConfigurationExtensionsLTSVersion>
98101
<MicrosoftExtensionsOptionsLTSVersion>8.0.2</MicrosoftExtensionsOptionsLTSVersion>
99-
<MicrosoftNETCoreAppRefLTSVersion>8.0.10</MicrosoftNETCoreAppRefLTSVersion>
100-
<MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.10</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
102+
<MicrosoftNETCoreAppRefLTSVersion>8.0.11</MicrosoftNETCoreAppRefLTSVersion>
103+
<MicrosoftNETCoreAppRuntimewinx64LTSVersion>8.0.11</MicrosoftNETCoreAppRuntimewinx64LTSVersion>
101104
<SystemCollectionsImmutableLTSVersion>8.0.0</SystemCollectionsImmutableLTSVersion>
102105
<SystemConfigurationConfigurationManagerLTSVersion>8.0.1</SystemConfigurationConfigurationManagerLTSVersion>
103106
<SystemDiagnosticsDiagnosticSourceLTSVersion>8.0.1</SystemDiagnosticsDiagnosticSourceLTSVersion>
@@ -110,17 +113,18 @@
110113
<SystemSecurityCryptographyPkcsLTSVersion>8.0.1</SystemSecurityCryptographyPkcsLTSVersion>
111114
<SystemSecurityCryptographyXmlLTSVersion>8.0.2</SystemSecurityCryptographyXmlLTSVersion>
112115
<SystemTextEncodingsWebLTSVersion>8.0.0</SystemTextEncodingsWebLTSVersion>
116+
<SystemNumericsTensorsLTSVersion>8.0.0</SystemNumericsTensorsLTSVersion>
113117
<SystemTextJsonLTSVersion>8.0.5</SystemTextJsonLTSVersion>
114118
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
115-
<MicrosoftAspNetCoreAppRefLTSVersion>8.0.10</MicrosoftAspNetCoreAppRefLTSVersion>
116-
<MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.10</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
117-
<MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.10</MicrosoftAspNetCoreMvcTestingLTSVersion>
118-
<MicrosoftAspNetCoreTestHostLTSVersion>8.0.10</MicrosoftAspNetCoreTestHostLTSVersion>
119-
<MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.10</MicrosoftExtensionsCachingSqlServerLTSVersion>
120-
<MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.10</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
121-
<MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.10</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
122-
<MicrosoftExtensionsHttpPollyLTSVersion>8.0.10</MicrosoftExtensionsHttpPollyLTSVersion>
123-
<MicrosoftExtensionsObjectPoolLTSVersion>8.0.10</MicrosoftExtensionsObjectPoolLTSVersion>
119+
<MicrosoftAspNetCoreAppRefLTSVersion>8.0.11</MicrosoftAspNetCoreAppRefLTSVersion>
120+
<MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>8.0.11</MicrosoftAspNetCoreAppRuntimewinx64LTSVersion>
121+
<MicrosoftAspNetCoreMvcTestingLTSVersion>8.0.11</MicrosoftAspNetCoreMvcTestingLTSVersion>
122+
<MicrosoftAspNetCoreTestHostLTSVersion>8.0.11</MicrosoftAspNetCoreTestHostLTSVersion>
123+
<MicrosoftExtensionsCachingSqlServerLTSVersion>8.0.11</MicrosoftExtensionsCachingSqlServerLTSVersion>
124+
<MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>8.0.11</MicrosoftExtensionsCachingStackExchangeRedisLTSVersion>
125+
<MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>8.0.11</MicrosoftExtensionsDiagnosticsHealthChecksLTSVersion>
126+
<MicrosoftExtensionsHttpPollyLTSVersion>8.0.11</MicrosoftExtensionsHttpPollyLTSVersion>
127+
<MicrosoftExtensionsObjectPoolLTSVersion>8.0.11</MicrosoftExtensionsObjectPoolLTSVersion>
124128
</PropertyGroup>
125129
<!--
126130

src/Generators/Microsoft.Gen.MetricsReports/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
the project itself. -->
55
<PropertyGroup>
66
<Stage>dev</Stage>
7+
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
78
</PropertyGroup>
89
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
910
</Project>

src/Libraries/Microsoft.Extensions.AI.Abstractions/Microsoft.Extensions.AI.Abstractions.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<PropertyGroup>
1010
<Stage>preview</Stage>
11+
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1112
<MinCodeCoverage>0</MinCodeCoverage>
1213
<MinMutationScore>0</MinMutationScore>
1314
</PropertyGroup>

src/Libraries/Microsoft.Extensions.AI.AzureAIInference/Microsoft.Extensions.AI.AzureAIInference.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<PropertyGroup>
1010
<Stage>preview</Stage>
11+
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1112
<MinCodeCoverage>0</MinCodeCoverage>
1213
<MinMutationScore>0</MinMutationScore>
1314
</PropertyGroup>

src/Libraries/Microsoft.Extensions.AI.Ollama/Microsoft.Extensions.AI.Ollama.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<PropertyGroup>
1010
<Stage>preview</Stage>
11+
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1112
<MinCodeCoverage>0</MinCodeCoverage>
1213
<MinMutationScore>0</MinMutationScore>
1314
</PropertyGroup>

src/Libraries/Microsoft.Extensions.AI.OpenAI/Microsoft.Extensions.AI.OpenAI.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<PropertyGroup>
1010
<Stage>preview</Stage>
11+
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1112
<MinCodeCoverage>0</MinCodeCoverage>
1213
<MinMutationScore>0</MinMutationScore>
1314
</PropertyGroup>

src/Libraries/Microsoft.Extensions.AI/Microsoft.Extensions.AI.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
<PropertyGroup>
1212
<Stage>preview</Stage>
13+
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1314
<MinCodeCoverage>0</MinCodeCoverage>
1415
<MinMutationScore>0</MinMutationScore>
1516
</PropertyGroup>

src/Libraries/Microsoft.Extensions.Caching.Hybrid/Microsoft.Extensions.Caching.Hybrid.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<InjectSharedDiagnosticIds>true</InjectSharedDiagnosticIds>
1414
<IsPackable>true</IsPackable>
1515
<Stage>dev</Stage>
16+
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
1617
<StageDevDiagnosticId>EXTEXP0018</StageDevDiagnosticId>
1718
<MinCodeCoverage>75</MinCodeCoverage>
1819
<MinMutationScore>50</MinMutationScore>

src/Libraries/Microsoft.Extensions.Diagnostics.Probes/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
importing the root level Directory.Build.props file. This property should be kept in here, as opposed to moving it to
44
the project itself. -->
55
<PropertyGroup>
6+
<SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
67
<Stage>dev</Stage>
78
<StageDevDiagnosticId>EXTEXP0015</StageDevDiagnosticId>
89
</PropertyGroup>

0 commit comments

Comments
 (0)