Build dlls to a common output directory.

dotnet · Aug 29, 2017 · 9e5863e · 9e5863e
1 parent 0947e5c
commit 9e5863e
Show file tree

Hide file tree

Showing 38 changed files with 138 additions and 78 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -28,6 +28,10 @@
     <!-- Enables workaround for https://github.com/NuGet/Home/issues/4695. -->
     <RepoToolsetQuietRestore>true</RepoToolsetQuietRestore>
 
+    <!-- All projects in this repository target the same framework -->
+    <TargetFramework>net46</TargetFramework>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+
     <VSSDKTargetPlatformRegRootSuffix Condition="'$(RootSuffix)' != ''">$(RootSuffix)</VSSDKTargetPlatformRegRootSuffix>
     <VSSDKTargetPlatformRegRootSuffix Condition="'$(VSSDKTargetPlatformRegRootSuffix)' == ''">ProjectSystem</VSSDKTargetPlatformRegRootSuffix>
 

diff --git 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
@@ -8,9 +8,9 @@
 
   <PropertyGroup>
     <OutDirName Condition="'$(OutDirName)' == ''">$(MSBuildProjectName)</OutDirName>
-    <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">$(ArtifactsBinDir)$(OutDirName)\</BaseOutputPath>
+    <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">$([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)$(OutDirName)\'))</BaseOutputPath>
     <OutputPath>$(BaseOutputPath)</OutputPath>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(ArtifactsObjDir)$(OutDirName)\</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$([System.IO.Path]::GetFullPath('$(ArtifactsObjDir)$(MSBuildProjectName)\'))</BaseIntermediateOutputPath>
     <IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>
   </PropertyGroup>
 </Project>
diff --git 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/...o.NetCore.ProjectTemplates.1.x/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x.csproj b/...o.NetCore.ProjectTemplates.1.x/Microsoft.VisualStudio.NetCore.ProjectTemplates.1.x.csproj
@@ -1,8 +1,6 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
-
     <!-- VS Insertion -->
     <VisualStudioInsertionComponent>$(MSBuildProjectName)</VisualStudioInsertionComponent>
   </PropertyGroup>

diff --git a/...ystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.csproj b/...ystem.Managed.CommonFiles/Microsoft.VisualStudio.ProjectSystem.Managed.CommonFiles.csproj
@@ -1,8 +1,6 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
-
     <!-- VS Insertion -->
     <VisualStudioInsertionComponent>Microsoft.VisualStudio.ProjectSystem.Managed</VisualStudioInsertionComponent>
   </PropertyGroup>

diff --git a/src/Common/Integration/App.config b/src/Common/Integration/App.config
@@ -9,7 +9,8 @@
     <add key="xunit.appDomain" value="ifAvailable" />
     <add key="xunit.methodDisplay" value="method" />
     <add key="xunit.shadowCopy" value="false"/>
-    <add key="ProjectSystem.XamlRulesDirRelativeToTestAssembly" value="..\..\..\VSSetup\Rules"/>
+    <!-- Path relative to the integration test output dir -->
+    <add key="ProjectSystem.XamlRulesDirRelativeToTestAssembly" value="..\..\VSSetup\Rules"/>
   </appSettings>
   <userSettings>
     <Microsoft.VisualStudio.IntegrationTest.Utilities.Settings>

diff --git a/src/DeployIntegrationDependencies/DeployIntegrationDependencies.csproj b/src/DeployIntegrationDependencies/DeployIntegrationDependencies.csproj
@@ -0,0 +1,17 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.IntegrationTests\Microsoft.VisualStudio.ProjectSystem.IntegrationTests.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.VisualStudio.IntegrationTest.Utilities" Version="$(MicrosoftVisualStudioIntegrationTestUtilitiesVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.LanguageServices" Version="$(MicrosoftVisualStudioLanguageServicesVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)" />
+    <PackageReference Include="xunit.runner.console" Version="$(XUnitVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/src/DeployIntegrationDependencies/Directory.Build.props b/src/DeployIntegrationDependencies/Directory.Build.props
@@ -0,0 +1,9 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+  <PropertyGroup>
+    <OutDirName>IntegrationTests</OutDirName>
+    <UseCommonOutputDirectory>false</UseCommonOutputDirectory>
+  </PropertyGroup>
+
+  <Import Project="..\Directory.Build.props"/>
+</Project>
diff --git a/src/DeployTestDependencies/DeployTestDependencies.csproj b/src/DeployTestDependencies/DeployTestDependencies.csproj
@@ -0,0 +1,25 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.VisualStudio.AppDesigner\Microsoft.VisualStudio.AppDesigner.vbproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.Editors\Microsoft.VisualStudio.Editors.vbproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.CSharp.VS\Microsoft.VisualStudio.ProjectSystem.CSharp.VS.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.CSharp\Microsoft.VisualStudio.ProjectSystem.CSharp.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.FSharp.VS\Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.FSharp\Microsoft.VisualStudio.ProjectSystem.FSharp.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.TestServices\Microsoft.VisualStudio.ProjectSystem.Managed.TestServices.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed.VS\Microsoft.VisualStudio.ProjectSystem.Managed.VS.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.Managed\Microsoft.VisualStudio.ProjectSystem.Managed.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS\Microsoft.VisualStudio.ProjectSystem.VisualBasic.VS.csproj" />
+    <ProjectReference Include="..\Microsoft.VisualStudio.ProjectSystem.VisualBasic\Microsoft.VisualStudio.ProjectSystem.VisualBasic.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)" />
+    <PackageReference Include="xunit.runner.console" Version="$(XUnitVersion)" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Readme.txt" />
+  </ItemGroup>
+</Project>
diff --git a/src/DeployTestDependencies/Directory.Build.props b/src/DeployTestDependencies/Directory.Build.props
@@ -0,0 +1,9 @@
+<!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+<Project>
+  <PropertyGroup>
+    <OutDirName>UnitTests</OutDirName>
+    <UseCommonOutputDirectory>false</UseCommonOutputDirectory>
+  </PropertyGroup>
+
+  <Import Project="..\Directory.Build.props"/>
+</Project>
diff --git a/src/DeployTestDependencies/Readme.txt 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.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,5 +1,11 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project>
+  <PropertyGroup Condition="'$(OutDirName)' == ''">
+    <OutDirName Condition="$(MSBuildProjectName.EndsWith('.UnitTests'))">UnitTests</OutDirName>
+    <OutDirName Condition="$(MSBuildProjectName.EndsWith('.IntegrationTests'))">IntegrationTests</OutDirName>
+    <OutDirName Condition="'$(OutDirName)' == ''">Dlls</OutDirName>
+  </PropertyGroup>
+
   <Import Project="..\Directory.Build.props"/>
   <Import Project="$(RepoToolsetDir)Settings.props" Condition="'$(RepoToolsetDir)' != ''" />
   <Import Project="..\build\VisualStudio.XamlRules.props" />
@@ -25,6 +31,11 @@
 
     <!-- Use IBC optimization data if available -->
     <IbcOptimizationDataDir>$(NuGetPackageRoot)\RoslynDependencies.OptimizationData\$(RoslynDependenciesOptimizationDataVersion)\content\OptimizationData\</IbcOptimizationDataDir>
+
+    <UseCommonOutputDirectory Condition="'$(UseCommonOutputDirectory)' == ''">true</UseCommonOutputDirectory>
+
+    <!-- Prevent vsix manifests from being copied to the shared output directory, makes build more deterministic -->
+    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -4,11 +4,26 @@
   <Import Project="..\build\VisualStudio.XamlRules.targets"/>
 
   <!-- 
-     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
-    -->
+    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
+  -->
   <Target Name="IncludeTransitiveProjectReferences" >
   </Target>
+
+  <!-- 
+    With UseCommonOutputDirectory turned on, any copy-local projects/references break
+    csproj's up-to-date check because they aren't copied to the output directory. 
+    Turn it off. 
+  -->
+  <ItemDefinitionGroup Condition="'$(UseCommonOutputDirectory)' == 'true'">
+    <Reference>
+      <Private>false</Private>
+    </Reference>
+
+    <ProjectReference>
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemDefinitionGroup>
 </Project>
diff --git a/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj b/src/Microsoft.VisualStudio.AppDesigner/Microsoft.VisualStudio.AppDesigner.vbproj
@@ -2,8 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\VisualStudioDesigner.props"/>
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
-
     <!-- TODO: Function doesn't return a value on all code paths (https://github.com/dotnet/project-system/issues/2592) -->
     <NoWarn>$(NoWarn);42353</NoWarn>
 

diff --git a/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj b/src/Microsoft.VisualStudio.Editors/Microsoft.VisualStudio.Editors.vbproj
@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\VisualStudioDesigner.props"/>
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
     <Prefer32Bit>false</Prefer32Bit>
 
     <!-- TODO: Function/Property doesn't return a value on all code paths (https://github.com/dotnet/project-system/issues/2592) -->

diff --git a/...ojectSystem.CSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests.csproj b/...ojectSystem.CSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.UnitTests.csproj
@@ -1,9 +1,6 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\HostAgnostic.props"/>
-  <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
-  </PropertyGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)"/>

diff --git a/...ystem.CSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests.csproj b/...ystem.CSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.UnitTests.csproj
@@ -1,9 +1,6 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\VisualStudio.props"/>
-  <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
-  </PropertyGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)"/>
   </ItemGroup>

diff --git a/...isualStudio.ProjectSystem.CSharp.VS/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.csproj b/...isualStudio.ProjectSystem.CSharp.VS/Microsoft.VisualStudio.ProjectSystem.CSharp.VS.csproj
@@ -3,7 +3,6 @@
   <Import Project="..\VisualStudio.props"/>
   <PropertyGroup>
     <RootNamespace>Microsoft.VisualStudio</RootNamespace>
-    <TargetFramework>net46</TargetFramework>
     <!-- VSIX -->
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <CreateVsixContainer>false</CreateVsixContainer>

diff --git a/...soft.VisualStudio.ProjectSystem.CSharp/Microsoft.VisualStudio.ProjectSystem.CSharp.csproj b/...soft.VisualStudio.ProjectSystem.CSharp/Microsoft.VisualStudio.ProjectSystem.CSharp.csproj
@@ -3,7 +3,6 @@
   <Import Project="..\HostAgnostic.props"/>
   <PropertyGroup>
     <RootNamespace>Microsoft.VisualStudio</RootNamespace>
-    <TargetFramework>net46</TargetFramework>
     <!-- The value of RuleInjectionClassName of XamlPropertyRule items defined by this project -->
     <XamlPropertyRuleInjectionClassName>CSharpProjectProperties</XamlPropertyRuleInjectionClassName>
   </PropertyGroup>

diff --git a/...ojectSystem.FSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests.csproj b/...ojectSystem.FSharp.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.UnitTests.csproj
@@ -1,9 +1,6 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\HostAgnostic.props"/>
-  <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>  
-  </PropertyGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests" />
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)"/>

diff --git a/...ystem.FSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests.csproj b/...ystem.FSharp.VS.UnitTests/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.UnitTests.csproj
@@ -1,9 +1,6 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\VisualStudio.props"/>
-  <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
-  </PropertyGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="DynamicProxyGenAssembly2" Key="$(MoqPublicKey)"/>
   </ItemGroup>

diff --git a/...isualStudio.ProjectSystem.FSharp.VS/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj b/...isualStudio.ProjectSystem.FSharp.VS/Microsoft.VisualStudio.ProjectSystem.FSharp.VS.csproj
@@ -3,7 +3,6 @@
   <Import Project="..\VisualStudio.props"/>
   <PropertyGroup>
     <RootNamespace>Microsoft.VisualStudio</RootNamespace>
-    <TargetFramework>net46</TargetFramework>
     <!-- VSIX -->
     <GeneratePkgDefFile>true</GeneratePkgDefFile>
     <CreateVsixContainer>false</CreateVsixContainer>