From 29128172fc60e04c83f79059c9b42eff828320c2 Mon Sep 17 00:00:00 2001
From: Tanya Solyanik <tanyaso@microsoft.com>
Date: Fri, 15 Apr 2022 16:32:40 -0700
Subject: [PATCH] Disable NU1505 warning until
 https://github.com/dotnet/sdk/issues/24747 is fixed.

---
 .../VisualBasicRuntimeTest/VisualBasicRuntimeTest.csproj    | 5 ++++-
 .../tests/AccessibilityTests/AccessibilityTests.csproj      | 6 ++++--
 .../DesignSurface/DemoConsole/DemoConsole.csproj            | 6 +++---
 .../NativeHost.ManagedControl.csproj                        | 6 ++++--
 .../WinformsControlsTest/WinformsControlsTest.csproj        | 4 +++-
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/VisualBasicRuntimeTest.csproj b/src/Microsoft.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/VisualBasicRuntimeTest.csproj
index 8f3ddde355d..6f3cefcd63d 100644
--- a/src/Microsoft.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/VisualBasicRuntimeTest.csproj
+++ b/src/Microsoft.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/VisualBasicRuntimeTest.csproj
@@ -2,8 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
+    <!-- NU1505 reports duplicate package download for Microsoft.NETCore.App.Host.win-x64.
+         Disabling this warning until https://github.com/dotnet/sdk/issues/24747 is fixed.-->
+    <NoWarn>$(NoWarn);NU1505</NoWarn>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\Microsoft.VisualBasic.Facade.csproj" />
   </ItemGroup>
diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/AccessibilityTests.csproj b/src/System.Windows.Forms/tests/AccessibilityTests/AccessibilityTests.csproj
index 0afe302fff5..d74f3bcea49 100644
--- a/src/System.Windows.Forms/tests/AccessibilityTests/AccessibilityTests.csproj
+++ b/src/System.Windows.Forms/tests/AccessibilityTests/AccessibilityTests.csproj
@@ -6,11 +6,13 @@
     <AssemblyName>AccessibilityTests</AssemblyName>
     <!--<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>-->
     <ApplicationManifest>app1.manifest</ApplicationManifest>
-
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <UpdateXlfOnBuild>false</UpdateXlfOnBuild>
+    <!-- NU1505 reports duplicate package download for Microsoft.NETCore.App.Host.win-x64.
+         Disabling this warning until https://github.com/dotnet/sdk/issues/24747 is fixed.-->
+    <NoWarn>$(NoWarn);NU1505</NoWarn>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.Windows.Forms.csproj" />
   </ItemGroup>
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/DemoConsole.csproj b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/DemoConsole.csproj
index f2aba3402dd..2135e137ebc 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/DemoConsole.csproj
+++ b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/DemoConsole.csproj
@@ -8,14 +8,14 @@
     <StartupObject />
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <UpdateXlfOnBuild>false</UpdateXlfOnBuild>
-
-    <NoWarn>$(NoWarn),SA1633,CS8002</NoWarn>
+    <!-- NU1505 reports duplicate package download for Microsoft.NETCore.App.Host.win-x64.
+         Disabling this warning until https://github.com/dotnet/sdk/issues/24747 is fixed.-->
+    <NoWarn>$(NoWarn);SA1633;CS8002;NU1505</NoWarn>
     <Copyright>Copyright © Paolo Foti 2008</Copyright>
     <Company />
     <Authors>Paolo Foti</Authors>
     <PackageLicenseExpression>CPOL</PackageLicenseExpression>
     <PackageProjectUrl>https://www.codeproject.com/Articles/24385/Have-a-Great-DesignTime-Experience-with-a-Powerful</PackageProjectUrl>
-
     <SuppressLicenseValidation>true</SuppressLicenseValidation>
   </PropertyGroup>
 
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/NativeHost.ManagedControl/NativeHost.ManagedControl.csproj b/src/System.Windows.Forms/tests/IntegrationTests/NativeHost.ManagedControl/NativeHost.ManagedControl.csproj
index d139f3387ee..a134fa79d0d 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/NativeHost.ManagedControl/NativeHost.ManagedControl.csproj
+++ b/src/System.Windows.Forms/tests/IntegrationTests/NativeHost.ManagedControl/NativeHost.ManagedControl.csproj
@@ -4,11 +4,13 @@
     <AssemblyName>NativeHost.ManagedControl</AssemblyName>
     <Platforms>x86;x64</Platforms>
     <EnableComHosting>true</EnableComHosting>
-
     <EnableXlfLocalization>false</EnableXlfLocalization>
     <UpdateXlfOnBuild>false</UpdateXlfOnBuild>
+    <!-- NU1505 reports duplicate package download for Microsoft.NETCore.App.Host.win-x64.
+         Disabling this warning until https://github.com/dotnet/sdk/issues/24747 is fixed.-->
+    <NoWarn>$(NoWarn);NU1505</NoWarn>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\System.Windows.Forms.Primitives\src\System.Windows.Forms.Primitives.csproj" />
     <ProjectReference Include="..\..\..\src\System.Windows.Forms.csproj" />
diff --git a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/WinformsControlsTest.csproj b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/WinformsControlsTest.csproj
index e7beb565118..3176aa37e0c 100644
--- a/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/WinformsControlsTest.csproj
+++ b/src/System.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/WinformsControlsTest.csproj
@@ -13,7 +13,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <NoWarn>$(NoWarn),WFDEV001</NoWarn>
+    <!-- NU1505 reports duplicate package download for Microsoft.NETCore.App.Host.win-x64.
+         Disabling this warning until https://github.com/dotnet/sdk/issues/24747 is fixed.-->
+    <NoWarn>$(NoWarn),WFDEV001;NU1505</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>