CP: Use Framework valuetuple rather than netstandard1.0 one (#5872)

* Use Framework valuetuple rather than netstandard1.0 one (#5867)

* remove references from template

Author: KevinRansom

build.cmd

@@ -611,8 +611,8 @@ if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\common7\ide\devenv.exe" se
 :vsversionset
 if "%VisualStudioVersion%" == "" echo Error: Could not find an installation of Visual Studio && goto :failure
 
-if exist "%VS160COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (
-    set _msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe"
+if exist "%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe" (
+    set _msbuildexe="%VS160COMNTOOLS%\..\..\MSBuild\Current\Bin\MSBuild.exe"
     goto :havemsbuild
 )
 if exist "%VS150COMNTOOLS%\..\..\MSBuild\15.0\Bin\MSBuild.exe" (

vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.fsproj

@@ -42,14 +42,6 @@
     <Reference Include="System"/>
     <Reference Include="System.Core"/>
     <Reference Include="System.Numerics"/>
-    <Reference Include="FSharp.Core">
-      <HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.ValueTuple">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />

vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate

@@ -26,8 +26,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="VisualFSharpTemplates">
-      <package id="System.ValueTuple" version="4.4.0" targetFramework="net40" skipAssemblyReferences="true" />
-      <package id="FSharp.Core" version="4.5.2" targetFramework="net40" skipAssemblyReferences="true" />
+      <package id="System.ValueTuple" version="4.4.0" />
+      <package id="FSharp.Core" version="4.5.2" />
      </packages>
   </WizardData>
 </VSTemplate>

vsintegration/ProjectTemplates/LibraryProject/Template/Library.fsproj

@@ -38,14 +38,6 @@
     <Reference Include="System"/>
     <Reference Include="System.Core"/>
     <Reference Include="System.Numerics"/>
-    <Reference Include="FSharp.Core">
-      <HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.ValueTuple">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />

vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate

@@ -26,8 +26,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="VisualFSharpTemplates">
-      <package id="System.ValueTuple" version="4.4.0" targetFramework="net40" skipAssemblyReferences="true" />
-      <package id="FSharp.Core" version="4.5.2" targetFramework="net40" skipAssemblyReferences="true" />
+      <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

@@ -45,14 +45,6 @@
     <Reference Include="System.Numerics"/>
     <Reference Include="System.Drawing"/>
     <Reference Include="System.Windows.Forms"/>
-    <Reference Include="FSharp.Core">
-      <HintPath>..\packages\FSharp.Core.4.5.2\lib\net45\FSharp.Core.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System.ValueTuple">
-      <HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Tutorial.fsx" />

vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate

@@ -24,8 +24,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="VisualFSharpTemplates">
-      <package id="System.ValueTuple" version="4.4.0" targetFramework="net40" skipAssemblyReferences="true" />
-      <package id="FSharp.Core" version="4.5.2" targetFramework="net40" skipAssemblyReferences="true" />
+      <package id="System.ValueTuple" version="4.4.0" />
+      <package id="FSharp.Core" version="4.5.2" />
      </packages>
   </WizardData>
 </VSTemplate>

vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj

@@ -6,7 +6,7 @@
     <AssemblyName>VisualFSharpTemplate</AssemblyName>
     <OutputType>Library</OutputType>
     <ExtensionInstallationFolder>Microsoft\FSharpTemplates</ExtensionInstallationFolder>
-    <DeployExtension>false</DeployExtension>
+    <DeployExtension>true</DeployExtension>
   </PropertyGroup>
 
   <ItemGroup>