diff --git a/.gitignore b/.gitignore
index 5aa7a2e6758..3696dc742a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -197,3 +197,6 @@ launchSettings.json
# include the test packages
!test/EndToEnd/Packages/**/*
!test/EndToEnd/ProjectTemplates/**/*.pfx
+
+.idea
+.ionide
diff --git a/build/packages.targets b/build/packages.targets
index a5fa8b5f612..c63dfaf1dbf 100644
--- a/build/packages.targets
+++ b/build/packages.targets
@@ -66,15 +66,10 @@
-
-
-
-
-
@@ -102,10 +97,6 @@
-
-
-
-
diff --git a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
index 15dd5fd29f3..87825fa0cd6 100644
--- a/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
+++ b/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
@@ -23,7 +23,6 @@
-
@@ -95,7 +93,7 @@
NuGetResources.Designer.cs
-
+
diff --git a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
index d452115ccca..1afe8e4f5c8 100644
--- a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
+++ b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj
@@ -26,11 +26,6 @@
-
-
-
-
-
True
@@ -38,7 +33,7 @@
Strings.resx
-
+
ResXFileCodeGenerator
diff --git a/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj b/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
index c3d3c399b4e..0d3f1847b44 100644
--- a/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
+++ b/src/NuGet.Core/NuGet.Protocol/NuGet.Protocol.csproj
@@ -34,7 +34,7 @@
Strings.resx
-
+
ResXFileCodeGenerator
@@ -50,10 +50,6 @@
-
-
-
-
-
\ No newline at end of file
+
diff --git a/test/NuGet.Core.FuncTests/NuGet.Core.FuncTest/NuGet.Core.FuncTest.csproj b/test/NuGet.Core.FuncTests/NuGet.Core.FuncTest/NuGet.Core.FuncTest.csproj
index 11066ddf6d2..f3c5721cdb7 100644
--- a/test/NuGet.Core.FuncTests/NuGet.Core.FuncTest/NuGet.Core.FuncTest.csproj
+++ b/test/NuGet.Core.FuncTests/NuGet.Core.FuncTest/NuGet.Core.FuncTest.csproj
@@ -1,4 +1,4 @@
-
+
true
@@ -23,10 +23,6 @@
-
-
-
-
diff --git a/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/NuGet.Build.Tasks.Pack.Test.csproj b/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/NuGet.Build.Tasks.Pack.Test.csproj
index a28aff0edc3..9f08a0d33f7 100644
--- a/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/NuGet.Build.Tasks.Pack.Test.csproj
+++ b/test/NuGet.Core.Tests/NuGet.Build.Tasks.Pack.Test/NuGet.Build.Tasks.Pack.Test.csproj
@@ -5,7 +5,7 @@
-
+
$(TargetFrameworksExe)
$(NETCoreTargetFrameworks)
@@ -25,7 +25,6 @@
-
diff --git a/test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/NuGet.Build.Tasks.Test.csproj b/test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/NuGet.Build.Tasks.Test.csproj
index 84f837c34e6..218c7fbe9e5 100644
--- a/test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/NuGet.Build.Tasks.Test.csproj
+++ b/test/NuGet.Core.Tests/NuGet.Build.Tasks.Test/NuGet.Build.Tasks.Test.csproj
@@ -27,7 +27,6 @@
-
@@ -55,7 +54,7 @@
TestStrings.Designer.cs
-
+
diff --git a/test/NuGet.Core.Tests/NuGet.Commands.Test/NuGet.Commands.Test.csproj b/test/NuGet.Core.Tests/NuGet.Commands.Test/NuGet.Commands.Test.csproj
index 3824242ea32..56891a9f8aa 100644
--- a/test/NuGet.Core.Tests/NuGet.Commands.Test/NuGet.Commands.Test.csproj
+++ b/test/NuGet.Core.Tests/NuGet.Commands.Test/NuGet.Commands.Test.csproj
@@ -1,4 +1,4 @@
-
+
true
@@ -19,10 +19,6 @@
-
-
-
-
@@ -36,7 +32,7 @@
-
+
diff --git a/test/NuGet.Core.Tests/NuGet.Common.Test/NuGet.Common.Test.csproj b/test/NuGet.Core.Tests/NuGet.Common.Test/NuGet.Common.Test.csproj
index d68ea671a90..408ba9f4538 100644
--- a/test/NuGet.Core.Tests/NuGet.Common.Test/NuGet.Common.Test.csproj
+++ b/test/NuGet.Core.Tests/NuGet.Common.Test/NuGet.Common.Test.csproj
@@ -18,12 +18,6 @@
-
-
-
-
-
-
diff --git a/test/NuGet.Core.Tests/NuGet.Configuration.Test/NuGet.Configuration.Test.csproj b/test/NuGet.Core.Tests/NuGet.Configuration.Test/NuGet.Configuration.Test.csproj
index 5c31b9e81fa..da01be811dd 100644
--- a/test/NuGet.Core.Tests/NuGet.Configuration.Test/NuGet.Configuration.Test.csproj
+++ b/test/NuGet.Core.Tests/NuGet.Configuration.Test/NuGet.Configuration.Test.csproj
@@ -19,9 +19,7 @@
-
-
diff --git a/test/NuGet.Core.Tests/NuGet.Frameworks.Test/NuGet.Frameworks.Test.csproj b/test/NuGet.Core.Tests/NuGet.Frameworks.Test/NuGet.Frameworks.Test.csproj
index c413deb77c6..5c23a9d63a0 100644
--- a/test/NuGet.Core.Tests/NuGet.Frameworks.Test/NuGet.Frameworks.Test.csproj
+++ b/test/NuGet.Core.Tests/NuGet.Frameworks.Test/NuGet.Frameworks.Test.csproj
@@ -18,10 +18,6 @@
-
-
-
-
diff --git a/test/NuGet.Core.Tests/NuGet.Packaging.Test/NuGet.Packaging.Test.csproj b/test/NuGet.Core.Tests/NuGet.Packaging.Test/NuGet.Packaging.Test.csproj
index 20c8d1bcd69..6094f6870a1 100644
--- a/test/NuGet.Core.Tests/NuGet.Packaging.Test/NuGet.Packaging.Test.csproj
+++ b/test/NuGet.Core.Tests/NuGet.Packaging.Test/NuGet.Packaging.Test.csproj
@@ -19,10 +19,6 @@
-
-
-
-
diff --git a/test/NuGet.Core.Tests/NuGet.Protocol.Tests/NuGet.Protocol.Tests.csproj b/test/NuGet.Core.Tests/NuGet.Protocol.Tests/NuGet.Protocol.Tests.csproj
index 55779753104..9b02e0cb552 100644
--- a/test/NuGet.Core.Tests/NuGet.Protocol.Tests/NuGet.Protocol.Tests.csproj
+++ b/test/NuGet.Core.Tests/NuGet.Protocol.Tests/NuGet.Protocol.Tests.csproj
@@ -29,19 +29,15 @@
-
-
-
-
-
+
-
\ No newline at end of file
+
diff --git a/test/TestExtensions/GenerateLicenseList/GenerateLicenseList.csproj b/test/TestExtensions/GenerateLicenseList/GenerateLicenseList.csproj
index 7867400015e..a51f11c5ea8 100644
--- a/test/TestExtensions/GenerateLicenseList/GenerateLicenseList.csproj
+++ b/test/TestExtensions/GenerateLicenseList/GenerateLicenseList.csproj
@@ -1,7 +1,7 @@
-
+
true
Exe
@@ -12,7 +12,6 @@
-
@@ -24,4 +23,4 @@
-
\ No newline at end of file
+
diff --git a/test/TestExtensions/TestablePlugin/TestablePlugin.csproj b/test/TestExtensions/TestablePlugin/TestablePlugin.csproj
index 1569a572872..b58ecc434c6 100644
--- a/test/TestExtensions/TestablePlugin/TestablePlugin.csproj
+++ b/test/TestExtensions/TestablePlugin/TestablePlugin.csproj
@@ -1,4 +1,4 @@
-
+
true
@@ -21,6 +21,13 @@
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/test/TestUtilities/Test.Utility/Test.Utility.csproj b/test/TestUtilities/Test.Utility/Test.Utility.csproj
index 96ed273aa5a..74ab6763949 100644
--- a/test/TestUtilities/Test.Utility/Test.Utility.csproj
+++ b/test/TestUtilities/Test.Utility/Test.Utility.csproj
@@ -69,8 +69,6 @@
-
-