Skip to content

Commit 4c475ad

Browse files
author
Mirroring
committed
Merge commit 'ae729297237e546cb812d221454d10d9aebef53e'
2 parents d8b2a25 + ae72929 commit 4c475ad

File tree

15 files changed

+76
-59
lines changed

15 files changed

+76
-59
lines changed

‎.vsts-ci.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ resources:
5454
ref: refs/tags/release
5555

5656
extends:
57-
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
57+
${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
58+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
59+
${{ else }}:
60+
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
5861
parameters:
5962
sdl:
6063
sourceAnalysisPool:

‎NuGet.config‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
77
<add key="darc-pub-dotnet-emsdk-6fd14a4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-emsdk-6fd14a4-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46-3/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-emsdk-6fd14a4-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46-2/nuget/v3/index.json" />
810
<add key="darc-pub-dotnet-emsdk-6fd14a4-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-6fd14a46-1/nuget/v3/index.json" />
911
<!-- End: Package sources from dotnet-emsdk -->
1012
<!-- Begin: Package sources from dotnet-format -->
@@ -16,21 +18,26 @@
1618
<!-- End: Package sources from dotnet-format -->
1719
<!-- Begin: Package sources from dotnet-aspnetcore -->
1820
<add key="darc-int-dotnet-aspnetcore-277e317" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d/nuget/v3/index.json" />
21+
<add key="darc-int-dotnet-aspnetcore-277e317-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d-2/nuget/v3/index.json" />
22+
<add key="darc-int-dotnet-aspnetcore-277e317-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-277e317d-1/nuget/v3/index.json" />
1923
<!-- End: Package sources from dotnet-aspnetcore -->
2024
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
21-
<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" />
25+
<add key="darc-pub-DotNet-msbuild-Trusted-286d171" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-286d1713/nuget/v3/index.json" />
2226
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2327
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
2428
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2529
<!-- Begin: Package sources from dotnet-runtime -->
2630
<add key="darc-int-dotnet-runtime-fce8ed9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90/nuget/v3/index.json" />
31+
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-2/nuget/v3/index.json" />
32+
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90-1/nuget/v3/index.json" />
2733
<!-- End: Package sources from dotnet-runtime -->
2834
<!-- Begin: Package sources from dotnet-templating -->
29-
<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" />
30-
<add key="darc-pub-dotnet-templating-caa21b1-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-caa21b11-1/nuget/v3/index.json" />
35+
<add key="darc-pub-dotnet-templating-9b452dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-9b452ddd/nuget/v3/index.json" />
3136
<!-- End: Package sources from dotnet-templating -->
3237
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3338
<add key="darc-int-dotnet-windowsdesktop-5fa74c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5fa74c83/nuget/v3/index.json" />
39+
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5fa74c83-2/nuget/v3/index.json" />
40+
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-5fa74c83-1/nuget/v3/index.json" />
3441
<!-- End: Package sources from dotnet-windowsdesktop -->
3542
<!-- Begin: Package sources from dotnet-winforms -->
3643
<!-- End: Package sources from dotnet-winforms -->
@@ -57,16 +64,22 @@
5764
<!-- Begin: Package sources from dotnet-templating -->
5865
<!-- End: Package sources from dotnet-templating -->
5966
<!-- Begin: Package sources from dotnet-aspnetcore -->
67+
<add key="darc-int-dotnet-aspnetcore-277e317-1" value="true" />
68+
<add key="darc-int-dotnet-aspnetcore-277e317-2" value="true" />
6069
<add key="darc-int-dotnet-aspnetcore-277e317" value="true" />
70+
<!-- End: Package sources from dotnet-aspnetcore -->
6171
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
6272
<!-- End: Package sources from DotNet-msbuild-Trusted -->
6373
<!-- Begin: Package sources from dotnet-format -->
6474
<!-- End: Package sources from dotnet-format -->
65-
<!-- End: Package sources from dotnet-aspnetcore -->
6675
<!-- Begin: Package sources from dotnet-runtime -->
76+
<add key="darc-int-dotnet-runtime-fce8ed9-1" value="true" />
77+
<add key="darc-int-dotnet-runtime-fce8ed9-2" value="true" />
6778
<add key="darc-int-dotnet-runtime-fce8ed9" value="true" />
6879
<!-- End: Package sources from dotnet-runtime -->
6980
<!-- Begin: Package sources from dotnet-windowsdesktop -->
81+
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-1" value="true" />
82+
<add key="darc-int-dotnet-windowsdesktop-5fa74c8-2" value="true" />
7083
<add key="darc-int-dotnet-windowsdesktop-5fa74c8" value="true" />
7184
<!-- Begin: Package sources from dotnet-winforms -->
7285
<!-- End: Package sources from dotnet-winforms -->

‎eng/Version.Details.xml‎

Lines changed: 20 additions & 20 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>9b452ddd4f2c1e62e373bfe6530f7970f24401d9</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.25407.10">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>caa21b1109a61dfb867ef1332a76a740894001f7</Sha>
10+
<Sha>9b452ddd4f2c1e62e373bfe6530f7970f24401d9</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.25407.10">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>caa21b1109a61dfb867ef1332a76a740894001f7</Sha>
14+
<Sha>9b452ddd4f2c1e62e373bfe6530f7970f24401d9</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.19">
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>6fd14a46f7bc405f4ba53b1e691c76fdc6324b0b</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.11.38">
58+
<Dependency Name="Microsoft.Build" Version="17.11.40">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>901dc04e451b05d9d583d4cedd50c3db605dab8c</Sha>
60+
<Sha>286d1713528913f2d14de72a5824c6b79eba1655</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.11.38-servicing-25354-03">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.11.40-servicing-25405-01">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>901dc04e451b05d9d583d4cedd50c3db605dab8c</Sha>
64+
<Sha>286d1713528913f2d14de72a5824c6b79eba1655</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.38-servicing-25354-03">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.11.40-servicing-25405-01">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>901dc04e451b05d9d583d4cedd50c3db605dab8c</Sha>
68+
<Sha>286d1713528913f2d14de72a5824c6b79eba1655</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.403-beta.24526.2">
@@ -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.25407.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
496+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</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.25407.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
501+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</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.25407.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
505+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</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.25407.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d</Sha>
509+
<Sha>a5ec3fab69ac440afe6764b2e046af6e8fcafa74</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: 6 additions & 6 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.25407.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -126,7 +126,7 @@
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
129-
<MicrosoftBuildPackageVersion>17.11.38</MicrosoftBuildPackageVersion>
129+
<MicrosoftBuildPackageVersion>17.11.40</MicrosoftBuildPackageVersion>
130130
<MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
131131
<!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
132132
so target one that matches the version in minimumMSBuildVersion.
@@ -135,21 +135,21 @@
135135
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.27</MicrosoftBuildMinimumVersion>
136136
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildFrameworkPackageVersion>
137137
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildRuntimePackageVersion>
138-
<MicrosoftBuildLocalizationPackageVersion>17.11.38-servicing-25354-03</MicrosoftBuildLocalizationPackageVersion>
138+
<MicrosoftBuildLocalizationPackageVersion>17.11.40-servicing-25405-01</MicrosoftBuildLocalizationPackageVersion>
139139
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
140140
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftBuildTasksCorePackageVersion>
141141
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
142142
<MicrosoftNETStringToolsPackageVersion>$(MicrosoftBuildMinimumVersion)</MicrosoftNETStringToolsPackageVersion>
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.25407.10</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.25407.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.117",
3+
"dotnet": "8.0.119",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)"
@@ -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.25407.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25407.1"
1919
}
2020
}

0 commit comments

Comments
 (0)