Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit28e0bf5

Browse files
authored
Switch legacy project System Templates to use nuget. (#4977)
* Switch legacy templates to use nuget.* Change template names* Revert testing mod
1 parenta1f4569 commit28e0bf5

23 files changed

+123
-172
lines changed

‎packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<packageid="System.Reflection.Metadata"version="1.4.2" />
2020
<packageid="System.ValueTuple"version="4.3.1" />
2121
<packageid="System.ValueTuple"version="4.4.0" />
22+
<packageid="FSharp.Core"version="4.3.4"/>
2223
<packageid="Microsoft.VisualFSharp.Msbuild.15.0"version="1.0.1" />
2324
<packageid="Microsoft.Build"version="14.3.0" />
2425
<packageid="Microsoft.Build.Framework"version="14.3.0" />

‎vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.fsproj‎

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
<TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<UseStandardResourceNames>true</UseStandardResourceNames>
15-
$if$ ($targetframeworkversion$ >= 4.0)
16-
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
17-
$else$
18-
<TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
19-
$endif$
2015
</PropertyGroup>
2116
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
2217
<DebugSymbols>true</DebugSymbols>
@@ -43,22 +38,17 @@
4338
</PropertyGroup>
4439
<ItemGroup>
4540
<ReferenceInclude="mscorlib"/>
41+
<ReferenceInclude="System"/>
42+
<ReferenceInclude="System.Core"/>
43+
<ReferenceInclude="System.Numerics"/>
4644
<ReferenceInclude="FSharp.Core">
47-
<Name>FSharp.Core</Name>
48-
<AssemblyName>FSharp.Core.dll</AssemblyName>
49-
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
45+
<HintPath>..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll</HintPath>
46+
<Private>True</Private>
5047
</Reference>
5148
<ReferenceInclude="System.ValueTuple">
5249
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
5350
<Private>True</Private>
5451
</Reference>
55-
<ReferenceInclude="System"/>
56-
$if$ ($targetframeworkversion$ >= 3.5)
57-
<ReferenceInclude="System.Core"/>
58-
$endif$
59-
$if$ ($targetframeworkversion$ > 3.5)
60-
<ReferenceInclude="System.Numerics"/>
61-
$endif$
6252
</ItemGroup>
6353
<ItemGroup>
6454
<CompileInclude="AssemblyInfo.fs" />
@@ -68,18 +58,9 @@
6858
<PropertyGroup>
6959
<MinimumVisualStudioVersionCondition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
7060
</PropertyGroup>
71-
<Choose>
72-
<WhenCondition="'$(VisualStudioVersion)' == '11.0'">
73-
<PropertyGroupCondition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
74-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
75-
</PropertyGroup>
76-
</When>
77-
<Otherwise>
78-
<PropertyGroupCondition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
79-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
80-
</PropertyGroup>
81-
</Otherwise>
82-
</Choose>
61+
<PropertyGroupCondition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
62+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
63+
</PropertyGroup>
8364
<ImportProject="$(FSharpTargetsPath)" />
8465
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8566
Other similar extension points exist, see Microsoft.Common.targets.

‎vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<IconPackage="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}"ID="4001" />
77
<TemplateID>Microsoft.FSharp.Application</TemplateID>
88
<ProjectType>FSharp</ProjectType>
9-
<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
9+
<RequiredFrameworkVersion>4.0</RequiredFrameworkVersion>
1010
<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
1111
<CreateNewFolder>true</CreateNewFolder>
1212
<DefaultName>ConsoleApplication</DefaultName>
@@ -27,6 +27,7 @@
2727
<WizardData>
2828
<packagesrepository="extension"repositoryId="VisualFSharp">
2929
<packageid="System.ValueTuple"version="4.4.0"targetFramework="net40" />
30+
<packageid="FSharp.Core"version="4.3.4"targetFramework="net40" />
3031
</packages>
3132
</WizardData>
3233
</VSTemplate>

‎vsintegration/ProjectTemplates/LibraryProject/Template/Library.fsproj‎

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
<AssemblyName>$safeprojectname$</AssemblyName>
1212
<UseStandardResourceNames>true</UseStandardResourceNames>
1313
<TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
14-
$if$ ($targetframeworkversion$ >= 4.0)
15-
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
16-
$else$
17-
<TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
18-
$endif$
1914
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
2015
</PropertyGroup>
2116
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
@@ -39,22 +34,17 @@
3934
</PropertyGroup>
4035
<ItemGroup>
4136
<ReferenceInclude="mscorlib"/>
37+
<ReferenceInclude="System"/>
38+
<ReferenceInclude="System.Core"/>
39+
<ReferenceInclude="System.Numerics"/>
4240
<ReferenceInclude="FSharp.Core">
43-
<Name>FSharp.Core</Name>
44-
<AssemblyName>FSharp.Core.dll</AssemblyName>
45-
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
41+
<HintPath>..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll</HintPath>
42+
<Private>True</Private>
4643
</Reference>
4744
<ReferenceInclude="System.ValueTuple">
4845
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
4946
<Private>True</Private>
5047
</Reference>
51-
<ReferenceInclude="System"/>
52-
$if$ ($targetframeworkversion$ >= 3.5)
53-
<ReferenceInclude="System.Core"/>
54-
$endif$
55-
$if$ ($targetframeworkversion$ > 3.5)
56-
<ReferenceInclude="System.Numerics"/>
57-
$endif$
5848
</ItemGroup>
5949
<ItemGroup>
6050
<CompileInclude="AssemblyInfo.fs" />
@@ -64,18 +54,9 @@
6454
<PropertyGroup>
6555
<MinimumVisualStudioVersionCondition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
6656
</PropertyGroup>
67-
<Choose>
68-
<WhenCondition="'$(VisualStudioVersion)' == '11.0'">
69-
<PropertyGroupCondition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
70-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
71-
</PropertyGroup>
72-
</When>
73-
<Otherwise>
74-
<PropertyGroupCondition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
75-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
76-
</PropertyGroup>
77-
</Otherwise>
78-
</Choose>
57+
<PropertyGroupCondition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
58+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
59+
</PropertyGroup>
7960
<ImportProject="$(FSharpTargetsPath)" />
8061
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8162
Other similar extension points exist, see Microsoft.Common.targets.

‎vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<IconPackage="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}"ID="4002" />
77
<TemplateID>Microsoft.FSharp.Library</TemplateID>
88
<ProjectType>FSharp</ProjectType>
9-
<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
9+
<RequiredFrameworkVersion>4.0</RequiredFrameworkVersion>
1010
<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
1111
<CreateNewFolder>true</CreateNewFolder>
1212
<DefaultName>Library</DefaultName>
@@ -27,6 +27,7 @@
2727
<WizardData>
2828
<packagesrepository="extension"repositoryId="VisualFSharp">
2929
<packageid="System.ValueTuple"version="4.4.0"targetFramework="net40" />
30-
</packages>
30+
<packageid="FSharp.Core"version="4.3.4"targetFramework="net40" />
31+
</packages>
3132
</WizardData>
3233
</VSTemplate>

‎vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.fsproj‎

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@
1212
<TargetFrameworkVersion>v$targetframeworkversion$</TargetFrameworkVersion>
1313
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1414
<UseStandardResourceNames>true</UseStandardResourceNames>
15-
$if$ ($targetframeworkversion$ >= 4.0)
16-
<TargetFSharpCoreVersion>4.4.3.0</TargetFSharpCoreVersion>
17-
$else$
18-
<TargetFSharpCoreVersion>2.3.0.0</TargetFSharpCoreVersion>
19-
$endif$
2015
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
2116
</PropertyGroup>
2217
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
@@ -44,20 +39,15 @@
4439
</PropertyGroup>
4540
<ItemGroup>
4641
<ReferenceInclude="mscorlib"/>
47-
<ReferenceInclude="FSharp.Core">
48-
<Name>FSharp.Core</Name>
49-
<AssemblyName>FSharp.Core.dll</AssemblyName>
50-
<HintPath>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\$(TargetFSharpCoreVersion)\FSharp.Core.dll</HintPath>
51-
</Reference>
5242
<ReferenceInclude="System"/>
53-
$if$ ($targetframeworkversion$ >= 3.5)
5443
<ReferenceInclude="System.Core"/>
55-
$endif$
56-
$if$ ($targetframeworkversion$ > 3.5)
5744
<ReferenceInclude="System.Numerics"/>
58-
$endif$
5945
<ReferenceInclude="System.Drawing"/>
6046
<ReferenceInclude="System.Windows.Forms"/>
47+
<ReferenceInclude="FSharp.Core">
48+
<HintPath>..\packages\FSharp.Core.4.3.4\lib\net45\FSharp.Core.dll</HintPath>
49+
<Private>True</Private>
50+
</Reference>
6151
<ReferenceInclude="System.ValueTuple">
6252
<HintPath>..\packages\System.ValueTuple.4.4.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
6353
<Private>True</Private>
@@ -69,18 +59,9 @@
6959
<PropertyGroup>
7060
<MinimumVisualStudioVersionCondition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
7161
</PropertyGroup>
72-
<Choose>
73-
<WhenCondition="'$(VisualStudioVersion)' == '11.0'">
74-
<PropertyGroupCondition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
75-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
76-
</PropertyGroup>
77-
</When>
78-
<Otherwise>
79-
<PropertyGroupCondition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
80-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
81-
</PropertyGroup>
82-
</Otherwise>
83-
</Choose>
62+
<PropertyGroupCondition=" '$(FSharpTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
63+
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
64+
</PropertyGroup>
8465
<ImportProject="$(FSharpTargetsPath)" />
8566
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8667
Other similar extension points exist, see Microsoft.Common.targets.

‎vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<IconPackage="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}"ID="4004" />
77
<TemplateID>Microsoft.FSharp.Tutorial</TemplateID>
88
<ProjectType>FSharp</ProjectType>
9-
<RequiredFrameworkVersion>2.0</RequiredFrameworkVersion>
9+
<RequiredFrameworkVersion>4.0</RequiredFrameworkVersion>
1010
<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
1111
<CreateNewFolder>true</CreateNewFolder>
1212
<DefaultName>Tutorial</DefaultName>
@@ -25,6 +25,7 @@
2525
<WizardData>
2626
<packagesrepository="extension"repositoryId="VisualFSharp">
2727
<packageid="System.ValueTuple"version="4.4.0"targetFramework="net40" />
28+
<packageid="FSharp.Core"version="4.3.4"targetFramework="net40" />
2829
</packages>
2930
</WizardData>
3031
</VSTemplate>

‎vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@
2323
<Link>License.txt</Link>
2424
<IncludeInVSIX>true</IncludeInVSIX>
2525
</Content>
26+
<ContentInclude="$(FSharpSourcesRoot)\..\packages\FSharp.Core.4.3.4\FSharp.Core.4.3.4.nupkg">
27+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
28+
<Link>packages\FSharp.Core.4.3.4.nupkg</Link>
29+
<IncludeInVSIX>true</IncludeInVSIX>
30+
</Content>
2631
<ContentInclude="$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\System.ValueTuple.4.3.1.nupkg">
2732
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2833
<Link>packages\System.ValueTuple.4.3.1.nupkg</Link>

‎vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
32
<root>
43
<!--
54
Microsoft ResX Schema
@@ -330,19 +329,19 @@
330329
<value>File.fs</value>
331330
</data>
332331
<dataname="5014"xml:space="preserve">
333-
<value>Console Application</value>
332+
<value>Console Application (.NET Framework)</value>
334333
</data>
335334
<dataname="5015"xml:space="preserve">
336335
<value>A project for creating a command-line application</value>
337336
</data>
338337
<dataname="5016"xml:space="preserve">
339-
<value>Library</value>
338+
<value>Library (.NET Framework)</value>
340339
</data>
341340
<dataname="5017"xml:space="preserve">
342341
<value>A project for creating an F# library</value>
343342
</data>
344343
<dataname="5018"xml:space="preserve">
345-
<value>Tutorial</value>
344+
<value>Tutorial (.NET Framework)</value>
346345
</data>
347346
<dataname="5019"xml:space="preserve">
348347
<value>A tutorial project providing a walkthrough of the F# language</value>

‎vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@
203203
<note />
204204
</trans-unit>
205205
<trans-unitid="5014">
206-
<source>Console Application</source>
207-
<targetstate="translated">Konzolová aplikace</target>
206+
<source>Console Application (.NET Framework)</source>
207+
<targetstate="needs-review-translation">Konzolová aplikace</target>
208208
<note />
209209
</trans-unit>
210210
<trans-unitid="5015">
@@ -213,8 +213,8 @@
213213
<note />
214214
</trans-unit>
215215
<trans-unitid="5016">
216-
<source>Library</source>
217-
<targetstate="translated">Knihovna</target>
216+
<source>Library (.NET Framework)</source>
217+
<targetstate="needs-review-translation">Knihovna</target>
218218
<note />
219219
</trans-unit>
220220
<trans-unitid="5017">
@@ -223,8 +223,8 @@
223223
<note />
224224
</trans-unit>
225225
<trans-unitid="5018">
226-
<source>Tutorial</source>
227-
<targetstate="translated">Tutoriál</target>
226+
<source>Tutorial (.NET Framework)</source>
227+
<targetstate="needs-review-translation">Tutoriál</target>
228228
<note />
229229
</trans-unit>
230230
<trans-unitid="5019">

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp