aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-12-31 16:20:11 -0600
committerSean Hall <r.sean.hall@gmail.com>2022-01-01 10:24:08 -0600
commit5be795c6bcbc03bc37f7cf7c758298ccfaa884ca (patch)
treef13c40af4a20cfbffaa474e656e145cdda16919e /src/api
parent37790ecdc4509d6dd3533933bb9131823f98a0ed (diff)
downloadwix-5be795c6bcbc03bc37f7cf7c758298ccfaa884ca.tar.gz
wix-5be795c6bcbc03bc37f7cf7c758298ccfaa884ca.tar.bz2
wix-5be795c6bcbc03bc37f7cf7c758298ccfaa884ca.zip
Remove warnings and make sure more don't creep in.
Tests are not run inside of traversal projects so that skipped test warnings don't fail the build.
Diffstat (limited to 'src/api')
-rw-r--r--src/api/api.cmd4
-rw-r--r--src/api/api_t.proj8
-rw-r--r--src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj2
-rw-r--r--src/api/burn/api_burn_t.proj (renamed from src/api/burn/burn_t.proj)18
-rw-r--r--src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj1
-rw-r--r--src/api/wix/api_wix_t.proj (renamed from src/api/wix/wix_t.proj)0
6 files changed, 20 insertions, 13 deletions
diff --git a/src/api/api.cmd b/src/api/api.cmd
index 7a4bbb43..6a424c34 100644
--- a/src/api/api.cmd
+++ b/src/api/api.cmd
@@ -12,10 +12,12 @@
12:: build 12:: build
13:: pack 13:: pack
14 14
15msbuild api_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\api_build.binlog || exit /b 15msbuild api_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\api_build.binlog || exit /b
16 16
17:: test 17:: test
18dotnet test burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj -c %_C% --nologo --no-build || exit /b 18dotnet test burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj -c %_C% --nologo --no-build || exit /b
19msbuild burn\test\BalUtilUnitTest -t:Test -p:Configuration=%_C% -nologo || exit /b
20msbuild burn\test\BextUtilUnitTest -t:Test -p:Configuration=%_C% -nologo || exit /b
19dotnet test wix\api_wix.sln -c %_C% --nologo --no-build || exit /b 21dotnet test wix\api_wix.sln -c %_C% --nologo --no-build || exit /b
20 22
21@popd 23@popd
diff --git a/src/api/api_t.proj b/src/api/api_t.proj
index d89feccf..d2bb8af3 100644
--- a/src/api/api_t.proj
+++ b/src/api/api_t.proj
@@ -1,9 +1,9 @@
1<Project Sdk="Microsoft.Build.Traversal"> 1<Project Sdk="Microsoft.Build.Traversal">
2 <ItemGroup> 2 <ItemGroup>
3 <ProjectReference Include="burn\burn_t.proj" Targets="Restore" BuildInParallel="false" /> 3 <ProjectReference Include="burn\api_burn_t.proj" Targets="Restore" BuildInParallel="false" />
4 <ProjectReference Include="wix\wix_t.proj" Targets="Restore" BuildInParallel="false" /> 4 <ProjectReference Include="wix\api_wix_t.proj" Targets="Restore" BuildInParallel="false" />
5 5
6 <ProjectReference Include="burn\burn_t.proj" /> 6 <ProjectReference Include="burn\api_burn_t.proj" />
7 <ProjectReference Include="wix\wix_t.proj" /> 7 <ProjectReference Include="wix\api_wix_t.proj" />
8 </ItemGroup> 8 </ItemGroup>
9</Project> 9</Project>
diff --git a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
index 74cbe551..990d23ab 100644
--- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
@@ -11,6 +11,8 @@
11 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile> 11 <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
12 <IncludeSymbols>true</IncludeSymbols> 12 <IncludeSymbols>true</IncludeSymbols>
13 <CreateDocumentationFile>true</CreateDocumentationFile> 13 <CreateDocumentationFile>true</CreateDocumentationFile>
14 <!-- https://github.com/NuGet/Home/issues/10665 -->
15 <NoWarn>NU5128</NoWarn>
14 </PropertyGroup> 16 </PropertyGroup>
15 17
16 <ItemGroup Condition=" '$(NCrunch)'=='' "> 18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
diff --git a/src/api/burn/burn_t.proj b/src/api/burn/api_burn_t.proj
index 46ccf8b2..f6918682 100644
--- a/src/api/burn/burn_t.proj
+++ b/src/api/burn/api_burn_t.proj
@@ -7,23 +7,25 @@
7 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" /> 7 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
8 <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" /> 8 <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
9 9
10 <!-- C++/CLI projects will try to build their dependent projects in parallel with others, so they must be built first. -->
11 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />
12 <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />
13
14 <!-- Make sure that if these rebuild balutil due to the inability for incremental build, then all shipped code uses the same binaries. -->
15 <ProjectReference Include="test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />
16 <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" BuildInParallel="false" />
17
10 <!-- Build --> 18 <!-- Build -->
11 19
12 <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" /> 20 <!-- bextutil x86 is built by BextUtilUnitTest -->
13 <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" /> 21 <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" />
14 <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" /> 22 <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" />
15 23
16 <!-- Let mbanative build balutil for latest toolset. -->
17 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" /> 24 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" />
18 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" /> 25 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" />
19 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" /> 26 <ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" />
20 27
21 <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" /> 28 <!-- balutil is built by multiple projects above. -->
22 <ProjectReference Include="test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj" Properties="Platform=AnyCPU" />
23
24 <!-- Test -->
25 <ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Test" />
26 <ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Test" />
27 29
28 <!-- Pack --> 30 <!-- Pack -->
29 <ProjectReference Include="balutil\balutil.vcxproj" Targets="PackNative" /> 31 <ProjectReference Include="balutil\balutil.vcxproj" Targets="PackNative" />
diff --git a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
index 8d68546f..af3a09b0 100644
--- a/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+++ b/src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
@@ -7,6 +7,7 @@
7 <IsPackable>false</IsPackable> 7 <IsPackable>false</IsPackable>
8 <RuntimeIdentifier>win-x86</RuntimeIdentifier> 8 <RuntimeIdentifier>win-x86</RuntimeIdentifier>
9 <SignOutput>false</SignOutput> 9 <SignOutput>false</SignOutput>
10 <RollForward>Major</RollForward>
10 </PropertyGroup> 11 </PropertyGroup>
11 12
12 <ItemGroup> 13 <ItemGroup>
diff --git a/src/api/wix/wix_t.proj b/src/api/wix/api_wix_t.proj
index 174b8b0e..174b8b0e 100644
--- a/src/api/wix/wix_t.proj
+++ b/src/api/wix/api_wix_t.proj