Path to the Windows SDK bin folder is now parameterized.

lstratman · Sep 26, 2020 · 2f59eee · 2f59eee
1 parent e869677
commit 2f59eee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/EasyConnect.csproj b/EasyConnect.csproj
@@ -43,6 +43,7 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">.\</SolutionDir>
     <RestorePackages>true</RestorePackages>
+    <WindowsSDKBin Condition="'$(WindowsSDKBin)' == ''">C:\Program Files (x86)\Windows Kits\10\bin\x86</WindowsSDKBin>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -402,8 +403,8 @@ copy "$(SolutionDir)AppXManifest.xml" "$(TargetDir)" 1&gt;:null 2&gt;&amp;1
 xcopy "$(SolutionDir)AppX\Assets\*" "$(TargetDir)\Assets" /I /Q /Y 1&gt;:null 2&gt;&amp;1
 cd "$(TargetDir)"
 del resources*.pri
-"C:\Program Files (x86)\Windows Kits\10\bin\x86\makepri.exe" new /pr . /cf ..\..\priconfig.xml /in $(ProjectName)
-"C:\Program Files (x86)\Windows Kits\10\bin\x86\makeappx.exe" pack /d . /p $(ProjectName).appx /l
+"$(WindowsSDKBin)\makepri.exe" new /pr . /cf ..\..\priconfig.xml /in $(ProjectName)
+"$(WindowsSDKBin)\makeappx.exe" pack /d . /p $(ProjectName).appx /l
 Exit /b 0</PostBuildEvent>
   </PropertyGroup>
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />

diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,7 @@ before_build:
 - ps: '[System.IO.File]::ReadAllText("${env:APPVEYOR_BUILD_FOLDER}\app.config").Replace(''<add key="checkForUpdates" value="false" />'', ''<add key="checkForUpdates" value="true" />'') | Set-Content ${env:APPVEYOR_BUILD_FOLDER}\app.config'
 build_script:
 - msbuild EasyConnect.sln /p:Configuration=%CONFIGURATION% /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
-- msbuild EasyConnect.sln /p:Configuration=AppX%CONFIGURATION% /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+- msbuild EasyConnect.sln /p:Configuration=AppX%CONFIGURATION% /p:WindowsSDKBin="C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64" /verbosity:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 after_build:
 - cmd: 7z a EasyConnect.zip %APPVEYOR_BUILD_FOLDER%\bin\%CONFIGURATION%\*.*
 - cmd: copy Installer\bin\%CONFIGURATION%\EasyConnect.msi .