Skip to content

[release/3.1.1xx] Update dependencies from dotnet/arcade #18773

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

Closed
dotnet-maestro wants to merge 1 commit into from
Closed

[release/3.1.1xx] Update dependencies from dotnet/arcade #18773

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
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21228.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21322.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
<Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</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.21322.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
<Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.21228.7">
<Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.21322.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
<Sha>1e5713e8cba9f3ff635ed4b7421d89b2fc989b8e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="3.1.16">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PlatformAbstractionsVersion>2.0.0</PlatformAbstractionsVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>1.5.0</SystemReflectionMetadataVersion>
<MicrosoftDotNetSignToolVersion>1.0.0-beta.21228.7</MicrosoftDotNetSignToolVersion>
<MicrosoftDotNetSignToolVersion>1.0.0-beta.21322.2</MicrosoftDotNetSignToolVersion>
</PropertyGroup>
<!-- Get .NET Framework reference assemblies from NuGet packages -->
<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 ($vsRequirements.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 @@ -6,7 +6,7 @@
}
},
"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.21322.2",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21322.2"
}
}