mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[main] Update dependencies from dotnet/arcade (#14036)

Browse source 
* Update dependencies from https://github.com/dotnet/arcade build 20220623.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22322.3 -> To Version 7.0.0-beta.22323.2

* Reference net7.0 version of BuildTasksInstallers assembly

* Remove backported arcade patch

* Remove patch that was for bootstrapping source-build

* Update dependencies from https://github.com/dotnet/arcade build 20220624.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22322.3 -> To Version 7.0.0-beta.22324.1

* Update dependencies from https://github.com/dotnet/arcade build 20220627.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22322.3 -> To Version 7.0.0-beta.22327.1

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22271-02 -> To Version 1.2.0-beta-22325-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Revert "Remove patch that was for bootstrapping source-build"

This reverts commit eb2dc3d7c1e6f23e191e7c49279c3b25ebf023ff.

* Update fsharp System.Memory package version to 4.5.5

* Don't directly reference SCI and SCM 5.0.0 from SDK

* Add backport links to new source-build patches

* Update dependencies from https://github.com/dotnet/arcade build 20220627.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22322.3 -> To Version 7.0.0-beta.22327.2

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22271-02 -> To Version 1.2.0-beta-22325-02 (parent: Microsoft.DotNet.Arcade.Sdk

* Update source-build xml doc baseline

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2022-06-28 18:08:30 +00:00 • committed by GitHub
parent f922a74fb9
commit a9bd605e2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 65 additions and 1157 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eng/common/tools.ps1
View file

@ -573,7 +573,7 @@ function InitializeBuildTool() {
ExitWithExitCode 1
}
$dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet')
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'netcoreapp3.1' }
$buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net7.0' }
} elseif ($msbuildEngine -eq "vs") {
try {
$msbuildPath = InitializeVisualStudioMSBuild -install:$restore

2
eng/common/tools.sh
View file

@ -312,7 +312,7 @@ function InitializeBuildTool {
# return values
_InitializeBuildTool="$_InitializeDotNetCli/dotnet"
_InitializeBuildToolCommand="msbuild"
_InitializeBuildToolFramework="netcoreapp3.1"
_InitializeBuildToolFramework="net7.0"
}
# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116