From 90f327f4720d589d19a04f560e3f28be1e06e3e0 Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Wed, 1 May 2019 09:55:58 -0700 Subject: [PATCH 1/7] Remove RoslynProjectType --- eng/targets/Imports.targets | 15 ++++++--------- ...CodeAnalysis.CSharp.CodeStyle.UnitTests.csproj | 1 - ...rosoft.CodeAnalysis.CodeStyle.UnitTests.csproj | 1 - ...nalysis.VisualBasic.CodeStyle.UnitTests.vbproj | 1 - ...deAnalysis.CSharp.CommandLine.UnitTests.csproj | 1 - ...soft.CodeAnalysis.CSharp.Emit.UnitTests.csproj | 1 - ...odeAnalysis.CSharp.IOperation.UnitTests.csproj | 1 - ....CodeAnalysis.CSharp.Semantic.UnitTests.csproj | 1 - ...ft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj | 1 - ...ft.CodeAnalysis.CSharp.Syntax.UnitTests.csproj | 1 - ...oft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj | 1 - .../Microsoft.CodeAnalysis.UnitTests.csproj | 1 - ...soft.Build.Tasks.CodeAnalysis.UnitTests.csproj | 1 - .../Extension/Roslyn.Compilers.Extension.csproj | 1 - .../VBCSCompiler.UnitTests.csproj | 1 - ...lysis.VisualBasic.CommandLine.UnitTests.vbproj | 1 - ...CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj | 1 - ...pilers.VisualBasic.IOperation.UnitTests.vbproj | 1 - ...Analysis.VisualBasic.Semantic.UnitTests.vbproj | 1 - ...deAnalysis.VisualBasic.Symbol.UnitTests.vbproj | 1 - ...deAnalysis.VisualBasic.Syntax.UnitTests.vbproj | 1 - ...icrosoft.CodeAnalysis.Debugging.Package.csproj | 3 +-- ...soft.CodeAnalysis.PooledObjects.Package.csproj | 3 +-- src/Deployment/RoslynDeployment.csproj | 1 - ...nalysis.CSharp.EditorFeatures.UnitTests.csproj | 1 - ...alysis.CSharp.EditorFeatures2.UnitTests.csproj | 1 - ...t.CodeAnalysis.EditorFeatures.UnitTests.csproj | 1 - ....CodeAnalysis.EditorFeatures2.UnitTests.vbproj | 1 - ...is.VisualBasic.EditorFeatures.UnitTests.vbproj | 1 - ...sis.CSharp.ExpressionCompiler.UnitTests.csproj | 1 - ...nalysis.CSharp.ResultProvider.UnitTests.csproj | 1 - ...CodeAnalysis.FunctionResolver.UnitTests.csproj | 1 - .../Package/ExpressionEvaluatorPackage.csproj | 1 - ...isualBasic.ExpressionCompiler.UnitTests.vbproj | 1 - ...is.VisualBasic.ResultProvider.UnitTests.vbproj | 1 - .../HostTest/InteractiveHost.UnitTests.csproj | 1 - ...icrosoft.CodeAnalysis.Compilers.Package.csproj | 1 - ...oft.CodeAnalysis.EditorFeatures.Package.csproj | 1 - src/NuGet/Microsoft.CodeAnalysis.Package.csproj | 1 - ...icrosoft.CodeAnalysis.Scripting.Package.csproj | 1 - .../Microsoft.NETCore.Compilers.Package.csproj | 1 - ...Microsoft.Net.Compilers.Toolset.Package.csproj | 1 - .../Microsoft.Net.Compilers.Package.csproj | 1 - .../VS.ExternalAPIs.Roslyn.Package.csproj | 1 - .../VisualStudio/VS.Tools.Roslyn.Package.csproj | 1 - ...ysis.CSharp.Scripting.Desktop.UnitTests.csproj | 1 - ...CodeAnalysis.CSharp.Scripting.UnitTests.csproj | 1 - ...odeAnalysis.Scripting.Desktop.UnitTests.csproj | 1 - ...rosoft.CodeAnalysis.Scripting.UnitTests.csproj | 1 - ...VisualBasic.Scripting.Desktop.UnitTests.vbproj | 1 - ...nalysis.VisualBasic.Scripting.UnitTests.vbproj | 1 - .../Microsoft.CodeAnalysis.Compilers.Setup.csproj | 1 - .../Roslyn.VisualStudio.Setup.ServiceHub.csproj | 1 - src/Setup/Installer/Installer.Package.csproj | 1 - ...tudio.LanguageServices.CSharp.UnitTests.csproj | 1 - .../Roslyn.VisualStudio.Next.UnitTests.csproj | 1 - ...VisualStudio.LanguageServices.UnitTests.vbproj | 1 - ...tudio.LanguageServices.IntegrationTests.csproj | 1 - ...soft.VisualStudio.IntegrationTest.Setup.csproj | 1 - ...oslyn.VisualStudio.RemoteHostClientMock.csproj | 1 - .../Roslyn.VisualStudio.Setup.Dependencies.csproj | 1 - .../Setup/Roslyn.VisualStudio.Setup.csproj | 1 - .../Roslyn.VisualStudio.DiagnosticsWindow.csproj | 1 - ...slyn.VisualStudio.InteractiveComponents.csproj | 1 - ...odeAnalysis.CSharp.Workspaces.UnitTests.csproj | 1 - ...osoft.CodeAnalysis.Workspaces.UnitTests.csproj | 1 - ...deAnalysis.Workspaces.Desktop.UnitTests.csproj | 1 - ...deAnalysis.Workspaces.MSBuild.UnitTests.csproj | 1 - ...alysis.VisualBasic.Workspaces.UnitTests.vbproj | 1 - 69 files changed, 8 insertions(+), 79 deletions(-) diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets index ffc7d5eec2942..dc5b678fd0c90 100644 --- a/eng/targets/Imports.targets +++ b/eng/targets/Imports.targets @@ -1,19 +1,16 @@  - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - + + 512 - + false true diff --git a/src/CodeStyle/Core/Tests/Microsoft.CodeAnalysis.CodeStyle.UnitTests.csproj b/src/CodeStyle/Core/Tests/Microsoft.CodeAnalysis.CodeStyle.UnitTests.csproj index 64ad9ae68e466..678bc2df805a5 100644 --- a/src/CodeStyle/Core/Tests/Microsoft.CodeAnalysis.CodeStyle.UnitTests.csproj +++ b/src/CodeStyle/Core/Tests/Microsoft.CodeAnalysis.CodeStyle.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis net46 - UnitTest diff --git a/src/CodeStyle/VisualBasic/Tests/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests.vbproj b/src/CodeStyle/VisualBasic/Tests/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests.vbproj index 11ed7f5d77b21..b4d4d091d10c9 100644 --- a/src/CodeStyle/VisualBasic/Tests/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests.vbproj +++ b/src/CodeStyle/VisualBasic/Tests/Microsoft.CodeAnalysis.VisualBasic.CodeStyle.UnitTests.vbproj @@ -4,7 +4,6 @@ Library net46 - UnitTest diff --git a/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj b/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj index 6b80e6e6e2fc3..07641c0ddcd52 100644 --- a/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/CommandLine/Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.CSharp.CommandLine.UnitTests $(RoslynPortableTargetFrameworks) - UnitTestPortable true diff --git a/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj b/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj index db18aa26c2dc4..7f7628868bc69 100644 --- a/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/Emit/Microsoft.CodeAnalysis.CSharp.Emit.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.CSharp.UnitTests $(RoslynPortableTargetFrameworks) - UnitTestPortable $(RoslynPortableRuntimeIdentifiers) true diff --git a/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj b/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj index 7c1b6794a53fe..ed2f7afe17cfa 100644 --- a/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/IOperation/Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.CSharp.IOperation.UnitTests $(RoslynPortableTargetFrameworks) - UnitTestPortable $(RoslynPortableRuntimeIdentifiers) diff --git a/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj b/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj index cbc5d5b0005e2..5e0fda3a96818 100644 --- a/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/Semantic/Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.CSharp.Semantic.UnitTests $(RoslynPortableTargetFrameworks) - UnitTestPortable $(RoslynPortableRuntimeIdentifiers) diff --git a/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj b/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj index aa81380d49431..6eede0deeb46d 100644 --- a/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/Symbol/Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.CSharp.Symbol.UnitTests true net472;netcoreapp3.0 - UnitTestPortable $(RoslynPortableRuntimeIdentifiers) true diff --git a/src/Compilers/CSharp/Test/Syntax/Microsoft.CodeAnalysis.CSharp.Syntax.UnitTests.csproj b/src/Compilers/CSharp/Test/Syntax/Microsoft.CodeAnalysis.CSharp.Syntax.UnitTests.csproj index ac8768feb5e67..464ef8ff432ba 100644 --- a/src/Compilers/CSharp/Test/Syntax/Microsoft.CodeAnalysis.CSharp.Syntax.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/Syntax/Microsoft.CodeAnalysis.CSharp.Syntax.UnitTests.csproj @@ -8,7 +8,6 @@ true true $(RoslynPortableTargetFrameworks) - UnitTestPortable $(NoWarn);1570;1587 diff --git a/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj b/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj index 01ac61d4686cf..c1ff143e4dd1c 100644 --- a/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj +++ b/src/Compilers/CSharp/Test/WinRT/Microsoft.CodeAnalysis.CSharp.WinRT.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.CSharp.UnitTests.CodeGen $(RoslynPortableTargetFrameworks) - UnitTestPortable diff --git a/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj b/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj index cb7b7cbb8070f..45e00cc3d1a2c 100644 --- a/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj +++ b/src/Compilers/Core/CodeAnalysisTest/Microsoft.CodeAnalysis.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.UnitTests true $(RoslynPortableTargetFrameworks) - UnitTestPortable $(RoslynPortableRuntimeIdentifiers) diff --git a/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj b/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj index 1dd02a8bb8fa8..e5b2afa43a5f4 100644 --- a/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj +++ b/src/Compilers/Core/MSBuildTaskTests/Microsoft.Build.Tasks.CodeAnalysis.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.BuildTasks.UnitTests true net472 - UnitTest true diff --git a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj index c6534fb2613c7..33b8a8cdaff29 100644 --- a/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj +++ b/src/Compilers/Extension/Roslyn.Compilers.Extension.csproj @@ -5,7 +5,6 @@ Library Roslyn.Compilers.Extension net472 - Vsix true diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj index fc816c59250fd..0c6993023f1d7 100644 --- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj +++ b/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj @@ -7,7 +7,6 @@ true $(RoslynPortableTargetFrameworks) $(RoslynPortableRuntimeIdentifiers) - UnitTestPortable diff --git a/src/Compilers/VisualBasic/Test/Syntax/Microsoft.CodeAnalysis.VisualBasic.Syntax.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Syntax/Microsoft.CodeAnalysis.VisualBasic.Syntax.UnitTests.vbproj index cc693073114ee..e321db704609f 100644 --- a/src/Compilers/VisualBasic/Test/Syntax/Microsoft.CodeAnalysis.VisualBasic.Syntax.UnitTests.vbproj +++ b/src/Compilers/VisualBasic/Test/Syntax/Microsoft.CodeAnalysis.VisualBasic.Syntax.UnitTests.vbproj @@ -4,7 +4,6 @@ Library $(RoslynPortableTargetFrameworks) - UnitTestPortable diff --git a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj index 801962d42e713..eb4cbfc4af6ca 100644 --- a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj +++ b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.Package.csproj @@ -3,8 +3,7 @@ netstandard1.3;net45 - SourcePackage - false + false none false diff --git a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj index b5a0965e6f944..69b508af36102 100644 --- a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj +++ b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.Package.csproj @@ -3,8 +3,7 @@ netstandard1.3;net45 - SourcePackage - false + false none false diff --git a/src/Deployment/RoslynDeployment.csproj b/src/Deployment/RoslynDeployment.csproj index 10767c84fb3a4..d739e9262c4d7 100644 --- a/src/Deployment/RoslynDeployment.csproj +++ b/src/Deployment/RoslynDeployment.csproj @@ -4,7 +4,6 @@ Library net472 - Vsix false diff --git a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj index 6480814f2ac28..c56573542a652 100644 --- a/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj +++ b/src/EditorFeatures/CSharpTest/Microsoft.CodeAnalysis.CSharp.EditorFeatures.UnitTests.csproj @@ -6,7 +6,6 @@ net472 Library Microsoft.CodeAnalysis.Editor.CSharp.UnitTests - UnitTest true diff --git a/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj b/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj index 3f896dd1e8a22..c2d9faaf80626 100644 --- a/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj +++ b/src/EditorFeatures/CSharpTest2/Microsoft.CodeAnalysis.CSharp.EditorFeatures2.UnitTests.csproj @@ -6,7 +6,6 @@ net472 Library Microsoft.CodeAnalysis.Editor.CSharp.UnitTests - UnitTest diff --git a/src/EditorFeatures/Test/Microsoft.CodeAnalysis.EditorFeatures.UnitTests.csproj b/src/EditorFeatures/Test/Microsoft.CodeAnalysis.EditorFeatures.UnitTests.csproj index f710b9e8804e4..23f7b14b04b43 100644 --- a/src/EditorFeatures/Test/Microsoft.CodeAnalysis.EditorFeatures.UnitTests.csproj +++ b/src/EditorFeatures/Test/Microsoft.CodeAnalysis.EditorFeatures.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.Editor.UnitTests net472 - UnitTest diff --git a/src/EditorFeatures/Test2/Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.vbproj b/src/EditorFeatures/Test2/Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.vbproj index 283096d16e5d8..483ec7badf010 100644 --- a/src/EditorFeatures/Test2/Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.vbproj +++ b/src/EditorFeatures/Test2/Microsoft.CodeAnalysis.EditorFeatures2.UnitTests.vbproj @@ -5,7 +5,6 @@ Library Off net472 - UnitTest diff --git a/src/EditorFeatures/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.UnitTests.vbproj b/src/EditorFeatures/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.UnitTests.vbproj index 39ce17fe36293..c1099c63d62ef 100644 --- a/src/EditorFeatures/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.UnitTests.vbproj +++ b/src/EditorFeatures/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.EditorFeatures.UnitTests.vbproj @@ -6,7 +6,6 @@ Off Default net472 - UnitTest diff --git a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.UnitTests.csproj b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.UnitTests.csproj index cef0203ff6df5..a242e103972c8 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.UnitTests.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/Microsoft.CodeAnalysis.CSharp.ExpressionCompiler.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.CSharp.UnitTests Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ExpressionCompiler.UnitTests net472 - UnitTest true diff --git a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/Microsoft.CodeAnalysis.CSharp.ResultProvider.UnitTests.csproj b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/Microsoft.CodeAnalysis.CSharp.ResultProvider.UnitTests.csproj index 63dbcdd6acc43..35b73424f0515 100644 --- a/src/ExpressionEvaluator/CSharp/Test/ResultProvider/Microsoft.CodeAnalysis.CSharp.ResultProvider.UnitTests.csproj +++ b/src/ExpressionEvaluator/CSharp/Test/ResultProvider/Microsoft.CodeAnalysis.CSharp.ResultProvider.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator Microsoft.CodeAnalysis.CSharp.ExpressionEvaluator.ResultProvider.UnitTests net472 - UnitTest true diff --git a/src/ExpressionEvaluator/Core/Test/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.UnitTests.csproj b/src/ExpressionEvaluator/Core/Test/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.UnitTests.csproj index 46028f13e2b9b..706241a23db23 100644 --- a/src/ExpressionEvaluator/Core/Test/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.UnitTests.csproj +++ b/src/ExpressionEvaluator/Core/Test/FunctionResolver/Microsoft.CodeAnalysis.FunctionResolver.UnitTests.csproj @@ -7,7 +7,6 @@ Microsoft.CodeAnalysis.ExpressionEvaluator.FunctionResolver.UnitTests true net472 - UnitTest diff --git a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj index c41f844ccfb8e..c398b35da8d0a 100644 --- a/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj +++ b/src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj @@ -3,7 +3,6 @@ Library - Vsix net472 diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.UnitTests.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.UnitTests.vbproj index f2bd99e63cad4..60cbd5ad3da2a 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.UnitTests.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ExpressionCompiler/Microsoft.CodeAnalysis.VisualBasic.ExpressionCompiler.UnitTests.vbproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ExpressionCompiler.UnitTests net472 - UnitTest diff --git a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/Microsoft.CodeAnalysis.VisualBasic.ResultProvider.UnitTests.vbproj b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/Microsoft.CodeAnalysis.VisualBasic.ResultProvider.UnitTests.vbproj index abc0a03c9f22a..288d3338445c4 100644 --- a/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/Microsoft.CodeAnalysis.VisualBasic.ResultProvider.UnitTests.vbproj +++ b/src/ExpressionEvaluator/VisualBasic/Test/ResultProvider/Microsoft.CodeAnalysis.VisualBasic.ResultProvider.UnitTests.vbproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator.ResultProvider.UnitTests net472 Default - UnitTest diff --git a/src/Interactive/HostTest/InteractiveHost.UnitTests.csproj b/src/Interactive/HostTest/InteractiveHost.UnitTests.csproj index 34efc14c8ab31..3964f9384c2a5 100644 --- a/src/Interactive/HostTest/InteractiveHost.UnitTests.csproj +++ b/src/Interactive/HostTest/InteractiveHost.UnitTests.csproj @@ -5,7 +5,6 @@ Library Roslyn.InteractiveHost.UnitTests net472 - UnitTest diff --git a/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj index c49a750b02117..a993726c81427 100644 --- a/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj +++ b/src/NuGet/Microsoft.CodeAnalysis.Compilers.Package.csproj @@ -2,7 +2,6 @@ netstandard2.0 - Custom true diff --git a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj index 4df664f73c24a..ebc038c3cd505 100644 --- a/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj +++ b/src/NuGet/Microsoft.CodeAnalysis.EditorFeatures.Package.csproj @@ -2,7 +2,6 @@ net472 - Custom true diff --git a/src/NuGet/Microsoft.CodeAnalysis.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Package.csproj index c5eb55786df88..dbd98cc58ea67 100644 --- a/src/NuGet/Microsoft.CodeAnalysis.Package.csproj +++ b/src/NuGet/Microsoft.CodeAnalysis.Package.csproj @@ -2,7 +2,6 @@ net472;netstandard2.0 - Custom true diff --git a/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj b/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj index bce805e370e5e..c865a9e07146c 100644 --- a/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj +++ b/src/NuGet/Microsoft.CodeAnalysis.Scripting.Package.csproj @@ -2,7 +2,6 @@ netstandard2.0 - Custom true diff --git a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj index 3a168cc659ac3..38733725c725c 100644 --- a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj +++ b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj @@ -2,7 +2,6 @@ netcoreapp2.1 - Custom true Microsoft.NETCore.Compilers diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj index 1ae79d8f756e0..61d7c46b6bd1f 100644 --- a/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj +++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj @@ -2,7 +2,6 @@ netcoreapp2.1;net472 - Custom true Microsoft.Net.Compilers.Toolset diff --git a/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj index e31c3da49d3a5..d7c37dc281d84 100644 --- a/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj +++ b/src/NuGet/Microsoft.Net.Compilers/Microsoft.Net.Compilers.Package.csproj @@ -2,7 +2,6 @@ net472 - Custom true Microsoft.Net.Compilers diff --git a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj index b99f577989544..bb822b54ce5e6 100644 --- a/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj +++ b/src/NuGet/VisualStudio/VS.ExternalAPIs.Roslyn.Package.csproj @@ -2,7 +2,6 @@ net472 - Custom false diff --git a/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj b/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj index 2b202900e28f3..b68bf074aca88 100644 --- a/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj +++ b/src/NuGet/VisualStudio/VS.Tools.Roslyn.Package.csproj @@ -2,7 +2,6 @@ net472 - Custom false diff --git a/src/Scripting/CSharpTest.Desktop/Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests.csproj b/src/Scripting/CSharpTest.Desktop/Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests.csproj index 12679b343b2e0..2d0f4bc4128f6 100644 --- a/src/Scripting/CSharpTest.Desktop/Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests.csproj +++ b/src/Scripting/CSharpTest.Desktop/Microsoft.CodeAnalysis.CSharp.Scripting.Desktop.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests true net472 - UnitTest diff --git a/src/Scripting/CSharpTest/Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests.csproj b/src/Scripting/CSharpTest/Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests.csproj index a653b30378eef..505ebd8505a16 100644 --- a/src/Scripting/CSharpTest/Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests.csproj +++ b/src/Scripting/CSharpTest/Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.CSharp.Scripting.UnitTests true $(RoslynPortableTargetFrameworks) - UnitTestPortable diff --git a/src/Scripting/CoreTest.Desktop/Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests.csproj b/src/Scripting/CoreTest.Desktop/Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests.csproj index 513404ee1bfc7..b33fc91d4bee5 100644 --- a/src/Scripting/CoreTest.Desktop/Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests.csproj +++ b/src/Scripting/CoreTest.Desktop/Microsoft.CodeAnalysis.Scripting.Desktop.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.Scripting.Test true net472 - UnitTest diff --git a/src/Scripting/CoreTest/Microsoft.CodeAnalysis.Scripting.UnitTests.csproj b/src/Scripting/CoreTest/Microsoft.CodeAnalysis.Scripting.UnitTests.csproj index 442a87d3d515b..5c67575163d39 100644 --- a/src/Scripting/CoreTest/Microsoft.CodeAnalysis.Scripting.UnitTests.csproj +++ b/src/Scripting/CoreTest/Microsoft.CodeAnalysis.Scripting.UnitTests.csproj @@ -6,7 +6,6 @@ Microsoft.CodeAnalysis.Scripting.Test true $(RoslynPortableTargetFrameworks) - UnitTestPortable diff --git a/src/Scripting/VisualBasicTest.Desktop/Microsoft.CodeAnalysis.VisualBasic.Scripting.Desktop.UnitTests.vbproj b/src/Scripting/VisualBasicTest.Desktop/Microsoft.CodeAnalysis.VisualBasic.Scripting.Desktop.UnitTests.vbproj index 9be545eb1d541..ed8565e9e9ed6 100644 --- a/src/Scripting/VisualBasicTest.Desktop/Microsoft.CodeAnalysis.VisualBasic.Scripting.Desktop.UnitTests.vbproj +++ b/src/Scripting/VisualBasicTest.Desktop/Microsoft.CodeAnalysis.VisualBasic.Scripting.Desktop.UnitTests.vbproj @@ -6,7 +6,6 @@ Properties true net472 - UnitTest diff --git a/src/Scripting/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests.vbproj b/src/Scripting/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests.vbproj index 7ad094db59ecb..3d824405d67d7 100644 --- a/src/Scripting/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests.vbproj +++ b/src/Scripting/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Scripting.UnitTests.vbproj @@ -4,7 +4,6 @@ Library net472 - UnitTest true diff --git a/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj b/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj index e28b311b5f871..3cc5800270cdd 100644 --- a/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj +++ b/src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.Setup.csproj @@ -2,7 +2,6 @@ net472 - Custom partial diff --git a/src/Setup/DevDivVsix/ServiceHubConfig/Roslyn.VisualStudio.Setup.ServiceHub.csproj b/src/Setup/DevDivVsix/ServiceHubConfig/Roslyn.VisualStudio.Setup.ServiceHub.csproj index a70ca70abf6f1..44af2522846a9 100644 --- a/src/Setup/DevDivVsix/ServiceHubConfig/Roslyn.VisualStudio.Setup.ServiceHub.csproj +++ b/src/Setup/DevDivVsix/ServiceHubConfig/Roslyn.VisualStudio.Setup.ServiceHub.csproj @@ -2,7 +2,6 @@ net472 - Custom Roslyn.VisualStudio.Setup.ServiceHub.vsix diff --git a/src/Setup/Installer/Installer.Package.csproj b/src/Setup/Installer/Installer.Package.csproj index c3f38dcf9a50e..73530fbe538f4 100644 --- a/src/Setup/Installer/Installer.Package.csproj +++ b/src/Setup/Installer/Installer.Package.csproj @@ -2,7 +2,6 @@ net472 - Custom diff --git a/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj b/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj index 104cd31c48787..be640d2c72386 100644 --- a/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj +++ b/src/VisualStudio/CSharp/Test/Microsoft.VisualStudio.LanguageServices.CSharp.UnitTests.csproj @@ -5,7 +5,6 @@ Library Roslyn.VisualStudio.CSharp.UnitTests net472 - UnitTest true diff --git a/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj b/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj index e00486e90d28f..25ca00f530da7 100644 --- a/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj +++ b/src/VisualStudio/Core/Test.Next/Roslyn.VisualStudio.Next.UnitTests.csproj @@ -5,7 +5,6 @@ Library Roslyn.VisualStudio.Next.UnitTests net472 - UnitTest $(DefineConstants);TESTS diff --git a/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj b/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj index abbcd6e79bfef..f8adb3d64bc72 100644 --- a/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj +++ b/src/VisualStudio/Core/Test/Microsoft.VisualStudio.LanguageServices.UnitTests.vbproj @@ -4,7 +4,6 @@ Library net472 - UnitTest diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/Microsoft.VisualStudio.LanguageServices.IntegrationTests.csproj b/src/VisualStudio/IntegrationTest/IntegrationTests/Microsoft.VisualStudio.LanguageServices.IntegrationTests.csproj index bc28cf686dae6..650f181739142 100644 --- a/src/VisualStudio/IntegrationTest/IntegrationTests/Microsoft.VisualStudio.LanguageServices.IntegrationTests.csproj +++ b/src/VisualStudio/IntegrationTest/IntegrationTests/Microsoft.VisualStudio.LanguageServices.IntegrationTests.csproj @@ -5,7 +5,6 @@ Library Roslyn.VisualStudio.IntegrationTests net472 - UnitTest diff --git a/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj b/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj index 3880c8e6c6fe4..ff886d3b4e351 100644 --- a/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj +++ b/src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj @@ -5,7 +5,6 @@ Library Microsoft.VisualStudio.IntegrationTest.Setup net472 - Vsix false diff --git a/src/VisualStudio/RemoteHostClientMock/Roslyn.VisualStudio.RemoteHostClientMock.csproj b/src/VisualStudio/RemoteHostClientMock/Roslyn.VisualStudio.RemoteHostClientMock.csproj index c02ae3c9d234d..122d548c36224 100644 --- a/src/VisualStudio/RemoteHostClientMock/Roslyn.VisualStudio.RemoteHostClientMock.csproj +++ b/src/VisualStudio/RemoteHostClientMock/Roslyn.VisualStudio.RemoteHostClientMock.csproj @@ -5,7 +5,6 @@ Library Roslyn.VisualStudio.RemoteHostClientMock net472 - Vsix false diff --git a/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj b/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj index 19ff7d33942d5..938984923e4e0 100644 --- a/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj +++ b/src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj @@ -5,7 +5,6 @@ Library Roslyn.VisualStudio.Setup.Dependencies net472 - Vsix true diff --git a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj index 834ef26e5216b..8f11f77422859 100644 --- a/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj +++ b/src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj @@ -5,7 +5,6 @@ Library Roslyn.VisualStudio.Setup net472 - Vsix true diff --git a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj index 92401c6ecf76f..2ebc9a64d8d95 100644 --- a/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj +++ b/src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj @@ -3,7 +3,6 @@ net472 - Vsix Library Roslyn.VisualStudio.DiagnosticsWindow diff --git a/src/VisualStudio/VisualStudioInteractiveComponents/Roslyn.VisualStudio.InteractiveComponents.csproj b/src/VisualStudio/VisualStudioInteractiveComponents/Roslyn.VisualStudio.InteractiveComponents.csproj index 6b3918cb08a62..29fbc6596f1dd 100644 --- a/src/VisualStudio/VisualStudioInteractiveComponents/Roslyn.VisualStudio.InteractiveComponents.csproj +++ b/src/VisualStudio/VisualStudioInteractiveComponents/Roslyn.VisualStudio.InteractiveComponents.csproj @@ -12,7 +12,6 @@ Library Roslyn.VisualStudio.InteractiveComponents - Vsix net472 diff --git a/src/Workspaces/CSharpTest/Microsoft.CodeAnalysis.CSharp.Workspaces.UnitTests.csproj b/src/Workspaces/CSharpTest/Microsoft.CodeAnalysis.CSharp.Workspaces.UnitTests.csproj index c70c8e3ea8de1..275e6680fb53a 100644 --- a/src/Workspaces/CSharpTest/Microsoft.CodeAnalysis.CSharp.Workspaces.UnitTests.csproj +++ b/src/Workspaces/CSharpTest/Microsoft.CodeAnalysis.CSharp.Workspaces.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.CSharp.UnitTests net472 - UnitTest diff --git a/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj b/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj index 76f5defd2375c..59f20923115c5 100644 --- a/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj +++ b/src/Workspaces/CoreTest/Microsoft.CodeAnalysis.Workspaces.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.UnitTests net472 - UnitTest diff --git a/src/Workspaces/DesktopTest/Microsoft.CodeAnalysis.Workspaces.Desktop.UnitTests.csproj b/src/Workspaces/DesktopTest/Microsoft.CodeAnalysis.Workspaces.Desktop.UnitTests.csproj index ed70290d924e0..e634fb19c1ce6 100644 --- a/src/Workspaces/DesktopTest/Microsoft.CodeAnalysis.Workspaces.Desktop.UnitTests.csproj +++ b/src/Workspaces/DesktopTest/Microsoft.CodeAnalysis.Workspaces.Desktop.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.UnitTests net472 - UnitTest diff --git a/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj b/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj index 456ee90f6e955..8457e3882f0b9 100644 --- a/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj +++ b/src/Workspaces/MSBuildTest/Microsoft.CodeAnalysis.Workspaces.MSBuild.UnitTests.csproj @@ -5,7 +5,6 @@ Library Microsoft.CodeAnalysis.MSBuild.UnitTests net472 - UnitTest diff --git a/src/Workspaces/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.vbproj b/src/Workspaces/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.vbproj index 887ab95b06466..5d3be172b051f 100644 --- a/src/Workspaces/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.vbproj +++ b/src/Workspaces/VisualBasicTest/Microsoft.CodeAnalysis.VisualBasic.Workspaces.UnitTests.vbproj @@ -6,7 +6,6 @@ Off Default net472 - UnitTest From 6ead9ed87e814536633b00bd33029e4edbcd2385 Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Wed, 1 May 2019 09:59:12 -0700 Subject: [PATCH 2/7] Remove ToolsVersion, namespace from Project tags --- eng/targets/Settings.props | 2 +- .../CSharp/CSharpAnalyzerDriver/CSharpAnalyzerDriver.shproj | 2 +- src/Compilers/Core/AnalyzerDriver/AnalyzerDriver.shproj | 2 +- src/Compilers/Core/CommandLine/CommandLine.shproj | 2 +- src/Compilers/RealParserTests/RealParserTests.csproj | 2 +- .../VisualBasic/BasicAnalyzerDriver/BasicAnalyzerDriver.shproj | 2 +- .../Microsoft.CodeAnalysis.Debugging.shproj | 2 +- .../PooledObjects/Microsoft.CodeAnalysis.PooledObjects.shproj | 2 +- .../DeployToolsetCompiler/DeployToolsetCompiler.csproj | 2 +- .../CSharp/Source/ResultProvider/CSharpResultProvider.shproj | 2 +- .../Core/Source/ResultProvider/ResultProvider.shproj | 2 +- src/ExpressionEvaluator/CoreSystem.Settings.targets | 2 +- .../Source/ResultProvider/BasicResultProvider.shproj | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/targets/Settings.props b/eng/targets/Settings.props index 013bedf055206..2e954153b35a3 100644 --- a/eng/targets/Settings.props +++ b/eng/targets/Settings.props @@ -1,6 +1,6 @@  - + $(CopyrightMicrosoft) Apache-2.0 diff --git a/src/Compilers/CSharp/CSharpAnalyzerDriver/CSharpAnalyzerDriver.shproj b/src/Compilers/CSharp/CSharpAnalyzerDriver/CSharpAnalyzerDriver.shproj index f6df73691339d..0a3290319e22d 100644 --- a/src/Compilers/CSharp/CSharpAnalyzerDriver/CSharpAnalyzerDriver.shproj +++ b/src/Compilers/CSharp/CSharpAnalyzerDriver/CSharpAnalyzerDriver.shproj @@ -1,6 +1,6 @@  - + 54e08bf5-f819-404f-a18d-0ab9ea81ea04 14.0 diff --git a/src/Compilers/Core/AnalyzerDriver/AnalyzerDriver.shproj b/src/Compilers/Core/AnalyzerDriver/AnalyzerDriver.shproj index c2600e70d9545..ca6286ba19d6c 100644 --- a/src/Compilers/Core/AnalyzerDriver/AnalyzerDriver.shproj +++ b/src/Compilers/Core/AnalyzerDriver/AnalyzerDriver.shproj @@ -1,6 +1,6 @@  - + d0bc9be7-24f6-40ca-8dc6-fcb93bd44b34 14.0 diff --git a/src/Compilers/Core/CommandLine/CommandLine.shproj b/src/Compilers/Core/CommandLine/CommandLine.shproj index e8e2859205c55..b5e2498fc4eb5 100644 --- a/src/Compilers/Core/CommandLine/CommandLine.shproj +++ b/src/Compilers/Core/CommandLine/CommandLine.shproj @@ -1,6 +1,6 @@  - + ad6f474e-e6d4-4217-91f3-b7af1be31ccc 14.0 diff --git a/src/Compilers/RealParserTests/RealParserTests.csproj b/src/Compilers/RealParserTests/RealParserTests.csproj index b81dca0d7cfd1..77649f80ea17b 100644 --- a/src/Compilers/RealParserTests/RealParserTests.csproj +++ b/src/Compilers/RealParserTests/RealParserTests.csproj @@ -1,6 +1,6 @@  - + Debug {315BB5EF-73A8-44DD-A6F8-C07680D1E4FF} diff --git a/src/Compilers/VisualBasic/BasicAnalyzerDriver/BasicAnalyzerDriver.shproj b/src/Compilers/VisualBasic/BasicAnalyzerDriver/BasicAnalyzerDriver.shproj index 1e3316acc63ec..a9090eb504241 100644 --- a/src/Compilers/VisualBasic/BasicAnalyzerDriver/BasicAnalyzerDriver.shproj +++ b/src/Compilers/VisualBasic/BasicAnalyzerDriver/BasicAnalyzerDriver.shproj @@ -1,6 +1,6 @@  - + e8f0baa5-7327-43d1-9a51-644e81ae55f1 14.0 diff --git a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.shproj b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.shproj index 2314ccdb0d4bb..d841ded7756c2 100644 --- a/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.shproj +++ b/src/Dependencies/CodeAnalysis.Debugging/Microsoft.CodeAnalysis.Debugging.shproj @@ -1,6 +1,6 @@  - + d73adf7d-2c1c-42ae-b2ab-edc9497e4b71 14.0 diff --git a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.shproj b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.shproj index 3c890161b5f58..8b05b6409c956 100644 --- a/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.shproj +++ b/src/Dependencies/PooledObjects/Microsoft.CodeAnalysis.PooledObjects.shproj @@ -1,6 +1,6 @@  - + c1930979-c824-496b-a630-70f5369a636f 14.0 diff --git a/src/Deployment/DeployToolsetCompiler/DeployToolsetCompiler.csproj b/src/Deployment/DeployToolsetCompiler/DeployToolsetCompiler.csproj index 47bf69a4bfd66..dfcc850d66ec8 100644 --- a/src/Deployment/DeployToolsetCompiler/DeployToolsetCompiler.csproj +++ b/src/Deployment/DeployToolsetCompiler/DeployToolsetCompiler.csproj @@ -1,6 +1,6 @@  - + {57557F32-0635-421A-BCF8-549AED50F764} diff --git a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.shproj b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.shproj index 44cb0320a2485..32cec6816915d 100644 --- a/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.shproj +++ b/src/ExpressionEvaluator/CSharp/Source/ResultProvider/CSharpResultProvider.shproj @@ -1,6 +1,6 @@  - + 3140fe61-0856-4367-9aa3-8081b9a80e36 14.0 diff --git a/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.shproj b/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.shproj index c86dd8281304c..7bc9b0244d090 100644 --- a/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.shproj +++ b/src/ExpressionEvaluator/Core/Source/ResultProvider/ResultProvider.shproj @@ -1,6 +1,6 @@  - + bb3ca047-5d00-48d4-b7d3-233c1265c065 14.0 diff --git a/src/ExpressionEvaluator/CoreSystem.Settings.targets b/src/ExpressionEvaluator/CoreSystem.Settings.targets index c2ff77b2a7b03..44b005ec7df34 100644 --- a/src/ExpressionEvaluator/CoreSystem.Settings.targets +++ b/src/ExpressionEvaluator/CoreSystem.Settings.targets @@ -1,6 +1,6 @@  - + true true diff --git a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.shproj b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.shproj index 46b72b083a716..24be9c794f867 100644 --- a/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.shproj +++ b/src/ExpressionEvaluator/VisualBasic/Source/ResultProvider/BasicResultProvider.shproj @@ -1,6 +1,6 @@  - + 3140fe61-0856-4367-9aa3-8081b9a80e35 14.0 From b7a78071ff84c62e8c176446d6191daf94dfaeb2 Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Wed, 1 May 2019 10:00:44 -0700 Subject: [PATCH 3/7] Remove updating of MSBuildAllProjects --- eng/Versions.props | 3 --- eng/targets/VisualStudio.targets | 7 +------ eng/targets/Vsdconfig.targets | 5 ----- eng/targets/XUnit.targets | 6 +----- .../CoreClrCompilerArtifacts.targets | 5 ----- .../DesktopCompilerArtifacts.targets | 4 ---- 6 files changed, 2 insertions(+), 28 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 37aeb636e5d61..9e3cdbf95039b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,9 +1,6 @@ - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - diff --git a/eng/targets/VisualStudio.targets b/eng/targets/VisualStudio.targets index 9b3ab3ea49be2..7494428138263 100644 --- a/eng/targets/VisualStudio.targets +++ b/eng/targets/VisualStudio.targets @@ -1,16 +1,11 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - $(GetVsixSourceItemsDependsOn);IncludeVsixLocalOnlyItems $(GetVsixSourceItemsDependsOn);IncludeNuGetResolvedAssets - true + true diff --git a/eng/targets/Vsdconfig.targets b/eng/targets/Vsdconfig.targets index 10bb8b993e1c6..55ff95ff6934d 100644 --- a/eng/targets/Vsdconfig.targets +++ b/eng/targets/Vsdconfig.targets @@ -1,11 +1,6 @@  - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + $(PrepareForBuildDependsOn);AddDefaultTestAppConfig diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets index c88a6765455f2..643d9fd0de0a5 100644 --- a/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets +++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/CoreClrCompilerArtifacts.targets @@ -1,11 +1,6 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - diff --git a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets index 642329038a4bd..080bbea726e9d 100644 --- a/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets +++ b/src/NuGet/Microsoft.Net.Compilers.Toolset/DesktopCompilerArtifacts.targets @@ -2,10 +2,6 @@ - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - + + + + + diff --git a/src/Tools/BuildBoss/BuildBoss.sln b/src/Tools/BuildBoss/BuildBoss.sln index 6859842bcca66..1ccda6ae6291f 100644 --- a/src/Tools/BuildBoss/BuildBoss.sln +++ b/src/Tools/BuildBoss/BuildBoss.sln @@ -1,10 +1,9 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27110.0 + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28824.287 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildBoss", "BuildBoss.csproj", "{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RepoUtil", "..\RepoUtil\RepoUtil.csproj", "{1CA184D3-89CB-4074-BEC5-F8AEBA657D41}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildBoss", "BuildBoss.csproj", "{9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -16,12 +15,11 @@ Global {9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Debug|Any CPU.Build.0 = Debug|Any CPU {9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Any CPU.ActiveCfg = Release|Any CPU {9C0660D9-48CA-40E1-BABA-8F6A1F11FE10}.Release|Any CPU.Build.0 = Release|Any CPU - {1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CA184D3-89CB-4074-BEC5-F8AEBA657D41}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7DA7C54F-CA30-48E6-8FD7-3A7A68E97872} + EndGlobalSection EndGlobal diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs index b1e3b95e47c34..1e93287335db4 100644 --- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs +++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using System.Text.RegularExpressions; namespace BuildBoss { @@ -29,6 +28,12 @@ public bool Check(TextWriter textWriter) var allGood = true; if (ProjectType == ProjectFileType.CSharp || ProjectType == ProjectFileType.Basic) { + if (!_projectUtil.IsNewSdk) + { + textWriter.WriteLine($"Project must new .NET SDK based"); + allGood = false; + } + // Properties that aren't related to build but instead artifacts of Visual Studio. allGood &= CheckForProperty(textWriter, "RestorePackages"); allGood &= CheckForProperty(textWriter, "SolutionDir"); @@ -47,14 +52,11 @@ public bool Check(TextWriter textWriter) allGood &= CheckForProperty(textWriter, "DocumentationFile"); // Items which are not necessary anymore in the new SDK - if (_projectUtil.IsNewSdk) - { - allGood &= CheckForProperty(textWriter, "ProjectGuid"); - allGood &= CheckForProperty(textWriter, "ProjectTypeGuids"); - allGood &= CheckForProperty(textWriter, "TargetFrameworkProfile"); - } + allGood &= CheckForProperty(textWriter, "ProjectGuid"); + allGood &= CheckForProperty(textWriter, "ProjectTypeGuids"); + allGood &= CheckForProperty(textWriter, "TargetFrameworkProfile"); - allGood &= CheckRoslynProjectType(textWriter); + allGood &= CheckTargetFrameworks(textWriter); allGood &= CheckProjectReferences(textWriter); allGood &= CheckPackageReferences(textWriter); @@ -88,68 +90,6 @@ private bool CheckForProperty(TextWriter textWriter, string propertyName) return true; } - /// - /// Validate the content of RoslynProjectType is one of the supported values. - /// - private bool CheckRoslynProjectType(TextWriter textWriter) - { - if (!ParseRoslynProjectData(textWriter, out var data)) - { - return false; - } - - var allGood = true; - allGood &= IsVsixCorrectlySpecified(textWriter, data); - allGood &= IsUnitTestNameCorrectlySpecified(textWriter, data); - allGood &= IsUnitTestPortableCorrectlySpecified(textWriter, data); - allGood &= CheckTargetFrameworks(textWriter, data); - - return allGood; - } - - private bool ParseRoslynProjectData(TextWriter textWriter, out RoslynProjectData data) - { - try - { - data = _projectUtil.GetRoslynProjectData(); - return true; - } - catch (Exception ex) - { - textWriter.WriteLine("Unable to parse Roslyn project properties"); - textWriter.WriteLine(ex.Message); - data = default; - return false; - } - } - - private bool IsVsixCorrectlySpecified(TextWriter textWriter, RoslynProjectData data) - { - var element = _projectUtil.FindSingleProperty("ProjectTypeGuids"); - if (element == null) - { - return true; - } - - foreach (var rawValue in element.Value.Split(';')) - { - var value = rawValue.Trim(); - if (string.IsNullOrEmpty(value)) - { - continue; - } - - var guid = Guid.Parse(value); - if (guid == ProjectEntryUtil.VsixProjectType && data.EffectiveKind != RoslynProjectKind.Vsix) - { - textWriter.WriteLine("Vsix projects must specify Vsix"); - return false; - } - } - - return true; - } - private bool CheckProjectReferences(TextWriter textWriter) { var allGood = true; @@ -159,53 +99,13 @@ private bool CheckProjectReferences(TextWriter textWriter) allGood &= CheckProjectReferencesComplete(textWriter, declaredList); allGood &= CheckUnitTestReferenceRestriction(textWriter, declaredList); allGood &= CheckTransitiveReferences(textWriter, declaredList); - allGood &= CheckProjectReferencesHaveCorrectGuid(textWriter, declaredEntryList); - allGood &= CheckNewSdkSimplified(textWriter, declaredEntryList); - - return allGood; - } - - /// - /// Ensure that all ProjectReference entries in the file have the correct GUID when - /// the Project child element is present. - /// - private bool CheckProjectReferencesHaveCorrectGuid(TextWriter textWriter, List entryList) - { - if (_projectUtil.IsNewSdk) - { - return true; - } - - var allGood = true; - foreach (var entry in entryList) - { - if (!_solutionMap.TryGetValue(entry.ProjectKey, out var data)) - { - textWriter.WriteLine($"Project not recognized {entry.FileName}"); - allGood = false; - continue; - } - - var dataGuid = data.ProjectUtil.GetProjectGuid(); - if (dataGuid != entry.Project) - { - textWriter.WriteLine($"Project Reference GUID for {entry.ProjectKey.FileName} doesn't match ProjectGuid"); - textWriter.WriteLine($"\tProject Guid {dataGuid}"); - textWriter.WriteLine($"\tReference Guid {entry.Project}"); - allGood = false; - } - } + allGood &= CheckNoGuidsOnProjectReferences(textWriter, declaredEntryList); return allGood; } - private bool CheckNewSdkSimplified(TextWriter textWriter, List entryList) + private bool CheckNoGuidsOnProjectReferences(TextWriter textWriter, List entryList) { - if (!_projectUtil.IsNewSdk) - { - return true; - } - var allGood = true; foreach (var entry in entryList) { @@ -287,12 +187,6 @@ static string GetAssemblyName(ProjectData projectData) private bool CheckDeploymentSettings(TextWriter textWriter) { - var data = _projectUtil.TryGetRoslynProjectData(); - if (data?.EffectiveKind == RoslynProjectKind.Custom) - { - return true; - } - var allGood = CheckForProperty(textWriter, "CopyNuGetImplementations"); allGood &= CheckForProperty(textWriter, "UseCommonOutputDirectory"); return allGood; @@ -335,8 +229,7 @@ private bool CheckProjectReferencesComplete(TextWriter textWriter, IEnumerable

private bool CheckUnitTestReferenceRestriction(TextWriter textWriter, IEnumerable declaredReferences) { - var data = _projectUtil.TryGetRoslynProjectData(); - if (!data.HasValue || !data.Value.IsAnyUnitTest) + if (!_data.IsTestProject) { return true; } @@ -349,8 +242,7 @@ private bool CheckUnitTestReferenceRestriction(TextWriter textWriter, IEnumerabl continue; } - var refData = projectData.ProjectUtil.TryGetRoslynProjectData(); - if (refData.HasValue && refData.Value.IsAnyUnitTest) + if (projectData.ProjectUtil.IsTestProject) { textWriter.WriteLine($"Cannot reference {key.FileName} as it is another unit test project"); allGood = false; @@ -367,8 +259,7 @@ private bool CheckUnitTestReferenceRestriction(TextWriter textWriter, IEnumerabl /// private bool CheckTransitiveReferences(TextWriter textWriter, IEnumerable declaredReferences) { - var data = _projectUtil.TryGetRoslynProjectData(); - if (!data.HasValue || !data.Value.IsDeploymentProject) + if (!_projectUtil.IsDeploymentProject) { return true; } @@ -418,73 +309,9 @@ private List GetProjectReferencesTransitive(IEnumerable return list; } - ///

- /// Our infrastructure depends on test assembly names having a very specific set of - /// suffixes: UnitTest and IntegrationTests. This check will verify that both test assemblies - /// are properly named and non-test assemblies are not incorrectly named. - /// - private bool IsUnitTestNameCorrectlySpecified(TextWriter textWriter, RoslynProjectData data) - { - if (ProjectType != ProjectFileType.CSharp && ProjectType != ProjectFileType.Basic) - { - return true; - } - - if (data.EffectiveKind == RoslynProjectKind.Depedency) - { - return true; - } - - string name = null; - var element = _projectUtil.FindSingleProperty("AssemblyName"); - if (element != null) - { - name = element.Value.Trim(); - } - else if (_projectUtil.IsNewSdk) - { - name = Path.GetFileNameWithoutExtension(_data.FileName); - } - else - { - textWriter.WriteLine($"Need to specify AssemblyName"); - return false; - } - - if (Regex.IsMatch(name, @"(UnitTests|IntegrationTests)$", RegexOptions.IgnoreCase) && !data.IsAnyUnitTest) - { - textWriter.WriteLine($"Assembly named {name} is not marked as a unit test"); - return false; - } - - if (data.IsAnyUnitTest && !Regex.IsMatch(name, @".*(UnitTests|IntegrationTests)$", RegexOptions.IgnoreCase)) - { - textWriter.WriteLine($"Assembly {name} is a unit test that doesn't end with UnitTests.dll"); - return false; - } - - return true; - } - - private bool IsUnitTestPortableCorrectlySpecified(TextWriter textWriter, RoslynProjectData data) - { - if (!data.IsAnyUnitTest) - { - return true; - } - - if (data.EffectiveKind == RoslynProjectKind.UnitTest && _projectUtil.GetTargetFrameworks() != null) - { - textWriter.WriteLine($"UnitTestPortable needs to be specified when using TargetFrameworks on a unit test project"); - return false; - } - - return true; - } - - private bool CheckTargetFrameworks(TextWriter textWriter, RoslynProjectData data) + private bool CheckTargetFrameworks(TextWriter textWriter) { - if (!data.IsAnyUnitTest) + if (!_data.IsUnitTestProject) { return true; } diff --git a/src/Tools/BuildBoss/ProjectData.cs b/src/Tools/BuildBoss/ProjectData.cs index b38875e6271bd..c77cbaf7bebfa 100644 --- a/src/Tools/BuildBoss/ProjectData.cs +++ b/src/Tools/BuildBoss/ProjectData.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.IO; using System.Xml.Linq; namespace BuildBoss @@ -19,6 +14,10 @@ internal sealed class ProjectData internal string Directory => Path.GetDirectoryName(FilePath); internal ProjectFileType ProjectFileType => ProjectEntryUtil.GetProjectFileType(FilePath); + internal bool IsTestProject => IsUnitTestProject || IsIntegrationTestProject; + internal bool IsUnitTestProject => Path.GetFileNameWithoutExtension(FilePath).EndsWith(".UnitTests"); + internal bool IsIntegrationTestProject => Path.GetFileNameWithoutExtension(FilePath).EndsWith(".IntegrationTests"); + internal ProjectData(string filePath) { FilePath = filePath; diff --git a/src/Tools/BuildBoss/ProjectEntry.cs b/src/Tools/BuildBoss/ProjectEntry.cs index 69f89b442bd6c..b95dc82b7f9b4 100644 --- a/src/Tools/BuildBoss/ProjectEntry.cs +++ b/src/Tools/BuildBoss/ProjectEntry.cs @@ -41,9 +41,7 @@ internal static class ProjectEntryUtil internal static readonly Guid VsixProjectType = new Guid("82B43B9B-A64C-4715-B499-D71E9CA2BD60"); internal static readonly Guid SharedProject = new Guid("D954291E-2A0B-460D-934E-DC6B0785DB48"); - internal static readonly Guid LegacyProjectSystemCSharp = new Guid("FAE04EC0-301F-11D3-BF4B-00C04F79EFBC"); internal static readonly Guid ManagedProjectSystemCSharp = new Guid("9A19103F-16F7-4668-BE54-9A1E7A4F7556"); - internal static readonly Guid LegacyProjectSystemVisualBasic = new Guid("F184B08F-C81C-45F6-A57F-5ABD9991F28F"); internal static readonly Guid ManagedProjectSystemVisualBasic = new Guid("778DAE3C-4631-46EA-AA77-85C1314464D9"); internal static ProjectFileType GetProjectFileType(string path) diff --git a/src/Tools/BuildBoss/ProjectUtil.cs b/src/Tools/BuildBoss/ProjectUtil.cs index 280229ecc6f5f..08f06713707df 100644 --- a/src/Tools/BuildBoss/ProjectUtil.cs +++ b/src/Tools/BuildBoss/ProjectUtil.cs @@ -16,26 +16,16 @@ internal class ProjectUtil internal XDocument Document { get; } internal XmlNamespaceManager Manager { get; } internal XNamespace Namespace { get; } + internal string OutputType { get; } public bool IsNewSdk => GetTargetFramework() != null || GetTargetFrameworks() != null; - public bool IsDesktopProject => Document.XPathSelectElements("//mb:TargetFrameworkVersion", Manager).FirstOrDefault() != null; + internal bool IsTestProject => IsUnitTestProject || IsIntegrationTestProject; + internal bool IsUnitTestProject => Path.GetFileNameWithoutExtension(Key.FilePath).EndsWith(".UnitTests"); + internal bool IsIntegrationTestProject => Path.GetFileNameWithoutExtension(Key.FilePath).EndsWith(".IntegrationTests"); - public bool IsPclProject - { - get - { - var elem = Document.XPathSelectElements("//mb:TargetFrameworkIdentifier", Manager).FirstOrDefault(); - if (elem == null) - { - return false; - } - - return StringComparer.OrdinalIgnoreCase.Equals(elem.Value, ".NETPortable"); - } - } - - internal ProjectUtil(string filePath) : this(new ProjectKey(filePath), XDocument.Load(filePath)) + internal ProjectUtil(string filePath) + : this(new ProjectKey(filePath), XDocument.Load(filePath)) { } @@ -46,78 +36,11 @@ internal ProjectUtil(ProjectKey key, XDocument document) Namespace = document.Root.Name.Namespace; Manager = new XmlNamespaceManager(new NameTable()); Manager.AddNamespace("mb", Namespace == XNamespace.None ? "" : SharedUtil.MSBuildNamespaceUriRaw); - } - - internal RoslynProjectData GetRoslynProjectData() - { - if (!TryGetRoslynProjectData(out var data, out var error)) - { - throw new Exception(error); - } - - return data; - } - - internal bool TryGetRoslynProjectData(out RoslynProjectData data, out string error) - { - data = default; - error = null; - - var typeElement = FindSingleProperty("RoslynProjectType"); - if (typeElement != null) - { - var value = typeElement.Value.Trim(); - var kind = RoslynProjectKindUtil.GetRoslynProjectKind(value); - if (kind == null) - { - error = $"The value {value} is illegal for element "; - return false; - } - data = new RoslynProjectData(kind.Value, kind.Value, value); - return true; - } - else - { - var outputType = FindSingleProperty("OutputType"); - switch (outputType?.Value.Trim()) - { - case "Exe": - case "WinExe": - data = new RoslynProjectData(RoslynProjectKind.Exe); - return true; - case "Library": - data = new RoslynProjectData(RoslynProjectKind.Dll); - return true; - default: - error = $"The value {outputType?.Value.Trim()} is not a recognized value of OutputType"; - return false; - } - } + OutputType = FindSingleProperty("OutputType")?.Value.Trim().ToLowerInvariant(); } - internal Guid? GetProjectGuid() - { - var elem = Document.XPathSelectElements("//mb:ProjectGuid", Manager).FirstOrDefault(); - if (elem == null) - { - return null; - } - - return Guid.Parse(elem.Value); - } - - internal RoslynProjectData? TryGetRoslynProjectData() - { - try - { - return GetRoslynProjectData(); - } - catch - { - return null; - } - } + internal bool IsDeploymentProject => IsTestProject || OutputType switch { "exe" => true, "winexe" => true, _ => false }; internal XElement GetTargetFramework() => Document.XPathSelectElements("//mb:TargetFramework", Manager).FirstOrDefault(); diff --git a/src/Tools/BuildBoss/RoslynProjectData.cs b/src/Tools/BuildBoss/RoslynProjectData.cs deleted file mode 100644 index b603ad3552e66..0000000000000 --- a/src/Tools/BuildBoss/RoslynProjectData.cs +++ /dev/null @@ -1,88 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BuildBoss -{ - internal enum RoslynProjectKind - { - Dll, - Exe, - ExeNonDeployment, - UnitTest, - UnitTestPortable, - Vsix, - Depedency, - SourcePackage, - Custom, - } - - internal static class RoslynProjectKindUtil - { - /// - /// Convert a declared kind into the correspending enum value. - /// - internal static RoslynProjectKind? GetRoslynProjectKind(string value) - { - switch (value) - { - case "UnitTestPortable": - return RoslynProjectKind.UnitTestPortable; - case "UnitTest": - return RoslynProjectKind.UnitTest; - case "Vsix": - return RoslynProjectKind.Vsix; - case "Dependency": - return RoslynProjectKind.Depedency; - case "Custom": - return RoslynProjectKind.Custom; - case "SourcePackage": - return RoslynProjectKind.SourcePackage; - default: - return null; - } - } - - internal static bool IsAnyUnitTest(RoslynProjectKind kind) - { - return - kind == RoslynProjectKind.UnitTest || - kind == RoslynProjectKind.UnitTestPortable; - } - - internal static bool IsDeploymentProject(RoslynProjectKind kind) - { - return - kind == RoslynProjectKind.Exe || - IsAnyUnitTest(kind); - } - } - - internal struct RoslynProjectData - { - internal RoslynProjectKind EffectiveKind { get; } - internal RoslynProjectKind? DeclaredKind { get; } - internal string DeclaredValue { get; } - - internal bool IsAnyUnitTest => RoslynProjectKindUtil.IsAnyUnitTest(EffectiveKind); - internal bool IsDeploymentProject => RoslynProjectKindUtil.IsDeploymentProject(EffectiveKind); - - internal RoslynProjectData(RoslynProjectKind effectiveKind) - { - EffectiveKind = effectiveKind; - DeclaredValue = null; - DeclaredKind = null; - } - - internal RoslynProjectData(RoslynProjectKind effectiveKind, RoslynProjectKind declaredKind, string declaredValue) - { - Debug.Assert(declaredKind == RoslynProjectKindUtil.GetRoslynProjectKind(declaredValue).Value); - EffectiveKind = effectiveKind; - DeclaredValue = declaredValue; - DeclaredKind = declaredKind; - } - } -} diff --git a/src/Tools/BuildBoss/SolutionCheckerUtil.cs b/src/Tools/BuildBoss/SolutionCheckerUtil.cs index 04dd9e4c4e65b..87eada353b28f 100644 --- a/src/Tools/BuildBoss/SolutionCheckerUtil.cs +++ b/src/Tools/BuildBoss/SolutionCheckerUtil.cs @@ -106,8 +106,8 @@ Guid getExpectedGuid(ProjectData data) var util = data.ProjectUtil; switch (ProjectEntryUtil.GetProjectFileType(data.FilePath)) { - case ProjectFileType.CSharp: return util.IsNewSdk ? ProjectEntryUtil.ManagedProjectSystemCSharp : ProjectEntryUtil.LegacyProjectSystemCSharp; - case ProjectFileType.Basic: return util.IsNewSdk ? ProjectEntryUtil.ManagedProjectSystemVisualBasic : ProjectEntryUtil.LegacyProjectSystemVisualBasic; + case ProjectFileType.CSharp: return ProjectEntryUtil.ManagedProjectSystemCSharp; + case ProjectFileType.Basic: return ProjectEntryUtil.ManagedProjectSystemVisualBasic; case ProjectFileType.Shared: return ProjectEntryUtil.SharedProject; default: throw new Exception($"Invalid file path {data.FilePath}"); } From c76943ebf05d7766130881af053498fb7dc85f2c Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Wed, 1 May 2019 10:55:34 -0700 Subject: [PATCH 5/7] Add comment --- eng/targets/VisualStudio.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/targets/VisualStudio.targets b/eng/targets/VisualStudio.targets index 7494428138263..2ea849a7a297a 100644 --- a/eng/targets/VisualStudio.targets +++ b/eng/targets/VisualStudio.targets @@ -5,6 +5,11 @@ $(GetVsixSourceItemsDependsOn);IncludeVsixLocalOnlyItems $(GetVsixSourceItemsDependsOn);IncludeNuGetResolvedAssets + true From ac4130e2bc50626ea176f63ea85eba3e60ae71d9 Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Wed, 1 May 2019 11:00:29 -0700 Subject: [PATCH 6/7] Delete DeployTooolsetCompiler --- .../DeployToolsetCompiler.csproj | 29 ------------------- .../DeployToolsetCompiler/Program.cs | 9 ------ .../DeployToolsetCompiler/project.json | 11 ------- 3 files changed, 49 deletions(-) delete mode 100644 src/Deployment/DeployToolsetCompiler/DeployToolsetCompiler.csproj delete mode 100644 src/Deployment/DeployToolsetCompiler/Program.cs delete mode 100644 src/Deployment/DeployToolsetCompiler/project.json diff --git a/src/Deployment/DeployToolsetCompiler/DeployToolsetCompiler.csproj b/src/Deployment/DeployToolsetCompiler/DeployToolsetCompiler.csproj deleted file mode 100644 index dfcc850d66ec8..0000000000000 --- a/src/Deployment/DeployToolsetCompiler/DeployToolsetCompiler.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - {57557F32-0635-421A-BCF8-549AED50F764} - Exe - DeployToolsetCompiler - DeployToolsetCompiler_DoNotUse - v4.7.2 - true - - - - - - - - - - - - - {7ad4fe65-9a30-41a6-8004-aa8f89bcb7f3} - MSBuildTask - - - - \ No newline at end of file diff --git a/src/Deployment/DeployToolsetCompiler/Program.cs b/src/Deployment/DeployToolsetCompiler/Program.cs deleted file mode 100644 index 72c3f192ccf97..0000000000000 --- a/src/Deployment/DeployToolsetCompiler/Program.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace DoNotUse -{ - public class Program - { - private static void Main(string[] args) - { - } - } -} diff --git a/src/Deployment/DeployToolsetCompiler/project.json b/src/Deployment/DeployToolsetCompiler/project.json deleted file mode 100644 index affab16383840..0000000000000 --- a/src/Deployment/DeployToolsetCompiler/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { }, - "frameworks": { - "net46": { } - }, - "runtimes": { - "win": { }, - "linux": { }, - "osx": { } - } -} From 5dea042713e70e1f6984e012be74d5aee1a6fa0a Mon Sep 17 00:00:00 2001 From: Tomas Matousek Date: Wed, 1 May 2019 11:35:21 -0700 Subject: [PATCH 7/7] Fixes --- Roslyn.sln | 2 +- eng/targets/Imports.targets | 4 ++-- eng/targets/VisualStudio.targets | 2 +- ...erformance.Tests.csproj => Roslyn.PerformanceTests.csproj} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename src/Test/Perf/tests/{Roslyn.Test.Performance.Tests.csproj => Roslyn.PerformanceTests.csproj} (100%) diff --git a/Roslyn.sln b/Roslyn.sln index ad6878efd1d2a..bc9a3e6941222 100644 --- a/Roslyn.sln +++ b/Roslyn.sln @@ -276,7 +276,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Lang EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.IntegrationTest.Utilities", "src\VisualStudio\IntegrationTest\TestUtilities\Microsoft.VisualStudio.IntegrationTest.Utilities.csproj", "{3BED15FD-D608-4573-B432-1569C1026F6D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roslyn.Test.Performance.Tests", "src\Test\Perf\tests\Roslyn.Test.Performance.Tests.csproj", "{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Roslyn.PerformanceTests", "src\Test\Perf\tests\Roslyn.PerformanceTests.csproj", "{DA0D2A70-A2F9-4654-A99A-3227EDF54FF1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.LanguageServices.Xaml", "src\VisualStudio\Xaml\Impl\Microsoft.VisualStudio.LanguageServices.Xaml.csproj", "{971E832B-7471-48B5-833E-5913188EC0E4}" EndProject diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets index 9e1aac1adeb00..8265efa49eab3 100644 --- a/eng/targets/Imports.targets +++ b/eng/targets/Imports.targets @@ -1,7 +1,7 @@  - + @@ -292,7 +292,7 @@ - + diff --git a/eng/targets/VisualStudio.targets b/eng/targets/VisualStudio.targets index 2ea849a7a297a..1cdf2a4621b68 100644 --- a/eng/targets/VisualStudio.targets +++ b/eng/targets/VisualStudio.targets @@ -10,7 +10,7 @@ These tools don't have RSP files and the full set of transitive references end up overflowing the allowed command line length for Windows. These projects must manually specify references to avoid this overflow. --> - true + true diff --git a/src/Test/Perf/tests/Roslyn.Test.Performance.Tests.csproj b/src/Test/Perf/tests/Roslyn.PerformanceTests.csproj similarity index 100% rename from src/Test/Perf/tests/Roslyn.Test.Performance.Tests.csproj rename to src/Test/Perf/tests/Roslyn.PerformanceTests.csproj