diff options
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/api.cmd | 8 | ||||
-rw-r--r-- | src/api/api.proj | 9 | ||||
-rw-r--r-- | src/api/api_t.proj | 9 | ||||
-rw-r--r-- | src/api/burn/burn_t.proj (renamed from src/api/burn/burn.proj) | 2 | ||||
-rw-r--r-- | src/api/wix/wix_t.proj (renamed from src/api/wix/wix.proj) | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/api/api.cmd b/src/api/api.cmd index 75303ea2..7a4bbb43 100644 --- a/src/api/api.cmd +++ b/src/api/api.cmd | |||
@@ -11,12 +11,12 @@ | |||
11 | :: restore | 11 | :: restore |
12 | :: build | 12 | :: build |
13 | :: pack | 13 | :: pack |
14 | msbuild -m -p:Configuration=%_C% api.proj || exit /b | ||
15 | 14 | ||
16 | :: test | 15 | msbuild api_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\api_build.binlog || exit /b |
17 | dotnet test -c %_C% --no-build burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj || exit /b | ||
18 | dotnet test -c %_C% --no-build wix\api_wix.sln || exit /b | ||
19 | 16 | ||
17 | :: test | ||
18 | dotnet test burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj -c %_C% --nologo --no-build || exit /b | ||
19 | dotnet test wix\api_wix.sln -c %_C% --nologo --no-build || exit /b | ||
20 | 20 | ||
21 | @popd | 21 | @popd |
22 | @endlocal | 22 | @endlocal |
diff --git a/src/api/api.proj b/src/api/api.proj deleted file mode 100644 index 6d7a4188..00000000 --- a/src/api/api.proj +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | <Project Sdk="Microsoft.Build.Traversal/3.0.23"> | ||
2 | <ItemGroup> | ||
3 | <ProjectReference Include="burn\burn.proj" Targets="Restore" BuildInParallel="false" /> | ||
4 | <ProjectReference Include="wix\wix.proj" Targets="Restore" BuildInParallel="false" /> | ||
5 | |||
6 | <ProjectReference Include="burn\burn.proj" /> | ||
7 | <ProjectReference Include="wix\wix.proj" /> | ||
8 | </ItemGroup> | ||
9 | </Project> | ||
diff --git a/src/api/api_t.proj b/src/api/api_t.proj new file mode 100644 index 00000000..d89feccf --- /dev/null +++ b/src/api/api_t.proj | |||
@@ -0,0 +1,9 @@ | |||
1 | <Project Sdk="Microsoft.Build.Traversal"> | ||
2 | <ItemGroup> | ||
3 | <ProjectReference Include="burn\burn_t.proj" Targets="Restore" BuildInParallel="false" /> | ||
4 | <ProjectReference Include="wix\wix_t.proj" Targets="Restore" BuildInParallel="false" /> | ||
5 | |||
6 | <ProjectReference Include="burn\burn_t.proj" /> | ||
7 | <ProjectReference Include="wix\wix_t.proj" /> | ||
8 | </ItemGroup> | ||
9 | </Project> | ||
diff --git a/src/api/burn/burn.proj b/src/api/burn/burn_t.proj index 49bd2876..46ccf8b2 100644 --- a/src/api/burn/burn.proj +++ b/src/api/burn/burn_t.proj | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | 3 | ||
4 | <Project Sdk="Microsoft.Build.Traversal/3.0.23"> | 4 | <Project Sdk="Microsoft.Build.Traversal"> |
5 | <ItemGroup> | 5 | <ItemGroup> |
6 | <!-- Restore: Explicitly restore the test projects, which need some hand-holding. --> | 6 | <!-- Restore: Explicitly restore the test projects, which need some hand-holding. --> |
7 | <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" /> | 7 | <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" /> |
diff --git a/src/api/wix/wix.proj b/src/api/wix/wix_t.proj index ea07e810..174b8b0e 100644 --- a/src/api/wix/wix.proj +++ b/src/api/wix/wix_t.proj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project Sdk="Microsoft.Build.Traversal/3.0.23"> | 1 | <Project Sdk="Microsoft.Build.Traversal"> |
2 | <ItemGroup> | 2 | <ItemGroup> |
3 | <!-- Build --> | 3 | <!-- Build --> |
4 | <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" /> | 4 | <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" /> |