Skip to content

Commit abee3fb

Browse files
authored
Merging internal commits for release/6.0.4xx (#43981)
2 parents 892f82d + 795da3c commit abee3fb

File tree

7 files changed

+111
-149
lines changed

7 files changed

+111
-149
lines changed

.vsts-ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,10 @@ extends:
112112
pool:
113113
${{ if eq(variables['System.TeamProject'], 'public') }}:
114114
name: NetCore-Svc-Public
115-
image: 1es-windows-2022-open
116-
os: windows
115+
demands: ImageOverride -equals windows.vs2022preview.amd64.open
117116
${{ if ne(variables['System.TeamProject'], 'public') }}:
118117
name: NetCore1ESPool-Svc-Internal
119-
image: 1es-windows-2022
120-
os: windows
118+
demands: ImageOverride -equals windows.vs2022preview.amd64
121119
${{ if eq(variables['System.TeamProject'], 'public') }}:
122120
helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
123121
${{ if ne(variables['System.TeamProject'], 'public') }}:

NuGet.config

Lines changed: 8 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,40 +4,21 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-aspnetcore -->
7-
<add key="darc-int-dotnet-aspnetcore-f0f9de5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f0f9de56/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-aspnetcore-f0f9de5-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f0f9de56-5/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-aspnetcore-827b960" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604/nuget/v3/index.json" />
98
<!-- End: Package sources from dotnet-aspnetcore -->
109
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1110
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
1211
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1312
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1413
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1514
<!-- Begin: Package sources from dotnet-runtime -->
16-
<add key="darc-int-dotnet-runtime-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
15+
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
1716
<!-- End: Package sources from dotnet-runtime -->
1817
<!-- Begin: Package sources from dotnet-templating -->
19-
<add key="darc-int-dotnet-templating-8413a0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-templating-8413a0d-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-9/nuget/v3/index.json" />
21-
<add key="darc-int-dotnet-templating-8413a0d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-8/nuget/v3/index.json" />
22-
<add key="darc-int-dotnet-templating-8413a0d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-7/nuget/v3/index.json" />
23-
<add key="darc-int-dotnet-templating-8413a0d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-6/nuget/v3/index.json" />
24-
<add key="darc-int-dotnet-templating-8413a0d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-5/nuget/v3/index.json" />
25-
<add key="darc-int-dotnet-templating-8413a0d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-4/nuget/v3/index.json" />
26-
<add key="darc-int-dotnet-templating-8413a0d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-3/nuget/v3/index.json" />
27-
<add key="darc-int-dotnet-templating-8413a0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-2/nuget/v3/index.json" />
28-
<add key="darc-int-dotnet-templating-8413a0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-1/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-templating-7de8a28" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7de8a286/nuget/v3/index.json" />
2919
<!-- End: Package sources from dotnet-templating -->
3020
<!-- Begin: Package sources from dotnet-windowsdesktop -->
31-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36/nuget/v3/index.json" />
32-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-9/nuget/v3/index.json" />
33-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-8/nuget/v3/index.json" />
34-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-7/nuget/v3/index.json" />
35-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-6/nuget/v3/index.json" />
36-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-5/nuget/v3/index.json" />
37-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-4/nuget/v3/index.json" />
38-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-3/nuget/v3/index.json" />
39-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-2/nuget/v3/index.json" />
40-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36-1/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978/nuget/v3/index.json" />
4122
<!-- End: Package sources from dotnet-windowsdesktop -->
4223
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4324
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -57,35 +38,16 @@
5738
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
5839
<!-- End: Package sources from DotNet-msbuild-Trusted -->
5940
<!-- Begin: Package sources from dotnet-templating -->
60-
<add key="darc-int-dotnet-templating-8413a0d-1" value="true" />
61-
<add key="darc-int-dotnet-templating-8413a0d-2" value="true" />
62-
<add key="darc-int-dotnet-templating-8413a0d-3" value="true" />
63-
<add key="darc-int-dotnet-templating-8413a0d-4" value="true" />
64-
<add key="darc-int-dotnet-templating-8413a0d-5" value="true" />
65-
<add key="darc-int-dotnet-templating-8413a0d-6" value="true" />
66-
<add key="darc-int-dotnet-templating-8413a0d-7" value="true" />
67-
<add key="darc-int-dotnet-templating-8413a0d-8" value="true" />
68-
<add key="darc-int-dotnet-templating-8413a0d-9" value="true" />
69-
<add key="darc-int-dotnet-templating-8413a0d" value="true" />
41+
<add key="darc-int-dotnet-templating-7de8a28" value="true" />
7042
<!-- End: Package sources from dotnet-templating -->
7143
<!-- Begin: Package sources from dotnet-aspnetcore -->
72-
<add key="darc-int-dotnet-aspnetcore-f0f9de5-5" value="true" />
73-
<add key="darc-int-dotnet-aspnetcore-f0f9de5" value="true" />
44+
<add key="darc-int-dotnet-aspnetcore-827b960" value="true" />
7445
<!-- End: Package sources from dotnet-aspnetcore -->
7546
<!-- Begin: Package sources from dotnet-runtime -->
76-
<add key="darc-int-dotnet-runtime-6c63698" value="true" />
47+
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
7748
<!-- End: Package sources from dotnet-runtime -->
7849
<!-- Begin: Package sources from dotnet-windowsdesktop -->
79-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-1" value="true" />
80-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-2" value="true" />
81-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-3" value="true" />
82-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-4" value="true" />
83-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-5" value="true" />
84-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-6" value="true" />
85-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-7" value="true" />
86-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-8" value="true" />
87-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3-9" value="true" />
88-
<add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="true" />
50+
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
8951
<!-- End: Package sources from dotnet-windowsdesktop -->
9052
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
9153
</disabledPackageSources>

0 commit comments

Comments
 (0)