Skip to content
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

[release/3.1] Update dependencies from dotnet/arcade #4813

Merged
merged 3 commits into from
Jul 9, 2021
Merged

[release/3.1] Update dependencies from dotnet/arcade #4813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c2c836
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 7, 2021
c3f9abe
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 9, 2021
da8611b
Update dependencies from https://github.com/dotnet/arcade build 20210…
dotnet-maestro[bot] Jul 9, 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
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 @@ -67,13 +67,13 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>1a04dd08e56bf52e88668c1ef2bd3f630ad442a5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21228.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21359.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21228.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21359.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/corefx</Uri>
Expand All @@ -99,17 +99,17 @@
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21228.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21359.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21228.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21359.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21228.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21359.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>
Expand Down
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 @@ -52,9 +52,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.21228.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21228.7</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.21228.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.21359.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21359.1</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.21359.1</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
Expand Down
25 changes: 17 additions & 8 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,12 +211,12 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc
InstallDotNet -dotnetRoot $dotnetRoot -version $version -architecture $architecture -skipNonVersionedFiles $false -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
}

function InstallDotNet([string] $dotnetRoot,
[string] $version,
[string] $architecture = "",
[string] $runtime = "",
[bool] $skipNonVersionedFiles = $false,
[string] $runtimeSourceFeed = "",
function InstallDotNet([string] $dotnetRoot,
[string] $version,
[string] $architecture = "",
[string] $runtime = "",
[bool] $skipNonVersionedFiles = $false,
[string] $runtimeSourceFeed = "",
[string] $runtimeSourceFeedKey = "") {

$installScript = GetDotNetInstallScript $dotnetRoot
Expand Down Expand Up @@ -323,7 +323,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
}

$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"

$local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
$local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
$global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
} else {
$global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
}

return $global:_MSBuildExe
}

function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {
Expand Down Expand Up @@ -523,7 +532,7 @@ function InitializeNativeTools() {
}
}

function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey)
function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey)
{
if (Test-Path variable:global:_ToolsetBuildProj) {
return $global:_ToolsetBuildProj
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": "1.0.0-beta.21228.7",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21228.7"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21359.1",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21359.1"
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",
Expand Down