Skip to content

Commit d2617ec

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into merge/release/9.0.1xx-to-release/9.0.2xx
2 parents 1676070 + 3b9d342 commit d2617ec

File tree

3 files changed

+8
-73
lines changed

3 files changed

+8
-73
lines changed

‎NuGet.config

-65
Original file line numberDiff line numberDiff line change
@@ -6,59 +6,20 @@
66
<!-- Begin: Package sources from dotnet-aspire -->
77
<!-- End: Package sources from dotnet-aspire -->
88
<!-- Begin: Package sources from dotnet-aspnetcore -->
9-
<add key="darc-int-dotnet-aspnetcore-af22eff" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-aspnetcore-af22eff-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-9/nuget/v3/index.json" />
11-
<add key="darc-int-dotnet-aspnetcore-af22eff-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-8/nuget/v3/index.json" />
12-
<add key="darc-int-dotnet-aspnetcore-af22eff-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-7/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-aspnetcore-af22eff-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-6/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-aspnetcore-af22eff-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-5/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-aspnetcore-af22eff-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-4/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-aspnetcore-af22eff-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-12/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-aspnetcore-af22eff-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-11/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-aspnetcore-af22eff-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-af22effa-10/nuget/v3/index.json" />
199
<!-- End: Package sources from dotnet-aspnetcore -->
2010
<!-- Begin: Package sources from dotnet-emsdk -->
21-
<add key="darc-pub-dotnet-emsdk-763d10a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1/nuget/v3/index.json" />
22-
<add key="darc-pub-dotnet-emsdk-763d10a-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-9/nuget/v3/index.json" />
23-
<add key="darc-pub-dotnet-emsdk-763d10a-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-8/nuget/v3/index.json" />
24-
<add key="darc-pub-dotnet-emsdk-763d10a-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-7/nuget/v3/index.json" />
25-
<add key="darc-pub-dotnet-emsdk-763d10a-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-6/nuget/v3/index.json" />
26-
<add key="darc-pub-dotnet-emsdk-763d10a-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-5/nuget/v3/index.json" />
27-
<add key="darc-pub-dotnet-emsdk-763d10a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-4/nuget/v3/index.json" />
28-
<add key="darc-pub-dotnet-emsdk-763d10a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-3/nuget/v3/index.json" />
29-
<add key="darc-pub-dotnet-emsdk-763d10a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-2/nuget/v3/index.json" />
30-
<add key="darc-pub-dotnet-emsdk-763d10a-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-12/nuget/v3/index.json" />
31-
<add key="darc-pub-dotnet-emsdk-763d10a-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-11/nuget/v3/index.json" />
32-
<add key="darc-pub-dotnet-emsdk-763d10a-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-10/nuget/v3/index.json" />
33-
<add key="darc-pub-dotnet-emsdk-763d10a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-763d10a1-1/nuget/v3/index.json" />
3411
<!-- End: Package sources from dotnet-emsdk -->
3512
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
3613
<!-- End: Package sources from DotNet-msbuild-Trusted -->
3714
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
3815
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3916
<!-- Begin: Package sources from dotnet-runtime -->
40-
<add key="darc-int-dotnet-runtime-9d5a6a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a/nuget/v3/index.json" />
41-
<add key="darc-int-dotnet-runtime-9d5a6a9-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a-9/nuget/v3/index.json" />
42-
<add key="darc-int-dotnet-runtime-9d5a6a9-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a-12/nuget/v3/index.json" />
4317
<!-- End: Package sources from dotnet-runtime -->
4418
<!-- Begin: Package sources from dotnet-templating -->
4519
<add key="darc-pub-dotnet-templating-44a0b49" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-44a0b49c/nuget/v3/index.json" />
4620
<add key="darc-pub-dotnet-templating-44a0b49-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-44a0b49c-1/nuget/v3/index.json" />
4721
<!-- End: Package sources from dotnet-templating -->
4822
<!-- Begin: Package sources from dotnet-windowsdesktop -->
49-
<add key="darc-int-dotnet-windowsdesktop-308dc79" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795/nuget/v3/index.json" />
50-
<add key="darc-int-dotnet-windowsdesktop-308dc79-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-9/nuget/v3/index.json" />
51-
<add key="darc-int-dotnet-windowsdesktop-308dc79-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-8/nuget/v3/index.json" />
52-
<add key="darc-int-dotnet-windowsdesktop-308dc79-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-7/nuget/v3/index.json" />
53-
<add key="darc-int-dotnet-windowsdesktop-308dc79-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-6/nuget/v3/index.json" />
54-
<add key="darc-int-dotnet-windowsdesktop-308dc79-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-5/nuget/v3/index.json" />
55-
<add key="darc-int-dotnet-windowsdesktop-308dc79-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-4/nuget/v3/index.json" />
56-
<add key="darc-int-dotnet-windowsdesktop-308dc79-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-3/nuget/v3/index.json" />
57-
<add key="darc-int-dotnet-windowsdesktop-308dc79-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-2/nuget/v3/index.json" />
58-
<add key="darc-int-dotnet-windowsdesktop-308dc79-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-12/nuget/v3/index.json" />
59-
<add key="darc-int-dotnet-windowsdesktop-308dc79-11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-11/nuget/v3/index.json" />
60-
<add key="darc-int-dotnet-windowsdesktop-308dc79-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-10/nuget/v3/index.json" />
61-
<add key="darc-int-dotnet-windowsdesktop-308dc79-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-308dc795-1/nuget/v3/index.json" />
6223
<!-- End: Package sources from dotnet-windowsdesktop -->
6324
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
6425
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -85,36 +46,10 @@
8546
<!-- Begin: Package sources from dotnet-templating -->
8647
<!-- End: Package sources from dotnet-templating -->
8748
<!-- Begin: Package sources from dotnet-aspnetcore -->
88-
<add key="darc-int-dotnet-aspnetcore-af22eff-10" value="true" />
89-
<add key="darc-int-dotnet-aspnetcore-af22eff-11" value="true" />
90-
<add key="darc-int-dotnet-aspnetcore-af22eff-12" value="true" />
91-
<add key="darc-int-dotnet-aspnetcore-af22eff-4" value="true" />
92-
<add key="darc-int-dotnet-aspnetcore-af22eff-5" value="true" />
93-
<add key="darc-int-dotnet-aspnetcore-af22eff-6" value="true" />
94-
<add key="darc-int-dotnet-aspnetcore-af22eff-7" value="true" />
95-
<add key="darc-int-dotnet-aspnetcore-af22eff-8" value="true" />
96-
<add key="darc-int-dotnet-aspnetcore-af22eff-9" value="true" />
97-
<add key="darc-int-dotnet-aspnetcore-af22eff" value="true" />
9849
<!-- End: Package sources from dotnet-aspnetcore -->
9950
<!-- Begin: Package sources from dotnet-runtime -->
100-
<add key="darc-int-dotnet-runtime-9d5a6a9-12" value="true" />
101-
<add key="darc-int-dotnet-runtime-9d5a6a9-9" value="true" />
102-
<add key="darc-int-dotnet-runtime-9d5a6a9" value="true" />
10351
<!-- End: Package sources from dotnet-runtime -->
10452
<!-- Begin: Package sources from dotnet-windowsdesktop -->
105-
<add key="darc-int-dotnet-windowsdesktop-308dc79-1" value="true" />
106-
<add key="darc-int-dotnet-windowsdesktop-308dc79-10" value="true" />
107-
<add key="darc-int-dotnet-windowsdesktop-308dc79-11" value="true" />
108-
<add key="darc-int-dotnet-windowsdesktop-308dc79-12" value="true" />
109-
<add key="darc-int-dotnet-windowsdesktop-308dc79-2" value="true" />
110-
<add key="darc-int-dotnet-windowsdesktop-308dc79-3" value="true" />
111-
<add key="darc-int-dotnet-windowsdesktop-308dc79-4" value="true" />
112-
<add key="darc-int-dotnet-windowsdesktop-308dc79-5" value="true" />
113-
<add key="darc-int-dotnet-windowsdesktop-308dc79-6" value="true" />
114-
<add key="darc-int-dotnet-windowsdesktop-308dc79-7" value="true" />
115-
<add key="darc-int-dotnet-windowsdesktop-308dc79-8" value="true" />
116-
<add key="darc-int-dotnet-windowsdesktop-308dc79-9" value="true" />
117-
<add key="darc-int-dotnet-windowsdesktop-308dc79" value="true" />
11853
<!-- End: Package sources from dotnet-windowsdesktop -->
11954
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
12055
</disabledPackageSources>

‎eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
<Sha>763d10a1a251be35337ee736832bfde3f9200672</Sha>
7070
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
7171
</Dependency>
72-
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24568-05">
72+
<Dependency Name="Microsoft.Build" Version="17.13.0-preview-24569-04">
7373
<Uri>https://github.com/dotnet/msbuild</Uri>
74-
<Sha>37fc8280dd8516257e7d04b9fc5e426de33091f2</Sha>
74+
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24568-05">
76+
<Dependency Name="Microsoft.Build.Localization" Version="17.13.0-preview-24569-04">
7777
<Uri>https://github.com/dotnet/msbuild</Uri>
78-
<Sha>37fc8280dd8516257e7d04b9fc5e426de33091f2</Sha>
78+
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
7979
</Dependency>
8080
<!-- Intermediate is necessary for source build. -->
81-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24568-05">
81+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.13.0-preview-24569-04">
8282
<Uri>https://github.com/dotnet/msbuild</Uri>
83-
<Sha>37fc8280dd8516257e7d04b9fc5e426de33091f2</Sha>
83+
<Sha>8f6b8ad0ace90c777c66711c907227fcfb6f2efe</Sha>
8484
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
8585
</Dependency>
8686
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.200-beta.24561.2">

‎eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@
199199
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
200200
201201
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
202-
<MicrosoftBuildVersion>17.13.0-preview-24568-05</MicrosoftBuildVersion>
203-
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24568-05</MicrosoftBuildLocalizationVersion>
202+
<MicrosoftBuildVersion>17.13.0-preview-24569-04</MicrosoftBuildVersion>
203+
<MicrosoftBuildLocalizationVersion>17.13.0-preview-24569-04</MicrosoftBuildLocalizationVersion>
204204
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.11.4</MicrosoftBuildMinimumVersion>
205205
<MinimumVSVersion>17.12</MinimumVSVersion>
206206
</PropertyGroup>

0 commit comments

Comments
 (0)