Skip to content

Commit de7bd96

Browse files
SimonZhao888SimonZhao888
authored
Merge branch 'release/8.0.3xx' into merge/release/8.0.1xx-to-release/8.0.3xx
2 parents 7e204ba + 4b26585 commit de7bd96

34 files changed

+565
-1944
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.23621.3",
6+
"version": "1.1.0-beta.24306.1",
77
"commands": [
88
"darc"
99
]

‎.vsts-ci.yml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ variables:
3131
value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
3232
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
3333
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
34-
- template: /eng/common/templates/variables/pool-providers.yml
34+
- template: /eng/common/templates-official/variables/pool-providers.yml
3535
# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning.
3636
- name: MicroBuildOutputFolderOverride
3737
value: $(Agent.TempDirectory)
@@ -73,13 +73,6 @@ extends:
7373
name: $(DncEngInternalBuildPool)
7474
image: 1es-windows-2022
7575
os: windows
76-
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
77-
componentgovernance:
78-
ignoreDirectories: artifacts, .packages
79-
# Temporary to workaround MicroBuild issues.
80-
credscan:
81-
enabled: false
82-
justificationForDisabling: 'CredScan is failing on the MicroBuild signing plugin. "MicroBuild/Plugins/nuget.config" has changing content and thus cannot be baselined.'
8376
stages:
8477
- stage: Build
8578
jobs:
@@ -101,7 +94,7 @@ extends:
10194
targetPath: $(Build.SourcesDirectory)\eng\buildConfiguration
10295
artifactName: buildConfiguration
10396

104-
# PR-only jobs
97+
# PR-only jobs
10598
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
10699
# Windows
107100
- template: eng/build.yml@self

‎.vsts-pr.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Pipeline: https://dev.azure.com/dnceng-public/public/_build?definitionId=20
2+
13
trigger:
24
batch: true
35
branches:

‎NuGet.config‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,15 @@
2020
<add key="darc-int-dotnet-aspnetcore-c78f4a8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c78f4a81-2/nuget/v3/index.json" />
2121
<add key="darc-int-dotnet-aspnetcore-c78f4a8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-c78f4a81-1/nuget/v3/index.json" />
2222
<!-- End: Package sources from dotnet-aspnetcore -->
23+
<!-- Begin: Package sources from dotnet-windowsdesktop -->
24+
<add key="darc-int-dotnet-windowsdesktop-2540f0e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-2540f0e-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7-4/nuget/v3/index.json" />
26+
<add key="darc-int-dotnet-windowsdesktop-2540f0e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7-3/nuget/v3/index.json" />
27+
<add key="darc-int-dotnet-windowsdesktop-2540f0e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7-2/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-windowsdesktop-2540f0e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7-1/nuget/v3/index.json" />
29+
<!-- End: Package sources from dotnet-windowsdesktop -->
2330
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
24-
<add key="darc-pub-DotNet-msbuild-Trusted-03e28d1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-03e28d16/nuget/v3/index.json" />
31+
<add key="darc-pub-DotNet-msbuild-Trusted-c765bdc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-c765bdcc/nuget/v3/index.json" />
2532
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2633
<!-- Begin: Package sources from dotnet-runtime -->
2734
<add key="darc-int-dotnet-runtime-574100b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6/nuget/v3/index.json" />
@@ -31,19 +38,12 @@
3138
<add key="darc-int-dotnet-runtime-574100b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-574100b6-1/nuget/v3/index.json" />
3239
<!-- End: Package sources from dotnet-runtime -->
3340
<!-- Begin: Package sources from dotnet-sdk -->
34-
<add key="darc-int-dotnet-sdk-d7ebb03" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d7ebb03e/nuget/v3/index.json" />
35-
<add key="darc-int-dotnet-sdk-d7ebb03-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d7ebb03e-4/nuget/v3/index.json" />
36-
<add key="darc-int-dotnet-sdk-d7ebb03-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d7ebb03e-3/nuget/v3/index.json" />
37-
<add key="darc-int-dotnet-sdk-d7ebb03-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d7ebb03e-2/nuget/v3/index.json" />
38-
<add key="darc-int-dotnet-sdk-d7ebb03-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-d7ebb03e-1/nuget/v3/index.json" />
41+
<add key="darc-int-dotnet-sdk-2f14d74" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2f14d74c/nuget/v3/index.json" />
42+
<add key="darc-int-dotnet-sdk-2f14d74-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2f14d74c-4/nuget/v3/index.json" />
43+
<add key="darc-int-dotnet-sdk-2f14d74-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2f14d74c-3/nuget/v3/index.json" />
44+
<add key="darc-int-dotnet-sdk-2f14d74-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2f14d74c-2/nuget/v3/index.json" />
45+
<add key="darc-int-dotnet-sdk-2f14d74-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-2f14d74c-1/nuget/v3/index.json" />
3946
<!-- End: Package sources from dotnet-sdk -->
40-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
41-
<add key="darc-int-dotnet-windowsdesktop-2540f0e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7/nuget/v3/index.json" />
42-
<add key="darc-int-dotnet-windowsdesktop-2540f0e-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7-4/nuget/v3/index.json" />
43-
<add key="darc-int-dotnet-windowsdesktop-2540f0e-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7-3/nuget/v3/index.json" />
44-
<add key="darc-int-dotnet-windowsdesktop-2540f0e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7-2/nuget/v3/index.json" />
45-
<add key="darc-int-dotnet-windowsdesktop-2540f0e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-2540f0e7-1/nuget/v3/index.json" />
46-
<!-- End: Package sources from dotnet-windowsdesktop -->
4747
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4848
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
4949
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -57,31 +57,31 @@
5757
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
5858
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
5959
<add key="msbuild-prerelease-with-release-version" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-8ffc3fe3/nuget/v3/index.json" />
60-
<add key="darc-int-dotnet-tools-internal" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json" />
6160
</packageSources>
6261
<disabledPackageSources>
6362
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
64-
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
65-
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6663
<!-- Begin: Package sources from dotnet-aspnetcore -->
6764
<add key="darc-int-dotnet-aspnetcore-c78f4a8-1" value="true" />
6865
<add key="darc-int-dotnet-aspnetcore-c78f4a8-2" value="true" />
6966
<add key="darc-int-dotnet-aspnetcore-c78f4a8-3" value="true" />
7067
<add key="darc-int-dotnet-aspnetcore-c78f4a8-4" value="true" />
7168
<add key="darc-int-dotnet-aspnetcore-c78f4a8" value="true" />
69+
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
70+
<!-- End: Package sources from DotNet-msbuild-Trusted -->
7271
<!-- End: Package sources from dotnet-aspnetcore -->
7372
<!-- Begin: Package sources from dotnet-runtime -->
7473
<add key="darc-int-dotnet-runtime-574100b-1" value="true" />
7574
<add key="darc-int-dotnet-runtime-574100b-2" value="true" />
7675
<add key="darc-int-dotnet-runtime-574100b-3" value="true" />
7776
<add key="darc-int-dotnet-runtime-574100b-4" value="true" />
7877
<add key="darc-int-dotnet-runtime-574100b" value="true" />
78+
<!-- End: Package sources from dotnet-runtime -->
7979
<!-- Begin: Package sources from dotnet-sdk -->
80-
<add key="darc-int-dotnet-sdk-d7ebb03-1" value="true" />
81-
<add key="darc-int-dotnet-sdk-d7ebb03-2" value="true" />
82-
<add key="darc-int-dotnet-sdk-d7ebb03-3" value="true" />
83-
<add key="darc-int-dotnet-sdk-d7ebb03-4" value="true" />
84-
<add key="darc-int-dotnet-sdk-d7ebb03" value="true" />
80+
<add key="darc-int-dotnet-sdk-2f14d74-1" value="true" />
81+
<add key="darc-int-dotnet-sdk-2f14d74-2" value="true" />
82+
<add key="darc-int-dotnet-sdk-2f14d74-3" value="true" />
83+
<add key="darc-int-dotnet-sdk-2f14d74-4" value="true" />
84+
<add key="darc-int-dotnet-sdk-2f14d74" value="true" />
8585
<!-- End: Package sources from dotnet-sdk -->
8686
<!-- Begin: Package sources from dotnet-windowsdesktop -->
8787
<add key="darc-int-dotnet-windowsdesktop-2540f0e-1" value="true" />
@@ -90,8 +90,6 @@
9090
<add key="darc-int-dotnet-windowsdesktop-2540f0e-4" value="true" />
9191
<add key="darc-int-dotnet-windowsdesktop-2540f0e" value="true" />
9292
<!-- End: Package sources from dotnet-windowsdesktop -->
93-
<!-- End: Package sources from dotnet-runtime -->
9493
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
95-
<add key="darc-int-dotnet-tools-internal" value="true" />
9694
</disabledPackageSources>
9795
</configuration>

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,23 @@
1111
-->
1212
<UsagePattern IdentityGlob="NuGet.*/*" />
1313

14+
<!-- These MSBuild packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
15+
<UsagePattern IdentityGlob="Microsoft.Build*/17.10.*" />
16+
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.10.*" />
17+
18+
<!-- These emsdk packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
19+
<UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100/8.0.*" />
20+
<UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100/8.0.*" />
21+
<UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100/8.0.*" />
22+
1423
<!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
1524
<UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
16-
25+
26+
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/*8.0.0*" />
27+
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/*8.0.0*" />
1728
<UsagePattern IdentityGlob="System.Formats.Asn1/*8.0.1*" />
1829
<UsagePattern IdentityGlob="System.Reflection.Metadata/*8.0.0*" />
30+
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*8.0.0*" />
31+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
1932
</IgnorePatterns>
2033
</UsageData>

0 commit comments

Comments
 (0)