Skip to content

Commit 1865a73

Browse files
v-wuzhaiv-wuzhai
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 1ce33fa + 8b956dc commit 1865a73

17 files changed

+216
-216
lines changed

‎Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<PackageVersion Include="Microsoft.TestPlatform.CLI" Version="$(MicrosoftTestPlatformCLIPackageVersion)" />
6767
<PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.4.16" />
6868
<PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="$(MicrosoftVisualStudioSetupConfigurationInteropVersion)" />
69-
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.28" />
69+
<PackageVersion Include="Microsoft.VisualStudio.SolutionPersistence" Version="1.0.52" />
7070
<PackageVersion Include="Microsoft.Web.Deployment" Version="$(WebDeploymentPackageVersion)" />
7171
<PackageVersion Include="Microsoft.Web.Xdt" Version="$(MicrosoftWebXdtPackageVersion)" />
7272
<PackageVersion Include="Microsoft.Win32.SystemEvents" Version="$(MicrosoftWin32SystemEventsPackageVersion)" />

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
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.DiagnosticSource/*8.0.1*" />
34+
<UsagePattern IdentityGlob="System.Diagnostics.DiagnosticSource/*9.0.0*" />
3535
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*9.0.0*" />
3636
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
3737
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*7.0.0*" />

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25155-03">
72+
<Dependency Name="Microsoft.Build" Version="17.14.0-preview-25157-07">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>428195cb74072bbb5314889119525369cb9bdeb0</Sha>
74+
<Sha>00b81e71d503ae21780f97f7f5206821e696a5f9</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25155-03">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.14.0-preview-25157-07">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>428195cb74072bbb5314889119525369cb9bdeb0</Sha>
78+
<Sha>00b81e71d503ae21780f97f7f5206821e696a5f9</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25155-03">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.14.0-preview-25157-07">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>428195cb74072bbb5314889119525369cb9bdeb0</Sha>
83+
<Sha>00b81e71d503ae21780f97f7f5206821e696a5f9</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25124.4">
@@ -93,43 +93,43 @@
9393
<Sha>e4889bb53328e6a75855c3f3d2122d0aacae7a4b</Sha>
9494
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
9595
</Dependency>
96-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25155.15">
96+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25157.4">
9797
<Uri>https://github.com/dotnet/roslyn</Uri>
98-
<Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
98+
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
9999
</Dependency>
100100
<!-- Intermediate is necessary for source build. -->
101-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25155.15">
101+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.14.0-3.25157.4">
102102
<Uri>https://github.com/dotnet/roslyn</Uri>
103-
<Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
103+
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
104104
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
105105
</Dependency>
106-
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25155.15">
106+
<Dependency Name="Microsoft.Net.Compilers.Toolset.Framework" Version="4.14.0-3.25157.4">
107107
<Uri>https://github.com/dotnet/roslyn</Uri>
108-
<Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
108+
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25155.15">
110+
<Dependency Name="Microsoft.CodeAnalysis" Version="4.14.0-3.25157.4">
111111
<Uri>https://github.com/dotnet/roslyn</Uri>
112-
<Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
112+
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
113113
</Dependency>
114-
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25155.15">
114+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.14.0-3.25157.4">
115115
<Uri>https://github.com/dotnet/roslyn</Uri>
116-
<Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
116+
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
117117
</Dependency>
118-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25155.15">
118+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.14.0-3.25157.4">
119119
<Uri>https://github.com/dotnet/roslyn</Uri>
120-
<Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
120+
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
121121
</Dependency>
122-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25155.15">
122+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.14.0-3.25157.4">
123123
<Uri>https://github.com/dotnet/roslyn</Uri>
124-
<Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
124+
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
125125
</Dependency>
126-
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25155.15">
126+
<Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0-3.25157.4">
127127
<Uri>https://github.com/dotnet/roslyn</Uri>
128-
<Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
128+
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
129129
</Dependency>
130-
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25155.15">
130+
<Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.14.0-3.25157.4">
131131
<Uri>https://github.com/dotnet/roslyn</Uri>
132-
<Sha>68501c0866aaacff3c6adfdd424f82d8e6557f50</Sha>
132+
<Sha>46223204b646f96104bac46f9dfa4959da9d86ac</Sha>
133133
</Dependency>
134134
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.2-rtm.25067.4">
135135
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
@@ -208,22 +208,22 @@
208208
<Uri>https://github.com/nuget/nuget.client</Uri>
209209
<Sha>c4b26195ee5a77e70b2ea5fd50db87d6a9194c24</Sha>
210210
</Dependency>
211-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25124-01">
211+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.14.0-preview-25157-01">
212212
<Uri>https://github.com/microsoft/vstest</Uri>
213-
<Sha>ae0246012a389cd83909cedf05a9b9332c083de5</Sha>
213+
<Sha>77eef3b233fa3b26109952dd7b81d14546822e73</Sha>
214214
</Dependency>
215-
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.14.0-preview-25124-01">
215+
<Dependency Name="Microsoft.TestPlatform.CLI" Version="17.14.0-preview-25157-01">
216216
<Uri>https://github.com/microsoft/vstest</Uri>
217-
<Sha>ae0246012a389cd83909cedf05a9b9332c083de5</Sha>
217+
<Sha>77eef3b233fa3b26109952dd7b81d14546822e73</Sha>
218218
</Dependency>
219-
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.14.0-preview-25124-01">
219+
<Dependency Name="Microsoft.TestPlatform.Build" Version="17.14.0-preview-25157-01">
220220
<Uri>https://github.com/microsoft/vstest</Uri>
221-
<Sha>ae0246012a389cd83909cedf05a9b9332c083de5</Sha>
221+
<Sha>77eef3b233fa3b26109952dd7b81d14546822e73</Sha>
222222
</Dependency>
223223
<!-- Intermediate is necessary for source build. -->
224-
<Dependency Name="Microsoft.SourceBuild.Intermediate.vstest" Version="17.14.0-preview-25124-01">
224+
<Dependency Name="Microsoft.SourceBuild.Intermediate.vstest" Version="17.14.0-preview-25157-01">
225225
<Uri>https://github.com/microsoft/vstest</Uri>
226-
<Sha>ae0246012a389cd83909cedf05a9b9332c083de5</Sha>
226+
<Sha>77eef3b233fa3b26109952dd7b81d14546822e73</Sha>
227227
<SourceBuild RepoName="vstest" ManagedOnly="true" />
228228
</Dependency>
229229
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.2">
@@ -321,22 +321,22 @@
321321
<Sha>704f7cb1d2cea33afb00c2097731216f121c2c73</Sha>
322322
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
323323
</Dependency>
324-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25155.1">
324+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25158.1">
325325
<Uri>https://github.com/dotnet/razor</Uri>
326-
<Sha>26f8f49a0751470e560d0e601221f0ec29871e3c</Sha>
326+
<Sha>b8b69d16b8457c165bbd0c9ab807ccb03410c2b8</Sha>
327327
</Dependency>
328-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25155.1">
328+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25158.1">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330-
<Sha>26f8f49a0751470e560d0e601221f0ec29871e3c</Sha>
330+
<Sha>b8b69d16b8457c165bbd0c9ab807ccb03410c2b8</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25155.1">
332+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25158.1">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334-
<Sha>26f8f49a0751470e560d0e601221f0ec29871e3c</Sha>
334+
<Sha>b8b69d16b8457c165bbd0c9ab807ccb03410c2b8</Sha>
335335
</Dependency>
336336
<!-- Intermediate is necessary for source build. -->
337-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25155.1">
337+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25158.1">
338338
<Uri>https://github.com/dotnet/razor</Uri>
339-
<Sha>26f8f49a0751470e560d0e601221f0ec29871e3c</Sha>
339+
<Sha>b8b69d16b8457c165bbd0c9ab807ccb03410c2b8</Sha>
340340
<SourceBuild RepoName="razor" ManagedOnly="true" />
341341
</Dependency>
342342
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="9.0.2">
@@ -411,9 +411,9 @@
411411
<SourceBuild RepoName="command-line-api" ManagedOnly="true" />
412412
</Dependency>
413413
<!-- Intermediate is necessary for source build. -->
414-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24631.1">
414+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.25157.1">
415415
<Uri>https://github.com/dotnet/source-build-externals</Uri>
416-
<Sha>3243189116c52a27506cc019f49a92038ae6b5f8</Sha>
416+
<Sha>71dbdccd13f28cfd1a35649263b55ebbeab26ee7</Sha>
417417
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
418418
</Dependency>
419419
<!-- Intermediate is necessary for source build. -->

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@
150150
</PropertyGroup>
151151
<PropertyGroup>
152152
<!-- Dependencies from https://github.com/Microsoft/vstest -->
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>
153+
<MicrosoftNETTestSdkPackageVersion>17.14.0-preview-25157-01</MicrosoftNETTestSdkPackageVersion>
154+
<MicrosoftTestPlatformCLIPackageVersion>17.14.0-preview-25157-01</MicrosoftTestPlatformCLIPackageVersion>
155+
<MicrosoftTestPlatformBuildPackageVersion>17.14.0-preview-25157-01</MicrosoftTestPlatformBuildPackageVersion>
156156
</PropertyGroup>
157157
<PropertyGroup>
158158
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
@@ -178,8 +178,8 @@
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.14.0-preview-25155-03</MicrosoftBuildVersion>
182-
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25155-03</MicrosoftBuildLocalizationVersion>
181+
<MicrosoftBuildVersion>17.14.0-preview-25157-07</MicrosoftBuildVersion>
182+
<MicrosoftBuildLocalizationVersion>17.14.0-preview-25157-07</MicrosoftBuildLocalizationVersion>
183183
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
184184
<MinimumVSVersion>17.12</MinimumVSVersion>
185185
</PropertyGroup>
@@ -202,14 +202,14 @@
202202
</PropertyGroup>
203203
<PropertyGroup>
204204
<!-- Dependencies from https://github.com/dotnet/roslyn -->
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>
205+
<MicrosoftNetCompilersToolsetVersion>4.14.0-3.25157.4</MicrosoftNetCompilersToolsetVersion>
206+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.14.0-3.25157.4</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
207+
<MicrosoftCodeAnalysisPackageVersion>4.14.0-3.25157.4</MicrosoftCodeAnalysisPackageVersion>
208+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.14.0-3.25157.4</MicrosoftCodeAnalysisCSharpPackageVersion>
209+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.14.0-3.25157.4</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
210+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.14.0-3.25157.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
211+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.14.0-3.25157.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
212+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.14.0-3.25157.4</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.25155.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
233-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25155.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
234-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25155.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
232+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25158.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
233+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25158.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
234+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25158.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/dotnet/wpf -->

0 commit comments

Comments
 (0)