File tree Expand file tree Collapse file tree 6 files changed +18
-16
lines changed Expand file tree Collapse file tree 6 files changed +18
-16
lines changed Original file line number Diff line number Diff line change 4
4
<clear />
5
5
<!-- Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6
6
<!-- Begin: Package sources from dotnet-runtime -->
7
- <add key =" darc-int-dotnet-runtime-5a400c2" value =" https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5a400c21/nuget/v3/index.json" />
8
7
<!-- End: Package sources from dotnet-runtime -->
9
8
<!-- Begin: Package sources from dotnet-efcore -->
10
- <add key =" darc-int-dotnet-efcore-f7333f1" value =" https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-f7333f1a/nuget/v3/index.json" />
11
9
<!-- End: Package sources from dotnet-efcore -->
12
10
<!-- End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
13
11
<add key =" dotnet-eng" value =" https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
27
25
<clear />
28
26
<!-- Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
29
27
<!-- Begin: Package sources from dotnet-efcore -->
30
- <add key =" darc-int-dotnet-efcore-f7333f1" value =" true" />
31
28
<!-- End: Package sources from dotnet-efcore -->
32
29
<!-- Begin: Package sources from dotnet-runtime -->
33
- <add key =" darc-int-dotnet-runtime-5a400c2" value =" true" />
34
30
<!-- End: Package sources from dotnet-runtime -->
35
31
<!-- End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
36
32
</disabledPackageSources >
Original file line number Diff line number Diff line change 280
280
<Uri >https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri >
281
281
<Sha >5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha >
282
282
</Dependency >
283
- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 6.0.0-beta.22463.7 " >
283
+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 6.0.0-beta.22512.3 " >
284
284
<Uri >https://github.com/dotnet/arcade</Uri >
285
- <Sha >2fbe602d12256bf82de53791ddcbb964c1541b4e </Sha >
285
+ <Sha >bb1e72113a7eaf8bebda940beba8cf8bee1b453f </Sha >
286
286
<SourceBuild RepoName =" arcade" ManagedOnly =" true" />
287
287
</Dependency >
288
- <Dependency Name =" Microsoft.DotNet.Build.Tasks.Installers" Version =" 6.0.0-beta.22463.7 " >
288
+ <Dependency Name =" Microsoft.DotNet.Build.Tasks.Installers" Version =" 6.0.0-beta.22512.3 " >
289
289
<Uri >https://github.com/dotnet/arcade</Uri >
290
- <Sha >2fbe602d12256bf82de53791ddcbb964c1541b4e </Sha >
290
+ <Sha >bb1e72113a7eaf8bebda940beba8cf8bee1b453f </Sha >
291
291
</Dependency >
292
- <Dependency Name =" Microsoft.DotNet.Build.Tasks.Templating" Version =" 6.0.0-beta.22463.7 " >
292
+ <Dependency Name =" Microsoft.DotNet.Build.Tasks.Templating" Version =" 6.0.0-beta.22512.3 " >
293
293
<Uri >https://github.com/dotnet/arcade</Uri >
294
- <Sha >2fbe602d12256bf82de53791ddcbb964c1541b4e </Sha >
294
+ <Sha >bb1e72113a7eaf8bebda940beba8cf8bee1b453f </Sha >
295
295
</Dependency >
296
- <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 6.0.0-beta.22463.7 " >
296
+ <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 6.0.0-beta.22512.3 " >
297
297
<Uri >https://github.com/dotnet/arcade</Uri >
298
- <Sha >2fbe602d12256bf82de53791ddcbb964c1541b4e </Sha >
298
+ <Sha >bb1e72113a7eaf8bebda940beba8cf8bee1b453f </Sha >
299
299
</Dependency >
300
300
</ToolsetDependencies >
301
301
</Dependencies >
Original file line number Diff line number Diff line change 131
131
<MicrosoftEntityFrameworkCoreVersion >6.0.10</MicrosoftEntityFrameworkCoreVersion >
132
132
<MicrosoftEntityFrameworkCoreDesignVersion >6.0.10</MicrosoftEntityFrameworkCoreDesignVersion >
133
133
<!-- Packages from dotnet/arcade -->
134
- <MicrosoftDotNetBuildTasksInstallersVersion >6.0.0-beta.22463.7 </MicrosoftDotNetBuildTasksInstallersVersion >
135
- <MicrosoftDotNetBuildTasksTemplatingVersion >6.0.0-beta.22463.7 </MicrosoftDotNetBuildTasksTemplatingVersion >
134
+ <MicrosoftDotNetBuildTasksInstallersVersion >6.0.0-beta.22512.3 </MicrosoftDotNetBuildTasksInstallersVersion >
135
+ <MicrosoftDotNetBuildTasksTemplatingVersion >6.0.0-beta.22512.3 </MicrosoftDotNetBuildTasksTemplatingVersion >
136
136
</PropertyGroup >
137
137
<!--
138
138
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 29
29
},
30
30
"msbuild-sdks" : {
31
31
"Yarn.MSBuild" : " 1.22.10" ,
32
- "Microsoft.DotNet.Arcade.Sdk" : " 6.0.0-beta.22463.7 " ,
33
- "Microsoft.DotNet.Helix.Sdk" : " 6.0.0-beta.22463.7 "
32
+ "Microsoft.DotNet.Arcade.Sdk" : " 6.0.0-beta.22512.3 " ,
33
+ "Microsoft.DotNet.Helix.Sdk" : " 6.0.0-beta.22512.3 "
34
34
}
35
35
}
You can’t perform that action at this time.
0 commit comments