File tree 5 files changed +16
-10
lines changed 5 files changed +16
-10
lines changed Original file line number Diff line number Diff line change 3
3
<ProductDependencies >
4
4
</ProductDependencies >
5
5
<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 " >
7
7
<Uri >https://github.com/dotnet/arcade</Uri >
8
- <Sha >2fbe602d12256bf82de53791ddcbb964c1541b4e </Sha >
8
+ <Sha >bb1e72113a7eaf8bebda940beba8cf8bee1b453f </Sha >
9
9
</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 " >
11
11
<Uri >https://github.com/dotnet/arcade</Uri >
12
- <Sha >2fbe602d12256bf82de53791ddcbb964c1541b4e </Sha >
12
+ <Sha >bb1e72113a7eaf8bebda940beba8cf8bee1b453f </Sha >
13
13
</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 " >
15
15
<Uri >https://github.com/dotnet/arcade</Uri >
16
- <Sha >2fbe602d12256bf82de53791ddcbb964c1541b4e </Sha >
16
+ <Sha >bb1e72113a7eaf8bebda940beba8cf8bee1b453f </Sha >
17
17
</Dependency >
18
18
</ToolsetDependencies >
19
19
</Dependencies >
Original file line number Diff line number Diff line change 6
6
<PreReleaseVersionIteration >1</PreReleaseVersionIteration >
7
7
</PropertyGroup >
8
8
<PropertyGroup >
9
- <MicrosoftDotNetBuildTasksPackagingVersion >6.0.0-beta.22463.7 </MicrosoftDotNetBuildTasksPackagingVersion >
9
+ <MicrosoftDotNetBuildTasksPackagingVersion >6.0.0-beta.22512.3 </MicrosoftDotNetBuildTasksPackagingVersion >
10
10
</PropertyGroup >
11
11
</Project >
Original file line number Diff line number Diff line change 26
26
[string ] $runtimeSourceFeed = ' ' ,
27
27
[string ] $runtimeSourceFeedKey = ' ' ,
28
28
[switch ] $excludePrereleaseVS ,
29
+ [switch ] $nativeToolsOnMachine ,
29
30
[switch ] $help ,
30
31
[Parameter (ValueFromRemainingArguments = $true )][String []]$properties
31
32
)
@@ -67,6 +68,7 @@ function Print-Usage() {
67
68
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
68
69
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
69
70
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)"
70
72
Write-Host " "
71
73
72
74
Write-Host " Command line arguments not listed above are passed thru to msbuild."
@@ -146,6 +148,9 @@ try {
146
148
$nodeReuse = $false
147
149
}
148
150
151
+ if ($nativeToolsOnMachine ) {
152
+ $env: NativeToolsOnMachine = $true
153
+ }
149
154
if ($restore ) {
150
155
InitializeNativeTools
151
156
}
Original file line number Diff line number Diff line change @@ -112,6 +112,7 @@ try {
112
112
$ToolPath = Convert-Path - Path $BinPath
113
113
Write-Host " Adding $ToolName to the path ($ToolPath )..."
114
114
Write-Host " ##vso[task.prependpath]$ToolPath "
115
+ $env: PATH = " $ToolPath ;$env: PATH "
115
116
$InstalledTools += @ { $ToolName = $ToolDirectory.FullName }
116
117
}
117
118
}
Original file line number Diff line number Diff line change 1
1
{
2
2
"tools" : {
3
- "dotnet" : " 6.0.109 "
3
+ "dotnet" : " 6.0.110 "
4
4
},
5
5
"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 " ,
8
8
"Microsoft.Build.Traversal" : " 2.0.2"
9
9
}
10
10
}
You can’t perform that action at this time.
0 commit comments