Skip to content

Commit 2a50066

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/3.1] Update dependencies from dotnet/arcade (#4813)
[release/3.1] Update dependencies from dotnet/arcade
1 parent 54403db commit 2a50066

File tree

4 files changed

+32
-23
lines changed

4 files changed

+32
-23
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@
6767
<Uri>https://github.com/dotnet/core-setup</Uri>
6868
<Sha>1a04dd08e56bf52e88668c1ef2bd3f630ad442a5</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21228.7">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21359.1">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
72+
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21228.7">
74+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.21359.1">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
76+
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
7777
</Dependency>
7878
<Dependency Name="Microsoft.NETCore.Platforms" Version="3.1.3" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
7979
<Uri>https://github.com/dotnet/corefx</Uri>
@@ -99,17 +99,17 @@
9999
<Uri>https://github.com/dotnet/coreclr</Uri>
100100
<Sha>c2e8c9f71737d87a95610851587e2a1eaf18c91c</Sha>
101101
</Dependency>
102-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21228.7">
102+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21359.1">
103103
<Uri>https://github.com/dotnet/arcade</Uri>
104-
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
104+
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
105105
</Dependency>
106-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21228.7">
106+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.21359.1">
107107
<Uri>https://github.com/dotnet/arcade</Uri>
108-
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
108+
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
109109
</Dependency>
110-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21228.7">
110+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.21359.1">
111111
<Uri>https://github.com/dotnet/arcade</Uri>
112-
<Sha>99023a1f05a0bb03257f473e48b376c8fb78f845</Sha>
112+
<Sha>1b4ae2cf54c730564509227fa4f4dd8a7c31dc81</Sha>
113113
</Dependency>
114114
<Dependency Name="System.Resources.Extensions" Version="4.7.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
115115
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-corefx</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
</PropertyGroup>
5353
<!-- Packages that come from https://github.com/dotnet/arcade -->
5454
<PropertyGroup>
55-
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.21228.7</MicrosoftDotNetApiCompatVersion>
56-
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21228.7</MicrosoftDotNetCodeAnalysisPackageVersion>
57-
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.21228.7</MicrosoftDotNetGenAPIVersion>
55+
<MicrosoftDotNetApiCompatVersion>1.0.0-beta.21359.1</MicrosoftDotNetApiCompatVersion>
56+
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.21359.1</MicrosoftDotNetCodeAnalysisPackageVersion>
57+
<MicrosoftDotNetGenAPIVersion>1.0.0-beta.21359.1</MicrosoftDotNetGenAPIVersion>
5858
</PropertyGroup>
5959
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
6060
<PropertyGroup>

‎eng/common/tools.ps1‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,12 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc
211211
InstallDotNet -dotnetRoot $dotnetRoot -version $version -architecture $architecture -skipNonVersionedFiles $false -runtimeSourceFeed $runtimeSourceFeed -runtimeSourceFeedKey $runtimeSourceFeedKey
212212
}
213213

214-
function InstallDotNet([string] $dotnetRoot,
215-
[string] $version,
216-
[string] $architecture = "",
217-
[string] $runtime = "",
218-
[bool] $skipNonVersionedFiles = $false,
219-
[string] $runtimeSourceFeed = "",
214+
function InstallDotNet([string] $dotnetRoot,
215+
[string] $version,
216+
[string] $architecture = "",
217+
[string] $runtime = "",
218+
[bool] $skipNonVersionedFiles = $false,
219+
[string] $runtimeSourceFeed = "",
220220
[string] $runtimeSourceFeedKey = "") {
221221

222222
$installScript = GetDotNetInstallScript $dotnetRoot
@@ -323,7 +323,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
323323
}
324324

325325
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
326-
return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
326+
327+
$local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
328+
$local:Prefer64bit = if (Get-Member -InputObject $vsRequirements -Name 'Prefer64bit') { $vsRequirements.Prefer64bit } else { $false }
329+
if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
330+
$global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
331+
} else {
332+
$global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
333+
}
334+
335+
return $global:_MSBuildExe
327336
}
328337

329338
function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {
@@ -523,7 +532,7 @@ function InitializeNativeTools() {
523532
}
524533
}
525534

526-
function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey)
535+
function InitializeToolset([string] $runtimeSourceFeed, [string] $runtimeSourceFeedKey)
527536
{
528537
if (Test-Path variable:global:_ToolsetBuildProj) {
529538
return $global:_ToolsetBuildProj

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21228.7",
16-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21228.7"
15+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21359.1",
16+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21359.1"
1717
},
1818
"native-tools": {
1919
"strawberry-perl": "5.28.1.1-1",

0 commit comments

Comments
 (0)