diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-01-27 20:36:21 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-01-27 21:26:31 -0600 |
| commit | d87e14bd1400ca561542b2e6ce1a69366c7812f7 (patch) | |
| tree | f5bb838a45f9349935d69ab56eeba0e35c7c2881 /src/api | |
| parent | af019d2b6d7b67df34355c038290d45366001ea9 (diff) | |
| download | wix-d87e14bd1400ca561542b2e6ce1a69366c7812f7.tar.gz wix-d87e14bd1400ca561542b2e6ce1a69366c7812f7.tar.bz2 wix-d87e14bd1400ca561542b2e6ce1a69366c7812f7.zip | |
Fix NoWarn being overridden and use PackageReference for TestSupport.
Diffstat (limited to 'src/api')
4 files changed, 4 insertions, 6 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 @@ | |||
| 12 | <IncludeSymbols>true</IncludeSymbols> | 12 | <IncludeSymbols>true</IncludeSymbols> |
| 13 | <CreateDocumentationFile>true</CreateDocumentationFile> | 13 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 14 | <!-- https://github.com/NuGet/Home/issues/10665 --> | 14 | <!-- https://github.com/NuGet/Home/issues/10665 --> |
| 15 | <NoWarn>NU5128</NoWarn> | 15 | <NoWarn>$(NoWarn);NU5128</NoWarn> |
| 16 | </PropertyGroup> | 16 | </PropertyGroup> |
| 17 | 17 | ||
| 18 | <ItemGroup Condition=" '$(NCrunch)'=='' "> | 18 | <ItemGroup Condition=" '$(NCrunch)'=='' "> |
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 @@ | |||
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | 16 | ||
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <!-- <PackageReference Include="WixBuildTools.TestSupport" /> --> | 18 | <PackageReference Include="WixBuildTools.TestSupport" /> |
| 19 | <ProjectReference Include="..\..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> | ||
| 20 | </ItemGroup> | 19 | </ItemGroup> |
| 21 | 20 | ||
| 22 | <ItemGroup> | 21 | <ItemGroup> |
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 @@ | |||
| 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 11 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 12 | <CreateDocumentationFile>true</CreateDocumentationFile> | 12 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 13 | <!-- TODO: This shouldn't be ignored because this is public-facing --> | 13 | <!-- TODO: This shouldn't be ignored because this is public-facing --> |
| 14 | <NoWarn>CS1591</NoWarn> | 14 | <NoWarn>$(NoWarn);CS1591</NoWarn> |
| 15 | </PropertyGroup> | 15 | </PropertyGroup> |
| 16 | 16 | ||
| 17 | <ItemGroup> | 17 | <ItemGroup> |
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 @@ | |||
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | 14 | ||
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <!-- <PackageReference Include="WixBuildTools.TestSupport" /> --> | 16 | <PackageReference Include="WixBuildTools.TestSupport" /> |
| 17 | <ProjectReference Include="..\..\..\..\internal\WixBuildTools.TestSupport\WixBuildTools.TestSupport.csproj" /> | ||
| 18 | </ItemGroup> | 17 | </ItemGroup> |
| 19 | 18 | ||
| 20 | <ItemGroup> | 19 | <ItemGroup> |