Skip to content

Commit 0d90178

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20220512.8 (#41696)
[main] Update dependencies from dotnet/arcade
1 parent 3888fda commit 0d90178

File tree

5 files changed

+21
-17
lines changed

5 files changed

+21
-17
lines changed

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -292,22 +292,22 @@
292292
<Uri>https://github.com/dotnet/runtime</Uri>
293293
<Sha>52fd1a576ef6640966046431edff2868e82b9e64</Sha>
294294
</Dependency>
295-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22255.2">
295+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22262.8">
296296
<Uri>https://github.com/dotnet/arcade</Uri>
297-
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
297+
<Sha>b7796f653e48e001123963f17387c052891b48e6</Sha>
298298
<SourceBuild RepoName="arcade" ManagedOnly="true" />
299299
</Dependency>
300-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22255.2">
300+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.22262.8">
301301
<Uri>https://github.com/dotnet/arcade</Uri>
302-
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
302+
<Sha>b7796f653e48e001123963f17387c052891b48e6</Sha>
303303
</Dependency>
304-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22255.2">
304+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="7.0.0-beta.22262.8">
305305
<Uri>https://github.com/dotnet/arcade</Uri>
306-
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
306+
<Sha>b7796f653e48e001123963f17387c052891b48e6</Sha>
307307
</Dependency>
308-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22255.2">
308+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22262.8">
309309
<Uri>https://github.com/dotnet/arcade</Uri>
310-
<Sha>ba1c3aff4be864c493031d989259ef92aaa23fc3</Sha>
310+
<Sha>b7796f653e48e001123963f17387c052891b48e6</Sha>
311311
</Dependency>
312312
</ToolsetDependencies>
313313
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@
135135
<MicrosoftEntityFrameworkCoreVersion>7.0.0-preview.5.22261.11</MicrosoftEntityFrameworkCoreVersion>
136136
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-preview.5.22261.11</MicrosoftEntityFrameworkCoreDesignVersion>
137137
<!-- Packages from dotnet/arcade -->
138-
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksInstallersVersion>
139-
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22255.2</MicrosoftDotNetBuildTasksTemplatingVersion>
138+
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22262.8</MicrosoftDotNetBuildTasksInstallersVersion>
139+
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22262.8</MicrosoftDotNetBuildTasksTemplatingVersion>
140140
</PropertyGroup>
141141
<!--
142142

eng/common/init-tools-native.ps1

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ try {
9393
$ToolVersion = ""
9494
}
9595
$ArcadeToolsDirectory = "C:\arcade-tools"
96-
if (Test-Path $ArcadeToolsDirectory -eq $False) {
96+
if (-not (Test-Path $ArcadeToolsDirectory)) {
9797
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
9898
exit 1
9999
}
@@ -103,13 +103,14 @@ try {
103103
exit 1
104104
}
105105
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
106-
if (Test-Path -Path "$BinPathFile" -eq $False) {
106+
if (-not (Test-Path -Path "$BinPathFile")) {
107107
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
108108
exit 1
109109
}
110110
$BinPath = Get-Content "$BinPathFile"
111-
Write-Host "Adding $ToolName to the path ($(Convert-Path -Path $BinPath))..."
112-
Write-Host "##vso[task.prependpath]$(Convert-Path -Path $BinPath)"
111+
$ToolPath = Convert-Path -Path $BinPath
112+
Write-Host "Adding $ToolName to the path ($ToolPath)..."
113+
Write-Host "##vso[task.prependpath]$ToolPath"
113114
}
114115
}
115116
exit 0
@@ -188,7 +189,7 @@ try {
188189
Write-Host "##vso[task.prependpath]$(Convert-Path -Path $InstallBin)"
189190
return $InstallBin
190191
}
191-
else {
192+
elseif (-not ($PathPromotion)) {
192193
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message 'Native tools install directory does not exist, installation failed'
193194
exit 1
194195
}

eng/common/internal/Tools.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
<ItemGroup>
99
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
1010
<PackageReference Remove="@(PackageReference)"/>
11+
<PackageReference Include="Microsoft.ManifestTool.CrossPlatform" Version="$(MicrosoftManifestToolCrossPlatformVersion)" />
12+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(MicrosoftVisualStudioEngMicroBuildCoreVersion)" />
13+
<PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild" Version="$(MicrosoftVisualStudioEngMicroBuildPluginsSwixBuildVersion)" />
1114
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
1215
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
1316
</ItemGroup>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22255.2",
31-
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22255.2"
30+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22262.8",
31+
"Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22262.8"
3232
}
3333
}

0 commit comments

Comments
 (0)