actions/runner-images-sangeeth
1
0
Fork 0
mirror of https://github.com/actions/runner-images-sangeeth.git synced 2025-12-15 06:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Fix platform conditions by adding brackets (#3856)

Browse Source
This commit is contained in:
Maxim Lobanov
2021-08-05 07:26:07 +03:00
committed by GitHub
parent 8481b2c846
commit 71a9049e38
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
images/win/scripts/Installers/Install-DotnetSDK.ps1
View File

@@ -32,7 +32,7 @@ function Invoke-Warmup (
function Fix-ImportPublishProfile ( function Fix-ImportPublishProfile (
$SdkVersion $SdkVersion
) { ) {
if (Test-IsWin16 -or Test-IsWin19) { if ((Test-IsWin16) -or (Test-IsWin19)) {
# Fix for issue https://github.com/dotnet/sdk/issues/1276. This will be fixed in 3.1. # Fix for issue https://github.com/dotnet/sdk/issues/1276. This will be fixed in 3.1.
$sdkTargetsName = "Microsoft.NET.Sdk.ImportPublishProfile.targets" $sdkTargetsName = "Microsoft.NET.Sdk.ImportPublishProfile.targets"
$sdkTargetsUrl = "https://raw.githubusercontent.com/dotnet/sdk/82bc30c99f1325dfaa7ad450be96857a4fca2845/src/Tasks/Microsoft.NET.Build.Tasks/targets/${sdkTargetsName}" $sdkTargetsUrl = "https://raw.githubusercontent.com/dotnet/sdk/82bc30c99f1325dfaa7ad450be96857a4fca2845/src/Tasks/Microsoft.NET.Build.Tasks/targets/${sdkTargetsName}"

2
images/win/scripts/SoftwareReport/SoftwareReport.VisualStudio.psm1
View File

@@ -52,7 +52,7 @@ function Get-VisualStudioExtensions {
) )
} }
if (Test-IsWin16 -or Test-IsWin19) { if ((Test-IsWin16) -or (Test-IsWin19)) {
# Wix # Wix
$wixPackageVersion = Get-WixVersion $wixPackageVersion = Get-WixVersion
$wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version $wixExtensionVersion = ($vsPackages | Where-Object {$_.Id -match 'WixToolset.VisualStudioExtension.Dev' -and $_.type -eq 'vsix'}).Version