Skip to content

Commit 87c18cf

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into darc-release/9.0.2xx-9e10730e-6a0c-4143-8f6e-91eb77a4c545
2 parents aecf0d5 + 4f0bcf1 commit 87c18cf

File tree

151 files changed

+953
-743
lines changed

Some content is hidden

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

151 files changed

+953
-743
lines changed

‎.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ extends:
9797
parameters:
9898
pool:
9999
name: $(DncEngInternalBuildPool)
100-
image: 1es-windows-2022
100+
image: windows.vs2022.amd64
101101
os: windows
102102
helixTargetQueue: windows.amd64.vs2022.pre
103103
oneESCompat:

‎NuGet.config

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,59 @@
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" />
919
<!-- End: Package sources from dotnet-aspnetcore -->
20+
<!-- 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" />
34+
<!-- End: Package sources from dotnet-emsdk -->
1035
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1136
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1237
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1338
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1439
<!-- 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" />
1543
<!-- End: Package sources from dotnet-runtime -->
1644
<!-- Begin: Package sources from dotnet-templating -->
1745
<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" />
1846
<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" />
1947
<!-- End: Package sources from dotnet-templating -->
2048
<!-- 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" />
2162
<!-- End: Package sources from dotnet-windowsdesktop -->
2263
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2364
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -44,10 +85,36 @@
4485
<!-- Begin: Package sources from dotnet-templating -->
4586
<!-- End: Package sources from dotnet-templating -->
4687
<!-- 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" />
4798
<!-- End: Package sources from dotnet-aspnetcore -->
4899
<!-- 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" />
49103
<!-- End: Package sources from dotnet-runtime -->
50104
<!-- 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" />
51118
<!-- End: Package sources from dotnet-windowsdesktop -->
52119
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
53120
</disabledPackageSources>

0 commit comments

Comments
 (0)