Skip to content

Commit f9457af

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/8.0.4xx' of https://github.com/dotnet/sdk into merge/release/8.0.3xx-to-release/8.0.4xx
2 parents e04bafb + 05630f6 commit f9457af

File tree

8 files changed

+28
-39
lines changed

8 files changed

+28
-39
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
7-
<add key="darc-pub-dotnet-emsdk-976b101" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-976b101e/nuget/v3/index.json" />
87
<!-- End: Package sources from dotnet-emsdk -->
98
<!-- Begin: Package sources from dotnet-format -->
109
<add key="darc-pub-dotnet-format-64cbc6c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-64cbc6c3/nuget/v3/index.json" />
@@ -14,21 +13,18 @@
1413
<add key="darc-pub-dotnet-format-64cbc6c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-64cbc6c3-1/nuget/v3/index.json" />
1514
<!-- End: Package sources from dotnet-format -->
1615
<!-- Begin: Package sources from dotnet-aspnetcore -->
17-
<add key="darc-int-dotnet-aspnetcore-cea5fa6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-cea5fa61/nuget/v3/index.json" />
1816
<!-- End: Package sources from dotnet-aspnetcore -->
1917
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
2018
<add key="darc-pub-DotNet-msbuild-Trusted-901dc04" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-901dc04e/nuget/v3/index.json" />
2119
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2220
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2321
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2422
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-ef853a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71/nuget/v3/index.json" />
2623
<!-- End: Package sources from dotnet-runtime -->
2724
<!-- Begin: Package sources from dotnet-templating -->
28-
<add key="darc-pub-dotnet-templating-caa21b1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-caa21b11/nuget/v3/index.json" />
25+
<add key="darc-pub-dotnet-templating-7af6f77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7af6f77c/nuget/v3/index.json" />
2926
<!-- End: Package sources from dotnet-templating -->
3027
<!-- Begin: Package sources from dotnet-windowsdesktop -->
31-
<add key="darc-int-dotnet-windowsdesktop-c4a3ad7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-c4a3ad74/nuget/v3/index.json" />
3228
<!-- End: Package sources from dotnet-windowsdesktop -->
3329
<!-- Begin: Package sources from dotnet-winforms -->
3430
<!-- End: Package sources from dotnet-winforms -->
@@ -55,17 +51,14 @@
5551
<!-- Begin: Package sources from dotnet-templating -->
5652
<!-- End: Package sources from dotnet-templating -->
5753
<!-- Begin: Package sources from dotnet-aspnetcore -->
58-
<add key="darc-int-dotnet-aspnetcore-cea5fa6" value="true" />
5954
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
6055
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6156
<!-- Begin: Package sources from dotnet-format -->
6257
<!-- End: Package sources from dotnet-format -->
6358
<!-- End: Package sources from dotnet-aspnetcore -->
6459
<!-- Begin: Package sources from dotnet-runtime -->
65-
<add key="darc-int-dotnet-runtime-ef853a7" value="true" />
6660
<!-- End: Package sources from dotnet-runtime -->
6761
<!-- Begin: Package sources from dotnet-windowsdesktop -->
68-
<add key="darc-int-dotnet-windowsdesktop-c4a3ad7" value="true" />
6962
<!-- Begin: Package sources from dotnet-winforms -->
7063
<!-- End: Package sources from dotnet-winforms -->
7164
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.413">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.414">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>caa21b1109a61dfb867ef1332a76a740894001f7</Sha>
6+
<Sha>7af6f77c604d9420f5e4b39c112d7f56ff6b3d56</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.413-servicing.25353.7">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.414-servicing.25404.4">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>caa21b1109a61dfb867ef1332a76a740894001f7</Sha>
10+
<Sha>7af6f77c604d9420f5e4b39c112d7f56ff6b3d56</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.413-servicing.25353.7">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.414-servicing.25404.4">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>caa21b1109a61dfb867ef1332a76a740894001f7</Sha>
14+
<Sha>7af6f77c604d9420f5e4b39c112d7f56ff6b3d56</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.18">
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25326.1">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25378.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
496+
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25326.1">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25378.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
501+
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25326.1">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25378.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
505+
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25326.1">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25378.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
509+
<Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25326.1</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25378.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -143,13 +143,13 @@
143143
</PropertyGroup>
144144
<PropertyGroup>
145145
<!-- Dependencies from https://github.com/dotnet/templating -->
146-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.413</MicrosoftTemplateEngineAbstractionsPackageVersion>
146+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.414</MicrosoftTemplateEngineAbstractionsPackageVersion>
147147
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
148148
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
149149
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
150150
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
151151
<!-- test dependencies -->
152-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.413-servicing.25353.7</MicrosoftTemplateEngineMocksPackageVersion>
152+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.414-servicing.25404.4</MicrosoftTemplateEngineMocksPackageVersion>
153153
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
154154
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
155155
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -215,7 +215,7 @@
215215
<PropertyGroup>
216216
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
217217
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
218-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25326.1</MicrosoftDotNetXUnitExtensionsVersion>
218+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25378.1</MicrosoftDotNetXUnitExtensionsVersion>
219219
<MoqPackageVersion>4.18.4</MoqPackageVersion>
220220
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
221221
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/build-pr.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ jobs:
4343
- group: DotNet-HelixApi-Access
4444
- _HelixApiToken: $(HelixApiAccessToken)
4545
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
46-
- group: dotnet-benchview
4746
- _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
4847
- _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
4948
- _PerfIterations: 25
@@ -225,7 +224,6 @@ jobs:
225224
- group: DotNet-HelixApi-Access
226225
- _HelixApiToken: $(HelixApiAccessToken)
227226
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
228-
- group: dotnet-benchview
229227
- _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
230228
- _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
231229
- _PerfIterations: 25
@@ -358,7 +356,6 @@ jobs:
358356
- group: DotNet-HelixApi-Access
359357
- _HelixApiToken: $(HelixApiAccessToken)
360358
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
361-
- group: dotnet-benchview
362359
- _OfficialBuildIdArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
363360
- _SignArgs: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
364361
- _PerfIterations: 25

‎eng/build.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jobs:
6060
- name: _HelixApiToken
6161
value: $(HelixApiAccessToken)
6262
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
63-
- group: dotnet-benchview
6463
- name: _OfficialBuildIdArgs
6564
value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
6665
- name: _SignArgs
@@ -255,7 +254,6 @@ jobs:
255254
- name: _HelixApiToken
256255
value: $(HelixApiAccessToken)
257256
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
258-
- group: dotnet-benchview
259257
- name: _OfficialBuildIdArgs
260258
value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
261259
- name: _SignArgs
@@ -401,7 +399,6 @@ jobs:
401399
- name: _HelixApiToken
402400
value: $(HelixApiAccessToken)
403401
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
404-
- group: dotnet-benchview
405402
- name: _OfficialBuildIdArgs
406403
value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
407404
- name: _SignArgs

‎eng/common/templates-official/job/job.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ parameters:
2121
# See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
2222
artifacts: ''
2323
enableMicrobuild: false
24+
microbuildUseESRP: true
2425
enablePublishBuildArtifacts: false
2526
enablePublishBuildAssets: false
2627
enablePublishTestResults: false
@@ -135,10 +136,11 @@ jobs:
135136
signType: $(_SignType)
136137
zipSources: false
137138
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138-
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
139-
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
140-
${{ else }}:
141-
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
139+
${{ if eq(parameters.microbuildUseESRP, true) }}:
140+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
141+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
142+
${{ else }}:
143+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
142144
env:
143145
TeamName: $(_TeamName)
144146
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

‎eng/common/tools.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
417417

418418
# Locate Visual Studio installation or download x-copy msbuild.
419419
$vsInfo = LocateVisualStudio $vsRequirements
420-
if ($vsInfo -ne $null) {
420+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
421421
# Ensure vsInstallDir has a trailing slash
422422
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
423423
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25378.1"
1919
}
2020
}

0 commit comments

Comments
 (0)