Skip to content

Commit 756a3c0

Browse files
mmitchemmitche
committed
Merge remote-tracking branch 'upstream/release/6.0' into internal/release/6.0
2 parents 357c80a + c1e9122 commit 756a3c0

36 files changed

+742
-195
lines changed

‎NuGet.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,8 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12-
<add key="darc-pub-dotnet-emsdk-1ec2e17" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-1ec2e17f/nuget/v3/index.json" />
1312
<!-- End: Package sources from dotnet-emsdk -->
1413
<!-- Begin: Package sources from dotnet-wcf -->
15-
<add key="darc-pub-dotnet-wcf-04c3656-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-wcf-04c3656e-1/nuget/v3/index.json" />
16-
<add key="darc-pub-dotnet-wcf-04c3656" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-wcf-04c3656e/nuget/v3/index.json" />
1714
<!-- End: Package sources from dotnet-wcf -->
1815
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1916
<!--

‎eng/Version.Details.xml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,77 +18,77 @@
1818
</Dependency>
1919
</ProductDependencies>
2020
<ToolsetDependencies>
21-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21522.3">
21+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21560.2">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
23+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21522.3">
25+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21560.2">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
27+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21522.3">
29+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21560.2">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
31+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21522.3">
33+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21560.2">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
35+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21522.3">
37+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21560.2">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
39+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21522.3">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21560.2">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
43+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21522.3">
45+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21560.2">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
47+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21522.3">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21560.2">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
51+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21522.3">
53+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21560.2">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
55+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21522.3">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21565.3">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
59+
<Sha>a35b36664af90a8e61f051ad06fb8039380b1526</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21522.3">
61+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21560.2">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
63+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21522.3">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21560.2">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
67+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
6868
</Dependency>
69-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21522.3">
69+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21560.2">
7070
<Uri>https://github.com/dotnet/arcade</Uri>
71-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
71+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
7272
</Dependency>
73-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21522.3">
73+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21560.2">
7474
<Uri>https://github.com/dotnet/arcade</Uri>
75-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
75+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
7676
</Dependency>
77-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21522.3">
77+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21560.2">
7878
<Uri>https://github.com/dotnet/arcade</Uri>
79-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
79+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
8080
</Dependency>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21522.3">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21560.2">
8282
<Uri>https://github.com/dotnet/arcade</Uri>
83-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
83+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21522.3">
85+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21560.2">
8686
<Uri>https://github.com/dotnet/arcade</Uri>
87-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
87+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21522.3">
89+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21560.2">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
91+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
9292
</Dependency>
9393
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
9494
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -210,9 +210,9 @@
210210
<Uri>https://github.com/dotnet/xharness</Uri>
211211
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
212212
</Dependency>
213-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21522.3">
213+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21560.2">
214214
<Uri>https://github.com/dotnet/arcade</Uri>
215-
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
215+
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
216216
</Dependency>
217217
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
218218
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,21 @@
5454
<!-- SDK dependencies -->
5555
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
5656
<!-- Arcade dependencies -->
57-
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21522.3</MicrosoftDotNetApiCompatVersion>
58-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksFeedVersion>
59-
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21522.3</MicrosoftDotNetCodeAnalysisVersion>
60-
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21522.3</MicrosoftDotNetGenAPIVersion>
61-
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21522.3</MicrosoftDotNetGenFacadesVersion>
62-
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21522.3</MicrosoftDotNetXUnitExtensionsVersion>
63-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21522.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
64-
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksArchivesVersion>
65-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksInstallersVersion>
66-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksPackagingVersion>
67-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksTemplatingVersion>
68-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69-
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21522.3</MicrosoftDotNetRemoteExecutorVersion>
70-
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21522.3</MicrosoftDotNetVersionToolsTasksVersion>
71-
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21522.3</MicrosoftDotNetPackageTestingVersion>
57+
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21560.2</MicrosoftDotNetApiCompatVersion>
58+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksFeedVersion>
59+
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21560.2</MicrosoftDotNetCodeAnalysisVersion>
60+
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21560.2</MicrosoftDotNetGenAPIVersion>
61+
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21560.2</MicrosoftDotNetGenFacadesVersion>
62+
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21560.2</MicrosoftDotNetXUnitExtensionsVersion>
63+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21560.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
64+
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksArchivesVersion>
65+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21565.3</MicrosoftDotNetBuildTasksInstallersVersion>
66+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksPackagingVersion>
67+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksTemplatingVersion>
68+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
69+
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21560.2</MicrosoftDotNetRemoteExecutorVersion>
70+
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21560.2</MicrosoftDotNetVersionToolsTasksVersion>
71+
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21560.2</MicrosoftDotNetPackageTestingVersion>
7272
<!-- NuGet dependencies -->
7373
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7474
<!-- Installer dependencies -->

‎eng/build.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,10 @@ foreach ($argument in $PSBoundParameters.Keys)
254254

255255
$failedBuilds = @()
256256

257+
# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
258+
# The later changes are ignored when using the cache.
259+
$env:DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0
260+
257261
if ($os -eq "Browser") {
258262
# override default arch for Browser, we only support wasm
259263
$arch = "wasm"

‎eng/build.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,10 @@ fi
468468

469469
initDistroRid $os $arch $crossBuild $portableBuild
470470

471+
# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
472+
# The later changes are ignored when using the cache.
473+
export DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0
474+
471475
# URL-encode space (%20) to avoid quoting issues until the msbuild call in /eng/common/tools.sh.
472476
# In *proj files (XML docs), URL-encoded string are rendered in their decoded form.
473477
cmakeargs="${cmakeargs// /%20}"

‎eng/common/templates/job/execute-sdl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
pool:
6363
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
6464
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
65-
name: Hosted VS2017
65+
vmImage: windows-2019
6666
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
6767
vmImage: windows-2019
6868
steps:

‎eng/common/templates/job/onelocbuild.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ parameters:
44

55
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
66
pool:
7-
vmImage: vs2017-win2016
7+
vmImage: windows-2019
88

99
CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
1010
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)

‎eng/common/templates/job/source-index-stage1.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
preSteps: []
77
binlogPath: artifacts/log/Debug/Build.binlog
88
pool:
9-
vmImage: vs2017-win2016
9+
vmImage: windows-2019
1010
condition: ''
1111
dependsOn: ''
1212

‎eng/common/templates/jobs/jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
- ${{ if eq(parameters.enableSourceBuild, true) }}:
8484
- Source_Build_Complete
8585
pool:
86-
vmImage: vs2017-win2016
86+
vmImage: windows-2019
8787
runAsPublic: ${{ parameters.runAsPublic }}
8888
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
8989
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
@@ -96,4 +96,4 @@ jobs:
9696
dependsOn:
9797
- Asset_Registry_Publish
9898
pool:
99-
vmImage: vs2017-win2016
99+
vmImage: windows-2019

‎eng/packaging.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(ServicingVersion)</VersionPrefix>
4545
<_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp>
4646
<_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp>
47-
<_AssemblyInTargetingPack Condition="'$(IsNETCoreAppSrc)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true'">true</_AssemblyInTargetingPack>
47+
<_AssemblyInTargetingPack Condition="('$(IsNETCoreAppSrc)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true') and '$(TargetFrameworkIdentifier)' != '.NETFramework'">true</_AssemblyInTargetingPack>
4848
<!-- Assembly version do not get updated in non-netfx ref pack assemblies. -->
49-
<AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true' or '$(TargetFrameworkIdentifier)' == '.NETFramework'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion>
49+
<AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion>
5050
</PropertyGroup>
5151

5252
<ItemGroup Condition="'$(EnablePackageValidation)' == 'true'">

0 commit comments

Comments
 (0)