Revert unnedded VS components

Nuget uses v14
nirbar · May 30, 2024 · df4345c · df4345c
1 parent b3764a4
commit df4345c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml
@@ -45,21 +45,6 @@ jobs:
           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"
           nuget restore src/dirs.proj
 
-      - name: Install VC ATL and MFC components
-        run: |
-          $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Community"
-          $args = ( 'modify', '--installPath', $InstallPath, '--all', '--quiet', '--norestart', '--nocache' ) 
-          Start-Process -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" -Wait -PassThru -NoNewWindow -ArgumentList $args
-          Start-Process -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" -Wait -PassThru -NoNewWindow -ArgumentList $args
-      - name: Install components
-        run: |
-                Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
-                $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Community"
-                $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",'--all', '--quiet', '--norestart', '--nocache')
-                # should be run twice
-                $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-                $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
-
       - name: Build PanelSwWixExtension
         run: msbuild src/dirs.proj -restore -p:FullVersion=${{ env.FULL_VERSION }}
 

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/PanelSwBackendExtension/PanelSwBackendExtension.vcxproj b/src/PanelSwBackendExtension/PanelSwBackendExtension.vcxproj
@@ -34,7 +34,7 @@
   </ImportGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SevenZapIncludePath);$(MSBuildThisFileDirectory)..\poco\Zip\include;$(MSBuildThisFileDirectory)..\poco\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SevenZapIncludePath);$(MSBuildThisFileDirectory)..\poco\Zip\include;$(MSBuildThisFileDirectory)..\poco\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_USRDLL;EXAMPLECADLL_EXPORTS;FullVersion="$(FullVersion)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition=" '$(EnableZipContainer)' == 'true' ">EnableZipContainer;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>

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\" />