Build witg v143 to pass on github image

nirbar · May 30, 2024 · cf44fc8 · cf44fc8
1 parent 3e5eb55
commit cf44fc8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/Nuget/PanelSwWixExtension4.targets b/src/Nuget/PanelSwWixExtension4.targets
@@ -6,7 +6,7 @@
     <PanelSwIncPath>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\include\'))</PanelSwIncPath>
     <IncludePath>$(PanelSwIncPath);$(IncludePath)</IncludePath>
 
-    <BasePanelSwLibPath Condition="$(PlatformToolset.ToLower().StartsWith('v14'))">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\lib\v142\'))</BasePanelSwLibPath>
+    <BasePanelSwLibPath Condition="$(PlatformToolset.ToLower().StartsWith('v14'))">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\lib\v14\'))</BasePanelSwLibPath>
     <PanelSwLibPath Condition="('$(BasePanelSwLibPath)' != '') And ('$(Platform)' == 'Win32')">$(BasePanelSwLibPath)x86\</PanelSwLibPath>
     <LibraryPath Condition="'$(PanelSwLibPath)' != ''">$(PanelSwLibPath);$(LibraryPath)</LibraryPath>
   </PropertyGroup>

diff --git a/src/PanelSwWixExtension/PanelSwWixExtension.csproj b/src/PanelSwWixExtension/PanelSwWixExtension.csproj
@@ -44,7 +44,8 @@
     <None Include="$(BaseBuildFolder)\x64\bin\$(Configuration)\DeferredExePackage\DeferredExePackage.exe" Visible="false" Pack="true" PackagePath="tools\lib\x64\" />
     <None Include=".\Xsd\PanelSwWixExtension.xsd" Pack="true" PackagePath="content" />
     <!-- lib -->
-    <None Include="$(BaseBuildFolder)\x86\bin\$(Configuration)\CaCommon\CaCommon.lib" Visible="false" Pack="true" PackagePath="tools\lib\v142\x86\" />
+    <None Include="$(BaseBuildFolder)\x86\bin\$(Configuration)\CaCommon\CaCommon.lib" Visible="false" Pack="true" PackagePath="tools\lib\v14\x86\" />
+    <None Include="$(BaseBuildFolder)\x64\bin\$(Configuration)\CaCommon\CaCommon.lib" Visible="false" Pack="true" PackagePath="tools\lib\v14\x64\" />
     <!-- inc -->
     <None Include="..\CaCommon\DeferredActionBase.h" Visible="false" Pack="true" PackagePath="tools\include\" />
     <None Include="..\CaCommon\RegistryKey.h" Visible="false" Pack="true" PackagePath="tools\include\" />

diff --git a/src/TidyBuild.custom.props b/src/TidyBuild.custom.props
@@ -15,7 +15,7 @@
     <!-- CMake -->
     <CMakeDir Condition="'$(CMakeDir)' == ''"></CMakeDir>
     <CMakeVsVersion Condition="'$(CMakeVsVersion)'==''">Visual Studio 17 2022</CMakeVsVersion>
-    <PlatformToolset Condition="'$(PlatformToolset)'==''">v142</PlatformToolset>
+    <PlatformToolset Condition="'$(PlatformToolset)'==''">v143</PlatformToolset>
     <XPDeprecationWarning>false</XPDeprecationWarning>
 
     <WindowsKitSharedDir Condition="'$(WindowsKitSharedDir)'=='' And Exists('C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\')">C:\Program Files (x86)\Windows Kits\10\Include\10.0.22621.0\shared\</WindowsKitSharedDir>

diff --git a/src/UnitTests/ZipFileUT/ZipFileUT.wxs b/src/UnitTests/ZipFileUT/ZipFileUT.wxs
@@ -18,7 +18,7 @@
     <PanelSW:Unzip TargetFolder="[WindowsVolume]1\2\3" ZipFile="[INSTALLFOLDER]1.zip" Overwrite="yes" Condition="Not Installed"/>
     <PanelSW:Unzip TargetFolder="[WindowsVolume]1\2\4" ZipFile="[INSTALLFOLDER]1.zip" Overwrite="yes" DeleteZip="yes" CreateRootFolder="no" Condition="Not Installed"/>
     <PanelSW:Unzip TargetFolder="[INSTALLFOLDER]npp" ZipFile="[#iconsext.zip]" OverwriteMode="Always" Condition="&amp;ProductFeature &gt;= 3"/>
-    <PanelSW:Unzip TargetFolder="[INSTALLFOLDER]msi" ZipFile="[OriginalDatabase]" OverwriteMode="Always" Condition="&amp;ProductFeature &gt;= 3" ErrorHandling="prompt"/>
+    <PanelSW:Unzip TargetFolder="[INSTALLFOLDER]msi" ZipFile="[OriginalDatabase].zip" OverwriteMode="Always" Condition="&amp;ProductFeature &gt;= 3" ErrorHandling="prompt"/>
 
     <ComponentGroup Id="ProductComponents">
       <Component Directory="INSTALLFOLDER">