Skip to content

Commit 7196234

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20221012.3 (#296)
[dotnet/release/6.0] Update dependencies from dotnet/arcade
1 parent d4c5121 commit 7196234

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22463.7">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22512.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
8+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22463.7">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22512.3">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
12+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22463.7">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22512.3">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>2fbe602d12256bf82de53791ddcbb964c1541b4e</Sha>
16+
<Sha>bb1e72113a7eaf8bebda940beba8cf8bee1b453f</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
77
</PropertyGroup>
88
<PropertyGroup>
9-
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22463.7</MicrosoftDotNetBuildTasksPackagingVersion>
9+
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22512.3</MicrosoftDotNetBuildTasksPackagingVersion>
1010
</PropertyGroup>
1111
</Project>

eng/common/build.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Param(
2626
[string] $runtimeSourceFeed = '',
2727
[string] $runtimeSourceFeedKey = '',
2828
[switch] $excludePrereleaseVS,
29+
[switch] $nativeToolsOnMachine,
2930
[switch] $help,
3031
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
3132
)
@@ -67,6 +68,7 @@ function Print-Usage() {
6768
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6869
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
6970
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
71+
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
7072
Write-Host ""
7173

7274
Write-Host "Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146148
$nodeReuse = $false
147149
}
148150

151+
if ($nativeToolsOnMachine) {
152+
$env:NativeToolsOnMachine = $true
153+
}
149154
if ($restore) {
150155
InitializeNativeTools
151156
}

eng/common/init-tools-native.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ try {
112112
$ToolPath = Convert-Path -Path $BinPath
113113
Write-Host "Adding $ToolName to the path ($ToolPath)..."
114114
Write-Host "##vso[task.prependpath]$ToolPath"
115+
$env:PATH = "$ToolPath;$env:PATH"
115116
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
116117
}
117118
}

global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "6.0.109"
3+
"dotnet": "6.0.110"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7",
7-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22463.7",
6+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3",
7+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22512.3",
88
"Microsoft.Build.Traversal": "2.0.2"
99
}
1010
}

0 commit comments

Comments
 (0)