Skip to content

Commit

Permalink
(Nugetize F# templates. Ensure value tuple installed on create templa…
Browse files Browse the repository at this point in the history
…te. (dotnet#1620)
  • Loading branch information
KevinRansom authored Oct 15, 2016
1 parent 2a9b5ef commit 00bab99
Show file tree
Hide file tree
Showing 36 changed files with 132 additions and 97 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,4 @@ tests/fsharp/core/array/dont.run.peverify
tests/fsharp/core/innerpoly/dont.run.peverify
tests/fsharp/typecheck/sigs/neg94-pre.dll
times
/tests/fsharpqa/testenv/bin/System.ValueTuple.dll
1 change: 0 additions & 1 deletion src/FSharpSource.Settings.targets
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<ToolsDir>$(MSBuildThisFileDirectory)..\Tools\</ToolsDir>
<BuildToolsTaskDir>$(ToolsDir)net45\</BuildToolsTaskDir>
<WarningsAsErrors />
<DeployExtension>false</DeployExtension>

<FX_NO_LOADER Condition=" '$(FX_NO_LOADER)'==''">false</FX_NO_LOADER>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,6 @@
<Reference Include="System.Reflection.Metadata"><HintPath>..\..\..\packages\System.Reflection.Metadata.1.4.1-beta-24227-04\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath></Reference>
<Reference Include="System.Collections.Immutable"><HintPath>..\..\..\packages\System.Collections.Immutable.1.2.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath></Reference>
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\System.ValueTuple.dll</HintPath></Reference>
<Reference Include="System.ValueTuple"><HintPath>..\..\..\packages\System.ValueTuple.4.0.0-rc3-24212-01\lib\netstandard1.1\\System.ValueTuple.dll</HintPath></Reference>
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" >
<Project>{DED3BBD7-53F4-428A-8C9F-27968E768605}</Project>
<Name>FSharp.Core</Name>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<ProjectGuid>{604F0DAA-2D33-48DD-B162-EDF0B672803D}</ProjectGuid>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<TargetFramework Condition="'$(TargetFramework)' == ''">net40</TargetFramework>
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
</PropertyGroup>

<Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />

<ItemGroup>
Expand All @@ -41,25 +42,25 @@
<InProject>false</InProject>
</FilesToLocalize>
</ItemGroup>

<ItemGroup>
<VSTemplate Include="Template\ConsoleApplication.vstemplate" />
</ItemGroup>

<ItemGroup>
<TemplateFiles Include="Template\App.config" />
<TemplateFiles Include="Template\ConsoleApplication.fsproj" />
<TemplateFiles Include="Template\AssemblyInfo.fs" />
<TemplateFiles Include="Template\Program.fs" />
<TemplateFiles Include="Template\packages.config" />

<TemplateFiles Include="Template\ConsoleApplication.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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Program.fs" />
<Content Include="packages.config" />
<None Include="App.config" />
</ItemGroup>
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,16 @@
<Project File="ConsoleApplication.fsproj" ReplaceParameters="true">
<ProjectItem ReplaceParameters="true">AssemblyInfo.fs</ProjectItem>
<ProjectItem ReplaceParameters="true" OpenInEditor="true">Program.fs</ProjectItem>
<ProjectItem ReplaceParameters="false">packages.config</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>
<WizardData>
<packages repository="extension" repositoryId="VisualFSharp">
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" targetFramework="net452" />
</packages>
</WizardData>
</VSTemplate>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<ProjectGuid>{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}</ProjectGuid>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<TargetFramework Condition="'$(TargetFramework)' == ''">net40</TargetFramework>
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
</PropertyGroup>

<Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />

<ItemGroup>
Expand All @@ -45,21 +46,20 @@
<ItemGroup>
<VSTemplate Include="Template\Library.vstemplate" />
</ItemGroup>

<ItemGroup>
<TemplateFiles Include="Template\AssemblyInfo.fs" />
<TemplateFiles Include="Template\Library.fsproj" />
<TemplateFiles Include="Template\Library.vstemplate" />
<TemplateFiles Include="Template\Library1.fs" />
<TemplateFiles Include="Template\packages.config" />
<TemplateFiles Include="Template\Script.fsx" />
</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="Library1.fs" />
<Content Include="packages.config" />
<None Include="Script.fsx" />
</ItemGroup>
<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,16 @@
<Project File="Library.fsproj" ReplaceParameters="true">
<ProjectItem ReplaceParameters="true">AssemblyInfo.fs</ProjectItem>
<ProjectItem ReplaceParameters="true" OpenInEditor="true">Library1.fs</ProjectItem>
<ProjectItem ReplaceParameters="false">packages.config</ProjectItem>
<ProjectItem ReplaceParameters="true">Script.fsx</ProjectItem>
</Project>
</TemplateContent>
<WizardExtension>
<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="VisualFSharp">
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" targetFramework="net452" />
</packages>
</WizardData>
</VSTemplate>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<ProjectGuid>{D9D95330-3626-4199-B7AF-17B8E4AF6D87}</ProjectGuid>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<TargetFramework Condition="'$(TargetFramework)' == ''">net40</TargetFramework>
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
</PropertyGroup>

<Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />

<ItemGroup>
<FilesToLocalize Include="$(OutDir)$(TemplateCategory)\$(AssemblyName)\AssemblyInfo.fs">
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(TemplateCategory)\$(AssemblyName)\AssemblyInfo.fs.lcl</TranslationFile>
Expand All @@ -41,25 +42,26 @@
<InProject>false</InProject>
</FilesToLocalize>
</ItemGroup>

<ItemGroup>
<VSTemplate Include="Template\NETCore259PortableLibrary.vstemplate" />
</ItemGroup>

<ItemGroup>
<TemplateFiles Include="Template\AssemblyInfo.fs" />
<TemplateFiles Include="Template\NETCore259PortableLibrary.vstemplate" />
<TemplateFiles Include="Template\PortableLibrary.fsproj" />
<TemplateFiles Include="Template\PortableLibrary1.fs" />
<TemplateFiles Include="Template\packages.config" />

<TemplateFiles Include="Template\Script.fsx" />
</ItemGroup>

<Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.tools.targets" />
<Import Project="$(FSharpSourcesRoot)\Microbuild.Settings.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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,16 @@
<Project File="PortableLibrary.fsproj" ReplaceParameters="true">
<ProjectItem ReplaceParameters="true" TargetFileName="AssemblyInfo.fs">AssemblyInfo.fs</ProjectItem>
<ProjectItem ReplaceParameters="true" OpenInEditor="true" TargetFileName="PortableLibrary1.fs">PortableLibrary1.fs</ProjectItem>
<ProjectItem ReplaceParameters="false">packages.config</ProjectItem>
<ProjectItem ReplaceParameters="true">Script.fsx</ProjectItem>
</Project>
</TemplateContent>
<WizardExtension>
<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="VisualFSharp">
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" targetFramework="net452" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="PortableLibrary1.fs" />
<Content Include="packages.config" />
<None Include="Script.fsx" />
</ItemGroup>
<PropertyGroup>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,14 @@
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<ProjectGuid>{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}</ProjectGuid>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<TargetFramework Condition="'$(TargetFramework)' == ''">net40</TargetFramework>
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetFramework)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>
</PropertyGroup>

<Import Project="$(FSharpSourcesRoot)\..\vsintegration\src\FSharp.Common.props" />

<ItemGroup>
<FilesToLocalize Include="$(OutDir)$(TemplateCategory)\$(AssemblyName)\AssemblyInfo.fs">
<TranslationFile>$(FSharpSourcesRoot)\..\loc\lcl\{Lang}\$(TemplateCategory)\$(AssemblyName)\AssemblyInfo.fs.lcl</TranslationFile>
Expand All @@ -41,25 +40,19 @@
<InProject>false</InProject>
</FilesToLocalize>
</ItemGroup>

<ItemGroup>
<VSTemplate Include="Template\NETCore78PortableLibrary.vstemplate" />
</ItemGroup>

<ItemGroup>
<TemplateFiles Include="Template\AssemblyInfo.fs" />
<TemplateFiles Include="Template\NETCore78PortableLibrary.vstemplate" />
<TemplateFiles Include="Template\PortableLibrary.fsproj" />
<TemplateFiles Include="Template\PortableLibrary1.fs" />
<TemplateFiles Include="Template\packages.config" />
<TemplateFiles Include="Template\Script.fsx" />
</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,16 @@
<Project File="PortableLibrary.fsproj" ReplaceParameters="true">
<ProjectItem ReplaceParameters="true" TargetFileName="AssemblyInfo.fs">AssemblyInfo.fs</ProjectItem>
<ProjectItem ReplaceParameters="true" OpenInEditor="true" TargetFileName="PortableLibrary1.fs">PortableLibrary1.fs</ProjectItem>
<ProjectItem ReplaceParameters="false">packages.config</ProjectItem>
<ProjectItem ReplaceParameters="true">Script.fsx</ProjectItem>
</Project>
</TemplateContent>
<WizardExtension>
<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="VisualFSharp">
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" targetFramework="net452" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="PortableLibrary1.fs" />
<Content Include="packages.config" />
<None Include="Script.fsx" />
</ItemGroup>
<PropertyGroup>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<CopyVsixManifestToOutput>false</CopyVsixManifestToOutput>
<CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
<CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
<ProjectGuid>{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}</ProjectGuid>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
Expand All @@ -41,25 +42,25 @@
<InProject>false</InProject>
</FilesToLocalize>
</ItemGroup>

<ItemGroup>
<VSTemplate Include="Template\NETCore7PortableLibrary.vstemplate" />
</ItemGroup>

<ItemGroup>
<TemplateFiles Include="Template\AssemblyInfo.fs" />
<TemplateFiles Include="Template\NETCore7PortableLibrary.vstemplate" />
<TemplateFiles Include="Template\PortableLibrary.fsproj" />
<TemplateFiles Include="Template\PortableLibrary1.fs" />
<TemplateFiles Include="Template\Script.fsx" />
<TemplateFiles Include="Template\packages.config" />

</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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,15 @@
<ProjectItem ReplaceParameters="true" TargetFileName="AssemblyInfo.fs">AssemblyInfo.fs</ProjectItem>
<ProjectItem ReplaceParameters="true" OpenInEditor="true" TargetFileName="PortableLibrary1.fs">PortableLibrary1.fs</ProjectItem>
<ProjectItem ReplaceParameters="true">Script.fsx</ProjectItem>
<ProjectItem ReplaceParameters="false">packages.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>
<WizardData>
<packages repository="extension" repositoryId="VisualFSharp">
<package id="System.ValueTuple" version="4.0.0-rc3-24212-01" targetFramework="net452" />
</packages>
</WizardData>
</VSTemplate>
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
<ItemGroup>
<Compile Include="AssemblyInfo.fs" />
<Compile Include="PortableLibrary1.fs" />
<Content Include="packages.config" />
<None Include="Script.fsx" />
</ItemGroup>
<PropertyGroup>
Expand Down
Loading

0 comments on commit 00bab99

Please sign in to comment.