aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-10-03 10:06:37 -0700
committerRob Mensching <rob@firegiant.com>2022-10-04 10:44:49 -0700
commit7d231e729b4e53979952dcdd12654aa77a411521 (patch)
tree45f185d6c4bcd679bfc030500dfee91e3c815681
parent5065bf991b76a6484d11d867b53fd2fe3e6a2fad (diff)
downloadwix-7d231e729b4e53979952dcdd12654aa77a411521.tar.gz
wix-7d231e729b4e53979952dcdd12654aa77a411521.tar.bz2
wix-7d231e729b4e53979952dcdd12654aa77a411521.zip
Small clean up of api segment build
-rw-r--r--src/api/api.cmd4
-rw-r--r--src/api/api.sln4
-rw-r--r--src/api/wix/api_wix.sln4
-rw-r--r--src/api/wix/api_wix_t.proj7
4 files changed, 9 insertions, 10 deletions
diff --git a/src/api/api.cmd b/src/api/api.cmd
index d93f1435..d1f87f54 100644
--- a/src/api/api.cmd
+++ b/src/api/api.cmd
@@ -41,6 +41,10 @@ dotnet test wix\api_wix.sln -c %_C% --nologo --no-build -l "trx;LogFileName=%_L%
41@del "..\..\build\artifacts\WixToolset.Data.*.nupkg" 2> nul 41@del "..\..\build\artifacts\WixToolset.Data.*.nupkg" 2> nul
42@del "..\..\build\artifacts\WixToolset.Extensibility.*.nupkg" 2> nul 42@del "..\..\build\artifacts\WixToolset.Extensibility.*.nupkg" 2> nul
43@del "..\..\build\artifacts\WixToolset.Mba.Core.*.nupkg" 2> nul 43@del "..\..\build\artifacts\WixToolset.Mba.Core.*.nupkg" 2> nul
44@del "%_L%\TestResults\WixToolsetTest.Mba.Core.trx" 2> nul
45@del "%_L%\TestResults\BalUtilUnitTest.trx" 2> nul
46@del "%_L%\TestResults\BextUtilUnitTest.trx" 2> nul
47@del "%_L%\TestResults\api_wix.trx" 2> nul
44@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.balutil" 2> nul 48@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.balutil" 2> nul
45@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bextutil" 2> nul 49@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bextutil" 2> nul
46@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrappercore.native" 2> nul 50@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.bootstrappercore.native" 2> nul
diff --git a/src/api/api.sln b/src/api/api.sln
index 4bec2ec3..bdde8794 100644
--- a/src/api/api.sln
+++ b/src/api/api.sln
@@ -1,7 +1,7 @@
1 1
2Microsoft Visual Studio Solution File, Format Version 12.00 2Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio Version 16 3# Visual Studio Version 17
4VisualStudioVersion = 16.6.30114.105 4VisualStudioVersion = 17.3.32922.545
5MinimumVisualStudioVersion = 10.0.40219.1 5MinimumVisualStudioVersion = 10.0.40219.1
6Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "wix\WixToolset.Data\WixToolset.Data.csproj", "{6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}" 6Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "wix\WixToolset.Data\WixToolset.Data.csproj", "{6B7C6F7F-4E0F-47D4-8E1E-A3A2E7C7AC60}"
7EndProject 7EndProject
diff --git a/src/api/wix/api_wix.sln b/src/api/wix/api_wix.sln
index 6096c12a..3bf034bd 100644
--- a/src/api/wix/api_wix.sln
+++ b/src/api/wix/api_wix.sln
@@ -1,7 +1,7 @@
1 1
2Microsoft Visual Studio Solution File, Format Version 12.00 2Microsoft Visual Studio Solution File, Format Version 12.00
3# Visual Studio Version 16 3# Visual Studio Version 17
4VisualStudioVersion = 16.0.31205.134 4VisualStudioVersion = 17.3.32922.545
5MinimumVisualStudioVersion = 10.0.40219.1 5MinimumVisualStudioVersion = 10.0.40219.1
6Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "WixToolset.Data\WixToolset.Data.csproj", "{73ADBD3A-8FB2-47DB-BC79-9BC61C40F2E0}" 6Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Data", "WixToolset.Data\WixToolset.Data.csproj", "{73ADBD3A-8FB2-47DB-BC79-9BC61C40F2E0}"
7EndProject 7EndProject
diff --git a/src/api/wix/api_wix_t.proj b/src/api/wix/api_wix_t.proj
index 174b8b0e..aafb85fa 100644
--- a/src/api/wix/api_wix_t.proj
+++ b/src/api/wix/api_wix_t.proj
@@ -1,12 +1,7 @@
1<Project Sdk="Microsoft.Build.Traversal"> 1<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup> 2 <ItemGroup>
3 <!-- Build -->
4 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" />
5 <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" />
6 <ProjectReference Include="test\WixToolsetTest.Data\WixToolsetTest.Data.csproj" />
7
8 <!-- Pack -->
9 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" Targets="Pack" /> 3 <ProjectReference Include="WixToolset.Data\WixToolset.Data.csproj" Targets="Pack" />
10 <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" Targets="Pack" /> 4 <ProjectReference Include="WixToolset.Extensibility\WixToolset.Extensibility.csproj" Targets="Pack" />
5 <ProjectReference Include="test\WixToolsetTest.Data\WixToolsetTest.Data.csproj" />
11 </ItemGroup> 6 </ItemGroup>
12</Project> 7</Project>