File tree Expand file tree Collapse file tree 5 files changed +21
-17
lines changed Expand file tree Collapse file tree 5 files changed +21
-17
lines changed Original file line number Diff line number Diff line change 292
292
<Uri >https://github.com/dotnet/runtime</Uri >
293
293
<Sha >52fd1a576ef6640966046431edff2868e82b9e64</Sha >
294
294
</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 " >
296
296
<Uri >https://github.com/dotnet/arcade</Uri >
297
- <Sha >ba1c3aff4be864c493031d989259ef92aaa23fc3 </Sha >
297
+ <Sha >b7796f653e48e001123963f17387c052891b48e6 </Sha >
298
298
<SourceBuild RepoName =" arcade" ManagedOnly =" true" />
299
299
</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 " >
301
301
<Uri >https://github.com/dotnet/arcade</Uri >
302
- <Sha >ba1c3aff4be864c493031d989259ef92aaa23fc3 </Sha >
302
+ <Sha >b7796f653e48e001123963f17387c052891b48e6 </Sha >
303
303
</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 " >
305
305
<Uri >https://github.com/dotnet/arcade</Uri >
306
- <Sha >ba1c3aff4be864c493031d989259ef92aaa23fc3 </Sha >
306
+ <Sha >b7796f653e48e001123963f17387c052891b48e6 </Sha >
307
307
</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 " >
309
309
<Uri >https://github.com/dotnet/arcade</Uri >
310
- <Sha >ba1c3aff4be864c493031d989259ef92aaa23fc3 </Sha >
310
+ <Sha >b7796f653e48e001123963f17387c052891b48e6 </Sha >
311
311
</Dependency >
312
312
</ToolsetDependencies >
313
313
</Dependencies >
Original file line number Diff line number Diff line change 135
135
<MicrosoftEntityFrameworkCoreVersion >7.0.0-preview.5.22261.11</MicrosoftEntityFrameworkCoreVersion >
136
136
<MicrosoftEntityFrameworkCoreDesignVersion >7.0.0-preview.5.22261.11</MicrosoftEntityFrameworkCoreDesignVersion >
137
137
<!-- 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 >
140
140
</PropertyGroup >
141
141
<!--
142
142
Original file line number Diff line number Diff line change 93
93
$ToolVersion = " "
94
94
}
95
95
$ArcadeToolsDirectory = " C:\arcade-tools"
96
- if (Test-Path $ArcadeToolsDirectory -eq $False ) {
96
+ if (-not ( Test-Path $ArcadeToolsDirectory ) ) {
97
97
Write-Error " Arcade tools directory '$ArcadeToolsDirectory ' was not found; artifacts were not properly installed."
98
98
exit 1
99
99
}
@@ -103,13 +103,14 @@ try {
103
103
exit 1
104
104
}
105
105
$BinPathFile = " $ ( $ToolDirectory.FullName ) \binpath.txt"
106
- if (Test-Path - Path " $BinPathFile " -eq $False ) {
106
+ if (-not ( Test-Path - Path " $BinPathFile " ) ) {
107
107
Write-Error " Unable to find binpath.txt in '$ ( $ToolDirectory.FullName ) ' ($ToolName $ToolVersion ); artifact is either installed incorrectly or is not a bootstrappable tool."
108
108
exit 1
109
109
}
110
110
$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 "
113
114
}
114
115
}
115
116
exit 0
@@ -188,7 +189,7 @@ try {
188
189
Write-Host " ##vso[task.prependpath]$ ( Convert-Path - Path $InstallBin ) "
189
190
return $InstallBin
190
191
}
191
- else {
192
+ elseif ( -not ( $PathPromotion )) {
192
193
Write-PipelineTelemetryError - Category ' NativeToolsBootstrap' - Message ' Native tools install directory does not exist, installation failed'
193
194
exit 1
194
195
}
Original file line number Diff line number Diff line change 8
8
<ItemGroup >
9
9
<!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->
10
10
<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)" />
11
14
<PackageReference Include =" Microsoft.DotNet.IBCMerge" Version =" $(MicrosoftDotNetIBCMergeVersion)" Condition =" '$(UsingToolIbcOptimization)' == 'true'" />
12
15
<PackageReference Include =" Drop.App" Version =" $(DropAppVersion)" ExcludeAssets =" all" Condition =" '$(UsingToolVisualStudioIbcTraining)' == 'true'" />
13
16
</ItemGroup >
Original file line number Diff line number Diff line change 27
27
},
28
28
"msbuild-sdks" : {
29
29
"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 "
32
32
}
33
33
}
You can’t perform that action at this time.
0 commit comments