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.
Sean Hall committed
Dec 31, 2021 at 16:20 UTC
5be795c6bcbc03bc37f7cf7c758298ccfaa884ca
26 files changed
+76
-78
src/api/api.cmd
+3
-1
@@ -12,10 +12,12 @@
12
:: build
13
:: pack
14
15
-msbuild api_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\api_build.binlog || exit /b
15
+msbuild api_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\api_build.binlog || exit /b
16
17
:: test
18
dotnet test burn\test\WixToolsetTest.Mba.Core\WixToolsetTest.Mba.Core.csproj -c %_C% --nologo --no-build || exit /b
19
+msbuild burn\test\BalUtilUnitTest -t:Test -p:Configuration=%_C% -nologo || exit /b
20
+msbuild burn\test\BextUtilUnitTest -t:Test -p:Configuration=%_C% -nologo || exit /b
21
dotnet test wix\api_wix.sln -c %_C% --nologo --no-build || exit /b
22
23
@popd
src/api/api_t.proj
+4
-4
@@ -1,9 +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" />
3
+ <ProjectReference Include="burn\api_burn_t.proj" Targets="Restore" BuildInParallel="false" />
4
+ <ProjectReference Include="wix\api_wix_t.proj" Targets="Restore" BuildInParallel="false" />
5
6
- <ProjectReference Include="burn\burn_t.proj" />
7
- <ProjectReference Include="wix\wix_t.proj" />
6
+ <ProjectReference Include="burn\api_burn_t.proj" />
7
+ <ProjectReference Include="wix\api_wix_t.proj" />
8
</ItemGroup>
9
</Project>
src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+2
@@ -11,6 +11,8 @@
11
<NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
12
<IncludeSymbols>true</IncludeSymbols>
13
<CreateDocumentationFile>true</CreateDocumentationFile>
14
+ <!-- https://github.com/NuGet/Home/issues/10665 -->
15
+ <NoWarn>NU5128</NoWarn>
16
</PropertyGroup>
17
18
<ItemGroup Condition=" '$(NCrunch)'=='' ">
src/api/burn/api_burn_t.proj
renamed
+10
-8
@@ -7,23 +7,25 @@
7
<ProjectReference Include="test\BalUtilUnitTest\BalUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
8
<ProjectReference Include="test\BextUtilUnitTest\BextUtilUnitTest.vcxproj" Targets="Restore" BuildInParallel="false" />
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
+
18
<!-- Build -->
19
12
- <ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x86" />
20
+ <!-- bextutil x86 is built by BextUtilUnitTest -->
21
<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=x64" />
22
<ProjectReference Include="bextutil\bextutil.vcxproj" Properties="Platform=ARM64" />
23
16
- <!-- Let mbanative build balutil for latest toolset. -->
24
<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x86" />
25
<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=x64" />
26
<ProjectReference Include="mbanative\mbanative.vcxproj" Properties="Platform=ARM64" />
27
21
- <ProjectReference Include="WixToolset.Mba.Core\WixToolset.Mba.Core.csproj" Properties="Platform=AnyCPU" />
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" />
28
+ <!-- balutil is built by multiple projects above. -->
29
30
<!-- Pack -->
31
<ProjectReference Include="balutil\balutil.vcxproj" Targets="PackNative" />
src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+1
@@ -7,6 +7,7 @@
7
<IsPackable>false</IsPackable>
8
<RuntimeIdentifier>win-x86</RuntimeIdentifier>
9
<SignOutput>false</SignOutput>
10
+ <RollForward>Major</RollForward>
11
</PropertyGroup>
12
13
<ItemGroup>
src/api/wix/api_wix_t.proj
renamed
src/burn/burn.cmd
+3
-1
@@ -12,7 +12,9 @@
12
13
nuget restore || exit /b
14
15
-msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\burn_build.binlog || exit /b
15
+msbuild burn_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\burn_build.binlog || exit /b
16
+
17
+msbuild test\BurnUnitTest -t:Test -p:Configuration=%_C% -nologo || exit /b
18
19
@popd
20
@endlocal
src/burn/burn.sln
+4
-3
@@ -43,13 +43,14 @@ Global
43
{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x64.Build.0 = Release|x64
44
{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x86.ActiveCfg = Release|Win32
45
{C38373AA-882F-4F55-B03F-2AAB4BFBE3F1}.Release|x86.Build.0 = Release|Win32
46
- {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|ARM64.ActiveCfg = Debug|ARM64
46
+ {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|ARM64.ActiveCfg = Debug|x64
47
{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x64.ActiveCfg = Debug|x64
48
{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x64.Build.0 = Debug|x64
49
{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x86.ActiveCfg = Debug|Win32
50
{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Debug|x86.Build.0 = Debug|Win32
51
- {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|ARM64.ActiveCfg = Release|ARM64
52
- {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x64.ActiveCfg = Release|Win32
51
+ {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|ARM64.ActiveCfg = Release|x64
52
+ {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x64.ActiveCfg = Release|x64
53
+ {9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x64.Build.0 = Release|x64
54
{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x86.ActiveCfg = Release|Win32
55
{9D1F1BA3-9393-4833-87A3-D5F1FC08EF67}.Release|x86.Build.0 = Release|Win32
56
EndGlobalSection
src/burn/burn_t.proj
+4
-4
@@ -1,10 +1,10 @@
1
<Project Sdk="Microsoft.Build.Traversal">
2
<ItemGroup>
3
- <ProjectReference Include="test\BurnUnitTest\BurnUnitTest.vcxproj" Targets="Test" />
3
+ <ProjectReference Include="test\BurnUnitTest\BurnUnitTest.vcxproj" Properties="Platform=x86" BuildInParallel="false" />
4
5
- <ProjectReference Include="burn.sln" Properties="Platform=x86" />
6
- <ProjectReference Include="burn.sln" Properties="Platform=x64" />
7
- <ProjectReference Include="burn.sln" Properties="Platform=ARM64" />
5
+ <ProjectReference Include="stub\stub.vcxproj" Properties="Platform=x86" />
6
+ <ProjectReference Include="stub\stub.vcxproj" Properties="Platform=x64" />
7
+ <ProjectReference Include="stub\stub.vcxproj" Properties="Platform=ARM64" />
8
9
<ProjectReference Include="stub\stub.vcxproj" Targets="PackNative" />
10
</ItemGroup>
src/burn/engine/engine.vcxproj
+1
-1
@@ -147,7 +147,7 @@
147
<Message>Compiling message file...</Message>
148
<Command>mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z engine.messages "$(InputDir)engine.mc"
149
rc.exe -fo "$(OutDir)engine.res" "$(IntDir)engine.messages.rc"</Command>
150
- <Outputs>$(IntDir)engine.messages.h;$(IntDir)engine.messages.rc;$(OutDir)engine.res</Outputs>
150
+ <Outputs>$(IntDir)engine.messages.h;$(IntDir)engine.messages.rc</Outputs>
151
</CustomBuild>
152
</ItemGroup>
153
src/burn/test/BurnUnitTest/BurnUnitTest.vcxproj
-9
@@ -13,10 +13,6 @@
13
<Configuration>Debug</Configuration>
14
<Platform>x64</Platform>
15
</ProjectConfiguration>
16
- <ProjectConfiguration Include="Debug|ARM64">
17
- <Configuration>Debug</Configuration>
18
- <Platform>ARM64</Platform>
19
- </ProjectConfiguration>
16
<ProjectConfiguration Include="Release|Win32">
17
<Configuration>Release</Configuration>
18
<Platform>Win32</Platform>
@@ -25,10 +21,6 @@
21
<Configuration>Release</Configuration>
22
<Platform>x64</Platform>
23
</ProjectConfiguration>
28
- <ProjectConfiguration Include="Release|ARM64">
29
- <Configuration>Release</Configuration>
30
- <Platform>ARM64</Platform>
31
- </ProjectConfiguration>
24
</ItemGroup>
25
26
<PropertyGroup Label="Globals">
@@ -78,7 +70,6 @@
70
</ItemGroup>
71
72
<ItemGroup>
81
- <None Include="packages.config" />
73
<ResourceCompile Include="BurnUnitTest.rc" />
74
</ItemGroup>
75
src/dtf/dtf.cmd
+1
-1
@@ -8,7 +8,7 @@
8
9
@echo Building dtf %_C%
10
11
-msbuild -Restore -t:Pack dtf.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\dtf_build.binlog|| exit /b
11
+msbuild -Restore -t:Pack dtf.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\dtf_build.binlog || exit /b
12
13
@popd
14
@endlocal
src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.nuspec
deleted
-26
@@ -1,26 +0,0 @@
1
-<?xml version="1.0"?>
2
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3
- <metadata minClientVersion="4.0">
4
- <id>$id$</id>
5
- <version>$version$</version>
6
- <title>$title$</title>
7
- <description>$description$</description>
8
- <authors>$authors$</authors>
9
- <license type="expression">MS-RL</license>
10
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
11
- <copyright>$copyright$</copyright>
12
- <projectUrl>$projectUrl$</projectUrl>
13
- <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14
- <dependencies>
15
- <group targetFramework=".NETFramework4.7.2" />
16
- </dependencies>
17
- </metadata>
18
-
19
- <files>
20
- <file src="$projectFolder$\build\$id$.props" target="build" />
21
- <file src="$projectFolder$\build\$id$.targets" target="build" />
22
-
23
- <file src="..\x86\$id$.dll" target="lib\net472" />
24
- <file src="..\x86\$id$.pdb" target="lib\net472" />
25
- </files>
26
-</package>
src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+8
@@ -9,10 +9,18 @@
9
<Configuration>Debug</Configuration>
10
<Platform>Win32</Platform>
11
</ProjectConfiguration>
12
+ <ProjectConfiguration Include="Debug|x64">
13
+ <Configuration>Debug</Configuration>
14
+ <Platform>x64</Platform>
15
+ </ProjectConfiguration>
16
<ProjectConfiguration Include="Release|Win32">
17
<Configuration>Release</Configuration>
18
<Platform>Win32</Platform>
19
</ProjectConfiguration>
20
+ <ProjectConfiguration Include="Release|x64">
21
+ <Configuration>Release</Configuration>
22
+ <Platform>x64</Platform>
23
+ </ProjectConfiguration>
24
</ItemGroup>
25
26
<PropertyGroup Label="Globals">
src/internal/WixBuildTools.TestSupport.Native/build/WixBuildTools.TestSupport.Native.targets
+3
-3
@@ -10,10 +10,10 @@
10
<!-- Include these references only when not referenced by the WixBuildTools.TestSupport.Native.vcxproj -->
11
<ItemGroup Condition="'$(MSBuildProjectName)'!='$(MSBuildThisFileName)'">
12
<Reference Include="WixBuildTools.TestSupport">
13
- <HintPath>$(RootBuildFolder)internal\$(Configuration)\x86\WixBuildTools.TestSupport.dll</HintPath>
13
+ <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixBuildTools.TestSupport.dll</HintPath>
14
</Reference>
15
<Reference Include="WixBuildTools.TestSupport.Native">
16
- <HintPath>$(RootBuildFolder)internal\$(Configuration)\x86\WixBuildTools.TestSupport.Native.dll</HintPath>
16
+ <HintPath>$(RootBuildFolder)internal\$(Configuration)\$(PlatformTarget)\WixBuildTools.TestSupport.Native.dll</HintPath>
17
</Reference>
18
</ItemGroup>
19
@@ -43,7 +43,7 @@
43
</Target>
44
45
<UsingTask AssemblyFile="$(RootPackagesFolder)xunit.runner.msbuild.2.4.1\build\net452\xunit.runner.msbuild.net452.dll" TaskName="Xunit.Runner.MSBuild.xunit" Architecture="x86" />
46
- <Target Name="Test" DependsOnTargets="Build">
46
+ <Target Name="Test">
47
<xunit Assemblies="$(TargetPath)" />
48
</Target>
49
</Project>
src/internal/internal.cmd
+3
-2
@@ -14,9 +14,10 @@ nuget restore || exit /b
14
:: dotnet pack -c %_C% WixBuildTools.MsgGen\WixBuildTools.MsgGen.csproj || exit /b
15
:: dotnet pack -c %_C% WixBuildTools.XsdGen\WixBuildTools.XsdGen.csproj || exit /b
16
17
-msbuild -t:Pack WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj -p:Configuration=%_C% -nologo || exit /b
17
+msbuild -t:Pack WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\internal_build.binlog || exit /b
18
19
-msbuild -t:Build WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -p:Configuration=%_C% -nologo || exit /b
19
+msbuild -t:Build WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -p:Configuration=%_C%;Platform=x86 -nologo || exit /b
20
+msbuild -t:Build WixBuildTools.TestSupport.Native\WixBuildTools.TestSupport.Native.vcxproj -p:Configuration=%_C%;Platform=x64 -nologo || exit /b
21
22
@popd
23
@endlocal
src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
-1
@@ -33,7 +33,6 @@
33
<ProjectGuid>{1244E671-F108-4334-BA52-8A7517F26ECD}</ProjectGuid>
34
<ConfigurationType>StaticLibrary</ConfigurationType>
35
<TargetName>dutil</TargetName>
36
- <MultiTargetLibrary>true</MultiTargetLibrary>
36
<CharacterSet>MultiByte</CharacterSet>
37
<Description>WiX Toolset native library foundation</Description>
38
<PackageId>WixToolset.DUtil</PackageId>
src/libs/dutil/dutil_t.proj
+1
-3
@@ -1,11 +1,9 @@
1
<Project Sdk="Microsoft.Build.Traversal">
2
<ItemGroup>
3
- <ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x86" />
3
+ <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Properties="Platform=x86" />
4
<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=x64" />
5
<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Properties="Platform=ARM64" />
6
7
- <ProjectReference Include="test\DUtilUnitTest\DUtilUnitTest.vcxproj" Targets="Test" />
8
-
7
<ProjectReference Include="WixToolset.DUtil\dutil.vcxproj" Targets="PackNative" />
8
</ItemGroup>
9
</Project>
src/libs/dutil/test/DUtilUnitTest/DUtilUnitTest.vcxproj
+8
@@ -9,10 +9,18 @@
9
<Configuration>Debug</Configuration>
10
<Platform>Win32</Platform>
11
</ProjectConfiguration>
12
+ <ProjectConfiguration Include="Debug|x64">
13
+ <Configuration>Debug</Configuration>
14
+ <Platform>x64</Platform>
15
+ </ProjectConfiguration>
16
<ProjectConfiguration Include="Release|Win32">
17
<Configuration>Release</Configuration>
18
<Platform>Win32</Platform>
19
</ProjectConfiguration>
20
+ <ProjectConfiguration Include="Release|x64">
21
+ <Configuration>Release</Configuration>
22
+ <Platform>x64</Platform>
23
+ </ProjectConfiguration>
24
</ItemGroup>
25
26
<PropertyGroup Label="Globals">
src/libs/libs.cmd
+3
-1
@@ -8,7 +8,9 @@
8
9
@echo Building libs %_C%
10
11
-msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\libs_build.binlog || exit /b
11
+msbuild -Restore libs_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\libs_build.binlog || exit /b
12
+
13
+msbuild dutil\test\DutilUnitTest -t:Test -p:Configuration=%_C% -nologo || exit /b
14
15
@popd
16
@endlocal
src/samples/samples.cmd
+1
-1
@@ -12,7 +12,7 @@
12
13
nuget restore || exit /b
14
15
-msbuild -t:Build -p:Configuration=%_C% -bl:..\..\build\logs\samples_build.binlog || exit /b
15
+msbuild -t:Build -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\samples_build.binlog || exit /b
16
17
@popd
18
@endlocal
src/wix/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
+1
-1
@@ -15,7 +15,7 @@
15
16
<ItemGroup>
17
<Reference Include="wix" HintPath="..\deps\wix.dll" />
18
- <None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net472" />
18
+ <None Condition=" '$(Configuration)'=='Release' " Include="..\deps\wix.dll" Pack="true" PackagePath="lib\net472" />
19
<None Include="..\deps\wix.dll" Pack="true" PackagePath="lib\netstandard2.0" />
20
</ItemGroup>
21
src/wix/WixToolset.Converters/WixConverter.cs
+1
@@ -15,6 +15,7 @@ namespace WixToolset.Converters
15
using WixToolset.Data.WindowsInstaller;
16
using WixToolset.Extensibility.Services;
17
18
+#pragma warning disable 1591 // TODO: add documentation
19
/// <summary>
20
/// How to convert CustomTable elements.
21
/// </summary>
src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+1
@@ -44,6 +44,7 @@ namespace WixToolsetTest.Sdk
44
}
45
}
46
47
+ [Theory(Skip = "https://github.com/wixtoolset/issues/issues/6407")]
48
[InlineData(BuildSystem.DotNetCoreSdk)]
49
[InlineData(BuildSystem.MSBuild)]
50
[InlineData(BuildSystem.MSBuild64)]
src/wix/wix.cmd
+6
-8
@@ -13,15 +13,13 @@
13
@echo Building wix %_C%
14
15
:: Restore
16
-msbuild -t:Restore wix.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_restore.binlog || exit /b
16
+msbuild -t:Restore wix.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\wix_restore.binlog || exit /b
17
18
19
:: Build
20
-msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=x86 || exit /b
21
-msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=x64 || exit /b
22
-msbuild wixnative\wixnative.vcxproj -p:Configuration=%_C% -nologo -p:Platform=ARM64 || exit /b
20
+msbuild wixnative\wixnative_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\wixnative_build.binlog || exit /b
21
24
-msbuild wix.sln -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_build.binlog || exit /b
22
+msbuild wix.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\wix_build.binlog || exit /b
23
24
25
:: Pre-Publish Test
@@ -34,7 +32,7 @@ dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.Heat || exit /b
32
33
34
:: Publish
37
-msbuild publish_t.proj -p:Configuration=%_C% -nologo -bl:..\..\build\logs\wix_publish.binlog || exit /b
35
+msbuild publish_t.proj -p:Configuration=%_C% -nologo -warnaserror -bl:..\..\build\logs\wix_publish.binlog || exit /b
36
37
robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\buildtasks %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO% /XF Microsoft.Build.*.dll
38
robocopy %_P_OBJ%\WixToolset.Sdk\separate\net472\x86\heat %_P%\WixToolset.Sdk\tools\net472\x86 %_RCO%
@@ -48,7 +46,7 @@ robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\buildtasks %_P%\WixTools
46
robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\heat %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
47
robocopy %_P_OBJ%\WixToolset.Sdk\separate\netcoreapp3.1\wix %_P%\WixToolset.Sdk\tools\netcoreapp3.1 %_RCO%
48
51
-msbuild -t:Publish -p:Configuration=%_C% -nologo -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b
49
+msbuild -t:Publish -p:Configuration=%_C% -nologo -warnaserror -p:PublishDir=%_P%WixToolset.Sdk\ WixToolset.Sdk\WixToolset.Sdk.csproj || exit /b
50
51
:: TODO - used by MsbuildFixture.ReportsInnerExceptionForUnexpectedExceptions test
52
:: msbuild -t:Publish -Restore -p:Configuration=%_C% -p:TargetFramework=net472 -p:RuntimeIdentifier=linux-x86 -p:PublishDir=%_P%WixToolset.Sdk\broken\net472\ wix\wix.csproj || exit /b
@@ -59,7 +57,7 @@ dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.BuildTasks || exit /
57
dotnet test -c %_C% --no-build --nologo test\WixToolsetTest.Sdk || exit /b
58
59
:: Pack
62
-msbuild pack_t.proj -p:Configuration=%_C% -nologo -m -bl:..\..\build\logs\wix_pack.binlog || exit /b
60
+msbuild pack_t.proj -p:Configuration=%_C% -nologo -m -warnaserror -bl:..\..\build\logs\wix_pack.binlog || exit /b
61
62
@popd
63
@endlocal
src/wix/wixnative/wixnative_t.proj
new
+7
@@ -0,0 +1,7 @@
1
+<Project Sdk="Microsoft.Build.Traversal">
2
+ <ItemGroup>
3
+ <ProjectReference Include="wixnative.vcxproj" Properties="Platform=x86" />
4
+ <ProjectReference Include="wixnative.vcxproj" Properties="Platform=x64" />
5
+ <ProjectReference Include="wixnative.vcxproj" Properties="Platform=ARM64" />
6
+ </ItemGroup>
7
+</Project>