diff --git a/Directory.Build.props b/Directory.Build.props
index d251d6de9c3..e401abc7c1e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -28,6 +28,10 @@
true
+
+ net46
+ false
+
$(RootSuffix)
ProjectSystem
diff --git a/ProjectSystem.sln b/ProjectSystem.sln
index 2c83e12a569..aff6b57afe8 100644
--- a/ProjectSystem.sln
+++ b/ProjectSystem.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26706.0
+VisualStudioVersion = 15.0.26811.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A50EC328-5D30-4624-98AD-B649461DB772}"
EndProject
@@ -75,6 +75,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.Proj
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x", "setup\Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x\Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x.csproj", "{5B4A2596-6078-415B-A6D6-08E90FFBF58C}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeployTestDependencies", "src\DeployTestDependencies\DeployTestDependencies.csproj", "{892500A5-BF6B-4FD5-A7B9-5EEA20EB775F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeployIntegrationDependencies", "src\DeployIntegrationDependencies\DeployIntegrationDependencies.csproj", "{C16993CC-6063-4447-AE16-BE671AFDE08A}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -218,6 +222,14 @@ Global
{5B4A2596-6078-415B-A6D6-08E90FFBF58C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5B4A2596-6078-415B-A6D6-08E90FFBF58C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B4A2596-6078-415B-A6D6-08E90FFBF58C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {892500A5-BF6B-4FD5-A7B9-5EEA20EB775F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {892500A5-BF6B-4FD5-A7B9-5EEA20EB775F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {892500A5-BF6B-4FD5-A7B9-5EEA20EB775F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {892500A5-BF6B-4FD5-A7B9-5EEA20EB775F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C16993CC-6063-4447-AE16-BE671AFDE08A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C16993CC-6063-4447-AE16-BE671AFDE08A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C16993CC-6063-4447-AE16-BE671AFDE08A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C16993CC-6063-4447-AE16-BE671AFDE08A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/build/RepoToolset/ProjectLayout.props b/build/RepoToolset/ProjectLayout.props
index 680919c078e..d911a60e7d2 100644
--- a/build/RepoToolset/ProjectLayout.props
+++ b/build/RepoToolset/ProjectLayout.props
@@ -8,9 +8,9 @@
$(MSBuildProjectName)
- $(ArtifactsBinDir)$(OutDirName)\
+ $([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)$(OutDirName)\'))
$(BaseOutputPath)
- $(ArtifactsObjDir)$(OutDirName)\
+ $([System.IO.Path]::GetFullPath('$(ArtifactsObjDir)$(MSBuildProjectName)\'))
$(BaseIntermediateOutputPath)
\ No newline at end of file
diff --git a/build/SignToolData.json b/build/SignToolData.json
index 6fd91864332..d25870a543c 100644
--- a/build/SignToolData.json
+++ b/build/SignToolData.json
@@ -4,26 +4,23 @@
"certificate": "MicrosoftSHA2",
"strongName": "MsSharedLib72",
"values": [
- "bin/Microsoft.VisualStudio.AppDesigner\\net46\\Microsoft.VisualStudio.AppDesigner.dll",
- "bin/Microsoft.VisualStudio.AppDesigner\\net46\\*\\Microsoft.VisualStudio.AppDesigner.resources.dll",
- "bin/Microsoft.VisualStudio.Editors\\net46\\Microsoft.VisualStudio.Editors.dll",
- "bin/Microsoft.VisualStudio.Editors\\net46\\*\\Microsoft.VisualStudio.Editors.resources.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.CSharp\\net46\\Microsoft.VisualStudio.ProjectSystem.CSharp.dll",
- //"bin/Microsoft.VisualStudio.ProjectSystem.CSharp\\net46\\*\\Microsoft.VisualStudio.ProjectSystem.CSharp.resources.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.CSharp.VS\\net46\\Microsoft.VisualStudio.ProjectSystem.CSharp.VS.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.CSharp.VS\\net46\\*\\Microsoft.VisualStudio.ProjectSystem.CSharp.VS.resources.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.FSharp\\net46\\Microsoft.VisualStudio.ProjectSystem.FSharp.dll",
- //"bin/Microsoft.VisualStudio.ProjectSystem.FSharp\\net46\\*\\Microsoft.VisualStudio.ProjectSystem.FSharp.resources.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.FSharp.VS\\net46\\Microsoft.VisualStudio.ProjectSystem.FSharp.VS.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.FSharp.VS\\net46\\*\\Microsoft.VisualStudio.ProjectSystem.FSharp.VS.resources.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.Managed\\net46\\Microsoft.VisualStudio.ProjectSystem.Managed.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.Managed\\net46\\*\\Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.Managed.VS\\net46\\Microsoft.VisualStudio.ProjectSystem.Managed.VS.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.Managed.VS\\net46\\*\\Microsoft.VisualStudio.ProjectSystem.Managed.VS.resources.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.VisualBasic\\net46\\Microsoft.VisualStudio.ProjectSystem.VisualBasic.dll",
- //"bin/Microsoft.VisualStudio.ProjectSystem.VisualBasic\\net46\\*\\Microsoft.VisualStudio.ProjectSystem.VisualBasic.resources.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS\\net46\\Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.dll",
- "bin/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS\\net46\\*\\Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.resources.dll"
+ "bin/Dlls/Microsoft.VisualStudio.AppDesigner.dll",
+ "bin/Dlls/*/Microsoft.VisualStudio.AppDesigner.resources.dll",
+ "bin/Dlls/Microsoft.VisualStudio.Editors.dll",
+ "bin/Dlls/*/Microsoft.VisualStudio.Editors.resources.dll",
+ "bin/Dlls/Microsoft.VisualStudio.ProjectSystem.CSharp.dll",
+ "bin/Dlls/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.dll",
+ "bin/Dlls/*/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.resources.dll",
+ "bin/Dlls/Microsoft.VisualStudio.ProjectSystem.FSharp.dll",
+ "bin/Dlls/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.dll",
+ "bin/Dlls/*/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.resources.dll",
+ "bin/Dlls/Microsoft.VisualStudio.ProjectSystem.Managed.dll",
+ "bin/Dlls/*/Microsoft.VisualStudio.ProjectSystem.Managed.resources.dll",
+ "bin/Dlls/Microsoft.VisualStudio.ProjectSystem.Managed.VS.dll",
+ "bin/Dlls/*/Microsoft.VisualStudio.ProjectSystem.Managed.VS.resources.dll",
+ "bin/Dlls/Microsoft.VisualStudio.ProjectSystem.VisualBasic.dll",
+ "bin/Dlls/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.dll",
+ "bin/Dlls/*/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.resources.dll"
]
},
{
diff --git a/setup/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x.csproj b/setup/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x.csproj
index 19bb9e76048..1482bd6fe8a 100644
--- a/setup/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x.csproj
+++ b/setup/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x.csproj
@@ -1,8 +1,6 @@
- net46
-
$(MSBuildProjectName)
diff --git a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.csproj b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.csproj
index 8cfb9d6acec..4be4b04b144 100644
--- a/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.csproj
+++ b/setup/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.csproj
@@ -1,8 +1,6 @@
- net46
-
Microsoft.VisualStudio.ProjectSystem.Managed
diff --git a/src/Common/Integration/App.config b/src/Common/Integration/App.config
index fee50f5b7ba..603971f163c 100644
--- a/src/Common/Integration/App.config
+++ b/src/Common/Integration/App.config
@@ -9,7 +9,8 @@
-
+
+
diff --git a/src/DeployIntegrationDependencies/DeployIntegrationDependencies.csproj b/src/DeployIntegrationDependencies/DeployIntegrationDependencies.csproj
new file mode 100644
index 00000000000..bb94ec10ec3
--- /dev/null
+++ b/src/DeployIntegrationDependencies/DeployIntegrationDependencies.csproj
@@ -0,0 +1,17 @@
+
+
+
+ x86
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/DeployIntegrationDependencies/Directory.Build.props b/src/DeployIntegrationDependencies/Directory.Build.props
new file mode 100644
index 00000000000..abab86835d0
--- /dev/null
+++ b/src/DeployIntegrationDependencies/Directory.Build.props
@@ -0,0 +1,9 @@
+
+
+
+ IntegrationTests
+ false
+
+
+
+
\ No newline at end of file
diff --git a/src/DeployTestDependencies/DeployTestDependencies.csproj b/src/DeployTestDependencies/DeployTestDependencies.csproj
new file mode 100644
index 00000000000..251af6cc031
--- /dev/null
+++ b/src/DeployTestDependencies/DeployTestDependencies.csproj
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/DeployTestDependencies/Directory.Build.props b/src/DeployTestDependencies/Directory.Build.props
new file mode 100644
index 00000000000..e9f9c3b1096
--- /dev/null
+++ b/src/DeployTestDependencies/Directory.Build.props
@@ -0,0 +1,9 @@
+
+
+
+ UnitTests
+ false
+
+
+
+
\ No newline at end of file
diff --git a/src/DeployTestDependencies/Readme.txt b/src/DeployTestDependencies/Readme.txt
new file mode 100644
index 00000000000..0aef33152ca
--- /dev/null
+++ b/src/DeployTestDependencies/Readme.txt
@@ -0,0 +1,5 @@
+To avoid tests copying the same binaries to the common build directory and causing races, this
+project is used to copy and deploy all the required product, xUnit and Moq binaries required
+to run all the project system tests.
+
+When adding new dependencies, reference them from this project.
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index dcabefd7b9b..4143752b3d3 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,5 +1,11 @@
+
+ UnitTests
+ IntegrationTests
+ Dlls
+
+
@@ -25,6 +31,11 @@
$(NuGetPackageRoot)\RoslynDependencies.OptimizationData\$(RoslynDependenciesOptimizationDataVersion)\content\OptimizationData\
+
+ true
+
+
+ false
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 59f3e7bd161..94831041218 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -4,11 +4,26 @@
+ Defining this target will disable the new SDK behavior of implicit transitive project
+ references. This is a fine feature in general but the current implementation breaks VSIX
+ construction by including a number of projects that should not be included.
+ https://github.com/dotnet/sdk/issues/1366
+ -->
+
+
+
+
+ false
+
+
+
+ false
+
+
\ No newline at end of file
diff --git a/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj b/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj
index ec17a625277..6909aa78265 100644
--- a/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj
+++ b/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj
@@ -2,8 +2,6 @@
- net46
-
$(NoWarn);42353
diff --git a/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj b/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
index 82922bed094..53d85883cea 100644
--- a/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
+++ b/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
@@ -2,7 +2,6 @@
- net46
false
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests.csproj
index 1609c869efc..ac1a9b905e6 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests.csproj
index 937ff79f99b..cbd98cb90dd 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.CSharp.VS/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.csproj b/src/Microsoft.VisualStudio.ProjectSystem.CSharp.VS/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.csproj
index 0f3e79c2d7d..b1c217cf94c 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.CSharp.VS/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.CSharp.VS/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.csproj
@@ -3,7 +3,6 @@
Microsoft.VisualStudio
- net46
true
false
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.CSharp/Microsoft.VisualStudio.ProjectSystem.CSharp.csproj b/src/Microsoft.VisualStudio.ProjectSystem.CSharp/Microsoft.VisualStudio.ProjectSystem.CSharp.csproj
index 8a33c9333a0..7477e048eb5 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.CSharp/Microsoft.VisualStudio.ProjectSystem.CSharp.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.CSharp/Microsoft.VisualStudio.ProjectSystem.CSharp.csproj
@@ -3,7 +3,6 @@
Microsoft.VisualStudio
- net46
CSharpProjectProperties
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests.csproj
index 8cf7c231a8e..2d091b79320 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests.csproj
index 4416c210c46..f87fb1a6d96 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj b/src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj
index 94230caaa9d..0172c453eea 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.FSharp.VS/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj
@@ -3,7 +3,6 @@
Microsoft.VisualStudio
- net46
true
false
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.FSharp/Microsoft.VisualStudio.ProjectSystem.FSharp.csproj b/src/Microsoft.VisualStudio.ProjectSystem.FSharp/Microsoft.VisualStudio.ProjectSystem.FSharp.csproj
index 52495422c32..dafd95aa26d 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.FSharp/Microsoft.VisualStudio.ProjectSystem.FSharp.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.FSharp/Microsoft.VisualStudio.ProjectSystem.FSharp.csproj
@@ -3,7 +3,6 @@
Microsoft.VisualStudio
- net46
FSharpProjectProperties
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.IntegrationTests/Microsoft.VisualStudio.ProjectSystem.IntegrationTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.IntegrationTests/Microsoft.VisualStudio.ProjectSystem.IntegrationTests.csproj
index 62b18d909d9..4d3687ae799 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.IntegrationTests/Microsoft.VisualStudio.ProjectSystem.IntegrationTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.IntegrationTests/Microsoft.VisualStudio.ProjectSystem.IntegrationTests.csproj
@@ -3,7 +3,6 @@
Microsoft.VisualStudio
- net46
x86
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.UnitTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.UnitTests.csproj
index 7687ea501da..0de1fe94fa6 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.UnitTests.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.csproj
index 761e106b61e..18be3671439 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices/Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj
index 3c49fcf0e7b..b85923966f8 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.UnitTests.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests.csproj
index 0982f4096f3..22abbb530d1 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.Managed.VS.UnitTests.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj
index 536f46ae436..33444c29111 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed.VS/Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj
@@ -3,7 +3,6 @@
Microsoft.VisualStudio
- net46
true
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj
index ee5fa051590..e0d268de410 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.Managed/Microsoft.VisualStudio.ProjectSystem.Managed.csproj
@@ -3,7 +3,6 @@
Microsoft.VisualStudio
- net46
ProjectProperties
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.UnitTests/Microsoft.VisualStudio.ProjectSystem.VisualBasic.UnitTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.UnitTests/Microsoft.VisualStudio.ProjectSystem.VisualBasic.UnitTests.csproj
index 022c0d176db..7e309a16df0 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.UnitTests/Microsoft.VisualStudio.ProjectSystem.VisualBasic.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.UnitTests/Microsoft.VisualStudio.ProjectSystem.VisualBasic.UnitTests.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.UnitTests.csproj b/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.UnitTests.csproj
index 8e6ce67f707..53ab619bbf8 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.UnitTests.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.UnitTests.csproj
@@ -1,9 +1,6 @@
-
- net46
-
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.csproj b/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.csproj
index 0c26414265b..882f110e3cd 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS/Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.csproj
@@ -3,7 +3,6 @@
Microsoft.VisualStudio
- net46
true
false
diff --git a/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic/Microsoft.VisualStudio.ProjectSystem.VisualBasic.csproj b/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic/Microsoft.VisualStudio.ProjectSystem.VisualBasic.csproj
index 4bfa2e21b6d..6cc6e19014e 100644
--- a/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic/Microsoft.VisualStudio.ProjectSystem.VisualBasic.csproj
+++ b/src/Microsoft.VisualStudio.ProjectSystem.VisualBasic/Microsoft.VisualStudio.ProjectSystem.VisualBasic.csproj
@@ -3,7 +3,6 @@
Microsoft.VisualStudio
- net46
FSharpProjectProperties
diff --git a/src/ProjectSystemSetup/ProjectSystemSetup.csproj b/src/ProjectSystemSetup/ProjectSystemSetup.csproj
index a0c8ff0792d..8315c7eaeb5 100644
--- a/src/ProjectSystemSetup/ProjectSystemSetup.csproj
+++ b/src/ProjectSystemSetup/ProjectSystemSetup.csproj
@@ -2,7 +2,6 @@
- net46
Microsoft.VisualStudio
ProjectSystem
diff --git a/src/Templates/Directory.Build.props b/src/Templates/Directory.Build.props
index ba3a3d18f98..be6d41fcd0a 100644
--- a/src/Templates/Directory.Build.props
+++ b/src/Templates/Directory.Build.props
@@ -1,9 +1,12 @@
+
+ Templates\$(MSBuildProjectName)
+
+
- net46
false
diff --git a/src/VisualStudioEditorsSetup/VisualStudioEditorsSetup.csproj b/src/VisualStudioEditorsSetup/VisualStudioEditorsSetup.csproj
index 27f22f9b50e..fef9dc008b9 100644
--- a/src/VisualStudioEditorsSetup/VisualStudioEditorsSetup.csproj
+++ b/src/VisualStudioEditorsSetup/VisualStudioEditorsSetup.csproj
@@ -2,7 +2,6 @@
- net46
Microsoft.VisualStudio