Skip to content

Commit 729e6ac

Browse files
SimonZhao888SimonZhao888
authored
Merge branch 'release/8.0.3xx' into merge/release/8.0.1xx-to-release/8.0.3xx
2 parents f0a87b2 + f6665eb commit 729e6ac

34 files changed

+546
-1934
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 & 14 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
@@ -330,11 +323,6 @@ extends:
330323
buildArchitecture: arm64
331324
runTests: false
332325

333-
# Source Build
334-
- template: /eng/common/templates-official/jobs/source-build.yml@self
335-
parameters:
336-
enableInternalSources: true
337-
338326
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
339327
- stage: Publish
340328
dependsOn:

‎.vsts-pr.yml‎

Lines changed: 2 additions & 4 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:
@@ -340,10 +342,6 @@ stages:
340342
linuxPortable: true
341343
runTests: false
342344

343-
- template: /eng/common/templates/jobs/source-build.yml
344-
parameters:
345-
enableInternalSources: true
346-
347345
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
348346
- stage: Publish
349347
dependsOn:

‎NuGet.config‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<!-- End: Package sources from dotnet-emsdk -->
1111
<!-- Begin: Package sources from dotnet-aspnetcore -->
1212
<!-- End: Package sources from dotnet-aspnetcore -->
13+
<!-- Begin: Package sources from dotnet-windowsdesktop -->
14+
<!-- End: Package sources from dotnet-windowsdesktop -->
1315
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
14-
<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" />
16+
<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" />
1517
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1618
<!-- Begin: Package sources from dotnet-runtime -->
1719
<!-- End: Package sources from dotnet-runtime -->
1820
<!-- Begin: Package sources from dotnet-sdk -->
1921
<!-- End: Package sources from dotnet-sdk -->
20-
<!-- Begin: Package sources from dotnet-windowsdesktop -->
21-
<!-- End: Package sources from dotnet-windowsdesktop -->
2222
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2323
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
2424
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -32,21 +32,19 @@
3232
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
3333
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
3434
<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" />
35-
<add key="darc-int-dotnet-tools-internal" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json" />
3635
</packageSources>
3736
<disabledPackageSources>
3837
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
38+
<!-- Begin: Package sources from dotnet-aspnetcore -->
3939
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
4040
<!-- End: Package sources from DotNet-msbuild-Trusted -->
41-
<!-- Begin: Package sources from dotnet-aspnetcore -->
4241
<!-- End: Package sources from dotnet-aspnetcore -->
4342
<!-- Begin: Package sources from dotnet-runtime -->
43+
<!-- End: Package sources from dotnet-runtime -->
4444
<!-- Begin: Package sources from dotnet-sdk -->
4545
<!-- End: Package sources from dotnet-sdk -->
4646
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4747
<!-- End: Package sources from dotnet-windowsdesktop -->
48-
<!-- End: Package sources from dotnet-runtime -->
4948
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
50-
<add key="darc-int-dotnet-tools-internal" value="true" />
5149
</disabledPackageSources>
5250
</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>

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,22 @@
8585
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
8686
<Sha>c78f4a816c0c6a978a801a05a31dce9013e099e2</Sha>
8787
</Dependency>
88-
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.120">
88+
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="8.0.317">
8989
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
90-
<Sha>d7ebb03e176c3ed147c16e40d8f5095caf2a7453</Sha>
90+
<Sha>2f14d74cabdbfc7f898e14bc474962532ec6b392</Sha>
9191
</Dependency>
92-
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.120-servicing.25421.8">
92+
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="8.0.317-servicing.25421.6">
9393
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
94-
<Sha>d7ebb03e176c3ed147c16e40d8f5095caf2a7453</Sha>
94+
<Sha>2f14d74cabdbfc7f898e14bc474962532ec6b392</Sha>
9595
</Dependency>
96-
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.120-servicing.25421.8">
96+
<Dependency Name="Microsoft.NET.Sdk" Version="8.0.317-servicing.25421.6">
9797
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
98-
<Sha>d7ebb03e176c3ed147c16e40d8f5095caf2a7453</Sha>
98+
<Sha>2f14d74cabdbfc7f898e14bc474962532ec6b392</Sha>
9999
<SourceBuild RepoName="sdk" ManagedOnly="true" />
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.120-servicing.25421.8">
101+
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="8.0.317-servicing.25421.6">
102102
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
103-
<Sha>d7ebb03e176c3ed147c16e40d8f5095caf2a7453</Sha>
103+
<Sha>2f14d74cabdbfc7f898e14bc474962532ec6b392</Sha>
104104
</Dependency>
105105
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
106106
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -110,18 +110,18 @@
110110
<Uri>https://github.com/dotnet/test-templates</Uri>
111111
<Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.23410.2">
113+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.6.0" Version="1.1.0-rc.24059.1">
114114
<Uri>https://github.com/dotnet/test-templates</Uri>
115-
<Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
115+
<Sha>7d2f2719628e6744f3172a2d48e0d1f600b360c0</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.23410.2">
117+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.7.0" Version="1.1.0-rc.24059.1">
118118
<Uri>https://github.com/dotnet/test-templates</Uri>
119-
<Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
119+
<Sha>7d2f2719628e6744f3172a2d48e0d1f600b360c0</Sha>
120120
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
121121
</Dependency>
122-
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.23410.2">
122+
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.8.0" Version="1.1.0-rc.24059.1">
123123
<Uri>https://github.com/dotnet/test-templates</Uri>
124-
<Sha>1e5f3603af2277910aad946736ee23283e7f3e16</Sha>
124+
<Sha>7d2f2719628e6744f3172a2d48e0d1f600b360c0</Sha>
125125
</Dependency>
126126
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
127127
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.20-servicing.25419.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@@ -132,41 +132,36 @@
132132
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
133133
<Sha>7b95ca673ef08b7325429a3b675184b815482564</Sha>
134134
</Dependency>
135-
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.102-beta.24081.2" CoherentParentDependency="Microsoft.NET.Sdk">
135+
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
136136
<Uri>https://github.com/dotnet/fsharp</Uri>
137-
<Sha>fc5e9eda234e2b69aa479f4f83faddc31fdd4da7</Sha>
137+
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
138138
</Dependency>
139-
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.102-beta.24081.2" CoherentParentDependency="Microsoft.NET.Sdk">
139+
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="8.0.301-beta.24271.6" CoherentParentDependency="Microsoft.NET.Sdk">
140140
<Uri>https://github.com/dotnet/fsharp</Uri>
141-
<Sha>fc5e9eda234e2b69aa479f4f83faddc31fdd4da7</Sha>
141+
<Sha>80c165644db640d0f309affe0daa281c7e17b939</Sha>
142142
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
143143
</Dependency>
144-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.8.0-release-23615-02" CoherentParentDependency="Microsoft.NET.Sdk">
144+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.10.0-release-24317-02" CoherentParentDependency="Microsoft.NET.Sdk">
145145
<Uri>https://github.com/microsoft/vstest</Uri>
146-
<Sha>aa59400b11e1aeee2e8af48928dbd48748a8bef9</Sha>
146+
<Sha>c4d80397805bec06b354d20aeb1773e243c6add0</Sha>
147147
<SourceBuild RepoName="vstest" ManagedOnly="true" />
148148
</Dependency>
149149
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.20" CoherentParentDependency="Microsoft.NET.Sdk">
150150
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
151151
<Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.25056.18" CoherentParentDependency="Microsoft.NET.Sdk">
153+
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.10.0-3.25064.8" CoherentParentDependency="Microsoft.NET.Sdk">
154154
<Uri>https://github.com/dotnet/roslyn</Uri>
155-
<Sha>a77b6e41d030878096fa496e00e4c0dffe5af9f0</Sha>
155+
<Sha>85262f5f51be12867c1c2776d7a2be55251c04be</Sha>
156156
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
157157
</Dependency>
158-
<Dependency Name="Microsoft.Build" Version="17.8.36" CoherentParentDependency="Microsoft.NET.Sdk">
159-
<Uri>https://github.com/dotnet/msbuild</Uri>
160-
<Sha>03e28d165c0959ee43aa91c2612776b011522a70</Sha>
161-
</Dependency>
162-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.8.36-servicing-25411-03" CoherentParentDependency="Microsoft.NET.Sdk">
158+
<Dependency Name="Microsoft.Build" Version="17.10.39" CoherentParentDependency="Microsoft.NET.Sdk">
163159
<Uri>https://github.com/dotnet/msbuild</Uri>
164-
<Sha>03e28d165c0959ee43aa91c2612776b011522a70</Sha>
165-
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
160+
<Sha>c765bdccd66f924b3244a57ec0df32abe3a11ef0</Sha>
166161
</Dependency>
167-
<Dependency Name="NuGet.Build.Tasks" Version="6.8.1-rc.2" CoherentParentDependency="Microsoft.NET.Sdk">
168-
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
169-
<Sha>550277e0616e549446f03fda35d3e23dff75dc01</Sha>
162+
<Dependency Name="NuGet.Build.Tasks" Version="6.10.2-rc.8" CoherentParentDependency="Microsoft.NET.Sdk">
163+
<Uri>https://github.com/nuget/nuget.client</Uri>
164+
<Sha>b42cb884109d8d33c956311f1a8c89a90be0c195</Sha>
170165
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
171166
</Dependency>
172167
<Dependency Name="Microsoft.ApplicationInsights" Version="2.0.0">
@@ -177,16 +172,16 @@
177172
<Uri>https://github.com/dotnet/emsdk</Uri>
178173
<Sha>222749b48ecb0fe78f236ca9c61f6ff3b09cdc99</Sha>
179174
</Dependency>
180-
<Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23557.2">
181-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
182-
<Sha>48e42f59d64d84b404e904996a9ed61f2a17a569</Sha>
183-
<SourceBuild RepoName="aspire" ManagedOnly="true" />
184-
</Dependency>
185175
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.20-servicing.25418.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
186176
<Uri>https://github.com/dotnet/emsdk</Uri>
187177
<Sha>222749b48ecb0fe78f236ca9c61f6ff3b09cdc99</Sha>
188178
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
189179
</Dependency>
180+
<Dependency Name="Microsoft.NET.Sdk.Aspire.Manifest-8.0.100" Version="8.0.0-preview.1.23557.2">
181+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspire</Uri>
182+
<Sha>48e42f59d64d84b404e904996a9ed61f2a17a569</Sha>
183+
<SourceBuild RepoName="aspire" ManagedOnly="true" />
184+
</Dependency>
190185
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1" CoherentParentDependency="Microsoft.NET.Sdk">
191186
<Uri>https://github.com/dotnet/deployment-tools</Uri>
192187
<Sha>5255d40e228ea1d4b624781b5b97ec16484a3b4b</Sha>
@@ -232,13 +227,13 @@
232227
<Uri>https://github.com/dotnet/arcade</Uri>
233228
<Sha>3edea53c9b10e4bc63de863d71a05d47d9bb5b69</Sha>
234229
</Dependency>
235-
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23578.2">
230+
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
236231
<Uri>https://github.com/dotnet/arcade-services</Uri>
237-
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
232+
<Sha>b65fa14c7799a84e7fc2384bf821720d8ab1873b</Sha>
238233
</Dependency>
239-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.23578.2">
234+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.24306.1">
240235
<Uri>https://github.com/dotnet/arcade-services</Uri>
241-
<Sha>5263b603d90991a0c200aca8b8892c3d7cfe4751</Sha>
236+
<Sha>b65fa14c7799a84e7fc2384bf821720d8ab1873b</Sha>
242237
</Dependency>
243238
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
244239
<Uri>https://github.com/dotnet/runtime</Uri>

0 commit comments

Comments
 (0)