Skip to content

Commit 1ce33fa

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into merge/release/9.0.2xx-to-release/9.0.3xx
2 parents b0b2500 + 6e88fab commit 1ce33fa

File tree

215 files changed

+2167
-1403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

215 files changed

+2167
-1403
lines changed

‎NuGet.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@
2828
<!-- Begin: Package sources from dotnet-emsdk -->
2929
<!-- End: Package sources from dotnet-emsdk -->
3030
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
31-
<add key="darc-pub-DotNet-msbuild-Trusted-d87bc64" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-d87bc64f/nuget/v3/index.json" />
3231
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3332
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3433
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3534
<!-- Begin: Package sources from dotnet-runtime -->
3635
<!-- End: Package sources from dotnet-runtime -->
3736
<!-- Begin: Package sources from dotnet-templating -->
38-
<add key="darc-pub-dotnet-templating-38b262d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-38b262d8/nuget/v3/index.json" />
3937
<!-- End: Package sources from dotnet-templating -->
4038
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4139
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,29 +22,31 @@
2222
<UsagePattern IdentityGlob="Microsoft.Extensions.FileSystemGlobbing/*6.0.0*" />
2323
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.7.2" />
2424
<UsagePattern IdentityGlob="Microsoft.VisualStudio.Setup.Configuration.Interop/3.2.2146" />
25-
<UsagePattern IdentityGlob="System.Collections.Immutable/8.0.0" />
25+
<UsagePattern IdentityGlob="System.Collections.Immutable/9.0.0" />
2626
<UsagePattern IdentityGlob="System.CommandLine.Rendering/0.4.0-alpha.24112.1" />
27-
<UsagePattern IdentityGlob="System.Composition/*8.0.0*" />
27+
<UsagePattern IdentityGlob="System.Composition/*9.0.0*" />
2828
<UsagePattern IdentityGlob="System.Composition.AttributedModel/*7.0.0*" />
2929
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*7.0.0*" />
3030
<UsagePattern IdentityGlob="System.Composition.Convention/*7.0.0*" />
3131
<UsagePattern IdentityGlob="System.Composition.Hosting/*7.0.0*" />
3232
<UsagePattern IdentityGlob="System.Composition.Runtime/*7.0.0*" />
3333
<UsagePattern IdentityGlob="System.Composition.TypedParts/*7.0.0*" />
34-
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*7.0.0*" />
34+
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/*8.0.1*" />
35+
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*9.0.0*" />
3536
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
3637
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />
37-
<UsagePattern IdentityGlob="System.Reflection.Metadata/8.0.0" />
38+
<UsagePattern IdentityGlob="System.Reflection.Metadata/9.0.0" />
3839
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*7.0.0*" />
3940

4041
<!-- Transitive dependencies from MSBuild -->
4142
<UsagePattern IdentityGlob="Microsoft.VisualStudio.SolutionPersistence/1.0.9" />
4243

4344
<!-- Transitive dependencies from roslyn -->
4445
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
45-
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/8.0.0" />
46-
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/8.0.0" />
47-
<UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/8.0.0" />
46+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection/9.0.0" />
47+
<UsagePattern IdentityGlob="Microsoft.Extensions.DependencyInjection.Abstractions/9.0.0" />
48+
<UsagePattern IdentityGlob="Microsoft.Extensions.Options/9.0.0" />
49+
<UsagePattern IdentityGlob="Microsoft.Extensions.Primitives/9.0.0" />
4850
<UsagePattern IdentityGlob="System.Buffers/4.6.0" />
4951
<UsagePattern IdentityGlob="System.Memory/4.6.0" />
5052
<UsagePattern IdentityGlob="System.Numerics.Vectors/4.6.0" />
@@ -57,8 +59,8 @@
5759
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
5860
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
5961

60-
<UsagePattern IdentityGlob="System.IO.Pipelines/*8.0.0*" />
61-
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
62+
<UsagePattern IdentityGlob="System.IO.Pipelines/*9.0.0*" />
63+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*9.0.0*" />
6264
</IgnorePatterns>
6365

6466
</UsageData>

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<PropertyGroup Label="Repo version information">
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
8-
<VersionSDKMinor>2</VersionSDKMinor>
9-
<VersionFeature>03</VersionFeature>
8+
<VersionSDKMinor>3</VersionSDKMinor>
9+
<VersionFeature>00</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -15,7 +15,7 @@
1515
<MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
1616
<CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
1717
<!-- Enable to remove prerelease label. -->
18-
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
18+
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
1919
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
2020
<!-- Calculate prerelease label -->
2121
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
@@ -34,7 +34,7 @@
3434
<VersionFeature50>17</VersionFeature50>
3535
<VersionFeature60>36</VersionFeature60>
3636
<VersionFeature70>20</VersionFeature70>
37-
<VersionFeature80>$([MSBuild]::Add($(VersionFeature), 12))</VersionFeature80>
37+
<VersionFeature80>13</VersionFeature80>
3838
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
3939
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4040
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@@ -135,29 +135,29 @@
135135
</PropertyGroup>
136136
<PropertyGroup>
137137
<!-- Dependencies from https://github.com/nuget/nuget.client -->
138-
<NuGetBuildTasksPackageVersion>6.13.2-rc.1</NuGetBuildTasksPackageVersion>
139-
<NuGetBuildTasksConsolePackageVersion>6.13.2-rc.1</NuGetBuildTasksConsolePackageVersion>
140-
<NuGetLocalizationPackageVersion>6.13.2-rc.1</NuGetLocalizationPackageVersion>
141-
<NuGetBuildTasksPackPackageVersion>6.13.2-rc.1</NuGetBuildTasksPackPackageVersion>
142-
<NuGetCommandLineXPlatPackageVersion>6.13.2-rc.1</NuGetCommandLineXPlatPackageVersion>
143-
<NuGetProjectModelPackageVersion>6.13.2-rc.1</NuGetProjectModelPackageVersion>
144-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.2-rc.1</MicrosoftBuildNuGetSdkResolverPackageVersion>
145-
<NuGetCommonPackageVersion>6.13.2-rc.1</NuGetCommonPackageVersion>
146-
<NuGetConfigurationPackageVersion>6.13.2-rc.1</NuGetConfigurationPackageVersion>
147-
<NuGetFrameworksPackageVersion>6.13.2-rc.1</NuGetFrameworksPackageVersion>
148-
<NuGetPackagingPackageVersion>6.13.2-rc.1</NuGetPackagingPackageVersion>
149-
<NuGetVersioningPackageVersion>6.13.2-rc.1</NuGetVersioningPackageVersion>
138+
<NuGetBuildTasksPackageVersion>6.13.0-rc.113</NuGetBuildTasksPackageVersion>
139+
<NuGetBuildTasksConsolePackageVersion>6.13.0-rc.113</NuGetBuildTasksConsolePackageVersion>
140+
<NuGetLocalizationPackageVersion>6.13.0-rc.113</NuGetLocalizationPackageVersion>
141+
<NuGetBuildTasksPackPackageVersion>6.13.0-rc.113</NuGetBuildTasksPackPackageVersion>
142+
<NuGetCommandLineXPlatPackageVersion>6.13.0-rc.113</NuGetCommandLineXPlatPackageVersion>
143+
<NuGetProjectModelPackageVersion>6.13.0-rc.113</NuGetProjectModelPackageVersion>
144+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.13.0-rc.113</MicrosoftBuildNuGetSdkResolverPackageVersion>
145+
<NuGetCommonPackageVersion>6.13.0-rc.113</NuGetCommonPackageVersion>
146+
<NuGetConfigurationPackageVersion>6.13.0-rc.113</NuGetConfigurationPackageVersion>
147+
<NuGetFrameworksPackageVersion>6.13.0-rc.113</NuGetFrameworksPackageVersion>
148+
<NuGetPackagingPackageVersion>6.13.0-rc.113</NuGetPackagingPackageVersion>
149+
<NuGetVersioningPackageVersion>6.13.0-rc.113</NuGetVersioningPackageVersion>
150150
</PropertyGroup>
151151
<PropertyGroup>
152152
<!-- Dependencies from https://github.com/Microsoft/vstest -->
153-
<MicrosoftNETTestSdkPackageVersion>17.13.0-release-25073-05</MicrosoftNETTestSdkPackageVersion>
154-
<MicrosoftTestPlatformCLIPackageVersion>17.13.0-release-25073-05</MicrosoftTestPlatformCLIPackageVersion>
155-
<MicrosoftTestPlatformBuildPackageVersion>17.13.0-release-25073-05</MicrosoftTestPlatformBuildPackageVersion>
153+
<MicrosoftNETTestSdkPackageVersion>17.14.0-preview-25124-01</MicrosoftNETTestSdkPackageVersion>
154+
<MicrosoftTestPlatformCLIPackageVersion>17.14.0-preview-25124-01</MicrosoftTestPlatformCLIPackageVersion>
155+
<MicrosoftTestPlatformBuildPackageVersion>17.14.0-preview-25124-01</MicrosoftTestPlatformBuildPackageVersion>
156156
</PropertyGroup>
157157
<PropertyGroup>
158158
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
159-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25123.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
160-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.25123.1</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
159+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25123.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
160+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.25123.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -178,38 +178,38 @@
178178
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
179179
180180
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
181-
<MicrosoftBuildVersion>17.13.19</MicrosoftBuildVersion>
182-
<MicrosoftBuildLocalizationVersion>17.13.19-preview-25128-01</MicrosoftBuildLocalizationVersion>
181+
<MicrosoftBuildVersion>17.14.0-preview-25155-03</MicrosoftBuildVersion>
182+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25155-03</MicrosoftBuildLocalizationVersion>
183183
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
184184
<MinimumVSVersion>17.12</MinimumVSVersion>
185185
</PropertyGroup>
186186
<PropertyGroup>
187187
<!-- Dependencies from https://github.com/dotnet/templating -->
188-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.203</MicrosoftTemplateEngineAbstractionsPackageVersion>
188+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.300-preview.25156.15</MicrosoftTemplateEngineAbstractionsPackageVersion>
189189
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
190190
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
191191
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
192192
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
193193
<!-- test dependencies -->
194-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.203-servicing.25156.14</MicrosoftTemplateEngineMocksPackageVersion>
194+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.300-preview.25156.15</MicrosoftTemplateEngineMocksPackageVersion>
195195
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
196196
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
197197
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
198198
</PropertyGroup>
199199
<PropertyGroup>
200200
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
201-
<MicrosoftFSharpCompilerPackageVersion>13.9.201-beta.25070.3</MicrosoftFSharpCompilerPackageVersion>
201+
<MicrosoftFSharpCompilerPackageVersion>13.9.300-beta.25124.4</MicrosoftFSharpCompilerPackageVersion>
202202
</PropertyGroup>
203203
<PropertyGroup>
204204
<!-- Dependencies from https://github.com/dotnet/roslyn -->
205-
<MicrosoftNetCompilersToolsetVersion>4.13.0-3.25155.17</MicrosoftNetCompilersToolsetVersion>
206-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.13.0-3.25155.17</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
207-
<MicrosoftCodeAnalysisPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisPackageVersion>
208-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisCSharpPackageVersion>
209-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
210-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
211-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
212-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.13.0-3.25155.17</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
205+
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25155.15</MicrosoftNetCompilersToolsetVersion>
206+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25155.15</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
207+
<MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisPackageVersion>
208+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisCSharpPackageVersion>
209+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
210+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
211+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
212+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25155.15</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
213213
</PropertyGroup>
214214
<PropertyGroup>
215215
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@@ -229,9 +229,9 @@
229229
</PropertyGroup>
230230
<PropertyGroup>
231231
<!-- Dependencies from https://github.com/dotnet/razor -->
232-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25123.6</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
233-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25123.6</MicrosoftCodeAnalysisRazorToolingInternalVersion>
234-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25123.6</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
232+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25155.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
233+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25155.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
234+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25155.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/dotnet/wpf -->

0 commit comments

Comments
 (0)