Skip to content

Commit 23179f5

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-b1d76040-5e89-45c9-9555-f07dbfe9ce71
2 parents 7dad478 + 40e5cb4 commit 23179f5

File tree

3 files changed

+30
-43
lines changed

3 files changed

+30
-43
lines changed

‎NuGet.config

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
<!-- Begin: Package sources from dotnet-aspire -->
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-emsdk -->
27-
<add key="darc-pub-dotnet-emsdk-dad5528" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e/nuget/v3/index.json" />
28-
<add key="darc-pub-dotnet-emsdk-dad5528-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e-2/nuget/v3/index.json" />
29-
<add key="darc-pub-dotnet-emsdk-dad5528-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e-1/nuget/v3/index.json" />
3027
<!-- End: Package sources from dotnet-emsdk -->
3128
<!-- Begin: Package sources from dotnet-aspnetcore -->
3229
<add key="darc-int-dotnet-aspnetcore-b96167f-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b96167fb-7/nuget/v3/index.json" />
@@ -36,22 +33,18 @@
3633
<add key="darc-int-dotnet-aspnetcore-b96167f-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-b96167fb-2/nuget/v3/index.json" />
3734
<!-- End: Package sources from dotnet-aspnetcore -->
3835
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
39-
<add key="darc-pub-DotNet-msbuild-Trusted-8314f8f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8314f8fc/nuget/v3/index.json" />
36+
<add key="darc-pub-DotNet-msbuild-Trusted-84e2956" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-84e2956b/nuget/v3/index.json" />
4037
<!-- End: Package sources from DotNet-msbuild-Trusted -->
4138
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
4239
<!-- End: Package sources from dotnet-roslyn-analyzers -->
4340
<!-- Begin: Package sources from dotnet-runtime -->
44-
<add key="darc-int-dotnet-runtime-831d23e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5/nuget/v3/index.json" />
45-
<add key="darc-int-dotnet-runtime-831d23e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-2/nuget/v3/index.json" />
46-
<add key="darc-int-dotnet-runtime-831d23e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5-1/nuget/v3/index.json" />
4741
<!-- End: Package sources from dotnet-runtime -->
4842
<!-- Begin: Package sources from dotnet-templating -->
43+
<add key="darc-pub-dotnet-templating-006b799" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-006b799c/nuget/v3/index.json" />
4944
<add key="darc-pub-dotnet-templating-693a4fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-693a4fd2/nuget/v3/index.json" />
45+
<add key="darc-pub-dotnet-templating-693a4fd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-693a4fd2-1/nuget/v3/index.json" />
5046
<!-- End: Package sources from dotnet-templating -->
5147
<!-- Begin: Package sources from dotnet-windowsdesktop -->
52-
<add key="darc-int-dotnet-windowsdesktop-1c33258" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c/nuget/v3/index.json" />
53-
<add key="darc-int-dotnet-windowsdesktop-1c33258-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c-2/nuget/v3/index.json" />
54-
<add key="darc-int-dotnet-windowsdesktop-1c33258-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1c33258c-1/nuget/v3/index.json" />
5548
<!-- End: Package sources from dotnet-windowsdesktop -->
5649
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5750
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -85,14 +78,8 @@
8578
<add key="darc-int-dotnet-aspnetcore-b96167f-7" value="true" />
8679
<!-- End: Package sources from dotnet-aspnetcore -->
8780
<!-- Begin: Package sources from dotnet-runtime -->
88-
<add key="darc-int-dotnet-runtime-831d23e-1" value="true" />
89-
<add key="darc-int-dotnet-runtime-831d23e-2" value="true" />
90-
<add key="darc-int-dotnet-runtime-831d23e" value="true" />
9181
<!-- End: Package sources from dotnet-runtime -->
9282
<!-- Begin: Package sources from dotnet-windowsdesktop -->
93-
<add key="darc-int-dotnet-windowsdesktop-1c33258-1" value="true" />
94-
<add key="darc-int-dotnet-windowsdesktop-1c33258-2" value="true" />
95-
<add key="darc-int-dotnet-windowsdesktop-1c33258" value="true" />
9683
<!-- End: Package sources from dotnet-windowsdesktop -->
9784
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
9885
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.105">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>693a4fd2526759d8408ec1388970143e666b03e2</Sha>
6+
<Sha>006b799c44481a0870d4cbe754e6aae9d1236708</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.105-servicing.25156.13">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.105-servicing.25163.3">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>693a4fd2526759d8408ec1388970143e666b03e2</Sha>
10+
<Sha>006b799c44481a0870d4cbe754e6aae9d1236708</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.105-servicing.25156.13">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.105-servicing.25163.3">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>693a4fd2526759d8408ec1388970143e666b03e2</Sha>
15+
<Sha>006b799c44481a0870d4cbe754e6aae9d1236708</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.3">
@@ -73,18 +73,18 @@
7373
<Sha>dad5528e5bdf92a05a5a404c5f7939523390b96d</Sha>
7474
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build" Version="17.12.32">
76+
<Dependency Name="Microsoft.Build" Version="17.12.33">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>8314f8fc4d11b3ea9bc86fba82b79e167cac41c6</Sha>
78+
<Sha>84e2956bf64ce0472e54b5bfcf22836667d300eb</Sha>
7979
</Dependency>
80-
<Dependency Name="Microsoft.Build.Localization" Version="17.12.32-preview-25125-10">
80+
<Dependency Name="Microsoft.Build.Localization" Version="17.12.33-preview-25169-05">
8181
<Uri>https://github.com/dotnet/msbuild</Uri>
82-
<Sha>8314f8fc4d11b3ea9bc86fba82b79e167cac41c6</Sha>
82+
<Sha>84e2956bf64ce0472e54b5bfcf22836667d300eb</Sha>
8383
</Dependency>
8484
<!-- Intermediate is necessary for source build. -->
85-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.32-preview-25125-10">
85+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.33-preview-25169-05">
8686
<Uri>https://github.com/dotnet/msbuild</Uri>
87-
<Sha>8314f8fc4d11b3ea9bc86fba82b79e167cac41c6</Sha>
87+
<Sha>84e2956bf64ce0472e54b5bfcf22836667d300eb</Sha>
8888
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8989
</Dependency>
9090
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.9.101-beta.25070.7">
@@ -379,14 +379,14 @@
379379
<Uri>https://github.com/dotnet/test-templates</Uri>
380380
<Sha>49c9ad01f057b3c6352bbec12b117acc2224493c</Sha>
381381
</Dependency>
382-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.24606.1">
382+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.9.0" Version="1.1.0-rtm.25168.1">
383383
<Uri>https://github.com/dotnet/test-templates</Uri>
384-
<Sha>8d99bca98e3fd0c8f4e10eb200aed20d9665de0e</Sha>
384+
<Sha>e66f2336162ebe9f1d781a8dae591e30d9ab08b4</Sha>
385385
</Dependency>
386386
<!-- Intermediate is necessary for source build. -->
387-
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.24606.1">
387+
<Dependency Name="Microsoft.SourceBuild.Intermediate.test-templates" Version="1.1.0-rtm.25168.1">
388388
<Uri>https://github.com/dotnet/test-templates</Uri>
389-
<Sha>8d99bca98e3fd0c8f4e10eb200aed20d9665de0e</Sha>
389+
<Sha>e66f2336162ebe9f1d781a8dae591e30d9ab08b4</Sha>
390390
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
391391
</Dependency>
392392
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
@@ -408,16 +408,16 @@
408408
<Sha>63ae81154c50a1cf9287cc47d8351d55b4289e6d</Sha>
409409
<SourceBuild RepoName="xdt" ManagedOnly="true" />
410410
</Dependency>
411-
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25123.3">
411+
<Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.25173.3">
412412
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
413413
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
414414
</Dependency>
415-
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.25123.3">
415+
<Dependency Name="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="3.11.0-beta1.25173.3">
416416
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
417417
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
418418
</Dependency>
419419
<!-- Intermediate is necessary for source build. -->
420-
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.11.0-beta1.25123.3">
420+
<Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.11.0-beta1.25173.3">
421421
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
422422
<Sha>16865ea61910500f1022ad2b96c499e5df02c228</Sha>
423423
<SourceBuild RepoName="roslyn-analyzers" ManagedOnly="true" />
@@ -451,9 +451,9 @@
451451
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
452452
</Dependency>
453453
<!-- Intermediate is necessary for source build. -->
454-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25163.3">
454+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.25170.3">
455455
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
456-
<Sha>27dfbb8d8a0344d845948109a5a1f0d9c7f17fa9</Sha>
456+
<Sha>6968f7059f4418e985febe704a3b1320f9e5887d</Sha>
457457
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
458458
</Dependency>
459459
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25059.4">

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>1</VersionSDKMinor>
9-
<VersionFeature>05</VersionFeature>
9+
<VersionFeature>06</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. -->
@@ -82,7 +82,7 @@
8282
<PropertyGroup>
8383
<!-- Dependency from https://github.com/dotnet/test-templates -->
8484
<!-- Supported versions -->
85-
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.24606.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
85+
<MicrosoftDotNetTestProjectTemplates90PackageVersion>1.1.0-rtm.25168.1</MicrosoftDotNetTestProjectTemplates90PackageVersion>
8686
</PropertyGroup>
8787
<PropertyGroup>
8888
<!-- Dependencies from https://github.com/dotnet/runtime -->
@@ -158,8 +158,8 @@
158158
</PropertyGroup>
159159
<PropertyGroup>
160160
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
161-
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25123.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
162-
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.25123.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
161+
<MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview.25173.3</MicrosoftCodeAnalysisNetAnalyzersVersion>
162+
<MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.11.0-beta1.25173.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
163163
</PropertyGroup>
164164
<PropertyGroup>
165165
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
@@ -180,8 +180,8 @@
180180
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
181181
182182
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
183-
<MicrosoftBuildVersion>17.12.32</MicrosoftBuildVersion>
184-
<MicrosoftBuildLocalizationVersion>17.12.32-preview-25125-10</MicrosoftBuildLocalizationVersion>
183+
<MicrosoftBuildVersion>17.12.33</MicrosoftBuildVersion>
184+
<MicrosoftBuildLocalizationVersion>17.12.33-preview-25169-05</MicrosoftBuildLocalizationVersion>
185185
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
186186
<MinimumVSVersion>17.12</MinimumVSVersion>
187187
</PropertyGroup>
@@ -193,7 +193,7 @@
193193
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
194194
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
195195
<!-- test dependencies -->
196-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.105-servicing.25156.13</MicrosoftTemplateEngineMocksPackageVersion>
196+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.105-servicing.25163.3</MicrosoftTemplateEngineMocksPackageVersion>
197197
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
198198
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
199199
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

0 commit comments

Comments
 (0)