Skip to content

[master] Update dependencies from dotnet/arcade #4142

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 1 commit into from
Feb 6, 2021
Merged

[master] Update dependencies from dotnet/arcade #4142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,25 +99,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21101.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21105.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2b430e5bbfaec37a6cead2f0cf79157f01f1a623</Sha>
<Sha>fc83e59329203724d4a63c4f6c843be62983a35e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21101.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21101.7</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21101.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21105.5</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>6.0.0-beta.21105.5</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21105.5</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
Expand Down
9 changes: 2 additions & 7 deletions eng/common/dotnet-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,8 @@ while [[ $# > 0 ]]; do
shift
done

# Use uname to determine what the CPU is.
cpuname=$(uname -p)
# Some Linux platforms report unknown for platform, but the arch for machine.
if [[ "$cpuname" == "unknown" ]]; then
cpuname=$(uname -m)
fi

# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
cpuname=$(uname -m)
case $cpuname in
aarch64)
buildarch=arm64
Expand Down
4 changes: 2 additions & 2 deletions eng/common/performance/performance-setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Param(
[string] $CoreRootDirectory,
[string] $BaselineCoreRootDirectory,
[string] $Architecture="x64",
[string] $Framework="net6.0",
[string] $Framework="net5.0",
[string] $CompilationMode="Tiered",
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
[string] $Branch=$env:BUILD_SOURCEBRANCH,
Expand Down Expand Up @@ -36,7 +36,7 @@ $HelixSourcePrefix = "pr"
$Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"

# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5.
if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net6.0")) {
if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) {
$Queue = "Windows.10.Amd64.ClientRS5.Open"
}

Expand Down
2 changes: 1 addition & 1 deletion eng/common/performance/performance-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY
core_root_directory=
baseline_core_root_directory=
architecture=x64
framework=net6.0
framework=net5.0
compilation_mode=tiered
repository=$BUILD_REPOSITORY_NAME
branch=$BUILD_SOURCEBRANCH
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21101.7",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21101.7"
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21105.5",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21105.5"
},
"sdk": {
"version": "6.0.100-preview.1.21077.13"
Expand Down