Skip to content

Commit 5330320

Browse files
committed
Try fix windows
1 parent 8f78730 commit 5330320

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
id: versions
2828
run: dotnet run -c Release --project ChromeForTesting/ChromeForTesting.VersionManager
2929
env:
30-
VERSION_INCREMENT: '15'
30+
VERSION_INCREMENT: '16'
3131

3232
VerifyTagExists:
3333
needs:

ChromeForTesting/ChromeForTesting/build/ChromeForTesting.targets

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,24 @@
6060
<!-- Windows -->
6161
<Exec Command="powershell -NoProfile -Command &quot;[System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture&quot;"
6262
ConsoleToMSBuild="true"
63-
Condition="$([MSBuild]::IsOSPlatform('Windows_NT'))">
63+
Condition="$([MSBuild]::IsOSPlatform('Windows'))">
6464
<Output TaskParameter="ConsoleOutput" PropertyName="OSArchitecture"/>
6565
</Exec>
6666
<Error Text="Only x86 and x64 are supported on windows"
67-
Condition="$([MSBuild]::IsOSPlatform('Windows_NT')) AND '$(OSArchitecture)' != 'X86' AND '$(OSArchitecture)' != 'X64'"/>
67+
Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(OSArchitecture)' != 'X86' AND '$(OSArchitecture)' != 'X64'"/>
6868
<PropertyGroup>
69-
<ChromePlatrofm Condition="$([MSBuild]::IsOSPlatform('Windows_NT')) AND '$(OSArchitecture)' == 'X86'">win32</ChromePlatrofm>
70-
<ChromePlatrofm Condition="$([MSBuild]::IsOSPlatform('Windows_NT')) AND '$(OSArchitecture)' == 'X64'">win64</ChromePlatrofm>
69+
<ChromePlatrofm Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(OSArchitecture)' == 'X86'">win32</ChromePlatrofm>
70+
<ChromePlatrofm Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(OSArchitecture)' == 'X64'">win64</ChromePlatrofm>
7171
</PropertyGroup>
7272
<DownloadFile
73-
Condition="$([MSBuild]::IsOSPlatform('Windows_NT'))"
73+
Condition="$([MSBuild]::IsOSPlatform('Windows'))"
7474
SourceUrl="https://storage.googleapis.com/chrome-for-testing-public/$(ChromeVersion)/$(ChromePlatrofm)/chrome-$(ChromePlatrofm).zip"
7575
DestinationFolder="$(Cache)"
7676
DestinationFileName="chrome.zip">
7777
</DownloadFile>
7878
<Exec
7979
Command="powershell -Command &quot;Expand-Archive -Path '$(Cache)chrome.zip' -DestinationPath '$(OutDir)chrome-for-testing-$(Version)'&quot;"
80-
Condition="$([MSBuild]::IsOSPlatform('Windows_NT')) And !Exists('$(OutDir)chrome-for-testing-$(Version)/chrome-$(ChromePlatrofm)')"/>
80+
Condition="$([MSBuild]::IsOSPlatform('Windows')) And !Exists('$(OutDir)chrome-for-testing-$(Version)/chrome-$(ChromePlatrofm)')"/>
8181
</Target>
8282

8383
<Target Name="DownloadChromeInPublish" AfterTargets="Publish">
@@ -129,23 +129,23 @@
129129
<!-- Windows -->
130130
<Exec Command="powershell -NoProfile -Command &quot;[System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture&quot;"
131131
ConsoleToMSBuild="true"
132-
Condition="$([MSBuild]::IsOSPlatform('Windows_NT'))">
132+
Condition="$([MSBuild]::IsOSPlatform('Windows'))">
133133
<Output TaskParameter="ConsoleOutput" PropertyName="OSArchitecture"/>
134134
</Exec>
135135
<Error Text="Only x86 and x64 are supported on windows"
136-
Condition="$([MSBuild]::IsOSPlatform('Windows_NT')) AND '$(OSArchitecture)' != 'X86' AND '$(OSArchitecture)' != 'X64'"/>
136+
Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(OSArchitecture)' != 'X86' AND '$(OSArchitecture)' != 'X64'"/>
137137
<PropertyGroup>
138-
<ChromePlatrofm Condition="$([MSBuild]::IsOSPlatform('Windows_NT')) AND '$(OSArchitecture)' == 'X86'">win32</ChromePlatrofm>
139-
<ChromePlatrofm Condition="$([MSBuild]::IsOSPlatform('Windows_NT')) AND '$(OSArchitecture)' == 'X64'">win64</ChromePlatrofm>
138+
<ChromePlatrofm Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(OSArchitecture)' == 'X86'">win32</ChromePlatrofm>
139+
<ChromePlatrofm Condition="$([MSBuild]::IsOSPlatform('Windows')) AND '$(OSArchitecture)' == 'X64'">win64</ChromePlatrofm>
140140
</PropertyGroup>
141141
<DownloadFile
142-
Condition="$([MSBuild]::IsOSPlatform('Windows_NT'))"
142+
Condition="$([MSBuild]::IsOSPlatform('Windows'))"
143143
SourceUrl="https://storage.googleapis.com/chrome-for-testing-public/$(ChromeVersion)/$(ChromePlatrofm)/chrome-$(ChromePlatrofm).zip"
144144
DestinationFolder="$(Cache)"
145145
DestinationFileName="chrome.zip">
146146
</DownloadFile>
147147
<Exec
148148
Command="powershell -Command &quot;Expand-Archive -Path '$(Cache)chrome.zip' -DestinationPath '$(PublishDir)chrome-for-testing-$(Version)'&quot;"
149-
Condition="$([MSBuild]::IsOSPlatform('Windows_NT')) And !Exists('$(PublishDir)chrome-for-testing-$(Version)/chrome-$(ChromePlatrofm)')"/>
149+
Condition="$([MSBuild]::IsOSPlatform('Windows')) And !Exists('$(PublishDir)chrome-for-testing-$(Version)/chrome-$(ChromePlatrofm)')"/>
150150
</Target>
151151
</Project>

0 commit comments

Comments
 (0)