diff options
author | Rob Mensching <rob@firegiant.com> | 2020-06-27 13:20:28 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2020-06-27 13:20:28 -0700 |
commit | c5458b789cda75af4f1782468b80162f9b24276b (patch) | |
tree | 21e24d18dcc7d33417dc35a3ead1f2d30cc5096a | |
parent | d1670b46cb1fbbc8c1c50708f0b0507a8cba1065 (diff) | |
download | wix-c5458b789cda75af4f1782468b80162f9b24276b.tar.gz wix-c5458b789cda75af4f1782468b80162f9b24276b.tar.bz2 wix-c5458b789cda75af4f1782468b80162f9b24276b.zip |
Improve build batch file
-rw-r--r-- | appveyor.cmd | 13 | ||||
-rw-r--r-- | nuget.config | 1 |
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 | ||
4 | nuget restore | 4 | nuget restore || exit /b |
5 | 5 | ||
6 | msbuild -p:Configuration=Release -t:Restore | 6 | msbuild -p:Configuration=Release -t:Restore || exit /b |
7 | 7 | ||
8 | msbuild -p:Configuration=Release -p:Platform=Win32 src\ca\complusca.vcxproj | 8 | msbuild -p:Configuration=Release -p:Platform=Win32 src\ca\complusca.vcxproj || exit /b |
9 | msbuild -p:Configuration=Release -p:Platform=x64 src\ca\complusca.vcxproj | 9 | msbuild -p:Configuration=Release -p:Platform=x64 src\ca\complusca.vcxproj || exit /b |
10 | 10 | ||
11 | msbuild -p:Configuration=Release src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj | 11 | msbuild -p:Configuration=Release src\test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj || exit /b |
12 | dotnet test -c Release --no-build src\test\WixToolsetTest.ComPlus || exit /b | ||
12 | 13 | ||
13 | msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.ComPlus.wixext.csproj | 14 | msbuild -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" /> |