From df4345c4f932ddc38beb427d1488b2218c8000e7 Mon Sep 17 00:00:00 2001 From: Nir Bar Date: Thu, 30 May 2024 09:40:39 +0300 Subject: [PATCH] Revert unnedded VS components Nuget uses v14 --- .github/workflows/github-actions-build.yml | 15 --------------- src/Nuget/PanelSwWixExtension4.targets | 2 +- .../PanelSwBackendExtension.vcxproj | 2 +- .../PanelSwWixExtension.csproj | 3 ++- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml index 59445932..3c87a06e 100644 --- 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 index 7e00d00a..b8444790 100644 --- a/src/Nuget/PanelSwWixExtension4.targets +++ b/src/Nuget/PanelSwWixExtension4.targets @@ -6,7 +6,7 @@ $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\include\')) $(PanelSwIncPath);$(IncludePath) - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\lib\v142\')) + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\lib\v14\')) $(BasePanelSwLibPath)x86\ $(PanelSwLibPath);$(LibraryPath) diff --git a/src/PanelSwBackendExtension/PanelSwBackendExtension.vcxproj b/src/PanelSwBackendExtension/PanelSwBackendExtension.vcxproj index 32c10f80..1a07e20c 100644 --- a/src/PanelSwBackendExtension/PanelSwBackendExtension.vcxproj +++ b/src/PanelSwBackendExtension/PanelSwBackendExtension.vcxproj @@ -34,7 +34,7 @@ - $(VC_IncludePath);$(WindowsSDK_IncludePath);$(SevenZapIncludePath);$(MSBuildThisFileDirectory)..\poco\Zip\include;$(MSBuildThisFileDirectory)..\poco\Foundation\include;%(AdditionalIncludeDirectories) + $(SevenZapIncludePath);$(MSBuildThisFileDirectory)..\poco\Zip\include;$(MSBuildThisFileDirectory)..\poco\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;_USRDLL;EXAMPLECADLL_EXPORTS;FullVersion="$(FullVersion)";%(PreprocessorDefinitions) EnableZipContainer;%(PreprocessorDefinitions) Use diff --git a/src/PanelSwWixExtension/PanelSwWixExtension.csproj b/src/PanelSwWixExtension/PanelSwWixExtension.csproj index 3737ad20..f32534d6 100644 --- a/src/PanelSwWixExtension/PanelSwWixExtension.csproj +++ b/src/PanelSwWixExtension/PanelSwWixExtension.csproj @@ -44,7 +44,8 @@ - + +