aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-27 13:20:28 -0700
committerRob Mensching <rob@firegiant.com>2020-06-27 13:20:28 -0700
commitc5458b789cda75af4f1782468b80162f9b24276b (patch)
tree21e24d18dcc7d33417dc35a3ead1f2d30cc5096a
parentd1670b46cb1fbbc8c1c50708f0b0507a8cba1065 (diff)
downloadwix-c5458b789cda75af4f1782468b80162f9b24276b.tar.gz
wix-c5458b789cda75af4f1782468b80162f9b24276b.tar.bz2
wix-c5458b789cda75af4f1782468b80162f9b24276b.zip
Improve build batch file
-rw-r--r--appveyor.cmd13
-rw-r--r--nuget.config1
2 files changed, 8 insertions, 6 deletions
diff --git a/appveyor.cmd b/appveyor.cmd
index 8a48fe2b..edd0a534 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -1,16 +1,17 @@
1@setlocal 1@setlocal
2@pushd %~dp0 2@pushd %~dp0
3 3
4nuget restore 4nuget restore || exit /b
5 5
6msbuild -p:Configuration=Release -t:Restore 6msbuild -p:Configuration=Release -t:Restore || exit /b
7 7
8msbuild -p:Configuration=Release -p:Platform=Win32 src\ca\complusca.vcxproj 8msbuild -p:Configuration=Release -p:Platform=Win32 src\ca\complusca.vcxproj || exit /b
9msbuild -p:Configuration=Release -p:Platform=x64 src\ca\complusca.vcxproj 9msbuild -p:Configuration=Release -p:Platform=x64 src\ca\complusca.vcxproj || exit /b
10 10
11msbuild -p:Configuration=Release src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj 11msbuild -p:Configuration=Release src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b
12dotnet test -c Release --no-build src\test\WixToolsetTest.ComPlus || exit /b
12 13
13msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.ComPlus.wixext.csproj 14msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.ComPlus.wixext.csproj || exit /b
14 15
15@popd 16@popd
16@endlocal \ No newline at end of file 17@endlocal \ No newline at end of file
diff --git a/nuget.config b/nuget.config
index aaee3228..db7aba29 100644
--- a/nuget.config
+++ b/nuget.config
@@ -2,6 +2,7 @@
2<configuration> 2<configuration>
3 <packageSources> 3 <packageSources>
4 <clear /> 4 <clear />
5 <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
5 <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" /> 6 <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
6 <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" /> 7 <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" />
7 <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" /> 8 <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" />