Skip to content

Commit 06e4f9f

Browse files
nirbarnirbar
committed
GitHub build on image 2022
1 parent 5e9048a commit 06e4f9f

File tree

8 files changed

+21
-19
lines changed

8 files changed

+21
-19
lines changed

‎.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ jobs:
118118
- name: Publish nuget packages to github
119119
if: ${{ github.event.inputs.publish_nuget == 'true' }}
120120
env:
121-
GITHUB_TOKEN: ${{ secrets.MY_GITHUB_PAT }}
121+
GITHUB_TOKEN: ${{ secrets.TAGGER_PAT }}
122122
run: |
123-
dotnet nuget push build/artifacts/**/*.${{ env.WIX_VERSION }}.nupkg --api-key ${{ secrets.GITHUB_TOKEN }} --source github
123+
dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
124+
dotnet nuget push "build/artifacts/**/PanelSwWix4.*.${{ env.WIX_VERSION }}.nupkg" --api-key ${{ secrets.GITHUB_TOKEN }} --source github
125+
dotnet nuget push "build/artifacts/**/PanelSwWix4.*.${{ env.WIX_VERSION }}.nupkg" --api-key ${{ secrets.NUGET_TOKEN }} --source https://api.nuget.org/v3/index.json
124126
git tag v${{ env.WIX_VERSION }}
125127
git push --tags

‎src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
2121

2222
<!-- This is C++-specific but used from managed projects to pick up native build artifacts. -->
23-
<WixNativeSdkLibraryToolset>v141</WixNativeSdkLibraryToolset>
23+
<WixNativeSdkLibraryToolset>v143</WixNativeSdkLibraryToolset>
2424
<PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
2525
<PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
2626

‎src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
4040
<file src="$projectFolder$\..\inc\BootstrapperApplicationTypes.h" target="build\native\include" />
4141
<file src="$projectFolder$\..\inc\BootstrapperEngineTypes.h" target="build\native\include" />
42-
<file src="v141\x86\balutil.lib" target="build\native\v14\x86" />
43-
<file src="v141\x64\balutil.lib" target="build\native\v14\x64" />
44-
<file src="v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
42+
<file src="v143\x86\balutil.lib" target="build\native\v14\x86" />
43+
<file src="v143\x64\balutil.lib" target="build\native\v14\x64" />
44+
<file src="v143\ARM64\balutil.lib" target="build\native\v14\ARM64" />
4545
</files>
4646
</package>

‎src/api/burn/bextutil/bextutil.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<file src="$projectFolder$\inc\*" target="build\native\include" />
2424
<file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
2525
<file src="$projectFolder$\..\inc\BootstrapperExtensionEngineTypes.h" target="build\native\include" />
26-
<file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
27-
<file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
28-
<file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
26+
<file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" />
27+
<file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" />
28+
<file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
2929
</files>
3030
</package>

‎src/ext/Bal/wixstdfn/wixstdfn.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<file src="$projectFolder$\build\$wixid$.props" target="build\$id$.props" />
2727
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
2828
<file src="$projectFolder$\inc\*" target="lib\native\include" />
29-
<file src="..\..\v141\x86\wixstdfn.lib" target="lib\native\v14\x86" />
30-
<file src="..\..\v141\x64\wixstdfn.lib" target="lib\native\v14\x64" />
31-
<file src="..\..\v141\ARM64\wixstdfn.lib" target="lib\native\v14\ARM64" />
29+
<file src="..\..\v143\x86\wixstdfn.lib" target="lib\native\v14\x86" />
30+
<file src="..\..\v143\x64\wixstdfn.lib" target="lib\native\v14\x64" />
31+
<file src="..\..\v143\ARM64\wixstdfn.lib" target="lib\native\v14\ARM64" />
3232
</files>
3333
</package>

‎src/libs/dutil/WixToolset.DUtil/dutil.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<file src="$projectFolder$\build\$wixid$.props" target="build\$id$.props" />
1919
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
2020
<file src="$projectFolder$\inc\*" target="build\native\include" />
21-
<file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" />
22-
<file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" />
23-
<file src="..\..\v141\ARM64\dutil.lib" target="build\native\v14\ARM64" />
21+
<file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
22+
<file src="..\..\v143\x86\dutil.lib" target="build\native\v14\x86" />
23+
<file src="..\..\v143\ARM64\dutil.lib" target="build\native\v14\ARM64" />
2424
</files>
2525
</package>

‎src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<file src="$projectFolder$\build\$wixid$.props" target="build\$id$.props" />
2222
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
2323
<file src="$projectFolder$\inc\*" target="build\native\include" />
24-
<file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" />
25-
<file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" />
26-
<file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
24+
<file src="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" />
25+
<file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" />
26+
<file src="..\..\v143\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
2727
</files>
2828
</package>

‎src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ public void SkipsCrossScopeDependencyRegistration()
10751075

10761076
Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine"));
10771077
Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, cached: Yes"));
1078-
Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related package for PackageA: \{[0-9A-Za-z\-]{36}\}, scope: PerUser, version: 1.0.0.0, language: 0 operation: MajorUpgrade"));
1078+
Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related package for PackageD: \{[0-9A-Za-z\-]{36}\}, scope: PerUser, version: 1.0.0.0, language: 0 operation: MajorUpgrade"));
10791079

10801080
bundleHv2.Uninstall();
10811081
bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache();

0 commit comments

Comments
 (0)