From d87e14bd1400ca561542b2e6ce1a69366c7812f7 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 27 Jan 2022 20:36:21 -0600 Subject: Fix NoWarn being overridden and use PackageReference for TestSupport. --- src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj | 2 +- .../test/WixToolsetTest.Mba.Core/WixToolsetTest.Mba.Core.csproj | 3 +-- src/api/wix/WixToolset.Data/WixToolset.Data.csproj | 2 +- src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj | 3 +-- .../test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj | 4 ---- .../WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj | 4 ---- .../test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj | 4 ---- .../test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj | 4 ---- .../test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj | 4 ---- src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj | 4 ---- src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj | 4 ---- src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj | 4 ---- .../WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj | 4 ---- src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj | 4 ---- src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj | 4 ---- src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj | 4 ---- .../WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj | 4 ---- src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj | 2 +- .../WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj | 2 +- src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj | 2 +- src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 2 +- .../WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | 2 +- .../WixToolsetTest.Converters.Symbolizer.csproj | 2 +- .../WixToolsetTest.Converters/WixToolsetTest.Converters.csproj | 3 +-- .../test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj | 7 +------ src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj | 3 +-- src/wix/wix/wix.csproj | 4 ---- 27 files changed, 13 insertions(+), 78 deletions(-) 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 990d23ab..9d7d9323 100644 --- a/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj +++ b/src/api/burn/WixToolset.Mba.Core/WixToolset.Mba.Core.csproj @@ -12,7 +12,7 @@ true true - NU5128 + $(NoWarn);NU5128 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 39d4def3..3ac13b46 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 @@ -15,8 +15,7 @@ - - + diff --git a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj index d139bc73..980440ea 100644 --- a/src/api/wix/WixToolset.Data/WixToolset.Data.csproj +++ b/src/api/wix/WixToolset.Data/WixToolset.Data.csproj @@ -11,7 +11,7 @@ true true - CS1591 + $(NoWarn);CS1591 diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj index 36220fb7..4400d799 100644 --- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj +++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj @@ -13,8 +13,7 @@ - - + diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj index b4f241c8..b440f273 100644 --- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj +++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj index 2e52a062..f1067f3f 100644 --- a/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj +++ b/src/ext/Dependency/test/WixToolsetTest.Dependency/WixToolsetTest.Dependency.csproj @@ -9,10 +9,6 @@ false - - NU1701 - - diff --git a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj index 8428a280..28496a2e 100644 --- a/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj +++ b/src/ext/DifxApp/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj index 59d58089..f0eab3bd 100644 --- a/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj +++ b/src/ext/DirectX/test/WixToolsetTest.DirectX/WixToolsetTest.DirectX.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj index c291c7f9..684fa4a5 100644 --- a/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj +++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj index 55a6b654..052b96b4 100644 --- a/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj +++ b/src/ext/Http/test/WixToolsetTest.Http/WixToolsetTest.Http.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj index dc895894..07d1a9ba 100644 --- a/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj +++ b/src/ext/Iis/test/WixToolsetTest.Iis/WixToolsetTest.Iis.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj index 726186b6..9b3d00ca 100644 --- a/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj +++ b/src/ext/Msmq/test/WixToolsetTest.Msmq/WixToolsetTest.Msmq.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj index 4a33631a..bd834200 100644 --- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj +++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj index 6044a81d..df560060 100644 --- a/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj +++ b/src/ext/Sql/test/WixToolsetTest.Sql/WixToolsetTest.Sql.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj index 61407107..211c02a6 100644 --- a/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj +++ b/src/ext/UI/test/WixToolsetTest.UI/WixToolsetTest.UI.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index bb1fc1f7..fdb21557 100644 --- a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj index fcd78ef5..f480d365 100644 --- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj +++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj @@ -8,10 +8,6 @@ false - - NU1701 - - diff --git a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj index 0be55c43..861f1679 100644 --- a/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj +++ b/src/internal/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj @@ -7,7 +7,7 @@ true embedded true - CS0618 + $(NoWarn);CS0618 false diff --git a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj index 3006e784..d614476f 100644 --- a/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj +++ b/src/internal/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj @@ -9,7 +9,7 @@ embedded true true - CS1591 + $(NoWarn);CS1591 false diff --git a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj index dd5a8272..031245ba 100644 --- a/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj +++ b/src/internal/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj @@ -9,7 +9,7 @@ true embedded true - CS0618 + $(NoWarn);CS0618 false diff --git a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj index 136e1615..619b85b6 100644 --- a/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj +++ b/src/wix/WixToolset.Core.Native/WixToolset.Core.Native.csproj @@ -9,7 +9,7 @@ WiX Toolset Native Processing true - NU5128 + $(NoWarn);NU5128 diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj index b166ba64..02a82e89 100644 --- a/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj +++ b/src/wix/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj index 5a35aeeb..8be39179 100644 --- a/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj +++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/WixToolsetTest.Converters.Symbolizer.csproj @@ -18,7 +18,7 @@ - + diff --git a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj index 222866d1..90344c2d 100644 --- a/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj +++ b/src/wix/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj @@ -24,8 +24,7 @@ - - + diff --git a/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj b/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj index 52efb99b..fd1e9ccb 100644 --- a/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj +++ b/src/wix/test/WixToolsetTest.Core.Burn/WixToolsetTest.Core.Burn.csproj @@ -9,17 +9,12 @@ false - - NU1701 - - - - + diff --git a/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj index 5119a038..2a706aa0 100644 --- a/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj +++ b/src/wix/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj @@ -18,8 +18,7 @@ - - + diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj index 41699a31..617cb0c0 100644 --- a/src/wix/wix/wix.csproj +++ b/src/wix/wix/wix.csproj @@ -16,10 +16,6 @@ $(OutputPath)publish\wix\ - - NU1701 - - -- cgit v1.2.3-55-g6feb