Revert "Update templates, fsharp.core version in sdk (#6144)" (#6156)

This reverts commit 49c1bbb3.

VisualFSharp.sln

@@ -96,6 +96,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TutorialProject", "vsintegr
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ItemTemplates", "ItemTemplates", "{F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppConfig", "vsintegration\ItemTemplates\AppConfig\AppConfig.csproj", "{6BA13AA4-C25F-480F-856B-8E8000299A72}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeFile", "vsintegration\ItemTemplates\CodeFile\CodeFile.csproj", "{12AC2813-E895-4AAA-AE6C-94E21DA09F64}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptFile", "vsintegration\ItemTemplates\ScriptFile\ScriptFile.csproj", "{A333B85A-DC23-49B6-9797-B89A7951E92D}"

build/targets/AssemblyVersions.props

@@ -21,8 +21,7 @@
     <_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
     <Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
 
-    <FSLanguageVersion>4.6</FSLanguageVersion>
-    <FSCoreMajorVersion>$(FSLanguageVersion)</FSCoreMajorVersion>
+    <FSCoreMajorVersion>4.6</FSCoreMajorVersion>
     <FSCorePackageVersion>$(FSCoreMajorVersion).0</FSCorePackageVersion>
     <FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>
 

src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props

@@ -74,7 +74,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 
   <PropertyGroup>
     <DefaultValueTuplePackageVersion>4.4.0</DefaultValueTuplePackageVersion>
-    <DefaultFSharpCorePackageVersion>4.6.0</DefaultFSharpCorePackageVersion>
+    <DefaultFSharpCorePackageVersion>4.5.2</DefaultFSharpCorePackageVersion>
     <ValueTupleImplicitPackageVersion>$(DefaultValueTuplePackageVersion)</ValueTupleImplicitPackageVersion>
     <FSharpCoreImplicitPackageVersion>$(DefaultFSharpCorePackageVersion)</FSharpCoreImplicitPackageVersion>
   </PropertyGroup>

src/fsharp/FSharp.Core/Directory.Build.props

@@ -6,7 +6,6 @@
   <PropertyGroup>
     <NuspecProperties>
       $(NuspecProperties);
-      fsLanguageVersion=$(FSLanguageVersion);
       fsCoreMajorVersion=$(FSCoreMajorVersion);
       fsPackageMajorVersion=$(FSPackageMajorVersion);
     </NuspecProperties>

src/fsharp/FSharp.Core/FSharp.Core.nuspec

@@ -2,10 +2,10 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>FSharp.Core</id>
-        <title>FSharp.Core for F# $fsLanguageVersion$</title>
-        <summary>FSharp.Core for F# $fsLanguageVersion$</summary>
+        <title>FSharp.Core for F# $fsCoreMajorVersion$</title>
+        <summary>FSharp.Core for F# $fsCoreMajorVersion$</summary>
         <description>
-            FSharp.Core redistributables from Visual F# Tools version $fsPackageMajorVersion$ For F# $fsLanguageVersion$
+            FSharp.Core redistributables from Visual F# Tools version $fsPackageMajorVersion$ For F# $fsCoreMajorVersion$
                 Supported Platforms:
                     .NET Framework 4.5+ (net45)
                     netstandard1.6      (netstandard1.6)

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 Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+
+  <PropertyGroup>
+    <AssemblyName>AppConfig</AssemblyName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <VSTemplate Include="Template\AppConfig.vstemplate" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <TemplateFiles Include="Template\App.config" />
+    <TemplateFiles Include="Template\AppConfig.vstemplate" />
+  </ItemGroup>
+
+</Project>

vsintegration/ItemTemplates/AppConfig/Template/App.config

+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+</configuration>

vsintegration/ItemTemplates/AppConfig/Template/AppConfig.vstemplate

+<?xml version="1.0" encoding="utf-8"?>
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5022" />
+    <Description Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5023" />
+    <Icon Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="4010" />
+    <TemplateID>Microsoft.FSharp.AppConfig</TemplateID>
+    <ProjectType>FSharp</ProjectType>
+    <SortOrder>60</SortOrder>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <DefaultName>App.config</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem>App.config</ProjectItem>
+  </TemplateContent>
+</VSTemplate>

vsintegration/ProjectTemplates/ConsoleProject/ConsoleProject.csproj

@@ -9,6 +9,7 @@
   <ItemGroup>
     <VSTemplate Include="Template\ConsoleApplication.vstemplate">
       <TranslatableResources>
+        Template\AssemblyInfo.fs;
         Template\Program.fs;
       </TranslatableResources>
     </VSTemplate>

vsintegration/ProjectTemplates/ConsoleProject/Template/App.config

+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        $if$ ($targetframeworkversion$ >= 4.0)<supportedRuntime version="v4.0" sku=".NETFramework,Version=v$targetframeworkversion$" />$endif$$if$ ($targetframeworkversion$ < 4.0)<supportedRuntime version="v2.0.50727" />$endif$
+    </startup>
+</configuration>
\ No newline at end of file

vsintegration/ProjectTemplates/ConsoleProject/Template/AssemblyInfo.fs

+namespace $safeprojectname$.AssemblyInfo
+
+open System.Reflection
+open System.Runtime.CompilerServices
+open System.Runtime.InteropServices
+
+// @@@GeneralInfo-Line1|General Information about an assembly is controlled through the following@@@
+// @@@GeneralInfo-Line2|set of attributes. Change these attribute values to modify the information@@@
+// @@@GeneralInfo-Line3|associated with an assembly.@@@
+[<assembly: AssemblyTitle("$projectname$")>]
+[<assembly: AssemblyDescription("")>]
+[<assembly: AssemblyConfiguration("")>]
+[<assembly: AssemblyCompany("$registeredorganization$")>]
+[<assembly: AssemblyProduct("$projectname$")>]
+[<assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")>]
+[<assembly: AssemblyTrademark("")>]
+[<assembly: AssemblyCulture("")>]
+
+// @@@ComVisible-Line1|Setting ComVisible to false makes the types in this assembly not visible@@@
+// @@@ComVisible-Line2|to COM components.  If you need to access a type in this assembly from@@@
+// @@@ComVisible-Line3|COM, set the ComVisible attribute to true on that type.@@@
+[<assembly: ComVisible(false)>]
+
+// @@@Guid-Line1|The following GUID is for the ID of the typelib if this project is exposed to COM@@@
+[<assembly: Guid("$guid1$")>]
+
+// @@@VersionInfo-Line1|Version information for an assembly consists of the following four values:@@@
+//
+//       @@@MajorVersion|Major Version@@@
+//       @@@MinorVersion|Minor Version@@@
+//       @@@BuildNumber|Build Number@@@
+//       @@@Revision|Revision@@@
+//
+// @@@VersionInfo-Line2|You can specify all the values or you can default the Build and Revision Numbers@@@
+// @@@VersionInfo-Line3|by using the '*' as shown below:@@@
+// [<assembly: AssemblyVersion("1.0.*")>]
+[<assembly: AssemblyVersion("1.0.0.0")>]
+[<assembly: AssemblyFileVersion("1.0.0.0")>]
+
+do
+    ()
\ No newline at end of file

vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.fsproj

 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>$guid1$</ProjectGuid>
     <OutputType>Exe</OutputType>
-    $if$($targetframeworkversion$ >= 4.7.2)<TargetFramework>net472</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.7.1)<TargetFramework>net471</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.7)<TargetFramework>net47</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.6.2)<TargetFramework>net462</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.6.1)<TargetFramework>net461</TargetFramework>$endif$$if$($targetframeworkversion$ <= 4.6)<TargetFramework>net46</TargetFramework>$endif$
-   </PropertyGroup>
-
+    <RootNamespace>$safeprojectname$</RootNamespace>
+    <AssemblyName>$safeprojectname$</AssemblyName>
+    <TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <UseStandardResourceNames>true</UseStandardResourceNames>
+    <WarningsAsErrors>3239;$(WarningsAsErrors)</WarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="mscorlib"/>
+    <Reference Include="System"/>
+    <Reference Include="System.Core"/>
+    <Reference Include="System.Numerics"/>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Program.fs" />
+    <None Include="App.config" />
   </ItemGroup>
-
-</Project>
\ No newline at end of file
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets') ">
+    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(FSharpTargetsPath)" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate

@@ -6,20 +6,28 @@
     <Icon Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="4001" />
     <TemplateID>Microsoft.FSharp.Application</TemplateID>
     <ProjectType>FSharp</ProjectType>
-    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.5</RequiredFrameworkVersion>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
     <CreateNewFolder>true</CreateNewFolder>
-    <DefaultName>ConsoleApp</DefaultName>
+    <DefaultName>ConsoleApplication</DefaultName>
     <ProvideDefaultName>true</ProvideDefaultName>
     <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
   </TemplateData>
   <TemplateContent>
     <Project File="ConsoleApplication.fsproj" ReplaceParameters="true">
+      <ProjectItem ReplaceParameters="true">AssemblyInfo.fs</ProjectItem>
       <ProjectItem ReplaceParameters="true" OpenInEditor="true">Program.fs</ProjectItem>
+      <ProjectItem ReplaceParameters="true">App.config</ProjectItem>
     </Project>
   </TemplateContent>
   <WizardExtension>
     <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
     <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
   </WizardExtension>
-</VSTemplate>
\ No newline at end of file
+  <WizardData>
+    <packages repository="extension" repositoryId="VisualFSharpTemplates">
+      <package id="System.ValueTuple" version="4.4.0" />
+      <package id="FSharp.Core" version="4.5.2" />
+     </packages>
+  </WizardData>
+</VSTemplate>

vsintegration/ProjectTemplates/LibraryProject/LibraryProject.csproj

@@ -9,6 +9,7 @@
   <ItemGroup>
     <VSTemplate Include="Template\Library.vstemplate">
       <TranslatableResources>
+        Template\AssemblyInfo.fs;
         Template\Script.fsx;
       </TranslatableResources>
     </VSTemplate>

vsintegration/ProjectTemplates/LibraryProject/Template/AssemblyInfo.fs

+namespace $safeprojectname$.AssemblyInfo
+
+open System.Reflection
+open System.Runtime.CompilerServices
+open System.Runtime.InteropServices
+
+// @@@GeneralInfo-Line1|General Information about an assembly is controlled through the following@@@
+// @@@GeneralInfo-Line2|set of attributes. Change these attribute values to modify the information@@@
+// @@@GeneralInfo-Line3|associated with an assembly.@@@
+[<assembly: AssemblyTitle("$projectname$")>]
+[<assembly: AssemblyDescription("")>]
+[<assembly: AssemblyConfiguration("")>]
+[<assembly: AssemblyCompany("$registeredorganization$")>]
+[<assembly: AssemblyProduct("$projectname$")>]
+[<assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")>]
+[<assembly: AssemblyTrademark("")>]
+[<assembly: AssemblyCulture("")>]
+
+// @@@ComVisible-Line1|Setting ComVisible to false makes the types in this assembly not visible@@@
+// @@@ComVisible-Line2|to COM components.  If you need to access a type in this assembly from@@@
+// @@@ComVisible-Line3|COM, set the ComVisible attribute to true on that type.@@@
+[<assembly: ComVisible(false)>]
+
+// @@@Guid-Line1|The following GUID is for the ID of the typelib if this project is exposed to COM@@@
+[<assembly: Guid("$guid1$")>]
+
+// @@@VersionInfo-Line1|Version information for an assembly consists of the following four values:@@@
+//
+//       @@@MajorVersion|Major Version@@@
+//       @@@MinorVersion|Minor Version@@@
+//       @@@BuildNumber|Build Number@@@
+//       @@@Revision|Revision@@@
+//
+// @@@VersionInfo-Line2|You can specify all the values or you can default the Build and Revision Numbers@@@
+// @@@VersionInfo-Line3|by using the '*' as shown below:@@@
+// [<assembly: AssemblyVersion("1.0.*")>]
+[<assembly: AssemblyVersion("1.0.0.0")>]
+[<assembly: AssemblyFileVersion("1.0.0.0")>]
+
+do
+    ()
\ No newline at end of file

vsintegration/ProjectTemplates/LibraryProject/Template/Library.fsproj

 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
-    $if$($targetframeworkversion$ >= 4.7.2)<TargetFramework>net472</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.7.1)<TargetFramework>net471</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.7)<TargetFramework>net47</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.6.2)<TargetFramework>net462</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.6.1)<TargetFramework>net461</TargetFramework>$endif$$if$($targetframeworkversion$ <= 4.6)<TargetFramework>net46</TargetFramework>$endif$
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>$guid1$</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>$safeprojectname$</RootNamespace>
+    <AssemblyName>$safeprojectname$</AssemblyName>
+    <UseStandardResourceNames>true</UseStandardResourceNames>
+    <TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <WarningsAsErrors>3239;$(WarningsAsErrors)</WarningsAsErrors>
   </PropertyGroup>
-
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="mscorlib"/>
+    <Reference Include="System"/>
+    <Reference Include="System.Core"/>
+    <Reference Include="System.Numerics"/>
+  </ItemGroup>
   <ItemGroup>
+    <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Library1.fs" />
+    <None Include="Script.fsx" />
   </ItemGroup>
-
-</Project>
\ No newline at end of file
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets') ">
+    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(FSharpTargetsPath)" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate

@@ -6,7 +6,7 @@
     <Icon Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="4002" />
     <TemplateID>Microsoft.FSharp.Library</TemplateID>
     <ProjectType>FSharp</ProjectType>
-    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.5</RequiredFrameworkVersion>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
     <CreateNewFolder>true</CreateNewFolder>
     <DefaultName>Library</DefaultName>
@@ -15,6 +15,7 @@
   </TemplateData>
   <TemplateContent>
     <Project File="Library.fsproj" ReplaceParameters="true">
+      <ProjectItem ReplaceParameters="true">AssemblyInfo.fs</ProjectItem>
       <ProjectItem ReplaceParameters="true" OpenInEditor="true">Library1.fs</ProjectItem>
       <ProjectItem ReplaceParameters="true">Script.fsx</ProjectItem>
     </Project>
@@ -23,4 +24,10 @@
     <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
     <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
   </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="VisualFSharpTemplates">
+      <package id="System.ValueTuple" version="4.4.0" />
+      <package id="FSharp.Core" version="4.5.2" />
+    </packages>
+  </WizardData>
 </VSTemplate>

vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.fsproj

 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>$guid1$</ProjectGuid>
     <OutputType>Exe</OutputType>
-    $if$($targetframeworkversion$ >= 4.7.2)<TargetFramework>net472</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.7.1)<TargetFramework>net471</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.7)<TargetFramework>net47</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.6.2)<TargetFramework>net462</TargetFramework>$endif$$if$($targetframeworkversion$ == 4.6.1)<TargetFramework>net461</TargetFramework>$endif$$if$($targetframeworkversion$ <= 4.6)<TargetFramework>net46</TargetFramework>$endif$
+    <RootNamespace>$safeprojectname$</RootNamespace>
+    <AssemblyName>$safeprojectname$</AssemblyName>
+    <TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <UseStandardResourceNames>true</UseStandardResourceNames>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <WarningsAsErrors>3239;$(WarningsAsErrors)</WarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <Tailcalls>false</Tailcalls>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <Tailcalls>true</Tailcalls>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <WarningLevel>3</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DocumentationFile>bin\$(Configuration)\$(AssemblyName).XML</DocumentationFile>
+    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
-
   <ItemGroup>
-    <Compile Include="Tutorial.fsx" />
+    <Reference Include="mscorlib"/>
+    <Reference Include="System"/>
+    <Reference Include="System.Core"/>
+    <Reference Include="System.Numerics"/>
+    <Reference Include="System.Drawing"/>
+    <Reference Include="System.Windows.Forms"/>
   </ItemGroup>
-
+  <ItemGroup>
+    <Compile Include="Tutorial.fsx" />
+   </ItemGroup>
+  <PropertyGroup>
+    <MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets') ">
+    <FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
+  </PropertyGroup>
+  <Import Project="$(FSharpTargetsPath)" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>

vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate

@@ -6,7 +6,7 @@
     <Icon Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="4004" />
     <TemplateID>Microsoft.FSharp.Tutorial</TemplateID>
     <ProjectType>FSharp</ProjectType>
-    <RequiredFrameworkVersion>4.6</RequiredFrameworkVersion>
+    <RequiredFrameworkVersion>4.5</RequiredFrameworkVersion>
     <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
     <CreateNewFolder>true</CreateNewFolder>
     <DefaultName>Tutorial</DefaultName>
@@ -22,4 +22,10 @@
     <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
     <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
   </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="VisualFSharpTemplates">
+      <package id="System.ValueTuple" version="4.4.0" />
+      <package id="FSharp.Core" version="4.5.2" />
+     </packages>
+  </WizardData>
 </VSTemplate>

vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest

@@ -48,6 +48,7 @@
     <Asset Type="Microsoft.VisualStudio.Analyzer" d:Source="Project" d:ProjectName="FSharp.Editor" Path="|FSharp.Editor|" />
     <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ProjectSystem.Base" Path="|ProjectSystem.Base|" />
 
+    <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|AppConfig;TemplateProjectOutputGroup|" d:ProjectName="AppConfig" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|CodeFile;TemplateProjectOutputGroup|" d:ProjectName="CodeFile" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|ScriptFile;TemplateProjectOutputGroup|" d:ProjectName="ScriptFile" d:VsixSubPath="ItemTemplates" />
     <Asset Type="Microsoft.VisualStudio.ItemTemplate" d:Source="Project" Path="ItemTemplates" d:TargetPath="|SignatureFile;TemplateProjectOutputGroup|" d:ProjectName="SignatureFile" d:VsixSubPath="ItemTemplates" />

vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj

@@ -199,6 +199,14 @@
       <Private>True</Private>
     </ProjectReference>
 
+    <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\AppConfig\AppConfig.csproj">
+      <Project>{6ba13aa4-c25f-480f-856b-8e8000299a72}</Project>
+      <Name>AppConfig</Name>
+      <VSIXSubPath>ItemTemplates</VSIXSubPath>
+      <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <Private>True</Private>
+    </ProjectReference>
     <ProjectReference Include="$(FSharpSourcesRoot)\..\vsintegration\ItemTemplates\CodeFile\CodeFile.csproj">
       <Project>{12ac2813-e895-4aaa-ae6c-94e21da09f64}</Project>
       <Name>CodeFile</Name>

vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj

@@ -10,6 +10,16 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Content Include="$(NuGetPackageRoot)\FSharp.Core\4.5.2\FSharp.Core.4.5.2.nupkg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>packages\FSharp.Core.4.5.2.nupkg</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="$(NuGetPackageRoot)\System.ValueTuple\4.4.0\System.ValueTuple.4.4.0.nupkg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>packages\System.ValueTuple.4.4.0.nupkg</Link>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="Source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>

vsintegration/fsharp-vsintegration-item-templates-build.proj

@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectFiles Include="$(MSBuildThisFileDirectory)ItemTemplates\AppConfig\AppConfig.csproj" />
     <ProjectFiles Include="$(MSBuildThisFileDirectory)ItemTemplates\CodeFile\CodeFile.csproj" />
     <ProjectFiles Include="$(MSBuildThisFileDirectory)ItemTemplates\ScriptFile\ScriptFile.csproj" />
     <ProjectFiles Include="$(MSBuildThisFileDirectory)ItemTemplates\SignatureFile\SignatureFile.csproj" />

vsintegration/src/SupportedRuntimes/SupportedRuntimes.xml

@@ -5,14 +5,14 @@
     </TargetFramework>
     <TargetFramework Identifier=".NETFramework" Version="v4.0">
         <Assembly Version="4.3.0.0" Description="F# 3.0 (FSharp.Core, 4.3.0.0)"/>
-    </TargetFramework>
+    </TargetFramework>    
     <TargetFramework Identifier=".NETFramework" Version="v4.5">
         <Assembly Version="4.3.0.0" Description="F# 3.0 (FSharp.Core, 4.3.0.0)"/>
         <Assembly Version="4.3.1.0" Description="F# 3.1 (FSharp.Core, 4.3.1.0)"/>
         <Assembly Version="4.4.0.0" Description="F# 4.0 (FSharp.Core, 4.4.0.0)"/>
         <Assembly Version="4.4.1.0" Description="F# 4.1 (FSharp.Core, 4.4.1.0)"/>
         <Assembly Version="4.4.3.0" Description="F# 4.1 (FSharp.Core, 4.4.3.0)"/>
-    </TargetFramework>
+    </TargetFramework>    
     <TargetFramework Identifier=".NETPortable" Profile="Profile47">
         <Assembly Version="2.3.5.0" Description="F# 3.0 (FSharp.Core, 2.3.5.0)"/>
         <Assembly Version="2.3.5.1" Description="F# 3.1 (FSharp.Core, 2.3.5.1)"/>
@@ -23,15 +23,15 @@
         <Assembly Version="3.3.1.0" Description="F# 3.1 (FSharp.Core, 3.3.1.0)"/>
         <Assembly Version="3.7.4.0" Description="F# 4.0 (FSharp.Core, 3.7.4.0)"/>
         <Assembly Version="3.7.41.0" Description="F# 4.1 (FSharp.Core, 3.7.41.0)"/>
-    </TargetFramework>
+    </TargetFramework>    
     <TargetFramework Identifier=".NETPortable" Profile="Profile78">
         <Assembly Version="3.78.3.1" Description="F# 3.1 (FSharp.Core, 3.78.3.1)"/>
         <Assembly Version="3.78.4.0" Description="F# 4.0 (FSharp.Core, 3.78.4.0)"/>
         <Assembly Version="3.78.41.0" Description="F# 4.1 (FSharp.Core, 3.78.41.0)"/>
-    </TargetFramework>
+    </TargetFramework>    
     <TargetFramework Identifier=".NETPortable" Profile="Profile259">
         <Assembly Version="3.259.3.1" Description="F# 3.1 (FSharp.Core, 3.259.3.1)"/>
         <Assembly Version="3.259.4.0" Description="F# 4.0 (FSharp.Core, 3.259.4.0)"/>
         <Assembly Version="3.259.41.0" Description="F# 4.1 (FSharp.Core, 3.259.41.0)"/>
-    </TargetFramework>
+    </TargetFramework>    
 </TargetFrameworks>