Skip to content

Commit 4b46c44

Browse files
nagilsonnagilson
authored
Merge branch 'release/8.0.1xx' into 8.0.1xx--centos-stream
2 parents 5f81410 + b6e0d52 commit 4b46c44

34 files changed

+248
-293
lines changed

‎.vsts-ci.yml

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

4646
extends:
47-
${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
48-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
49-
${{ else }}:
50-
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
47+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
5148
parameters:
5249
containers:
5350
alpine319WithNode:

‎NuGet.config

Lines changed: 10 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,50 +7,22 @@
77
<clear />
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-emsdk -->
10-
<add key="darc-pub-dotnet-emsdk-e92f92e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef/nuget/v3/index.json" />
11-
<add key="darc-pub-dotnet-emsdk-e92f92e-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-9/nuget/v3/index.json" />
12-
<add key="darc-pub-dotnet-emsdk-e92f92e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-8/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-emsdk-e92f92e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-7/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-e92f92e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-6/nuget/v3/index.json" />
15-
<add key="darc-pub-dotnet-emsdk-e92f92e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-5/nuget/v3/index.json" />
16-
<add key="darc-pub-dotnet-emsdk-e92f92e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-4/nuget/v3/index.json" />
17-
<add key="darc-pub-dotnet-emsdk-e92f92e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-3/nuget/v3/index.json" />
18-
<add key="darc-pub-dotnet-emsdk-e92f92e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-2/nuget/v3/index.json" />
19-
<add key="darc-pub-dotnet-emsdk-e92f92e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-1/nuget/v3/index.json" />
10+
<add key="darc-pub-dotnet-emsdk-b767aab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba/nuget/v3/index.json" />
2011
<!-- End: Package sources from dotnet-emsdk -->
2112
<!-- Begin: Package sources from dotnet-aspnetcore -->
22-
<add key="darc-int-dotnet-aspnetcore-954f61d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd/nuget/v3/index.json" />
23-
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-954f61dd-8/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-009e1cca/nuget/v3/index.json" />
2414
<!-- End: Package sources from dotnet-aspnetcore -->
2515
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
26-
<add key="darc-pub-DotNet-msbuild-Trusted-b5265ef" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-b5265ef3/nuget/v3/index.json" />
16+
<add key="darc-pub-DotNet-msbuild-Trusted-31744df" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-31744dfc/nuget/v3/index.json" />
2717
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2818
<!-- Begin: Package sources from dotnet-runtime -->
29-
<add key="darc-int-dotnet-runtime-08338fc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-08338fca/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-runtime-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
3020
<!-- End: Package sources from dotnet-runtime -->
3121
<!-- Begin: Package sources from dotnet-sdk -->
32-
<add key="darc-int-dotnet-sdk-0ea3de9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b/nuget/v3/index.json" />
33-
<add key="darc-int-dotnet-sdk-0ea3de9-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-9/nuget/v3/index.json" />
34-
<add key="darc-int-dotnet-sdk-0ea3de9-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-8/nuget/v3/index.json" />
35-
<add key="darc-int-dotnet-sdk-0ea3de9-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-7/nuget/v3/index.json" />
36-
<add key="darc-int-dotnet-sdk-0ea3de9-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-6/nuget/v3/index.json" />
37-
<add key="darc-int-dotnet-sdk-0ea3de9-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-5/nuget/v3/index.json" />
38-
<add key="darc-int-dotnet-sdk-0ea3de9-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-4/nuget/v3/index.json" />
39-
<add key="darc-int-dotnet-sdk-0ea3de9-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-3/nuget/v3/index.json" />
40-
<add key="darc-int-dotnet-sdk-0ea3de9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-2/nuget/v3/index.json" />
41-
<add key="darc-int-dotnet-sdk-0ea3de9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-0ea3de9b-1/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-sdk-8f21634" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8f216348/nuget/v3/index.json" />
4223
<!-- End: Package sources from dotnet-sdk -->
4324
<!-- Begin: Package sources from dotnet-windowsdesktop -->
44-
<add key="darc-int-dotnet-windowsdesktop-1526afd" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4/nuget/v3/index.json" />
45-
<add key="darc-int-dotnet-windowsdesktop-1526afd-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-9/nuget/v3/index.json" />
46-
<add key="darc-int-dotnet-windowsdesktop-1526afd-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-8/nuget/v3/index.json" />
47-
<add key="darc-int-dotnet-windowsdesktop-1526afd-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-7/nuget/v3/index.json" />
48-
<add key="darc-int-dotnet-windowsdesktop-1526afd-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-6/nuget/v3/index.json" />
49-
<add key="darc-int-dotnet-windowsdesktop-1526afd-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-5/nuget/v3/index.json" />
50-
<add key="darc-int-dotnet-windowsdesktop-1526afd-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-4/nuget/v3/index.json" />
51-
<add key="darc-int-dotnet-windowsdesktop-1526afd-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-3/nuget/v3/index.json" />
52-
<add key="darc-int-dotnet-windowsdesktop-1526afd-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-2/nuget/v3/index.json" />
53-
<add key="darc-int-dotnet-windowsdesktop-1526afd-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1526afd4-1/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-e43b37de/nuget/v3/index.json" />
5426
<!-- End: Package sources from dotnet-windowsdesktop -->
5527
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
5628
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -70,34 +42,15 @@
7042
<disabledPackageSources>
7143
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
7244
<!-- Begin: Package sources from dotnet-aspnetcore -->
73-
<add key="darc-int-dotnet-aspnetcore-954f61d-8" value="true" />
74-
<add key="darc-int-dotnet-aspnetcore-954f61d" value="true" />
45+
<add key="darc-int-dotnet-aspnetcore-009e1cc" value="true" />
7546
<!-- End: Package sources from dotnet-aspnetcore -->
7647
<!-- Begin: Package sources from dotnet-runtime -->
77-
<add key="darc-int-dotnet-runtime-08338fc" value="true" />
48+
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
7849
<!-- Begin: Package sources from dotnet-sdk -->
79-
<add key="darc-int-dotnet-sdk-0ea3de9-1" value="true" />
80-
<add key="darc-int-dotnet-sdk-0ea3de9-2" value="true" />
81-
<add key="darc-int-dotnet-sdk-0ea3de9-3" value="true" />
82-
<add key="darc-int-dotnet-sdk-0ea3de9-4" value="true" />
83-
<add key="darc-int-dotnet-sdk-0ea3de9-5" value="true" />
84-
<add key="darc-int-dotnet-sdk-0ea3de9-6" value="true" />
85-
<add key="darc-int-dotnet-sdk-0ea3de9-7" value="true" />
86-
<add key="darc-int-dotnet-sdk-0ea3de9-8" value="true" />
87-
<add key="darc-int-dotnet-sdk-0ea3de9-9" value="true" />
88-
<add key="darc-int-dotnet-sdk-0ea3de9" value="true" />
50+
<add key="darc-int-dotnet-sdk-8f21634" value="true" />
8951
<!-- End: Package sources from dotnet-sdk -->
9052
<!-- Begin: Package sources from dotnet-windowsdesktop -->
91-
<add key="darc-int-dotnet-windowsdesktop-1526afd-1" value="true" />
92-
<add key="darc-int-dotnet-windowsdesktop-1526afd-2" value="true" />
93-
<add key="darc-int-dotnet-windowsdesktop-1526afd-3" value="true" />
94-
<add key="darc-int-dotnet-windowsdesktop-1526afd-4" value="true" />
95-
<add key="darc-int-dotnet-windowsdesktop-1526afd-5" value="true" />
96-
<add key="darc-int-dotnet-windowsdesktop-1526afd-6" value="true" />
97-
<add key="darc-int-dotnet-windowsdesktop-1526afd-7" value="true" />
98-
<add key="darc-int-dotnet-windowsdesktop-1526afd-8" value="true" />
99-
<add key="darc-int-dotnet-windowsdesktop-1526afd-9" value="true" />
100-
<add key="darc-int-dotnet-windowsdesktop-1526afd" value="true" />
53+
<add key="darc-int-dotnet-windowsdesktop-e43b37d" value="true" />
10154
<!-- End: Package sources from dotnet-windowsdesktop -->
10255
<!-- End: Package sources from dotnet-runtime -->
10356
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/ManualVersions.props

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.44</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.44</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.44</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.44</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.44</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.44</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.44</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.43</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.43</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.43</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.43</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.43</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.43</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.43</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.56</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.56</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.56</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.56</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.56</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.56</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.56</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.55</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.55</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.55</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.55</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.55</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.55</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.55</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
2626
</PropertyGroup>
2727
</Project>

‎eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@
1313

1414
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
1515
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
16+
17+
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
18+
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
1619
</IgnorePatterns>
1720
</UsageData>

0 commit comments

Comments
 (0)