Merge pull request #4411 from brettfo/template-sdk

convert item and project template projects to the dotnet SDK

Merge pull request #4411 from brettfo/template-sdk
convert item and project template projects to the dotnet SDK
2a7188c7 · Brett V. Forsgren · GitHub · d8125171 · 668825a4 · 2a7188c7
20 changed file
--- a/build-everything.proj
+++ b/build-everything.proj
@@ -34,8 +34,10 @@
    <ProjectsWithNet40 Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
    <ProjectsWithNet40 Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
  </ItemGroup>
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(BUILD_VS)'=='1'">
    <RestoreVSIntegration>true</RestoreVSIntegration>
+    <RestoreVSIntegrationItemTemplates>true</RestoreVSIntegrationItemTemplates>
+    <RestoreVSIntegrationProjectTemplates>true</RestoreVSIntegrationProjectTemplates>
  </PropertyGroup>

  <ItemGroup Condition="'$(BUILD_FCS)'=='1'">
@@ -114,6 +116,8 @@
    <ProjectsToRestore Include="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" Condition="'$(RestorePEVerify)' == 'true'" />
    <ProjectsToRestore Include="vsintegration/fsharp-vsintegration-src-build.proj" Condition="'$(RestoreVSIntegration)' == 'true'" />
    <ProjectsToRestore Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(RestoreVSIntegrationUnitTests)' == 'true'" />
+    <ProjectsToRestore Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" Condition="'$(RestoreVSIntegrationItemTemplates)' == 'true'" />
+    <ProjectsToRestore Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" Condition="'$(RestoreVSIntegrationProjectTemplates)' == 'true'" />
  </ItemGroup>

  <PropertyGroup>

--- a/vsintegration/ItemTemplates/AppConfig/AppConfig.csproj
+++ b/vsintegration/ItemTemplates/AppConfig/AppConfig.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
    <AssemblyName>AppConfig</AssemblyName>
-    <TemplateCategory>ItemTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
  </PropertyGroup>

-  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
-  </PropertyGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
-  
  <ItemGroup>
    <VSTemplate Include="Template\AppConfig.vstemplate" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <TemplateFiles Include="Template\App.config" />
    <TemplateFiles Include="Template\AppConfig.vstemplate" />
  </ItemGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  
-  <Target Name="CoreCompile" />
-  
-  <Target Name="CopyFilesToOutputDirectory" AfterTargets="CoreCompile">
-    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(OutDir)$(TemplateCategory)\$(AssemblyName)\%(Filename)%(Extension)')" />
-  </Target>
-</Project>
\ No newline at end of file
+
+</Project>
--- a/vsintegration/ItemTemplates/CodeFile/CodeFile.csproj
+++ b/vsintegration/ItemTemplates/CodeFile/CodeFile.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
    <AssemblyName>CodeFile</AssemblyName>
-    <TemplateCategory>ItemTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
  </PropertyGroup>

-  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
-  </PropertyGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
-  
  <ItemGroup>
    <VSTemplate Include="Template\CodeFile.vstemplate" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <TemplateFiles Include="Template\File.fs" />
    <TemplateFiles Include="Template\CodeFile.vstemplate" />
  </ItemGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  
-  <Target Name="CoreCompile" />
-  
-  <Target Name="CopyFilesToOutputDirectory" AfterTargets="CoreCompile">
-    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(OutDir)$(TemplateCategory)\$(AssemblyName)\%(Filename)%(Extension)')" />
-  </Target>
-</Project>
\ No newline at end of file
+
+</Project>
--- a/vsintegration/ItemTemplates/Directory.Build.props
+++ b/vsintegration/ItemTemplates/Directory.Build.props
+<Project>
+
+  <PropertyGroup>
+    <TemplateCategory>ItemTemplates</TemplateCategory>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Templates.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+</Project>
--- a/vsintegration/ItemTemplates/Directory.Build.targets
+++ b/vsintegration/ItemTemplates/Directory.Build.targets
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Templates.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
--- a/vsintegration/ItemTemplates/ResourceFile/ResourceFile.csproj
+++ b/vsintegration/ItemTemplates/ResourceFile/ResourceFile.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
    <AssemblyName>ResourceFile</AssemblyName>
-    <TemplateCategory>ItemTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <ProjectGuid>{0385564F-07B4-4264-AB8A-17C393E9140C}</ProjectGuid>
  </PropertyGroup>

-  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
-  </PropertyGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
-  
  <ItemGroup>
    <VSTemplate Include="Template\Resource.vstemplate" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <TemplateFiles Include="Template\Resource.resx" />
    <TemplateFiles Include="Template\Resource.vstemplate" />
  </ItemGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  
-  <Target Name="CoreCompile" />
-  
-  <Target Name="CopyFilesToOutputDirectory" AfterTargets="CoreCompile">
-    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(OutDir)$(TemplateCategory)\$(AssemblyName)\%(Filename)%(Extension)')" />
-  </Target>
-</Project>
\ No newline at end of file
+
+</Project>
--- a/vsintegration/ItemTemplates/ScriptFile/ScriptFile.csproj
+++ b/vsintegration/ItemTemplates/ScriptFile/ScriptFile.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
    <AssemblyName>ScriptFile</AssemblyName>
-    <TemplateCategory>ItemTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
  </PropertyGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />

  <ItemGroup>
    <VSTemplate Include="Template\ScriptFile.vstemplate" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <TemplateFiles Include="Template\File.fsx" />
    <TemplateFiles Include="Template\ScriptFile.vstemplate" />
  </ItemGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  
-  <Target Name="CoreCompile" />
-  
-  <Target Name="CopyFilesToOutputDirectory" AfterTargets="CoreCompile">
-    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(OutDir)$(TemplateCategory)\$(AssemblyName)\%(Filename)%(Extension)')" />
-  </Target>
-</Project>
\ No newline at end of file
+
+</Project>
--- a/vsintegration/ItemTemplates/SignatureFile/SignatureFile.csproj
+++ b/vsintegration/ItemTemplates/SignatureFile/SignatureFile.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
    <AssemblyName>SignatureFile</AssemblyName>
-    <TemplateCategory>ItemTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
  </PropertyGroup>

-  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
-  </PropertyGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
-  
  <ItemGroup>
    <VSTemplate Include="Template\SignatureFile.vstemplate" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <TemplateFiles Include="Template\File.fsi" />
    <TemplateFiles Include="Template\SignatureFile.vstemplate" />
  </ItemGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  
-  <Target Name="CoreCompile" />
-  
-  <Target Name="CopyFilesToOutputDirectory" AfterTargets="CoreCompile">
-    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(OutDir)$(TemplateCategory)\$(AssemblyName)\%(Filename)%(Extension)')" />
-  </Target>
-</Project>
\ No newline at end of file
+
+</Project>
--- a/vsintegration/ItemTemplates/TextFile/TextFile.csproj
+++ b/vsintegration/ItemTemplates/TextFile/TextFile.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
-    <AssemblyName>TextFile</AssemblyName>
-    <TemplateCategory>ItemTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">

  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
+    <AssemblyName>TextFile</AssemblyName>
  </PropertyGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />

  <ItemGroup>
    <VSTemplate Include="Template\TextFile.vstemplate" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <TemplateFiles Include="Template\TextFile.txt" />
    <TemplateFiles Include="Template\TextFile.vstemplate" />
  </ItemGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  
-  <Target Name="CoreCompile" />
-  
-  <Target Name="CopyFilesToOutputDirectory" AfterTargets="CoreCompile">
-    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(OutDir)$(TemplateCategory)\$(AssemblyName)\%(Filename)%(Extension)')" />
-  </Target>
-</Project>
\ No newline at end of file
+
+</Project>
--- a/vsintegration/ItemTemplates/XMLFile/XMLFile.csproj
+++ b/vsintegration/ItemTemplates/XMLFile/XMLFile.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
    <AssemblyName>XMLFile</AssemblyName>
-    <TemplateCategory>ItemTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
  </PropertyGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />

  <ItemGroup>
    <VSTemplate Include="Template\XMLFile.vstemplate" />
  </ItemGroup>
-  
+
  <ItemGroup>
    <TemplateFiles Include="Template\XMLFile.xml" />
    <TemplateFiles Include="Template\XMLFile.vstemplate" />
  </ItemGroup>
-  
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
-  
-  <Target Name="CoreCompile" />
-  
-  <Target Name="CopyFilesToOutputDirectory" AfterTargets="CoreCompile">
-    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(OutDir)$(TemplateCategory)\$(AssemblyName)\%(Filename)%(Extension)')" />
-  </Target>
-</Project>
\ No newline at end of file
+
+</Project>
--- a/vsintegration/ProjectTemplates/ConsoleProject/ConsoleProject.csproj
+++ b/vsintegration/ProjectTemplates/ConsoleProject/ConsoleProject.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
-    <AssemblyName>ConsoleProject</AssemblyName>
-    <TemplateCategory>ProjectTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <ProjectGuid>{604F0DAA-2D33-48DD-B162-EDF0B672803D}</ProjectGuid>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">

  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
+    <AssemblyName>ConsoleProject</AssemblyName>
  </PropertyGroup>

-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
-
  <ItemGroup>
    <VSTemplate Include="Template\ConsoleApplication.vstemplate">
      <TranslatableResources>
@@ -38,8 +15,4 @@
    </VSTemplate>
  </ItemGroup>

-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-
-  <Target Name="CoreCompile" />
-
-</Project>
\ No newline at end of file
+</Project>
--- a/vsintegration/ProjectTemplates/Directory.Build.props
+++ b/vsintegration/ProjectTemplates/Directory.Build.props
+<Project>
+
+  <PropertyGroup>
+    <TemplateCategory>ProjectTemplates</TemplateCategory>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Templates.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+</Project>
--- a/vsintegration/ProjectTemplates/Directory.Build.targets
+++ b/vsintegration/ProjectTemplates/Directory.Build.targets
+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Templates.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+</Project>
--- a/vsintegration/ProjectTemplates/LibraryProject/LibraryProject.csproj
+++ b/vsintegration/ProjectTemplates/LibraryProject/LibraryProject.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
-    <AssemblyName>LibraryProject</AssemblyName>
-    <TemplateCategory>ProjectTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <ProjectGuid>{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}</ProjectGuid>
-  </PropertyGroup>
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">

  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
+    <AssemblyName>LibraryProject</AssemblyName>
  </PropertyGroup>

-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
-
  <ItemGroup>
    <VSTemplate Include="Template\Library.vstemplate">
      <TranslatableResources>
@@ -38,8 +15,4 @@
    </VSTemplate>
  </ItemGroup>

-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-
-  <Target Name="CoreCompile" />
-
-</Project>
\ No newline at end of file
+</Project>
--- a/vsintegration/ProjectTemplates/TutorialProject/TutorialProject.csproj
+++ b/vsintegration/ProjectTemplates/TutorialProject/TutorialProject.csproj
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
  <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
    <AssemblyName>TutorialProject</AssemblyName>
-    <TemplateCategory>ProjectTemplates</TemplateCategory>
-    <IsPackage>true</IsPackage>
-    <GenerateLocalizedTemplates>true</GenerateLocalizedTemplates>
-    <GeneratePkgDefFile>false</GeneratePkgDefFile>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
-    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
-    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
-    <CreateVsixContainer>false</CreateVsixContainer>
-    <DeployExtension>false</DeployExtension>
-    <DeployVSTemplates>false</DeployVSTemplates>
-    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
-    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
-    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
-    <ProjectGuid>{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}</ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
  </PropertyGroup>

-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />
-
  <ItemGroup>
    <VSTemplate Include="Template\Tutorial.vstemplate">
      <TranslatableResources>
@@ -36,8 +14,4 @@
    </VSTemplate>
  </ItemGroup>

-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-
-  <Target Name="CoreCompile" />
-
-</Project>
\ No newline at end of file
+</Project>
--- a/vsintegration/Templates.Directory.Build.props
+++ b/vsintegration/Templates.Directory.Build.props
+<Project>
+
+  <Import Project="FSharp.Directory.Build.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net46</TargetFramework>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <ImportVsSDK>true</ImportVsSDK>
+    <IsPackage>true</IsPackage>
+    <GeneratePkgDefFile>false</GeneratePkgDefFile>
+    <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <CreateVsixContainer>false</CreateVsixContainer>
+    <DeployExtension>false</DeployExtension>
+    <DeployVSTemplates>false</DeployVSTemplates>
+    <CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
+  </PropertyGroup>
+
+</Project>
--- a/vsintegration/Templates.Directory.Build.targets
+++ b/vsintegration/Templates.Directory.Build.targets
+<Project>
+
+  <Import Project="FSharp.Directory.Build.targets" />
+
+  <PropertyGroup>
+    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- everything under the `Template` directory is not to be considered part of the project -->
+    <Compile Remove="**\Template\**" />
+    <EmbeddedResource Remove="**\Template\**" />
+    <None Remove="**\Template\**" />
+  </ItemGroup>
+
+  <Target Name="CoreCompile" />
+
+  <Target Name="CopyFilesToOutputDirectory" AfterTargets="CoreCompile">
+    <Copy SourceFiles="@(TemplateFiles)" DestinationFiles="@(TemplateFiles->'$(OutputPath)\%(Filename)%(Extension)')" />
+  </Target>
+
+</Project>
--- a/vsintegration/fsharp-vsintegration-item-templates-build.proj
+++ b/vsintegration/fsharp-vsintegration-item-templates-build.proj
@@ -15,5 +15,9 @@
  </ItemGroup>

  <Import Project="..\src\root.traversal.targets"/>
-</Project>

+  <Target Name="Restore">
+    <MSBuild Projects="@(ProjectFiles)" Targets="Restore" />
+  </Target>
+
+</Project>
--- a/vsintegration/fsharp-vsintegration-project-templates-build.proj
+++ b/vsintegration/fsharp-vsintegration-project-templates-build.proj
@@ -11,5 +11,10 @@
  </ItemGroup>

  <Import Project="..\src\root.traversal.targets"/>
+
+  <Target Name="Restore">
+    <MSBuild Projects="@(ProjectFiles)" Targets="Restore" />
+  </Target>
+
 </Project>

--- a/vsintegration/src/fsharp.common.props
+++ b/vsintegration/src/fsharp.common.props
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  See License.txt in the project root for license information. -->
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-  </PropertyGroup>  
-
-  <!-- Use standard VS for Open Build. -->
-  <Import Project="..\..\..\src\FSharp.Common.props" Condition="Exists('..\..\..\src\FSharp.Common.props') AND $(_NTROOT) != ''" />
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="'$(DevDivBuild)' == '' and Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-
-  <PropertyGroup Condition="'$(DevDivBuild)' == ''">
-    <FSharpSourcesRoot Condition="'$(FSharpSourcesRoot)' == '' and '$(DevDivBuild)' == ''   ">..\..</FSharpSourcesRoot>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)' == ''">net40</TargetDotnetProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" ('$(Configuration)' == 'Debug' or '$(Configuration)' == 'Release') and '$(DevDivBuild)' == ''">
-    <OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug'">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' or '$(Configuration)' == 'VSRelease'">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-
-</Project>
\ No newline at end of file