Fixes dotnet#7025

This change re-enables nuget warnings that were reported mistakenly previously because fix for false positives reached VS2022.
Tanya-Solyanik · Jul 14, 2022 · 96cad8a · 96cad8a
1 parent 4763e8a
commit 96cad8a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 60 deletions.
diff --git a/...t.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/VisualBasicRuntimeTest.csproj b/...t.VisualBasic/tests/IntegrationTests/VisualBasicRuntimeTest/VisualBasicRuntimeTest.csproj
@@ -2,11 +2,8 @@
 
   <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/src/System.Windows.Forms.csproj b/src/System.Windows.Forms/src/System.Windows.Forms.csproj
@@ -23,9 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\System.Windows.Forms.PrivateSourceGenerators\src\System.Windows.Forms.PrivateSourceGenerators.csproj" 
-                      ReferenceOutputAssembly="false"
-                      OutputItemType="Analyzer" />
+    <ProjectReference Include="..\..\System.Windows.Forms.PrivateSourceGenerators\src\System.Windows.Forms.PrivateSourceGenerators.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>
@@ -651,48 +649,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Update="System\Windows\Forms\ComboBox.ChildAccessibleObject.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ObjectCollection.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.FlatComboAdapter.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.AutoCompleteDropDownFinder.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ACNativeWindow.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildTextUiaProvider.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildListUiaProvider.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildEditUiaProvider.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxAccessibleObject.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxItemAccessibleObjectCollection.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxItemAccessibleObject.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Update="System\Windows\Forms\ComboBox.ChildAccessibleObject.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.ObjectCollection.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.FlatComboAdapter.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.AutoCompleteDropDownFinder.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.ACNativeWindow.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildDropDownButtonUiaProvider.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildTextUiaProvider.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildListUiaProvider.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildEditUiaProvider.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxAccessibleObject.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxItemAccessibleObjectCollection.cs" />
+    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxItemAccessibleObject.cs" />
     <Compile Update="System\Windows\Forms\ComboBox.ItemComparer.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildNativeWindow.cs">
-      <SubType>Component</SubType>
-    </Compile>
+    <Compile Update="System\Windows\Forms\ComboBox.ComboBoxChildNativeWindow.cs" />
   </ItemGroup>
 
   <ItemGroup Condition="Exists('comctl32.dll')">

diff --git a/src/System.Windows.Forms/tests/AccessibilityTests/Accessibility_Core_App.csproj b/src/System.Windows.Forms/tests/AccessibilityTests/Accessibility_Core_App.csproj
@@ -8,10 +8,6 @@
     <ApplicationManifest>app.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>

diff --git a/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/DemoConsole.csproj b/src/System.Windows.Forms/tests/IntegrationTests/DesignSurface/DemoConsole/DemoConsole.csproj
@@ -8,9 +8,7 @@
     <StartupObject />
     <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);SA1633;CS8002;NU1505</NoWarn>
+    <NoWarn>$(NoWarn);SA1633;CS8002</NoWarn>
     <Copyright>Copyright © Paolo Foti 2008</Copyright>
     <Company />
     <Authors>Paolo Foti</Authors>

diff --git a/...s.Forms/tests/IntegrationTests/NativeHost.ManagedControl/NativeHost.ManagedControl.csproj b/...s.Forms/tests/IntegrationTests/NativeHost.ManagedControl/NativeHost.ManagedControl.csproj
@@ -6,11 +6,8 @@
     <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/...tem.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/WinformsControlsTest.csproj b/...tem.Windows.Forms/tests/IntegrationTests/WinformsControlsTest/WinformsControlsTest.csproj
@@ -13,9 +13,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- 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>
+    <NoWarn>$(NoWarn);WFDEV001</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>