Skip to content

Commit 12b3496

Browse files
v-wuzhaiv-wuzhai
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer into merge/release/8.0.1xx-to-release/8.0.3xx
2 parents 60301e3 + 394c348 commit 12b3496

34 files changed

+583
-1940
lines changed

‎.config/dotnet-tools.json

+1-1
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

+4-11
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)
@@ -56,7 +56,7 @@ extends:
5656
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
5757
centosStream8:
5858
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
59-
debian11:
59+
debian11Amd64:
6060
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
6161
fedora40:
6262
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40
@@ -71,13 +71,6 @@ extends:
7171
name: $(DncEngInternalBuildPool)
7272
image: 1es-windows-2022
7373
os: windows
74-
${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
75-
componentgovernance:
76-
ignoreDirectories: artifacts, .packages
77-
# Temporary to workaround MicroBuild issues.
78-
credscan:
79-
enabled: false
80-
justificationForDisabling: 'CredScan is failing on the MicroBuild signing plugin. "MicroBuild/Plugins/nuget.config" has changing content and thus cannot be baselined.'
8174
stages:
8275
- stage: Build
8376
jobs:
@@ -99,7 +92,7 @@ extends:
9992
targetPath: $(Build.SourcesDirectory)\eng\buildConfiguration
10093
artifactName: buildConfiguration
10194

102-
# PR-only jobs
95+
# PR-only jobs
10396
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
10497
# Windows
10598
- template: eng/build.yml@self
@@ -142,7 +135,7 @@ extends:
142135
parameters:
143136
agentOs: Linux
144137
jobName: Build_Debian_11_Debug_x64
145-
container: debian11
138+
container: debian11Amd64
146139
buildConfiguration: Debug
147140
buildArchitecture: x64
148141
additionalBuildParameters: '/p:BuildSdkDeb=true'

‎.vsts-pr.yml

+4-2
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:
@@ -78,8 +80,8 @@ stages:
7880
- template: eng/build-pr.yml
7981
parameters:
8082
agentOs: Linux
81-
jobName: Build_Fedora_36_Debug_x64
82-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36'
83+
jobName: Build_Fedora_39_Debug_x64
84+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39'
8385
buildConfiguration: Debug
8486
buildArchitecture: x64
8587
linuxPortable: true

‎NuGet.config

+23-18
Original file line numberDiff line numberDiff line change
@@ -18,25 +18,28 @@
1818
<add key="darc-int-dotnet-aspnetcore-31d685b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-2/nuget/v3/index.json" />
1919
<add key="darc-int-dotnet-aspnetcore-31d685b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-31d685b2-1/nuget/v3/index.json" />
2020
<!-- End: Package sources from dotnet-aspnetcore -->
21+
<!-- Begin: Package sources from dotnet-windowsdesktop -->
22+
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
23+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
24+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
25+
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
26+
<!-- End: Package sources from dotnet-windowsdesktop -->
2127
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
22-
<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" />
2328
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2429
<!-- Begin: Package sources from dotnet-runtime -->
2530
<add key="darc-int-dotnet-runtime-89ef51c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5/nuget/v3/index.json" />
2631
<add key="darc-int-dotnet-runtime-89ef51c-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-89ef51c5-3/nuget/v3/index.json" />
2732
<!-- End: Package sources from dotnet-runtime -->
2833
<!-- Begin: Package sources from dotnet-sdk -->
29-
<add key="darc-int-dotnet-sdk-f7cd007" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f7cd007b/nuget/v3/index.json" />
30-
<add key="darc-int-dotnet-sdk-f7cd007-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f7cd007b-3/nuget/v3/index.json" />
31-
<add key="darc-int-dotnet-sdk-f7cd007-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f7cd007b-2/nuget/v3/index.json" />
32-
<add key="darc-int-dotnet-sdk-f7cd007-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f7cd007b-1/nuget/v3/index.json" />
34+
<add key="darc-int-dotnet-sdk-55a73a0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e/nuget/v3/index.json" />
35+
<add key="darc-int-dotnet-sdk-55a73a0-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-7/nuget/v3/index.json" />
36+
<add key="darc-int-dotnet-sdk-55a73a0-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-6/nuget/v3/index.json" />
37+
<add key="darc-int-dotnet-sdk-55a73a0-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-5/nuget/v3/index.json" />
38+
<add key="darc-int-dotnet-sdk-55a73a0-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-4/nuget/v3/index.json" />
39+
<add key="darc-int-dotnet-sdk-55a73a0-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-3/nuget/v3/index.json" />
40+
<add key="darc-int-dotnet-sdk-55a73a0-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-2/nuget/v3/index.json" />
41+
<add key="darc-int-dotnet-sdk-55a73a0-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-55a73a0e-1/nuget/v3/index.json" />
3342
<!-- End: Package sources from dotnet-sdk -->
34-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
35-
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4/nuget/v3/index.json" />
36-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-3/nuget/v3/index.json" />
37-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-2/nuget/v3/index.json" />
38-
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0dad47b4-1/nuget/v3/index.json" />
39-
<!-- End: Package sources from dotnet-windowsdesktop -->
4043
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4144
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
4245
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -50,7 +53,6 @@
5053
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
5154
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
5255
<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" />
53-
<add key="darc-int-dotnet-tools-internal" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json" />
5456
</packageSources>
5557
<disabledPackageSources>
5658
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
@@ -63,20 +65,23 @@
6365
<!-- Begin: Package sources from dotnet-runtime -->
6466
<add key="darc-int-dotnet-runtime-89ef51c-3" value="true" />
6567
<add key="darc-int-dotnet-runtime-89ef51c" value="true" />
68+
<!-- End: Package sources from dotnet-runtime -->
6669
<!-- Begin: Package sources from dotnet-sdk -->
67-
<add key="darc-int-dotnet-sdk-f7cd007-1" value="true" />
68-
<add key="darc-int-dotnet-sdk-f7cd007-2" value="true" />
69-
<add key="darc-int-dotnet-sdk-f7cd007-3" value="true" />
70-
<add key="darc-int-dotnet-sdk-f7cd007" value="true" />
70+
<add key="darc-int-dotnet-sdk-55a73a0-1" value="true" />
71+
<add key="darc-int-dotnet-sdk-55a73a0-2" value="true" />
72+
<add key="darc-int-dotnet-sdk-55a73a0-3" value="true" />
73+
<add key="darc-int-dotnet-sdk-55a73a0-4" value="true" />
74+
<add key="darc-int-dotnet-sdk-55a73a0-5" value="true" />
75+
<add key="darc-int-dotnet-sdk-55a73a0-6" value="true" />
76+
<add key="darc-int-dotnet-sdk-55a73a0-7" value="true" />
77+
<add key="darc-int-dotnet-sdk-55a73a0" value="true" />
7178
<!-- End: Package sources from dotnet-sdk -->
7279
<!-- Begin: Package sources from dotnet-windowsdesktop -->
7380
<add key="darc-int-dotnet-windowsdesktop-0dad47b-1" value="true" />
7481
<add key="darc-int-dotnet-windowsdesktop-0dad47b-2" value="true" />
7582
<add key="darc-int-dotnet-windowsdesktop-0dad47b-3" value="true" />
7683
<add key="darc-int-dotnet-windowsdesktop-0dad47b" value="true" />
7784
<!-- End: Package sources from dotnet-windowsdesktop -->
78-
<!-- End: Package sources from dotnet-runtime -->
7985
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
80-
<add key="darc-int-dotnet-tools-internal" value="true" />
8186
</disabledPackageSources>
8287
</configuration>

‎eng/SourceBuildPrebuiltBaseline.xml

+14-1
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,22 @@
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.4" />
16+
<UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.10.4" />
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.Reflection.Metadata/*8.0.0*" />
29+
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/*8.0.0*" />
30+
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
1831
</IgnorePatterns>
1932
</UsageData>

0 commit comments

Comments
 (0)