Skip to content

Commit dc56c95

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-8880b51a-9455-4397-b377-95fb98ac6853
2 parents edd17c0 + ad560cb commit dc56c95

21 files changed

+300
-415
lines changed

.vsts-ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@ resources:
5757
ref: refs/tags/release
5858

5959
extends:
60-
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
61-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
62-
${{ else }}:
63-
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
60+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
6461
parameters:
6562
containers:
6663
alpine319WithNode:

NuGet.config

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-deployment-tools -->
77
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-4/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-3/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-2/nuget/v3/index.json" />
811
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-9/nuget/v3/index.json" />
912
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-8/nuget/v3/index.json" />
1013
<add key="darc-pub-dotnet-deployment-tools-b2d5c0c-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-deployment-tools-b2d5c0c5-7/nuget/v3/index.json" />
@@ -46,7 +49,7 @@
4649
<add key="darc-int-dotnet-aspnetcore-4442a18-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-4442a188-1/nuget/v3/index.json" />
4750
<!-- End: Package sources from dotnet-aspnetcore -->
4851
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
49-
<add key="darc-pub-DotNet-msbuild-Trusted-90b52dd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-90b52dda-1/nuget/v3/index.json" />
52+
<add key="darc-pub-DotNet-msbuild-Trusted-e0b90a9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-e0b90a9a/nuget/v3/index.json" />
5053
<!-- End: Package sources from DotNet-msbuild-Trusted -->
5154
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
5255
<!-- End: Package sources from dotnet-roslyn-analyzers -->
@@ -57,6 +60,25 @@
5760
<!-- End: Package sources from dotnet-runtime -->
5861
<!-- Begin: Package sources from dotnet-templating -->
5962
<add key="darc-pub-dotnet-templating-5936acf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-5936acfc/nuget/v3/index.json" />
63+
<add key="darc-pub-dotnet-templating-f46c70a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab/nuget/v3/index.json" />
64+
<add key="darc-pub-dotnet-templating-f46c70a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-4/nuget/v3/index.json" />
65+
<add key="darc-pub-dotnet-templating-f46c70a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-3/nuget/v3/index.json" />
66+
<add key="darc-pub-dotnet-templating-f46c70a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-2/nuget/v3/index.json" />
67+
<add key="darc-pub-dotnet-templating-f46c70a-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-9/nuget/v3/index.json" />
68+
<add key="darc-pub-dotnet-templating-f46c70a-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-8/nuget/v3/index.json" />
69+
<add key="darc-pub-dotnet-templating-f46c70a-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-7/nuget/v3/index.json" />
70+
<add key="darc-pub-dotnet-templating-f46c70a-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-6/nuget/v3/index.json" />
71+
<add key="darc-pub-dotnet-templating-f46c70a-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-5/nuget/v3/index.json" />
72+
<add key="darc-pub-dotnet-templating-f46c70a-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-4/nuget/v3/index.json" />
73+
<add key="darc-pub-dotnet-templating-f46c70a-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-3/nuget/v3/index.json" />
74+
<add key="darc-pub-dotnet-templating-f46c70a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-2/nuget/v3/index.json" />
75+
<add key="darc-pub-dotnet-templating-f46c70a-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-15/nuget/v3/index.json" />
76+
<add key="darc-pub-dotnet-templating-f46c70a-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-14/nuget/v3/index.json" />
77+
<add key="darc-pub-dotnet-templating-f46c70a-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-13/nuget/v3/index.json" />
78+
<add key="darc-pub-dotnet-templating-f46c70a-12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-12/nuget/v3/index.json" />
79+
<add key="darc-pub-dotnet-templating-f46c70a-11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-11/nuget/v3/index.json" />
80+
<add key="darc-pub-dotnet-templating-f46c70a-10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-10/nuget/v3/index.json" />
81+
<add key="darc-pub-dotnet-templating-f46c70a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f46c70ab-1/nuget/v3/index.json" />
6082
<!-- End: Package sources from dotnet-templating -->
6183
<!-- Begin: Package sources from dotnet-windowsdesktop -->
6284
<add key="darc-int-dotnet-windowsdesktop-af254ce" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af254ce1/nuget/v3/index.json" />

0 commit comments

Comments
 (0)