diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-07-12 23:11:06 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-07-12 23:11:06 -0700 |
| commit | 0ccf2b9a0749955c258185d8c3455b4b3e904fba (patch) | |
| tree | 73a9ae80091cbd9583bf3aabbfc977910773c24f /src | |
| parent | ae8c2ebdb5c22268fc4edda112ef028a4bef412f (diff) | |
| download | wix-0ccf2b9a0749955c258185d8c3455b4b3e904fba.tar.gz wix-0ccf2b9a0749955c258185d8c3455b4b3e904fba.tar.bz2 wix-0ccf2b9a0749955c258185d8c3455b4b3e904fba.zip | |
Target NuGet NoWarn to specific PackageReference
Diffstat (limited to 'src')
4 files changed, 3 insertions, 16 deletions
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj index 07e50453..8011e16c 100644 --- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj +++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | <PropertyGroup> | 11 | <PropertyGroup> |
| 12 | <!-- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> --> | 12 | <!-- <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> --> |
| 13 | <NoWarn>NU1701</NoWarn> | ||
| 14 | </PropertyGroup> | 13 | </PropertyGroup> |
| 15 | 14 | ||
| 16 | <ItemGroup> | 15 | <ItemGroup> |
diff --git a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj index 30079866..caf58c91 100644 --- a/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj +++ b/src/WixToolset.Core.Burn/WixToolset.Core.Burn.csproj | |||
| @@ -8,17 +8,13 @@ | |||
| 8 | <Title>WiX Toolset Core Burn</Title> | 8 | <Title>WiX Toolset Core Burn</Title> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <PropertyGroup> | ||
| 12 | <NoWarn>NU1701</NoWarn> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 15 | <ItemGroup> | 11 | <ItemGroup> |
| 16 | <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> | 12 | <ProjectReference Include="..\WixToolset.Core\WixToolset.Core.csproj" /> |
| 17 | </ItemGroup> | 13 | </ItemGroup> |
| 18 | 14 | ||
| 19 | <ItemGroup> | 15 | <ItemGroup> |
| 20 | <PackageReference Include="WixToolset.Dtf.Resources" Version="4.0.*" /> | 16 | <PackageReference Include="WixToolset.Dtf.Resources" Version="4.0.*" NoWarn="NU1701" /> |
| 21 | <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" /> | 17 | <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" NoWarn="NU1701" /> |
| 22 | </ItemGroup> | 18 | </ItemGroup> |
| 23 | 19 | ||
| 24 | <ItemGroup> | 20 | <ItemGroup> |
diff --git a/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj b/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj index fcd5937b..f5897912 100644 --- a/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj +++ b/src/WixToolset.Core.WindowsInstaller/WixToolset.Core.WindowsInstaller.csproj | |||
| @@ -8,10 +8,6 @@ | |||
| 8 | <Title>WiX Toolset Core Windows Installer</Title> | 8 | <Title>WiX Toolset Core Windows Installer</Title> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <PropertyGroup> | ||
| 12 | <NoWarn>NU1701</NoWarn> | ||
| 13 | </PropertyGroup> | ||
| 14 | |||
| 15 | <ItemGroup> | 11 | <ItemGroup> |
| 16 | <EmbeddedResource Include="Data\actions.xml" /> | 12 | <EmbeddedResource Include="Data\actions.xml" /> |
| 17 | <EmbeddedResource Include="Data\tables.xml" /> | 13 | <EmbeddedResource Include="Data\tables.xml" /> |
| @@ -22,7 +18,7 @@ | |||
| 22 | </ItemGroup> | 18 | </ItemGroup> |
| 23 | 19 | ||
| 24 | <ItemGroup> | 20 | <ItemGroup> |
| 25 | <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" /> | 21 | <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" NoWarn="NU1701" /> |
| 26 | </ItemGroup> | 22 | </ItemGroup> |
| 27 | 23 | ||
| 28 | <ItemGroup> | 24 | <ItemGroup> |
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj index 69e37baa..bfc3dfea 100644 --- a/src/wix/wix.csproj +++ b/src/wix/wix.csproj | |||
| @@ -9,10 +9,6 @@ | |||
| 9 | <Title>WiX Toolset Compiler</Title> | 9 | <Title>WiX Toolset Compiler</Title> |
| 10 | </PropertyGroup> | 10 | </PropertyGroup> |
| 11 | 11 | ||
| 12 | <PropertyGroup> | ||
| 13 | <NoWarn>NU1701</NoWarn> | ||
| 14 | </PropertyGroup> | ||
| 15 | |||
| 16 | <!-- | 12 | <!-- |
| 17 | <ItemGroup> | 13 | <ItemGroup> |
| 18 | <Content Include="wix.cmd" CopyToOutputDirectory="PreserveNewest" /> | 14 | <Content Include="wix.cmd" CopyToOutputDirectory="PreserveNewest" /> |