Skip to content

[release/6.0] Update dependencies from dotnet/arcade #61422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 15, 2021
Merged

[release/6.0] Update dependencies from dotnet/arcade #61422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a975f1e
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Nov 10, 2021
e372ca1
Update dependencies from https://github.com/dotnet/arcade build 20211…
dotnet-maestro[bot] Nov 10, 2021
82fc505
pin the fileversions in the platformManifest file for ref pack
Nov 11, 2021
881d475
Apply suggestions from code review
Anipik Nov 11, 2021
579de13
Disable SDK Targeting Pack Cache
safern Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<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" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<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" />
<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" />
<!-- End: Package sources from dotnet-wcf -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!--
Expand Down
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,77 +18,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21522.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -210,9 +210,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21522.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21560.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>faafd09c70b30bece9947f898cfd6e732de06f33</Sha>
<Sha>ee9b7f19853685805c612103282c8d9486c7db86</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.2.21511.46</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21522.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21522.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21522.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21522.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21522.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21522.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21522.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21522.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21522.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21522.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21560.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21560.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21560.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21560.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21560.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21560.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21560.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21560.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21560.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21560.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
4 changes: 4 additions & 0 deletions eng/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,10 @@ foreach ($argument in $PSBoundParameters.Keys)

$failedBuilds = @()

# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
# The later changes are ignored when using the cache.
$env:DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0

if ($os -eq "Browser") {
# override default arch for Browser, we only support wasm
$arch = "wasm"
Expand Down
4 changes: 4 additions & 0 deletions eng/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,10 @@ fi

initDistroRid $os $arch $crossBuild $portableBuild

# Disable targeting pack caching as we reference a partially constructed targeting pack and update it later.
# The later changes are ignored when using the cache.
export DOTNETSDK_ALLOW_TARGETING_PACK_CACHING=0

# URL-encode space (%20) to avoid quoting issues until the msbuild call in /eng/common/tools.sh.
# In *proj files (XML docs), URL-encoded string are rendered in their decoded form.
cmakeargs="${cmakeargs// /%20}"
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/execute-sdl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
pool:
# To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019.
${{ if eq(parameters.extractArchiveArtifacts, 'false') }}:
name: Hosted VS2017
vmImage: windows-2019
${{ if ne(parameters.extractArchiveArtifacts, 'false') }}:
vmImage: windows-2019
steps:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:

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

CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat: $(BotAccount-dotnet-bot-repo-PAT)
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/source-index-stage1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ parameters:
preSteps: []
binlogPath: artifacts/log/Debug/Build.binlog
pool:
vmImage: vs2017-win2016
vmImage: windows-2019
condition: ''
dependsOn: ''

Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates/jobs/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
- ${{ if eq(parameters.enableSourceBuild, true) }}:
- Source_Build_Complete
pool:
vmImage: vs2017-win2016
vmImage: windows-2019
runAsPublic: ${{ parameters.runAsPublic }}
publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }}
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
Expand All @@ -96,4 +96,4 @@ jobs:
dependsOn:
- Asset_Registry_Publish
pool:
vmImage: vs2017-win2016
vmImage: windows-2019
12 changes: 6 additions & 6 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"sdk": {
"version": "6.0.100-rc.1.21430.12",
"version": "6.0.100",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
"dotnet": "6.0.100-rc.1.21430.12"
"dotnet": "6.0.100"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21522.3",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21522.3",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21522.3",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21522.3",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21560.2",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21560.2",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21560.2",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21560.2",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"
Expand Down
5 changes: 5 additions & 0 deletions src/installer/pkg/sfx/Microsoft.NETCore.App/Microsoft.NETCore.App.Ref.sfxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<PropertyGroup>
<PlatformPackageType>TargetingPack</PlatformPackageType>
<UseTemplatedPlatformManifest>true</UseTemplatedPlatformManifest>
<CreatePlatformManifest Condition="'$(PreReleaseVersionLabel)' == 'servicing'">false</CreatePlatformManifest>
<ArchiveName>dotnet-targeting-pack</ArchiveName>
<InstallerName>dotnet-targeting-pack</InstallerName>
<OverridePackageId Condition="'$(PgoInstrument)' != ''">$(SharedFrameworkName).PGO</OverridePackageId>
Expand All @@ -19,4 +20,8 @@
<FilesToPackage Include="@(Analyzer)" ExcludeFromValidation="true" TargetPath="analyzers/%(RecursiveDir)" />
</ItemGroup>
</Target>

<ItemGroup Condition="'$(CreatePlatformManifest)' == 'false'">
<FilesToPackage Include="PlatformManifest.txt" TargetPath="data" GeneratedBuildFile="true" />
</ItemGroup>
</Project>
Loading