Skip to content

Commit 9099759

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into merge/release/8.0.1xx-to-release/8.0.3xx
2 parents 764693b + 4a115ed commit 9099759

File tree

6 files changed

+31
-33
lines changed

6 files changed

+31
-33
lines changed

‎NuGet.config

Lines changed: 4 additions & 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-c7e5d39" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b/nuget/v3/index.json" />
@@ -14,21 +13,21 @@
1413
<add key="darc-pub-dotnet-format-c7e5d39-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-c7e5d39b-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 -->
20-
<add key="darc-pub-DotNet-msbuild-Trusted-dbc02fd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-dbc02fd5/nuget/v3/index.json" />
18+
<add key="darc-pub-DotNet-msbuild-Trusted-cac01d6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-cac01d67/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 -->
2825
<add key="darc-pub-dotnet-templating-fc618ad" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-fc618ad8/nuget/v3/index.json" />
26+
<add key="darc-pub-dotnet-templating-fc618ad-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-fc618ad8-3/nuget/v3/index.json" />
27+
<add key="darc-pub-dotnet-templating-fc618ad-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-fc618ad8-2/nuget/v3/index.json" />
28+
<add key="darc-pub-dotnet-templating-fc618ad-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-fc618ad8-1/nuget/v3/index.json" />
2929
<!-- End: Package sources from dotnet-templating -->
3030
<!-- 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" />
3231
<!-- End: Package sources from dotnet-windowsdesktop -->
3332
<!-- Begin: Package sources from dotnet-winforms -->
3433
<!-- End: Package sources from dotnet-winforms -->
@@ -55,7 +54,6 @@
5554
<!-- Begin: Package sources from dotnet-templating -->
5655
<!-- End: Package sources from dotnet-templating -->
5756
<!-- Begin: Package sources from dotnet-aspnetcore -->
58-
<add key="darc-int-dotnet-aspnetcore-cea5fa6" value="true" />
5957
<!-- End: Package sources from dotnet-aspnetcore -->
6058
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
6159
<!-- End: Package sources from DotNet-msbuild-Trusted -->
@@ -65,10 +63,8 @@
6563
<!-- End: Package sources from dotnet-format -->
6664
<!-- End: Package sources from dotnet-aspnetcore -->
6765
<!-- Begin: Package sources from dotnet-runtime -->
68-
<add key="darc-int-dotnet-runtime-ef853a7" value="true" />
6966
<!-- End: Package sources from dotnet-runtime -->
7067
<!-- Begin: Package sources from dotnet-windowsdesktop -->
71-
<add key="darc-int-dotnet-windowsdesktop-c4a3ad7" value="true" />
7268
<!-- Begin: Package sources from dotnet-winforms -->
7369
<!-- End: Package sources from dotnet-winforms -->
7470
<!-- End: Package sources from dotnet-windowsdesktop -->

‎eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@
5555
<Uri>https://github.com/dotnet/emsdk</Uri>
5656
<Sha>976b101e5539557c20e2ac39885ac879531bcf82</Sha>
5757
</Dependency>
58-
<Dependency Name="Microsoft.Build" Version="17.10.33">
58+
<Dependency Name="Microsoft.Build" Version="17.10.35">
5959
<Uri>https://github.com/dotnet/msbuild</Uri>
60-
<Sha>dbc02fd53b9594bf912231e2955694827ed18884</Sha>
60+
<Sha>cac01d670cd054af080c4b696a8e8261549146e1</Sha>
6161
</Dependency>
62-
<Dependency Name="Microsoft.Build.Localization" Version="17.10.33-servicing-25353-02">
62+
<Dependency Name="Microsoft.Build.Localization" Version="17.10.35-servicing-25404-02">
6363
<Uri>https://github.com/dotnet/msbuild</Uri>
64-
<Sha>dbc02fd53b9594bf912231e2955694827ed18884</Sha>
64+
<Sha>cac01d670cd054af080c4b696a8e8261549146e1</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.33-servicing-25353-02">
66+
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.10.35-servicing-25404-02">
6767
<Uri>https://github.com/dotnet/msbuild</Uri>
68-
<Sha>dbc02fd53b9594bf912231e2955694827ed18884</Sha>
68+
<Sha>cac01d670cd054af080c4b696a8e8261549146e1</Sha>
6969
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
7070
</Dependency>
7171
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.8.301-beta.24271.6">
@@ -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>7.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>7.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>
@@ -126,7 +126,7 @@
126126
</PropertyGroup>
127127
<PropertyGroup>
128128
<!-- Dependencies from https://github.com/Microsoft/msbuild -->
129-
<MicrosoftBuildPackageVersion>17.10.33</MicrosoftBuildPackageVersion>
129+
<MicrosoftBuildPackageVersion>17.10.35</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,7 +135,7 @@
135135
<MicrosoftBuildPackageVersion Condition="'$(DotNetBuildFromSource)' != 'true'">17.8.29</MicrosoftBuildPackageVersion>
136136
<MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
137137
<MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
138-
<MicrosoftBuildLocalizationPackageVersion>17.10.33-servicing-25353-02</MicrosoftBuildLocalizationPackageVersion>
138+
<MicrosoftBuildLocalizationPackageVersion>17.10.35-servicing-25404-02</MicrosoftBuildLocalizationPackageVersion>
139139
<MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
140140
<MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
141141
<MicrosoftBuildTasksCoreVersion>$(MicrosoftBuildTasksCorePackageVersion)</MicrosoftBuildTasksCoreVersion>
@@ -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/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)