Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GitHub build 2022 #1

Merged
merged 8 commits into from
May 30, 2024
Merged

GitHub build 2022 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f422cee
Build with platform toolset v143, to pass on github
nirbar May 30, 2024
16831f2
Update dutil.nuspec
nirbar May 30, 2024
35dba85
Update wcautil.nuspec
nirbar May 30, 2024
56b921f
Update bextutil.nuspec
nirbar May 30, 2024
d88a53b
Update WixToolset.BootstrapperApplicationApi.nuspec
nirbar May 30, 2024
dcd56d9
Update wixstdfn.nuspec
nirbar May 30, 2024
58a5afa
Update wixstdfn.nuspec
nirbar May 30, 2024
b1338df
Update DependencyTests.cs
nirbar May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>

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

Expand Down
6 changes: 3 additions & 3 deletions ...i/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
<file src="$projectFolder$\..\inc\BootstrapperApplicationTypes.h" target="build\native\include" />
<file src="$projectFolder$\..\inc\BootstrapperEngineTypes.h" target="build\native\include" />
<file src="v141\x86\balutil.lib" target="build\native\v14\x86" />
<file src="v141\x64\balutil.lib" target="build\native\v14\x64" />
<file src="v141\ARM64\balutil.lib" target="build\native\v14\ARM64" />
<file src="v143\x86\balutil.lib" target="build\native\v14\x86" />
<file src="v143\x64\balutil.lib" target="build\native\v14\x64" />
<file src="v143\ARM64\balutil.lib" target="build\native\v14\ARM64" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/api/burn/bextutil/bextutil.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<file src="$projectFolder$\inc\*" target="build\native\include" />
<file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
<file src="$projectFolder$\..\inc\BootstrapperExtensionEngineTypes.h" target="build\native\include" />
<file src="..\..\v141\x86\bextutil.lib" target="build\native\v14\x86" />
<file src="..\..\v141\x64\bextutil.lib" target="build\native\v14\x64" />
<file src="..\..\v141\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
<file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" />
<file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" />
<file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/ext/Bal/wixstdfn/wixstdfn.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<file src="$projectFolder$\build\$wixid$.props" target="build\$id$.props" />
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
<file src="$projectFolder$\inc\*" target="lib\native\include" />
<file src="..\..\v141\x86\wixstdfn.lib" target="lib\native\v14\x86" />
<file src="..\..\v141\x64\wixstdfn.lib" target="lib\native\v14\x64" />
<file src="..\..\v141\ARM64\wixstdfn.lib" target="lib\native\v14\ARM64" />
<file src="..\..\v143\x86\wixstdfn.lib" target="lib\native\v14\x86" />
<file src="..\..\v143\x64\wixstdfn.lib" target="lib\native\v14\x64" />
<file src="..\..\v143\ARM64\wixstdfn.lib" target="lib\native\v14\ARM64" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/libs/dutil/WixToolset.DUtil/dutil.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<file src="$projectFolder$\build\$wixid$.props" target="build\$id$.props" />
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
<file src="$projectFolder$\inc\*" target="build\native\include" />
<file src="..\..\v141\x64\dutil.lib" target="build\native\v14\x64" />
<file src="..\..\v141\x86\dutil.lib" target="build\native\v14\x86" />
<file src="..\..\v141\ARM64\dutil.lib" target="build\native\v14\ARM64" />
<file src="..\..\v143\x64\dutil.lib" target="build\native\v14\x64" />
<file src="..\..\v143\x86\dutil.lib" target="build\native\v14\x86" />
<file src="..\..\v143\ARM64\dutil.lib" target="build\native\v14\ARM64" />
</files>
</package>
6 changes: 3 additions & 3 deletions src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
<file src="$projectFolder$\build\$wixid$.props" target="build\$id$.props" />
<file src="$projectFolder$\..\..\..\internal\images\wix.png" />
<file src="$projectFolder$\inc\*" target="build\native\include" />
<file src="..\..\v141\x64\wcautil.lib" target="build\native\v14\x64" />
<file src="..\..\v141\x86\wcautil.lib" target="build\native\v14\x86" />
<file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
<file src="..\..\v143\x64\wcautil.lib" target="build\native\v14\x64" />
<file src="..\..\v143\x86\wcautil.lib" target="build\native\v14\x86" />
<file src="..\..\v143\ARM64\wcautil.lib" target="build\native\v14\ARM64" />
</files>
</package>
2 changes: 1 addition & 1 deletion src/test/burn/WixToolsetTest.BurnE2E/DependencyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1075,7 +1075,7 @@ public void SkipsCrossScopeDependencyRegistration()

Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine"));
Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, cached: Yes"));
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"));
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"));

bundleHv2.Uninstall();
bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache();
Expand Down
Loading