@joebigelow / wix / commits / d87e14bd

Fix NoWarn being overridden and use PackageReference for TestSupport.

Sean Hall committed Jan 27, 2022 at 20:36 UTC d87e14bd1400ca561542b2e6ce1a69366c7812f7
27 files changed +13 -78
src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj
+1 -1
@@ -12,7 +12,7 @@
12 <IncludeSymbols>true</IncludeSymbols>
13 <CreateDocumentationFile>true</CreateDocumentationFile>
14 <!-- https://github.com/NuGet/Home/issues/10665 -->
15 - <NoWarn>NU5128</NoWarn>
15 + <NoWarn>$(NoWarn);NU5128</NoWarn>
16 </PropertyGroup>
17
18 <ItemGroup Condition=" '$(NCrunch)'=='' ">
src/api/burn/test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj
+1 -2
@@ -15,8 +15,7 @@
15 </ItemGroup>
16
17 <ItemGroup>
18 - <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
19 - <ProjectReference Include="..\..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
18 + <PackageReference Include="WixBuildTools.TestSupport" />
19 </ItemGroup>
20
21 <ItemGroup>
src/api/wix/WixToolset.Data/WixToolset.Data.csproj
+1 -1
@@ -11,7 +11,7 @@
11 <PublishRepositoryUrl>true</PublishRepositoryUrl>
12 <CreateDocumentationFile>true</CreateDocumentationFile>
13 <!-- TODO: This shouldn't be ignored because this is public-facing -->
14 - <NoWarn>CS1591</NoWarn>
14 + <NoWarn>$(NoWarn);CS1591</NoWarn>
15 </PropertyGroup>
16
17 <ItemGroup>
src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
+1 -2
@@ -13,8 +13,7 @@
13 </ItemGroup>
14
15 <ItemGroup>
16 - <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
17 - <ProjectReference Include="..\..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
16 + <PackageReference Include="WixBuildTools.TestSupport" />
17 </ItemGroup>
18
19 <ItemGroup>
src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj
-4
@@ -9,10 +9,6 @@
9 <SignOutput>false</SignOutput>
10 </PropertyGroup>
11
12 - <PropertyGroup>
13 - <NoWarn>NU1701</NoWarn>
14 - </PropertyGroup>
15 -
12 <ItemGroup>
13 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
14 </ItemGroup>
src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\UsingDriver\example.txt" CopyToOutputDirectory="PreserveNewest" />
13 <Content Include="TestData\UsingDriver\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\UsingPixelShaderVersion\example.txt" CopyToOutputDirectory="PreserveNewest" />
13 <Content Include="TestData\UsingPixelShaderVersion\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\UsingIis\example.txt" CopyToOutputDirectory="PreserveNewest" />
13 <Content Include="TestData\UsingIis\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\UsingMessageQueue\example.txt" CopyToOutputDirectory="PreserveNewest" />
13 <Content Include="TestData\UsingMessageQueue\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
-4
@@ -8,10 +8,6 @@
8 <SignOutput>false</SignOutput>
9 </PropertyGroup>
10
11 - <PropertyGroup>
12 - <NoWarn>NU1701</NoWarn>
13 - </PropertyGroup>
14 -
11 <ItemGroup>
12 <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+1 -1
@@ -7,7 +7,7 @@
7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
8 <DebugType>embedded</DebugType>
9 <PublishRepositoryUrl>true</PublishRepositoryUrl>
10 - <NoWarn>CS0618</NoWarn>
10 + <NoWarn>$(NoWarn);CS0618</NoWarn>
11 <SignOutput>false</SignOutput>
12 </PropertyGroup>
13
src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+1 -1
@@ -9,7 +9,7 @@
9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 - <NoWarn>CS1591</NoWarn>
12 + <NoWarn>$(NoWarn);CS1591</NoWarn>
13 <SignOutput>false</SignOutput>
14 </PropertyGroup>
15
src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+1 -1
@@ -9,7 +9,7 @@
9 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
10 <DebugType>embedded</DebugType>
11 <PublishRepositoryUrl>true</PublishRepositoryUrl>
12 - <NoWarn>CS0618</NoWarn>
12 + <NoWarn>$(NoWarn);CS0618</NoWarn>
13 <SignOutput>false</SignOutput>
14 </PropertyGroup>
15
src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+1 -1
@@ -9,7 +9,7 @@
9 <Description>WiX Toolset Native Processing</Description>
10 <CreateDocumentationFile>true</CreateDocumentationFile>
11 <!-- https://github.com/NuGet/Home/issues/10665 -->
12 - <NoWarn>NU5128</NoWarn>
12 + <NoWarn>$(NoWarn);NU5128</NoWarn>
13 </PropertyGroup>
14
15 <ItemGroup>
src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+1 -1
@@ -24,7 +24,7 @@
24
25 <ItemGroup>
26 <PackageReference Include="Microsoft.Build.Tasks.Core" />
27 - <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
27 + <PackageReference Include="WixBuildTools.TestSupport" />
28 </ItemGroup>
29
30 <ItemGroup>
src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj
+1 -1
@@ -18,7 +18,7 @@
18
19 <ItemGroup>
20 <PackageReference Include="WixToolset.Data" />
21 - <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
21 + <PackageReference Include="WixBuildTools.TestSupport" />
22 </ItemGroup>
23
24 <ItemGroup>
src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
+1 -2
@@ -24,8 +24,7 @@
24 </ItemGroup>
25
26 <ItemGroup>
27 - <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
28 - <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
27 + <PackageReference Include="WixBuildTools.TestSupport" />
28 </ItemGroup>
29
30 <ItemGroup>
src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj
+1 -6
@@ -9,17 +9,12 @@
9 <SignOutput>false</SignOutput>
10 </PropertyGroup>
11
12 - <PropertyGroup>
13 - <NoWarn>NU1701</NoWarn>
14 - </PropertyGroup>
15 -
12 <ItemGroup>
13 <ProjectReference Include="..\..\WixToolset.Core.Burn\WixToolset.Core.Burn.csproj" />
14 </ItemGroup>
15
16 <ItemGroup>
21 - <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
22 - <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
17 + <PackageReference Include="WixBuildTools.TestSupport" />
18 </ItemGroup>
19
20 <ItemGroup>
src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
+1 -2
@@ -18,8 +18,7 @@
18 </ItemGroup>
19
20 <ItemGroup>
21 - <!-- <PackageReference Include="WixBuildTools.TestSupport" /> -->
22 - <ProjectReference Include="..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" />
21 + <PackageReference Include="WixBuildTools.TestSupport" />
22 </ItemGroup>
23
24 <ItemGroup>
src/wix/wix/wix.csproj
-4
@@ -16,10 +16,6 @@
16 <NuspecBasePath>$(OutputPath)publish\wix\</NuspecBasePath>
17 </PropertyGroup>
18
19 - <PropertyGroup>
20 - <NoWarn>NU1701</NoWarn>
21 - </PropertyGroup>
22 -
19 <ItemGroup>
20 <ProjectReference Include="..\WixToolset.Converters\WixToolset.Converters.csproj" />
21 <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" />