convert VisualFSharpTemplates to the dotnet SDK

build-everything.proj

@@ -39,6 +39,7 @@
     <RestoreLanguageServiceProfiling>true</RestoreLanguageServiceProfiling>
     <RestoreVSIntegrationItemTemplates>true</RestoreVSIntegrationItemTemplates>
     <RestoreVSIntegrationProjectTemplates>true</RestoreVSIntegrationProjectTemplates>
+    <RestoreVSIntegrationVsix>true</RestoreVSIntegrationVsix>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(BUILD_FCS)'=='1'">
@@ -120,6 +121,7 @@
     <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'" />
+    <ProjectsToRestore Include="vsintegration/fsharp-vsintegration-vsix-build.proj" Condition="'$(RestoreVSIntegrationVsix)' == 'true'" />
   </ItemGroup>
 
   <PropertyGroup>

vsintegration/FSharp.Directory.Build.targets

@@ -11,6 +11,11 @@
     <PackageTargetFallback>net462</PackageTargetFallback>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(CreateVsixContainer)' == 'true'">
+    <!-- Ensure VSIX packages end up in the proper location. -->
+    <OutDir>$(OutputPath)\</OutDir>
+  </PropertyGroup>
+
   <ImportGroup Condition="'$(ImportVsSDK)' == 'true'">
     <Import Project="$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.props" />
     <Import Project="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.targets" />

vsintegration/Vsix/FSharp.Directory.Build.props

+<Project>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+
+  <PropertyGroup>
+    <VSRootSuffix>RoslynDev</VSRootSuffix>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
+    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
+    <StartAction>Program</StartAction>
+    <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
+    <StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
+    <VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
+    <CreateVsixContainer>true</CreateVsixContainer>
+  </PropertyGroup>
+
+</Project>

vsintegration/Vsix/FSharp.Directory.Build.targets

+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+</Project>

vsintegration/Vsix/VisualFSharpTemplates/Directory.Build.props

+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
+</Project>

vsintegration/Vsix/VisualFSharpTemplates/Directory.Build.targets

+<Project>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+</Project>

vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.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">
+
   <PropertyGroup>
-    <FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
-    <TargetDotnetProfile Condition="'$(TargetDotnetProfile)'==''">net40</TargetDotnetProfile>
-    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">15.0</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(FSharpSourcesRoot)\..\packages\Microsoft.VSSDK.BuildTools.$(RoslynVSPackagesVersion)\tools</VSToolsPath>
-    <FileUpgradeFlags></FileUpgradeFlags>
-    <OldToolsVersion>15.0</OldToolsVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <UpgradeBackupLocation></UpgradeBackupLocation>
+    <AssemblyName>VisualFSharpTemplate</AssemblyName>
+    <TargetFramework>net46</TargetFramework>
+    <OutputType>Library</OutputType>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -22,8 +16,6 @@
     <UpdatePeriodically>true</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -37,43 +29,16 @@
     <ExtensionInstallationRoot>CommonExtensions</ExtensionInstallationRoot>
     <ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>
     <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <VSRootSuffix>RoslynDev</VSRootSuffix>
-    <UseCodebase>true</UseCodebase>
-    <DeployExtension Condition=" '$(DeployExtension)' == '' and ('$(AppVeyor)' != '' or '$(HUDSON_COOKIE)' != '' or '$(UsingMicrobuild)' != '') ">False</DeployExtension>
-    <DeployExtension Condition=" '$(DeployExtension)' == '' and '$(AppVeyor)' == '' and '$(HUDSON_COOKIE)' == '' and '$(UsingMicrobuild)' == '' ">True</DeployExtension>
-    <ProjectGuid>{385035C1-9171-408A-8EAA-67DDC14E2CF3}</ProjectGuid>
     <IsPackage>true</IsPackage>
-    <RootNamespace>VisualFSharpTemplate</RootNamespace>
-    <RootBinPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin</RootBinPath>
-    <AssemblyName>VisualFSharpTemplate</AssemblyName>
-    <OutputPath>$(RootBinPath)</OutputPath>
-    <MicroBuildAssemblyVersion>15.4.1.0</MicroBuildAssemblyVersion>
-    <MicroBuildAssemblyFileLanguage>cs</MicroBuildAssemblyFileLanguage>
     <DeployExtension>false</DeployExtension>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
-    <StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
-    <VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
-    <CreateVsixContainer>true</CreateVsixContainer>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <StartAction>Program</StartAction>
-    <StartProgram>$(DevEnvDir)devenv.exe</StartProgram>
-    <CreateVsixContainer>true</CreateVsixContainer>
-    <StartArguments>/rootsuffix $(VSRootSuffix) /log</StartArguments>
-    <VSSDKTargetPlatformRegRootSuffix>$(VSRootSuffix)</VSSDKTargetPlatformRegRootSuffix>
-  </PropertyGroup>
+
   <ItemGroup>
     <None Include="Source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.6">
       <Visible>False</Visible>
@@ -91,8 +56,9 @@
       <Install>false</Install>
     </BootstrapperPackage>
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\ProjectTemplates\ConsoleProject\ConsoleProject.csproj">
+    <ProjectReference Include="..\..\ProjectTemplates\ConsoleProject\ConsoleProject.csproj">
       <Project>{604f0daa-2d33-48dd-b162-edf0b672803d}</Project>
       <Name>ConsoleProject</Name>
       <VSIXSubPath>ProjectTemplates</VSIXSubPath>
@@ -100,7 +66,7 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\ProjectTemplates\LibraryProject\LibraryProject.csproj">
+    <ProjectReference Include="..\..\ProjectTemplates\LibraryProject\LibraryProject.csproj">
       <Project>{01678cda-a11f-4dee-9344-2edf91cf1ae7}</Project>
       <Name>LibraryProject</Name>
       <VSIXSubPath>ProjectTemplates</VSIXSubPath>
@@ -108,7 +74,7 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <Private>True</Private>
     </ProjectReference>
-    <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\ProjectTemplates\TutorialProject\TutorialProject.csproj">
+    <ProjectReference Include="..\..\ProjectTemplates\TutorialProject\TutorialProject.csproj">
       <Project>{2facee44-48bd-40b5-a2ee-b54a0c9bb7c4}</Project>
       <Name>TutorialProject</Name>
       <VSIXSubPath>ProjectTemplates</VSIXSubPath>
@@ -117,6 +83,5 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
-  <Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.targets" />
+
 </Project>

vsintegration/fsharp-vsintegration-vsix-build.proj

@@ -5,12 +5,19 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <VsixProjects Include="Vsix\VisualFSharpFull\VisualFSharpFull.csproj" />
-    <VsixProjects Include="Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
-    <VsixProjects Include="Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj" />
+    <ProjectFiles Include="Vsix\VisualFSharpFull\VisualFSharpFull.csproj" />
+    <ProjectFiles Include="Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
+    <ProjectFiles Include="Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj" />
   </ItemGroup>
 
-  <Target Name="Build">
-    <MSBuild Projects="@(VsixProjects)" Targets="Build" Properties="Configuration=$(Configuration)" />
+  <ItemGroup>
+    <SdkProjects Include="Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\src\root.traversal.targets"/>
+
+  <Target Name="Restore">
+    <MSBuild Projects="@(SdkProjects)" Targets="Restore" />
   </Target>
+
 </Project>