diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2020-05-11 19:27:18 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-11 19:27:18 +0300 |
commit | ffec224a2a69f0cde4c43d9c90090dcb294ca6c6 (patch) | |
tree | be47e6f55809c75d2845b41a4cd567c43e7bac43 /eng/common | |
parent | 424d147ae786fa080861bbfc35cdcee75900975a (diff) |
[master] Update dependencies from dotnet/arcade (#1180)
* Update dependencies from https://github.com/dotnet/arcade build 20200506.5
- Microsoft.DotNet.ApiCompat: 5.0.0-beta.20228.4 -> 5.0.0-beta.20256.5
- Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20228.4 -> 5.0.0-beta.20256.5
* Add restore to lint.sh/cmd
* Remove lint restore from azure-pipelines.yml
* Make sure the Lint step fails on violations
* Disable https listening in WebApiTest.cs
It doesn't play nice with CI environments.
* Disable WebApi test on CI on macOS
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
Diffstat (limited to 'eng/common')
-rw-r--r-- | eng/common/internal/Tools.csproj | 1 | ||||
-rw-r--r-- | eng/common/performance/performance-setup.ps1 | 5 | ||||
-rwxr-xr-x | eng/common/performance/performance-setup.sh | 2 | ||||
-rw-r--r-- | eng/common/sdk-task.ps1 | 9 |
4 files changed, 10 insertions, 7 deletions
diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 1a39a7ef3..f46d5efe2 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -4,6 +4,7 @@ <PropertyGroup> <TargetFramework>net472</TargetFramework> <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets> + <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages> </PropertyGroup> <ItemGroup> <!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following --> diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 1763a1a97..f5e6ca688 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -3,7 +3,7 @@ Param( [string] $CoreRootDirectory, [string] $BaselineCoreRootDirectory, [string] $Architecture="x64", - [string] $Framework="netcoreapp5.0", + [string] $Framework="net5.0", [string] $CompilationMode="Tiered", [string] $Repository=$env:BUILD_REPOSITORY_NAME, [string] $Branch=$env:BUILD_SOURCEBRANCH, @@ -31,7 +31,8 @@ $HelixSourcePrefix = "pr" $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open" -if ($Framework.StartsWith("netcoreapp")) { +# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5. +if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) { $Queue = "Windows.10.Amd64.ClientRS5.Open" } diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index b9eecf94b..34eed8b67 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY core_root_directory= baseline_core_root_directory= architecture=x64 -framework=netcoreapp5.0 +framework=net5.0 compilation_mode=tiered repository=$BUILD_REPOSITORY_NAME branch=$BUILD_SOURCEBRANCH diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 79c25e7f3..f997be433 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -59,14 +59,15 @@ try { if( $msbuildEngine -eq "vs") { # Ensure desktop MSBuild is available for sdk tasks. - if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "vs" )) { - $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.4`" }") -MemberType NoteProperty + if( -not ($GlobalJson.tools.PSObject.Properties.Name -contains "vs" )) { + $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.4.0-alpha" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.5.0-alpha" -MemberType NoteProperty } - InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true + $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true + $global:_MSBuildExe = "$($xcopyMSBuildToolsFolder)\MSBuild\Current\Bin\MSBuild.exe" } $taskProject = GetSdkTaskProject $task |