[Pkg-cli-apps-commits] [fsharp] 13/60: Enable Profile 78 and 259. Add Templates to allow users to use them. (changeset 1296994)
Christopher Halse Rogers
raof-guest at moszumanska.debian.org
Sun Sep 14 08:13:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
raof-guest pushed a commit to branch master
in repository fsharp.
commit 20d447902eca68458a9ccaba2d801cf3b0964111
Author: KevinRansom <kevinr at microsoft.com>
Date: Mon Jul 14 00:09:20 2014 -0700
Enable Profile 78 and 259. Add Templates to allow users to use them. (changeset 1296994)
---
changelist.txt | 3 +
src/FSharpSource.targets | 44 +-
src/fsharp/FSharp.Core/FSharp.Core.fsproj | 2 +
tests/RunTests.cmd | 6 +
tests/config.bat | 10 +-
tests/fsharp/core/libtest/test.fsx | 3 +-
.../ConsoleApplication1/portabletestentry.csproj | 18 +-
.../fsharp/core/netcore/{ => netcore259}/build.bat | 4 +-
tests/fsharp/core/netcore/{ => netcore259}/run.bat | 4 +-
tests/fsharp/core/netcore/{ => netcore7}/build.bat | 4 +-
tests/fsharp/core/netcore/{ => netcore7}/run.bat | 4 +-
.../fsharp/core/netcore/{ => netcore78}/build.bat | 4 +-
tests/fsharp/core/netcore/{ => netcore78}/run.bat | 4 +-
.../netcoreautomationhelperlibrary.fsproj | 27 +-
.../netcorelibrary1/netcoretestinglibrary.fsproj | 27 +-
vsintegration/src/Deployment.sln | 24 +
.../NetCore259ProjectTemplates.csproj} | 8 +-
.../NETCorePortableLibrary/PortableLibrary.fsproj | 6 +-
.../NETCorePortableLibrary/PortableLibrary1.fs | 4 +
.../NETCorePortableLibrary/Script.fsx | 6 +
.../fsNETCore259PortableLibrary.vstemplate} | 6 +-
.../NetCore78ProjectTemplates.csproj} | 8 +-
.../NetCorePortableLibrary}/PortableLibrary.fsproj | 6 +-
.../NetCorePortableLibrary/PortableLibrary1.fs | 4 +
.../NetCorePortableLibrary/Script.fsx | 6 +
.../fsNETCore78PortableLibrary.vstemplate} | 6 +-
.../NetCoreProjectTemplates.csproj | 8 +-
.../NETCorePortableLibrary/PortableLibrary.fsproj | 2 +-
...mplate => fsNETCore7PortableLibrary.vstemplate} | 2 +-
.../VsProDeployTemplates.csproj | 14 +
.../source.extension.vsixmanifest | 2 +
.../FSharp.LanguageService.fsproj | 2 +-
.../FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj | 2 +-
.../src/vs/FsPkgs/FSharp.Project/FS/VSPackage.resx | 20 +-
.../FsPkgs/FSharp.Project/FS/VSPackage_Dev11.resx | 530 ---------------------
.../vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj | 2 +-
36 files changed, 221 insertions(+), 611 deletions(-)
diff --git a/changelist.txt b/changelist.txt
index 63aa6bb..1082c95 100644
--- a/changelist.txt
+++ b/changelist.txt
@@ -11,6 +11,9 @@
Changelist for Visual F# Tools 3.1.2
====================================
+* Update internal packager, and build files to support the new profiles
+* Fix some bugs in the open source Profile 7, 78 and 259, improve build support for it.
+- Open source the Visual Studio Fsharp UI tests and test harnesses
- Open source project system, language service, editor, vs_fsi
* #! treated as a comment when it is at the start of an fsharp file
* Fix for #78 - allow space characters in active pattern case identifiers
diff --git a/src/FSharpSource.targets b/src/FSharpSource.targets
index 55a93c5..e7beeee 100644
--- a/src/FSharpSource.targets
+++ b/src/FSharpSource.targets
@@ -7,11 +7,16 @@
<When Condition="'$(ProjectLanguage)' == 'FSharp'">
<Choose>
<When Condition="'$(AssemblyName)' == 'FSharp.Core'">
+ <PropertyGroup Condition="'$(TargetFramework)' == 'Portable7' or '$(TargetFramework)' == 'Portable78' or '$(TargetFramework)' == 'Portable259'">
+ <IsPortableProfile>true</IsPortableProfile>
+ </PropertyGroup>
<PropertyGroup>
- <OtherFlags Condition="'$(TargetFramework)' != 'net20' AND '$(TargetFramework)' != 'portable47' AND '$(TargetFramework)' != 'portable7'">$(OtherFlags) --version:4.3.1.9055</OtherFlags>
+ <OtherFlags Condition="'$(TargetFramework)' != 'net20' and $(IsPortableProfile) != 'true'">$(OtherFlags) --version:4.3.1.9055</OtherFlags>
<OtherFlags Condition="'$(TargetFramework)' == 'net20'">$(OtherFlags) --version:2.3.1.9055</OtherFlags>
- <OtherFlags Condition="'$(TargetFramework)' == 'portable47'">$(OtherFlags) --version:2.3.5.9055</OtherFlags>
<OtherFlags Condition="'$(TargetFramework)' == 'portable7'">$(OtherFlags) --version:3.3.1.9055</OtherFlags>
+ <OtherFlags Condition="'$(TargetFramework)' == 'portable47'">$(OtherFlags) --version:2.3.5.9055</OtherFlags>
+ <OtherFlags Condition="'$(TargetFramework)' == 'portable78'">$(OtherFlags) --version:3.4.78.9055</OtherFlags>
+ <OtherFlags Condition="'$(TargetFramework)' == 'portable259'">$(OtherFlags) --version:3.4.259.9055</OtherFlags>
<OtherFlags>$(OtherFlags) --delaysign+ --keyfile:"$(FSharpSourcesRoot)\fsharp\msft.pubkey"</OtherFlags>
<DefineConstants>STRONG_NAME_AND_DELAY_SIGN_FSHARP_COMPILER_WITH_MSFT_KEY;$(DefineConstants)</DefineConstants>
<StrongNames>true</StrongNames>
@@ -140,7 +145,6 @@
<DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_TRUNCATE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CULTURE_INFO_ARGS</DefineConstants>
- <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_MODULES</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_TO_LOWER_INVARIANT</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
@@ -184,8 +188,9 @@
<!-- Target Portable Profile 7 -->
<PropertyGroup Condition="'$(TargetFramework)'=='portable7'">
- <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
<DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
+ <DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE7</DefineConstants>
+ <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
<DefineConstants>$(DefineConstants);FX_ATLEAST_35</DefineConstants>
<DefineConstants>$(DefineConstants);FX_ATLEAST_PORTABLE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
@@ -193,14 +198,11 @@
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
- <DefineConstants>$(DefineConstants);FX_NO_REFLECTION_MODULES</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
- <DefineConstants>$(DefineConstants);FX_NO_BASED_ARRAYS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
- <DefineConstants>$(DefineConstants);FX_NO_ICLONEABLE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_KEY_SORT</DefineConstants>
@@ -221,13 +223,16 @@
</PropertyGroup>
<!-- Target Portable -->
- <PropertyGroup Condition="'$(TargetFramework)'=='netcore78'">
+ <PropertyGroup Condition="'$(TargetFramework)'=='portable78'">
+ <DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
+ <DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE78</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
+ <DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
@@ -237,29 +242,31 @@
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
- <DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
+ <DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
<DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_THREADPOOL</DefineConstants>
+ <DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
- <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
<TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
</PropertyGroup>
- <PropertyGroup Condition="'$(TargetFramework)'=='netcore259'">
+ <PropertyGroup Condition="'$(TargetFramework)'=='portable259'">
+ <DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
+ <DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE259</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CONVERTER</DefineConstants>
<DefineConstants>$(DefineConstants);FX_RESHAPED_REFLECTION</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_ARRAY_LONG_LENGTH</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_EXIT</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CHAR_PARSE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_DEFAULT_DEPENDENCY_TYPE</DefineConstants>
+ <DefineConstants>$(DefineConstants);FX_SIMPLE_SECURITY_PERMISSIONS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_SYSTEM_CONSOLE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_TPL_PARALLEL</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_BINARY_SERIALIZATION</DefineConstants>
@@ -269,20 +276,19 @@
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_METADATA_TOKENS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_REFLECTION_EMIT</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_WEB_CLIENT</DefineConstants>
- <DefineConstants>$(DefineConstants);FSHARP_CORE_NETCORE_PORTABLE</DefineConstants>
+ <DefineConstants>$(DefineConstants);FX_NO_SECURITY_PERMISSIONS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_PARAMETERIZED_THREAD_START</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_THREAD</DefineConstants>
<DefineConstants>$(DefineConstants);FX_EVENTWAITHANDLE_NO_IDISPOSABLE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_EXIT_CONTEXT_FLAGS</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_REGISTERED_WAIT_HANDLES</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_THREADPOOL</DefineConstants>
+ <DefineConstants>$(DefineConstants);PUT_TYPE_PROVIDERS_IN_FSCORE</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CUSTOMATTRIBUTEDATA</DefineConstants>
- <DefineConstants>$(DefineConstants);QUERIES_IN_FSLIB</DefineConstants>
<DefineConstants>$(DefineConstants);FX_NO_CONCURRENT_DICTIONARY</DefineConstants>
<DefineConstants>$(DefineConstants);FX_ATLEAST_LINQ</DefineConstants>
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <OtherFlags>$(OtherFlags) --targetprofile:netcore</OtherFlags>
</PropertyGroup>
<!-- Target Silverlight 3.0 -->
@@ -620,7 +626,7 @@
<FSharpTargetsPath>..\Proto\$(protoCLIDir)\bin\Microsoft.Portable.FSharp-proto.Targets</FSharpTargetsPath>
</PropertyGroup>
</When>
- <When Condition="'$(TargetFramework)'=='netcore78' or '$(TargetFramework)'=='netcore259'">
+ <When Condition="'$(TargetFramework)'=='portable78' or '$(TargetFramework)'=='portable259'">
<PropertyGroup>
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets</FSharpTargetsPath>
</PropertyGroup>
@@ -686,15 +692,15 @@
Text="Configuration '$(Configuration)' is not one of the supported configurations: Debug, Release, Proto"
Condition="'$(Configuration)'!='Release' and '$(Configuration)'!='Debug' and '$(Configuration)'!='VSRelease' and '$(Configuration)'!='VSDebug' and '$(Configuration)'!='Proto'"/>
<Error
- Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5, sl5-compiler, portable47, portable7, netcore78, netcore259"
+ Text="TargetFramework '$(TargetFramework)' is not one of the supported configurations: 'empty', net20, net40, sl3-wp, sl5, sl5-compiler, portable47, portable7, portable78, portable259"
Condition="! ('$(TargetFramework)' == 'net40' or
'$(TargetFramework)' == 'net20' or
'$(TargetFramework)' == 'sl5' or
'$(TargetFramework)' == 'sl3-wp' or
'$(TargetFramework)' == 'portable47' or
'$(TargetFramework)' == 'portable7' or
- '$(TargetFramework)' == 'netcore78' or
- '$(TargetFramework)' == 'netcore259')"/>
+ '$(TargetFramework)' == 'portable78' or
+ '$(TargetFramework)' == 'portable259')"/>
<Error
Text="TargetFramework '$(TargetFramework)' is only supported when building FSharp.Core.dll. All other components must be built with TargetFramework=net40"
Condition="'$(AssemblyName)' != 'FSharp.Core' and '$(TargetFramework)' != 'net40'"/>
diff --git a/src/fsharp/FSharp.Core/FSharp.Core.fsproj b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
index e72c76a..96868be 100644
--- a/src/fsharp/FSharp.Core/FSharp.Core.fsproj
+++ b/src/fsharp/FSharp.Core/FSharp.Core.fsproj
@@ -20,6 +20,8 @@
<OtherFlags Condition=" '$(TargetFramework)'=='net20'">$(OtherFlags) --compiling-fslib-20:"$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\mscorlib.dll" </OtherFlags>
<OtherFlags Condition=" '$(TargetFramework)'=='net40'">$(OtherFlags) --compiling-fslib-40</OtherFlags>
<OtherFlags Condition=" '$(TargetFramework)'=='portable7'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
+ <OtherFlags Condition=" '$(TargetFramework)'=='portable78'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
+ <OtherFlags Condition=" '$(TargetFramework)'=='portable259'">$(OtherFlags) --targetprofile:netcore</OtherFlags>
</PropertyGroup>
diff --git a/tests/RunTests.cmd b/tests/RunTests.cmd
index 4abecbb..191cfcb 100644
--- a/tests/RunTests.cmd
+++ b/tests/RunTests.cmd
@@ -96,6 +96,8 @@ set FSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETF
set FSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0
set FSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1
set FSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.3.1.0
+set FSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.78.310
+set FSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.259.310
set FSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers
REM == open source logic
@@ -103,12 +105,16 @@ if exist "%FSCBinPath%\FSharp.Core.dll" set FSCOREDLLPATH=%FSCBinPath%
if exist "%FSCBinPath%\..\..\net20\bin\FSharp.Core.dll" set FSCOREDLL20PATH=%FSCBinPath%\..\..\net20\bin
if exist "%FSCBinPath%\..\..\portable47\bin\FSharp.Core.dll" set FSCOREDLLPORTABLEPATH=%FSCBinPath%\..\..\portable47\bin
if exist "%FSCBinPath%\..\..\portable7\bin\FSharp.Core.dll" set FSCOREDLLNETCOREPATH=%FSCBinPath%\..\..\portable7\bin
+IF EXIST "%FSCBinPath%\..\..\portable78\bin\FSharp.Core.dll" set FSCOREDLLNETCORE78PATH=%FSCBinPath%\..\..\portable78\bin
+IF EXIST "%FSCBinPath%\..\..\portable259\bin\FSharp.Core.dll" set FSCOREDLLNETCORE259PATH=%FSCBinPath%\..\..\portable259\bin
if exist "%FSCBinPath%\FSharp.Data.TypeProviders.dll" set FSDATATPPATH=%FSCBinPath%
set FSCOREDLLPATH=%FSCOREDLLPATH%\FSharp.Core.dll
set FSCOREDLL20PATH=%FSCOREDLL20PATH%\FSharp.Core.dll
set FSCOREDLLPORTABLEPATH=%FSCOREDLLPORTABLEPATH%\FSharp.Core.dll
set FSCOREDLLNETCOREPATH=%FSCOREDLLNETCOREPATH%\FSharp.Core.dll
+set FSCOREDLLNETCORE78PATH=%FSCOREDLLNETCORE78PATH%\FSharp.Core.dll
+set FSCOREDLLNETCORE259PATH=%FSCOREDLLNETCORE259PATH%\FSharp.Core.dll
set FSDATATPPATH=%FSDATATPPATH%\FSharp.Data.TypeProviders.dll
for /d %%i in (%WINDIR%\Microsoft.NET\Framework\v4.0.?????) do set CORDIR=%%i
diff --git a/tests/config.bat b/tests/config.bat
index 046ed35..cd2c802 100644
--- a/tests/config.bat
+++ b/tests/config.bat
@@ -208,7 +208,9 @@ echo FSCBinPath =%FSCBinPath%
echo FSCOREDLL20PATH =%FSCOREDLL20PATH%
echo FSCOREDLLPATH =%FSCOREDLLPATH%
echo FSCOREDLLPORTABLEPATH =%FSCOREDLLPORTABLEPATH%
-echo FSCOREDLLNETCOREPATH =%FSCOREDLLNETCOREPATH%
+echo FSCOREDLLNETCOREPATH=%FSCOREDLLNETCOREPATH%
+echo FSCOREDLLNETCORE78PATH=%FSCOREDLLNETCORE78PATH%
+echo FSCOREDLLNETCORE259PATH=%FSCOREDLLNETCORE259PATH%
echo FSDATATPPATH =%FSDATATPPATH%
echo FSDIFF =%FSDIFF%
echo FSI =%FSI%
@@ -259,6 +261,8 @@ set FSCOREDLLPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETF
set FSCOREDLL20PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v2.0\2.3.0.0
set FSCOREDLLPORTABLEPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETPortable\2.3.5.1
set FSCOREDLLNETCOREPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.3.1.0
+set FSCOREDLLNETCORE78PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.78.310
+set FSCOREDLLNETCORE259PATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETCore\3.4.259.310
set FSDATATPPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.3.0.0\Type Providers
REM == Check if using open build instead
@@ -266,10 +270,14 @@ IF EXIST "%FSCBinPath%\FSharp.Core.dll" set FSCOREDLLPATH=%FSCBinPath%
IF EXIST "%FSCBinPath%\..\..\net20\bin\FSharp.Core.dll" set FSCOREDLL20PATH=%FSCBinPath%\..\..\net20\bin
IF EXIST "%FSCBinPath%\..\..\portable47\bin\FSharp.Core.dll" set FSCOREDLLPORTABLEPATH=%FSCBinPath%\..\..\portable47\bin
IF EXIST "%FSCBinPath%\..\..\portable7\bin\FSharp.Core.dll" set FSCOREDLLNETCOREPATH=%FSCBinPath%\..\..\portable7\bin
+IF EXIST "%FSCBinPath%\..\..\portable78\bin\FSharp.Core.dll" set FSCOREDLLNETCORE78PATH=%FSCBinPath%\..\..\portable78\bin
+IF EXIST "%FSCBinPath%\..\..\portable259\bin\FSharp.Core.dll" set FSCOREDLLNETCORE259PATH=%FSCBinPath%\..\..\portable259\bin
IF EXIST "%FSCBinPath%\FSharp.Data.TypeProviders.dll" set FSDATATPPATH=%FSCBinPath%
set FSCOREDLLPATH=%FSCOREDLLPATH%\FSharp.Core.dll
set FSCOREDLL20PATH=%FSCOREDLL20PATH%\FSharp.Core.dll
set FSCOREDLLPORTABLEPATH=%FSCOREDLLPORTABLEPATH%\FSharp.Core.dll
set FSCOREDLLNETCOREPATH=%FSCOREDLLNETCOREPATH%\FSharp.Core.dll
+set FSCOREDLLNETCORE78PATH=%FSCOREDLLNETCORE78PATH%\FSharp.Core.dll
+set FSCOREDLLNETCORE259PATH=%FSCOREDLLNETCORE259PATH%\FSharp.Core.dll
set FSDATATPPATH=%FSDATATPPATH%\FSharp.Data.TypeProviders.dll
diff --git a/tests/fsharp/core/libtest/test.fsx b/tests/fsharp/core/libtest/test.fsx
index b5185ac..1c8ea20 100644
--- a/tests/fsharp/core/libtest/test.fsx
+++ b/tests/fsharp/core/libtest/test.fsx
@@ -2294,7 +2294,8 @@ do check "generic format d" "1us" (sprintf "%A" 1us)
do check "generic format e" "1" (sprintf "%A" 1)
do check "generic format f" "1u" (sprintf "%A" 1ul)
do check "generic format g" "1L" (sprintf "%A" 1L)
-do check "generic format i" ("1" + bigintsuffix) (sprintf "%A" 1I)
+do check "generic format i" ("1" + bigintsuffix) ( printf "%A" 1I
+ sprintf "%A" 1I)
do check "generic format j" "1.0" (sprintf "%A" 1.0)
do check "generic format k" "1.01" (sprintf "%A" 1.01)
do check "generic format l" "1000.0" (sprintf "%A" 1000.0)
diff --git a/tests/fsharp/core/netcore/ConsoleApplication1/portabletestentry.csproj b/tests/fsharp/core/netcore/ConsoleApplication1/portabletestentry.csproj
index 3a4a76b..c2e4529 100644
--- a/tests/fsharp/core/netcore/ConsoleApplication1/portabletestentry.csproj
+++ b/tests/fsharp/core/netcore/ConsoleApplication1/portabletestentry.csproj
@@ -21,7 +21,6 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
@@ -30,15 +29,28 @@
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup>
+ <OutputPath>bin\$(Configuration)\$(TestProfile)\</OutputPath>
+ <IntermediateOutputPath>obj\$(Configuration)\$(TestProfile)\</IntermediateOutputPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(TestProfile)'=='' or '$(TestProfile)'=='Profile7'">
+ <ProfileCorePath>$(FSCOREDLLNETCOREPATH)</ProfileCorePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(TestProfile)'=='Profile78'">
+ <ProfileCorePath>$(FSCOREDLLNETCORE78PATH)</ProfileCorePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(TestProfile)'=='Profile259'">
+ <ProfileCorePath>$(FSCOREDLLNETCORE259PATH)</ProfileCorePath>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<SpecificVersion>False</SpecificVersion>
- <HintPath>$(FSCOREDLLNETCOREPATH)</HintPath>
+ <HintPath>$(ProfileCorePath)</HintPath>
+ <Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
diff --git a/tests/fsharp/core/netcore/build.bat b/tests/fsharp/core/netcore/netcore259/build.bat
similarity index 50%
copy from tests/fsharp/core/netcore/build.bat
copy to tests/fsharp/core/netcore/netcore259/build.bat
index f46d446..46c7563 100644
--- a/tests/fsharp/core/netcore/build.bat
+++ b/tests/fsharp/core/netcore/netcore259/build.bat
@@ -1,10 +1,10 @@
@if "%_echo%"=="" echo off
-call %~d0%~p0..\..\..\config.bat
+call %~d0%~p0..\..\..\..\config.bat
IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
echo Test not supported except on Ultimate
exit /b 0
)
-"%MSBUILDTOOLSPATH%\msbuild.exe" netcore.sln /p:Configuration=Debug
+"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug
exit /b %ERRORLEVEL%
\ No newline at end of file
diff --git a/tests/fsharp/core/netcore/run.bat b/tests/fsharp/core/netcore/netcore259/run.bat
similarity index 72%
copy from tests/fsharp/core/netcore/run.bat
copy to tests/fsharp/core/netcore/netcore259/run.bat
index 74bdf47..734ce70 100644
--- a/tests/fsharp/core/netcore/run.bat
+++ b/tests/fsharp/core/netcore/netcore259/run.bat
@@ -2,7 +2,7 @@
setlocal
-call %~d0%~p0..\..\..\config.bat
+call %~d0%~p0..\..\..\..\config.bat
IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
echo Test not supported except on Ultimate
@@ -11,7 +11,7 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
set CONTROL_FAILURES_LOG=%~dp0\control_failures.log
-.\ConsoleApplication1\bin\Debug\PortableTestEntry.exe
+..\ConsoleApplication1\bin\Debug\profile359\PortableTestEntry.exe
endlocal
exit /b %ERRORLEVEL%
diff --git a/tests/fsharp/core/netcore/build.bat b/tests/fsharp/core/netcore/netcore7/build.bat
similarity index 50%
copy from tests/fsharp/core/netcore/build.bat
copy to tests/fsharp/core/netcore/netcore7/build.bat
index f46d446..46c7563 100644
--- a/tests/fsharp/core/netcore/build.bat
+++ b/tests/fsharp/core/netcore/netcore7/build.bat
@@ -1,10 +1,10 @@
@if "%_echo%"=="" echo off
-call %~d0%~p0..\..\..\config.bat
+call %~d0%~p0..\..\..\..\config.bat
IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
echo Test not supported except on Ultimate
exit /b 0
)
-"%MSBUILDTOOLSPATH%\msbuild.exe" netcore.sln /p:Configuration=Debug
+"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug
exit /b %ERRORLEVEL%
\ No newline at end of file
diff --git a/tests/fsharp/core/netcore/run.bat b/tests/fsharp/core/netcore/netcore7/run.bat
similarity index 73%
copy from tests/fsharp/core/netcore/run.bat
copy to tests/fsharp/core/netcore/netcore7/run.bat
index 74bdf47..e999ffe 100644
--- a/tests/fsharp/core/netcore/run.bat
+++ b/tests/fsharp/core/netcore/netcore7/run.bat
@@ -2,7 +2,7 @@
setlocal
-call %~d0%~p0..\..\..\config.bat
+call %~d0%~p0..\..\..\..\config.bat
IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
echo Test not supported except on Ultimate
@@ -11,7 +11,7 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
set CONTROL_FAILURES_LOG=%~dp0\control_failures.log
-.\ConsoleApplication1\bin\Debug\PortableTestEntry.exe
+..\ConsoleApplication1\bin\Debug\profile7\PortableTestEntry.exe
endlocal
exit /b %ERRORLEVEL%
diff --git a/tests/fsharp/core/netcore/build.bat b/tests/fsharp/core/netcore/netcore78/build.bat
similarity index 50%
rename from tests/fsharp/core/netcore/build.bat
rename to tests/fsharp/core/netcore/netcore78/build.bat
index f46d446..46c7563 100644
--- a/tests/fsharp/core/netcore/build.bat
+++ b/tests/fsharp/core/netcore/netcore78/build.bat
@@ -1,10 +1,10 @@
@if "%_echo%"=="" echo off
-call %~d0%~p0..\..\..\config.bat
+call %~d0%~p0..\..\..\..\config.bat
IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
echo Test not supported except on Ultimate
exit /b 0
)
-"%MSBUILDTOOLSPATH%\msbuild.exe" netcore.sln /p:Configuration=Debug
+"%MSBUILDTOOLSPATH%\msbuild.exe" ..\netcore.sln /p:Configuration=Debug
exit /b %ERRORLEVEL%
\ No newline at end of file
diff --git a/tests/fsharp/core/netcore/run.bat b/tests/fsharp/core/netcore/netcore78/run.bat
similarity index 72%
rename from tests/fsharp/core/netcore/run.bat
rename to tests/fsharp/core/netcore/netcore78/run.bat
index 74bdf47..caf7c73 100644
--- a/tests/fsharp/core/netcore/run.bat
+++ b/tests/fsharp/core/netcore/netcore78/run.bat
@@ -2,7 +2,7 @@
setlocal
-call %~d0%~p0..\..\..\config.bat
+call %~d0%~p0..\..\..\..\config.bat
IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
echo Test not supported except on Ultimate
@@ -11,7 +11,7 @@ IF /I "%INSTALL_SKU%" NEQ "ULTIMATE" (
set CONTROL_FAILURES_LOG=%~dp0\control_failures.log
-.\ConsoleApplication1\bin\Debug\PortableTestEntry.exe
+..\ConsoleApplication1\bin\Debug\profile78\PortableTestEntry.exe
endlocal
exit /b %ERRORLEVEL%
diff --git a/tests/fsharp/core/netcore/netcoreautomationhelperlibrary/netcoreautomationhelperlibrary.fsproj b/tests/fsharp/core/netcore/netcoreautomationhelperlibrary/netcoreautomationhelperlibrary.fsproj
index f91f6ae..1ce3c7b 100644
--- a/tests/fsharp/core/netcore/netcoreautomationhelperlibrary/netcoreautomationhelperlibrary.fsproj
+++ b/tests/fsharp/core/netcore/netcoreautomationhelperlibrary/netcoreautomationhelperlibrary.fsproj
@@ -10,7 +10,6 @@
<RootNamespace>NetCoreAutomationHelperLibrary</RootNamespace>
<AssemblyName>NetCoreAutomationHelperLibrary</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetProfile>netcore</TargetProfile>
<Name>NetCoreAutomationHelperLibrary</Name>
<SccProjectName>SAK</SccProjectName>
@@ -18,24 +17,40 @@
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(TestProfile)'=='' or '$(TestProfile)'=='Profile7'">
+ <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+ <TargetFSharpCoreVersion>3.3.1.0</TargetFSharpCoreVersion>
+ <ProfileCorePath>$(FSCOREDLLNETCOREPATH)</ProfileCorePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(TestProfile)'=='Profile78'">
+ <TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
+ <TargetFSharpCoreVersion>3.4.78.310</TargetFSharpCoreVersion>
+ <ProfileCorePath>$(FSCOREDLLNETCORE78PATH)</ProfileCorePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(TestProfile)'=='Profile259'">
+ <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+ <TargetFSharpCoreVersion>3.4.259.310</TargetFSharpCoreVersion>
+ <ProfileCorePath>$(FSCOREDLLNETCORE259PATH)</ProfileCorePath>
+ </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
- <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NetCore</DefineConstants>
<WarningLevel>3</WarningLevel>
- <DocumentationFile>bin\Debug\PortableAutomationHelperLibrary.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
- <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<WarningLevel>3</WarningLevel>
- <DocumentationFile>bin\Release\PortableAutomationHelperLibrary.XML</DocumentationFile>
+ </PropertyGroup>
+ <PropertyGroup>
+ <OutputPath>bin\$(Configuration)\$(TestProfile)\</OutputPath>
+ <IntermediateOutputPath>obj\$(Configuration)\$(TestProfile)\</IntermediateOutputPath>
+ <DocumentationFile>bin\$(Configuration)\$(TestProfile)\PortableAutomationHelperLibrary.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
@@ -54,7 +69,7 @@
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
- <HintPath>$(FSCOREDLLNETCOREPATH)</HintPath>
+ <HintPath>$(ProfileCorePath)</HintPath>
</Reference>
</ItemGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/tests/fsharp/core/netcore/netcorelibrary1/netcoretestinglibrary.fsproj b/tests/fsharp/core/netcore/netcorelibrary1/netcoretestinglibrary.fsproj
index c1b96f0..73e588a 100644
--- a/tests/fsharp/core/netcore/netcorelibrary1/netcoretestinglibrary.fsproj
+++ b/tests/fsharp/core/netcore/netcorelibrary1/netcoretestinglibrary.fsproj
@@ -10,7 +10,6 @@
<RootNamespace>NetCoreLibrary1</RootNamespace>
<AssemblyName>NetCoreTestingLibrary</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
<TargetProfile>netcore</TargetProfile>
<Name>NetCoreTestingLibrary</Name>
<SccProjectName>SAK</SccProjectName>
@@ -18,30 +17,46 @@
<SccAuxPath>SAK</SccAuxPath>
<SccLocalPath>SAK</SccLocalPath>
</PropertyGroup>
+ <PropertyGroup Condition=" '$(TestProfile)'=='' or '$(TestProfile)'=='Profile7'">
+ <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+ <TargetFSharpCoreVersion>3.3.1.0</TargetFSharpCoreVersion>
+ <ProfileCorePath>$(FSCOREDLLNETCOREPATH)</ProfileCorePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(TestProfile)'=='Profile78'">
+ <TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
+ <TargetFSharpCoreVersion>3.4.78.310</TargetFSharpCoreVersion>
+ <ProfileCorePath>$(FSCOREDLLNETCORE78PATH)</ProfileCorePath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(TestProfile)'=='Profile259'">
+ <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
+ <TargetFSharpCoreVersion>3.4.259.310</TargetFSharpCoreVersion>
+ <ProfileCorePath>$(FSCOREDLLNETCORE259PATH)</ProfileCorePath>
+ </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<Tailcalls>false</Tailcalls>
- <OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;Portable;NetCore;COMPILED</DefineConstants>
<WarningLevel>3</WarningLevel>
- <DocumentationFile>bin\Debug\NetCoreLibrary1.XML</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<Tailcalls>true</Tailcalls>
- <OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;Portable;NetCore</DefineConstants>
<WarningLevel>3</WarningLevel>
- <DocumentationFile>bin\Release\NetCoreLibrary1.XML</DocumentationFile>
+ </PropertyGroup>
+ <PropertyGroup>
+ <OutputPath>bin\$(Configuration)\$(TestProfile)\</OutputPath>
+ <IntermediateOutputPath>obj\$(Configuration)\$(TestProfile)\</IntermediateOutputPath>
+ <DocumentationFile>bin\$(Configuration)\$(TestProfile)\PortableAutomationHelperLibrary.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="FSharp.Core">
<Name>FSharp.Core</Name>
<AssemblyName>FSharp.Core.dll</AssemblyName>
- <HintPath>$(FSCOREDLLNETCOREPATH)</HintPath>
+ <HintPath>$(ProfileCorePath)</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
diff --git a/vsintegration/src/Deployment.sln b/vsintegration/src/Deployment.sln
index 404724c..76a4fcf 100644
--- a/vsintegration/src/Deployment.sln
+++ b/vsintegration/src/Deployment.sln
@@ -47,6 +47,10 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "FSharp.PropertiesPages", "v
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ProjectSystem", "vs\FsPkgs\FSharp.Project\FS\ProjectSystem.fsproj", "{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCore259ProjectTemplates", "Templates\NetCore259ProjectTemplates\NetCore259ProjectTemplates.csproj", "{D9D95330-3626-4199-B7AF-17B8E4AF6D87}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetCore78ProjectTemplates", "Templates\NetCore78ProjectTemplates\NetCore78ProjectTemplates.csproj", "{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -276,6 +280,26 @@ Global
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.VSDebug|Any CPU.Build.0 = VSDebug|Any CPU
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.VSRelease|Any CPU.ActiveCfg = VSRelease|Any CPU
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.VSRelease|Any CPU.Build.0 = VSRelease|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|Any CPU.Build.0 = Proto|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.VSDebug|Any CPU.ActiveCfg = VSDebug|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.VSDebug|Any CPU.Build.0 = VSDebug|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.VSRelease|Any CPU.ActiveCfg = VSRelease|Any CPU
+ {D9D95330-3626-4199-B7AF-17B8E4AF6D87}.VSRelease|Any CPU.Build.0 = VSRelease|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|Any CPU.Build.0 = Proto|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.VSDebug|Any CPU.ActiveCfg = VSDebug|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.VSDebug|Any CPU.Build.0 = VSDebug|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.VSRelease|Any CPU.ActiveCfg = VSRelease|Any CPU
+ {1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.VSRelease|Any CPU.Build.0 = VSRelease|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj b/vsintegration/src/Templates/NetCore259ProjectTemplates/NetCore259ProjectTemplates.csproj
similarity index 95%
copy from vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj
copy to vsintegration/src/Templates/NetCore259ProjectTemplates/NetCore259ProjectTemplates.csproj
index a3831af..015ee77 100644
--- a/vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj
+++ b/vsintegration/src/Templates/NetCore259ProjectTemplates/NetCore259ProjectTemplates.csproj
@@ -34,11 +34,11 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <ProjectGuid>{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}</ProjectGuid>
+ <ProjectGuid>{D9D95330-3626-4199-B7AF-17B8E4AF6D87}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>NetCoreProjectTemplates</RootNamespace>
- <AssemblyName>NetCoreProjectTemplates</AssemblyName>
+ <RootNamespace>NetCore259ProjectTemplates</RootNamespace>
+ <AssemblyName>NetCore259ProjectTemplates</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<GeneratePkgDefFile>false</GeneratePkgDefFile>
@@ -69,7 +69,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <VSTemplate Include="ProjectTemplates\NETCorePortableLibrary\fsNETCorePortableLibrary.vstemplate">
+ <VSTemplate Include="ProjectTemplates\NETCorePortableLibrary\fsNETCore259PortableLibrary.vstemplate">
<OutputSubPath>Windows</OutputSubPath>
<SortOrder>100</SortOrder>
<SubType>Designer</SubType>
diff --git a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj b/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
similarity index 90%
copy from vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
copy to vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
index 90cf6db..26ff2fa 100644
--- a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
+++ b/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
@@ -10,9 +10,9 @@
<RootNamespace>$safeprojectname$</RootNamespace>
<AssemblyName>$safeprojectname$</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+ <TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
<TargetProfile>netcore</TargetProfile>
- <TargetFSharpCoreVersion>3.3.1.0</TargetFSharpCoreVersion>
+ <TargetFSharpCoreVersion>3.4.259.310</TargetFSharpCoreVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -47,7 +47,7 @@
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">12</MinimumVisualStudioVersion>
</PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets"/>
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets" />
<!-- 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">
diff --git a/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary1.fs b/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary1.fs
new file mode 100644
index 0000000..c8a8cd1
--- /dev/null
+++ b/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary1.fs
@@ -0,0 +1,4 @@
+namespace $safeprojectname$
+
+type Class1() =
+ member this.X = "F#"
diff --git a/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/Script.fsx b/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/Script.fsx
new file mode 100644
index 0000000..92ed2ff
--- /dev/null
+++ b/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/Script.fsx
@@ -0,0 +1,6 @@
+// Learn more about F# at http://fsharp.net. See the 'F# Tutorial' project
+// for more guidance on F# programming.
+
+#load "PortableLibrary1.fs"
+open $safeprojectname$
+
diff --git a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCorePortableLibrary.vstemplate b/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCore259PortableLibrary.vstemplate
similarity index 92%
copy from vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCorePortableLibrary.vstemplate
copy to vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCore259PortableLibrary.vstemplate
index 9c48933..83d40c5 100644
--- a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCorePortableLibrary.vstemplate
+++ b/vsintegration/src/Templates/NetCore259ProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCore259PortableLibrary.vstemplate
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
<TemplateData>
- <Name Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5047" />
- <Description Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5048" />
+ <Name Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5051" />
+ <Description Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5052" />
<Icon Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="4002" />
- <TemplateID>Microsoft.FSharp.NETCorePortableLibrary</TemplateID>
+ <TemplateID>Microsoft.FSharp.NETCore259PortableLibrary</TemplateID>
<ProjectType>FSharp</ProjectType>
<RequiredFrameworkVersion>4.5</RequiredFrameworkVersion>
<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj b/vsintegration/src/Templates/NetCore78ProjectTemplates/NetCore78ProjectTemplates.csproj
similarity index 95%
copy from vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj
copy to vsintegration/src/Templates/NetCore78ProjectTemplates/NetCore78ProjectTemplates.csproj
index a3831af..94ea3c8 100644
--- a/vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj
+++ b/vsintegration/src/Templates/NetCore78ProjectTemplates/NetCore78ProjectTemplates.csproj
@@ -34,11 +34,11 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <ProjectGuid>{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}</ProjectGuid>
+ <ProjectGuid>{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>NetCoreProjectTemplates</RootNamespace>
- <AssemblyName>NetCoreProjectTemplates</AssemblyName>
+ <RootNamespace>NetCoreProfile78ProjectTemplates</RootNamespace>
+ <AssemblyName>NetCoreProfile78ProjectTemplates</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<GeneratePkgDefFile>false</GeneratePkgDefFile>
@@ -69,7 +69,7 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <VSTemplate Include="ProjectTemplates\NETCorePortableLibrary\fsNETCorePortableLibrary.vstemplate">
+ <VSTemplate Include="ProjectTemplates\NETCorePortableLibrary\fsNETCore78PortableLibrary.vstemplate">
<OutputSubPath>Windows</OutputSubPath>
<SortOrder>100</SortOrder>
<SubType>Designer</SubType>
diff --git a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj b/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/PortableLibrary.fsproj
similarity index 90%
copy from vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
copy to vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/PortableLibrary.fsproj
index 90cf6db..818b65e 100644
--- a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
+++ b/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/PortableLibrary.fsproj
@@ -10,9 +10,9 @@
<RootNamespace>$safeprojectname$</RootNamespace>
<AssemblyName>$safeprojectname$</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <TargetFrameworkProfile>Profile7</TargetFrameworkProfile>
+ <TargetFrameworkProfile>Profile78</TargetFrameworkProfile>
<TargetProfile>netcore</TargetProfile>
- <TargetFSharpCoreVersion>3.3.1.0</TargetFSharpCoreVersion>
+ <TargetFSharpCoreVersion>3.4.78.310</TargetFSharpCoreVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -47,7 +47,7 @@
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">12</MinimumVisualStudioVersion>
</PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets"/>
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets" />
<!-- 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">
diff --git a/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/PortableLibrary1.fs b/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/PortableLibrary1.fs
new file mode 100644
index 0000000..c8a8cd1
--- /dev/null
+++ b/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/PortableLibrary1.fs
@@ -0,0 +1,4 @@
+namespace $safeprojectname$
+
+type Class1() =
+ member this.X = "F#"
diff --git a/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/Script.fsx b/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/Script.fsx
new file mode 100644
index 0000000..92ed2ff
--- /dev/null
+++ b/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/Script.fsx
@@ -0,0 +1,6 @@
+// Learn more about F# at http://fsharp.net. See the 'F# Tutorial' project
+// for more guidance on F# programming.
+
+#load "PortableLibrary1.fs"
+open $safeprojectname$
+
diff --git a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCorePortableLibrary.vstemplate b/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/fsNETCore78PortableLibrary.vstemplate
similarity index 92%
copy from vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCorePortableLibrary.vstemplate
copy to vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/fsNETCore78PortableLibrary.vstemplate
index 9c48933..de90102 100644
--- a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCorePortableLibrary.vstemplate
+++ b/vsintegration/src/Templates/NetCore78ProjectTemplates/ProjectTemplates/NetCorePortableLibrary/fsNETCore78PortableLibrary.vstemplate
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
<TemplateData>
- <Name Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5047" />
- <Description Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5048" />
+ <Name Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5049" />
+ <Description Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5050" />
<Icon Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="4002" />
- <TemplateID>Microsoft.FSharp.NETCorePortableLibrary</TemplateID>
+ <TemplateID>Microsoft.FSharp.NETCore78PortableLibrary</TemplateID>
<ProjectType>FSharp</ProjectType>
<RequiredFrameworkVersion>4.5</RequiredFrameworkVersion>
<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj b/vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj
index a3831af..7948833 100644
--- a/vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj
+++ b/vsintegration/src/Templates/NetCoreProjectTemplates/NetCoreProjectTemplates.csproj
@@ -69,16 +69,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
- <VSTemplate Include="ProjectTemplates\NETCorePortableLibrary\fsNETCorePortableLibrary.vstemplate">
+ <VSTemplate Include="ProjectTemplates\NetCorePortableLibrary\fsNETCore7PortableLibrary.vstemplate">
<OutputSubPath>Windows</OutputSubPath>
<SortOrder>100</SortOrder>
<SubType>Designer</SubType>
</VSTemplate>
</ItemGroup>
<ItemGroup>
- <None Include="ProjectTemplates\NETCorePortableLibrary\PortableLibrary.fsproj" />
- <None Include="ProjectTemplates\NETCorePortableLibrary\PortableLibrary1.fs" />
- <None Include="ProjectTemplates\NETCorePortableLibrary\Script.fsx" />
+ <None Include="ProjectTemplates\NetCorePortableLibrary\PortableLibrary.fsproj" />
+ <None Include="ProjectTemplates\NetCorePortableLibrary\PortableLibrary1.fs" />
+ <None Include="ProjectTemplates\NetCorePortableLibrary\Script.fsx" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5">
diff --git a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj b/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
index 90cf6db..eb18b4e 100644
--- a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
+++ b/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/PortableLibrary.fsproj
@@ -47,7 +47,7 @@
<PropertyGroup>
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">12</MinimumVisualStudioVersion>
</PropertyGroup>
- <Import Project="$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets"/>
+ <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.Portable.FSharp.Targets" />
<!-- 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">
diff --git a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCorePortableLibrary.vstemplate b/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCore7PortableLibrary.vstemplate
similarity index 94%
rename from vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCorePortableLibrary.vstemplate
rename to vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCore7PortableLibrary.vstemplate
index 9c48933..2974651 100644
--- a/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCorePortableLibrary.vstemplate
+++ b/vsintegration/src/Templates/NetCoreProjectTemplates/ProjectTemplates/NETCorePortableLibrary/fsNETCore7PortableLibrary.vstemplate
@@ -4,7 +4,7 @@
<Name Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5047" />
<Description Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="5048" />
<Icon Package="{91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C}" ID="4002" />
- <TemplateID>Microsoft.FSharp.NETCorePortableLibrary</TemplateID>
+ <TemplateID>Microsoft.FSharp.NETCore7PortableLibrary</TemplateID>
<ProjectType>FSharp</ProjectType>
<RequiredFrameworkVersion>4.5</RequiredFrameworkVersion>
<NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
diff --git a/vsintegration/src/deployment/VsProDeployTemplates/VsProDeployTemplates.csproj b/vsintegration/src/deployment/VsProDeployTemplates/VsProDeployTemplates.csproj
index b29730c..2c450c0 100644
--- a/vsintegration/src/deployment/VsProDeployTemplates/VsProDeployTemplates.csproj
+++ b/vsintegration/src/deployment/VsProDeployTemplates/VsProDeployTemplates.csproj
@@ -83,6 +83,20 @@
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
</ProjectReference>
+ <ProjectReference Include="..\..\Templates\NetCore78ProjectTemplates\NetCore78ProjectTemplates.csproj">
+ <Project>{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}</Project>
+ <Name>NetCore78ProjectTemplates</Name>
+ <VSIXSubPath>ProjectTemplates</VSIXSubPath>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Templates\NetCore259ProjectTemplates\NetCore259ProjectTemplates.csproj">
+ <Project>{D9D95330-3626-4199-B7AF-17B8E4AF6D87}</Project>
+ <Name>NetCore259ProjectTemplates</Name>
+ <VSIXSubPath>ProjectTemplates</VSIXSubPath>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ <IncludeOutputGroupsInVSIX>TemplateProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
+ </ProjectReference>
<ProjectReference Include="..\..\Templates\PortableLibraryProjectTemplates\PortableLibraryProjectTemplates.csproj">
<Project>{DB374A0C-7560-479F-9B21-D37C81F7624F}</Project>
<Name>PortableLibraryProjectTemplates</Name>
diff --git a/vsintegration/src/deployment/VsProDeployTemplates/source.extension.vsixmanifest b/vsintegration/src/deployment/VsProDeployTemplates/source.extension.vsixmanifest
index 2647c8c..94e8023 100644
--- a/vsintegration/src/deployment/VsProDeployTemplates/source.extension.vsixmanifest
+++ b/vsintegration/src/deployment/VsProDeployTemplates/source.extension.vsixmanifest
@@ -15,6 +15,8 @@
<Assets>
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="SilverlightProjectTemplates" d:TargetPath="|SilverlightProjectTemplates;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:TargetPath="|NetCoreProjectTemplates;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+ <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:TargetPath="|NetCore78ProjectTemplates;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
+ <Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:TargetPath="|NetCore259ProjectTemplates;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="PortableLibraryProjectTemplates" d:TargetPath="|PortableLibraryProjectTemplates;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="TutorialProjectTemplates" d:TargetPath="|TutorialProjectTemplates;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
<Asset Type="Microsoft.VisualStudio.ProjectTemplate" d:Source="Project" d:ProjectName="ConsoleProjectTemplates" d:TargetPath="|ConsoleProjectTemplates;TemplateProjectOutputGroup|" Path="ProjectTemplates" d:VsixSubPath="ProjectTemplates" />
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj
index 6d16fb3..7ad0c92 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.LanguageService/FSharp.LanguageService.fsproj
@@ -84,7 +84,7 @@
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
- <Reference Include="Microsoft.VisualStudio.CommonIDE" />
+ <Reference Include ="Microsoft.VisualStudio.CommonIDE, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="PresentationFramework" />
<Reference Include="PresentationCore" />
<Reference Include="WindowsBase" />
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj b/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj
index 0c094cf..bfcd5a1 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ProjectSystem.fsproj
@@ -68,7 +68,7 @@
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.dll" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
- <Reference Include="Microsoft.VisualStudio.CommonIDE" />
+ <Reference Include ="Microsoft.VisualStudio.CommonIDE, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>true</SpecificVersion>
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/VSPackage.resx b/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/VSPackage.resx
index 5da5d15..6fe7186 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/VSPackage.resx
+++ b/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/VSPackage.resx
@@ -324,7 +324,7 @@
<value>File.fs</value>
</data>
<data name="5014" xml:space="preserve">
- <value>Console</value>
+ <value>Console Application</value>
</data>
<data name="5015" xml:space="preserve">
<value>A project for creating a command-line application</value>
@@ -384,10 +384,10 @@
<value>A blank XML file</value>
</data>
<data name="5034" xml:space="preserve">
- <value>Portable Library (Legacy)</value>
+ <value>Portable Library (.NET 4.0+, Windows 8, Silverlight 5)</value>
</data>
<data name="5035" xml:space="preserve">
- <value>A project for creating an F# library (.dll) that can run on .NET Framework 4.0 and higher, Windows Store and Silverlight 5.</value>
+ <value>A project for creating an F# library (.dll) that can run on .NET Framework 4.0+, Windows Store and Silverlight 5.</value>
</data>
<data name="5036" xml:space="preserve">
<value>Data</value>
@@ -420,11 +420,23 @@
<value>A project item for consuming a Web Service using WsdlService type provider.</value>
</data>
<data name="5047" xml:space="preserve">
- <value>Portable Library</value>
+ <value>Portable Library (.NET 4.5, Windows Store)</value>
</data>
<data name="5048" xml:space="preserve">
<value>A project for creating an F# library (.dll) that can run on .NET Framework 4.5 and Windows Store.</value>
</data>
+ <data name="5049" xml:space="preserve">
+ <value>Portable Library (.NET 4.5, Windows Store, Windows Phone 8 Silverlight)</value>
+ </data>
+ <data name="5050" xml:space="preserve">
+ <value>A project for creating an F# library (.dll) that can run on .NET Framework 4.5, Windows Store and Windows Phone 8 Silverlight.</value>
+ </data>
+ <data name="5051" xml:space="preserve">
+ <value>Portable Library (.NET 4.5, Windows Store, Windows Phone 8.1, Windows Phone Silverlight 8)</value>
+ </data>
+ <data name="5052" xml:space="preserve">
+ <value>A project for creating an F# library (.dll) that can run on .NET Framework 4.5, Windows Store, Windows Phone 8.1 and Windows Phone Silverlight 8.</value>
+ </data>
<data name="6000" xml:space="preserve">
<value>F# Tools</value>
</data>
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/VSPackage_Dev11.resx b/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/VSPackage_Dev11.resx
deleted file mode 100644
index 3db0213..0000000
--- a/vsintegration/src/vs/FsPkgs/FSharp.Project/FS/VSPackage_Dev11.resx
+++ /dev/null
@@ -1,530 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Open Technologies, Inc. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="ProjectReferenceError2" xml:space="preserve">
- <value>You must build the target project before it can be referenced.</value>
- </data>
- <data name="Application" xml:space="preserve">
- <value>Application</value>
- </data>
- <data name="GeneralCaption" xml:space="preserve">
- <value>General</value>
- </data>
- <data name="AssemblyName" xml:space="preserve">
- <value>Assembly Name</value>
- </data>
- <data name="AssemblyNameDescription" xml:space="preserve">
- <value>The name of the output file that will hold assembly metadata.</value>
- </data>
- <data name="OutputType" xml:space="preserve">
- <value>Output Type</value>
- </data>
- <data name="OutputTypeDescription" xml:space="preserve">
- <value>The type of application to build.</value>
- </data>
- <data name="DefaultNamespace" xml:space="preserve">
- <value>Default Namespace</value>
- </data>
- <data name="DefaultNamespaceDescription" xml:space="preserve">
- <value>Specifies the default namespace for added items, such as classes, that are added via the Add New Item Dialog Box.</value>
- </data>
- <data name="StartupObject" xml:space="preserve">
- <value>Startup Object</value>
- </data>
- <data name="StartupObjectDescription" xml:space="preserve">
- <value>The name of the class that contains the static Main method that you want called when you launch your application.</value>
- </data>
- <data name="ApplicationIcon" xml:space="preserve">
- <value>Application Icon</value>
- </data>
- <data name="ApplicationIconDescription" xml:space="preserve">
- <value>Sets the .ico file to use as your application icon.</value>
- </data>
- <data name="Project" xml:space="preserve">
- <value>Project</value>
- </data>
- <data name="ProjectFile" xml:space="preserve">
- <value>Project File</value>
- </data>
- <data name="ProjectFileDescription" xml:space="preserve">
- <value>The name of the file containing build, configuration, and other information about the project.</value>
- </data>
- <data name="ProjectFolder" xml:space="preserve">
- <value>Project Folder</value>
- </data>
- <data name="ProjectFolderDescription" xml:space="preserve">
- <value>The absolute location of the project.</value>
- </data>
- <data name="OutputFile" xml:space="preserve">
- <value>Output File</value>
- </data>
- <data name="OutputFileDescription" xml:space="preserve">
- <value>The name of the project's primary output file.</value>
- </data>
- <data name="TargetPlatform" xml:space="preserve">
- <value>Target Platform</value>
- </data>
- <data name="TargetPlatformDescription" xml:space="preserve">
- <value>The version of the Common Language Runtime to use for output assembly</value>
- </data>
- <data name="TargetPlatformLocation" xml:space="preserve">
- <value>Target Platform Location</value>
- </data>
- <data name="TargetPlatformLocationDescription" xml:space="preserve">
- <value>The location of the target platform</value>
- </data>
- <data name="ProjectFileExtensionFilter" xml:space="preserve">
- <value>F# Project File (*.fsproj)</value>
- </data>
- <data name="ComponentFileExtensionFilter" xml:space="preserve">
- <value>Component File (*.dll;*.exe)</value>
- </data>
- <data name="OtherFlags" xml:space="preserve">
- <value>Other Flags</value>
- </data>
- <data name="OtherFlagsDescription" xml:space="preserve">
- <value>Other compiler flags</value>
- </data>
- <data name="Build" xml:space="preserve">
- <value>Build</value>
- </data>
- <data name="1" xml:space="preserve">
- <value>ZCAAMQRIJJRIKKJAC1EERAHEZ3J2J0ZKKIC8RMHTQMIDK2CQMZAAMZM3MJJ0Q1Q8KMJAIQIII1JCH8K0HAQAEPPJR1K8PQJIHRJZAMHRKCQCM3IAI3KZMEI3CARKCPPC</value>
- </data>
- <data name="2" xml:space="preserve">
- <value>IDPEKPQCA3RAR2DMQ2PKI1MDD8HEMME0JZR3Q1AIK3K2KCKPEPE8DQHJQ3PPATP9HIMPJ1MZR0CRQCEAICK3MZCCJ1A9I9H0KKKTIMRECKHRQCIMAZEPCKC1RRH3PHDZ</value>
- </data>
- <data name="3" xml:space="preserve">
- <value>AMJHDQDDD1EZJJMAQ1RRHJJIZ9EZPCJRR1PPE0J9EMDJA3KEQDD1KDDIMJDEJHKHHZECDHQDJTI0KRQ8IRC2C0KCMJH1RHJ9K2KCI1KHC3CHZEMQRDIREJITKIKAQZAK</value>
- </data>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="300" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpSplashScreenIcon.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpAboutBox.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="1000.ctmenu" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(O)\MenusAndCommands.cto;System.Byte[], mscorlib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4000" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpWindowsApplication.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4001" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpApplication_32.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4002" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpLibrary.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4003" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpScript.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4004" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpTutorial.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4005" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpCodeFile_32.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4006" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpScriptFile.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4007" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpSignature.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4008" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpEmptyProject_32.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4009" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\Utility_Text.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4010" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\Local_AppConfig.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4011" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\Data_XML.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4012" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\Resource_Bitmap.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4013" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpSilverLIghtClassLibrary.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4014" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\Data_Source.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4015" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\Data_LinQToSQL.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4016" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\Data_Entity.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4100" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\ProjectNode.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4101" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSFile.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4102" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSIFile.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4103" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSXFile.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="4200" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>$(I)\..\..\devdiv\vsintegration\src\vs\FsPkgs\FSharp.Project\FS\Resources\FSharpInteractive.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
- <data name="5001" xml:space="preserve">
- <value>F# Script File</value>
- </data>
- <data name="5002" xml:space="preserve">
- <value>A blank F# script file (.fsx)</value>
- </data>
- <data name="5003" xml:space="preserve">
- <value>Script.fsx</value>
- </data>
- <data name="5005" xml:space="preserve">
- <value>FSharp Text Editor</value>
- </data>
- <data name="5006" xml:space="preserve">
- <value>Code</value>
- </data>
- <data name="5007" xml:space="preserve">
- <value>General</value>
- </data>
- <data name="5008" xml:space="preserve">
- <value>Windows</value>
- </data>
- <data name="5009" xml:space="preserve">
- <value>Silverlight</value>
- </data>
- <data name="5011" xml:space="preserve">
- <value>F# Source File</value>
- </data>
- <data name="5012" xml:space="preserve">
- <value>A blank F# source file (.fs)</value>
- </data>
- <data name="5013" xml:space="preserve">
- <value>File.fs</value>
- </data>
- <data name="5014" xml:space="preserve">
- <value>Console Application</value>
- </data>
- <data name="5015" xml:space="preserve">
- <value>A project for creating a command-line application</value>
- </data>
- <data name="5016" xml:space="preserve">
- <value>Library</value>
- </data>
- <data name="5017" xml:space="preserve">
- <value>A project for creating an F# library</value>
- </data>
- <data name="5018" xml:space="preserve">
- <value>Tutorial</value>
- </data>
- <data name="5019" xml:space="preserve">
- <value>A tutorial project providing a walkthrough of the F# language</value>
- </data>
- <data name="5020" xml:space="preserve">
- <value>Silverlight Library</value>
- </data>
- <data name="5021" xml:space="preserve">
- <value>A project for creating an F# Silverlight library</value>
- </data>
- <data name="5022" xml:space="preserve">
- <value>Application Configuration File</value>
- </data>
- <data name="5023" xml:space="preserve">
- <value>A file for storing application configuration and settings values</value>
- </data>
- <data name="5024" xml:space="preserve">
- <value>Source File</value>
- </data>
- <data name="5025" xml:space="preserve">
- <value>A blank F# source file (.fs)</value>
- </data>
- <data name="5026" xml:space="preserve">
- <value>Script File</value>
- </data>
- <data name="5027" xml:space="preserve">
- <value>A blank F# script file (.fsx)</value>
- </data>
- <data name="5028" xml:space="preserve">
- <value>Signature File</value>
- </data>
- <data name="5029" xml:space="preserve">
- <value>A blank F# signature file (.fsi)</value>
- </data>
- <data name="5030" xml:space="preserve">
- <value>Text File</value>
- </data>
- <data name="5031" xml:space="preserve">
- <value>An empty text file</value>
- </data>
- <data name="5032" xml:space="preserve">
- <value>XML File</value>
- </data>
- <data name="5033" xml:space="preserve">
- <value>A blank XML file</value>
- </data>
- <data name="5034" xml:space="preserve">
- <value>Portable Library (Legacy)</value>
- </data>
- <data name="5035" xml:space="preserve">
- <value>A project for creating an F# library (.dll) that can run on .NET Framework 4.0 and higher, Windows Store and Silverlight 5.</value>
- </data>
- <data name="5036" xml:space="preserve">
- <value>Data</value>
- </data>
- <data name="5037" xml:space="preserve">
- <value>OData Service Connection (LINQ, type provider)</value>
- </data>
- <data name="5038" xml:space="preserve">
- <value>A project item for consuming a Open Data Protocol (OData) web service using ODataService type provider.</value>
- </data>
- <data name="5040" xml:space="preserve">
- <value>A project item for consuming a .NET Managed Resources File (Resx) using ResxFile type provider.</value>
- </data>
- <data name="5041" xml:space="preserve">
- <value>SQL Database Connection (LINQ to SQL, type provider)</value>
- </data>
- <data name="5042" xml:space="preserve">
- <value>A project item for using the SqlDataConnection (LINQ to SQL) type provider to generate types and consume data in a live SQL database.</value>
- </data>
- <data name="5043" xml:space="preserve">
- <value>SQL Database Connection (LINQ to Entities, type provider)</value>
- </data>
- <data name="5044" xml:space="preserve">
- <value>A project item for using the SqlEntityConnection (Entity Data Model) type provider to generate types and consume data in a live SQL database.</value>
- </data>
- <data name="5045" xml:space="preserve">
- <value>WSDL Service Connection (type provider)</value>
- </data>
- <data name="5046" xml:space="preserve">
- <value>A project item for consuming a Web Service using WsdlService type provider.</value>
- </data>
- <data name="5047" xml:space="preserve">
- <value>Portable Library</value>
- </data>
- <data name="5048" xml:space="preserve">
- <value>A project for creating an F# library (.dll) that can run on .NET Framework 4.5 and Windows Store.</value>
- </data>
- <data name="6000" xml:space="preserve">
- <value>F# Tools</value>
- </data>
- <data name="6001" xml:space="preserve">
- <value>F# Interactive</value>
- </data>
- <data name="6002" xml:space="preserve">
- <value>F# Project Files (*.fsproj);*.fsproj</value>
- </data>
- <data name="6003" xml:space="preserve">
- <value>Visual F# Files (*.fs,*.fsi,*.fsx,*.fsscript);*.fs,*.fsi,*.fsx,*.fsscript</value>
- </data>
- <data name="7000" xml:space="preserve">
- <value>Visual F#</value>
- </data>
- <data name="7001" xml:space="preserve">
- <value>Customizes the environment to maximize code editor screen space and improve the visibility of F# commands and tool windows.</value>
- </data>
- <data name="ProductDetails" xml:space="preserve">
- <value>Microsoft Visual F# $(VSGeneralBrandVersion)$(VSGeneralBrandRelease)</value>
- </data>
- <data name="9002" xml:space="preserve">
- <value>Microsoft Visual F# $(VSGeneralBrandVersion)$(VSGeneralBrandRelease)</value>
- </data>
- <data name="ProductID" xml:space="preserve">
- <value>1.0</value>
- </data>
- <data name="ProductName" xml:space="preserve">
- <value>Microsoft Visual F#</value>
- </data>
- <data name="9001" xml:space="preserve">
- <value>Visual F# $(VSGeneralBrandVersion)$(VSGeneralBrandRelease)</value>
- </data>
- <data name="9027" xml:space="preserve">
- <value>F# Interactive</value>
- </data>
- <data name="ProductRegistryName" xml:space="preserve">
- <value>Microsoft Visual F#</value>
- </data>
- <data name="InvalidOutputType" xml:space="preserve">
- <value>Invalid OutputType value</value>
- </data>
- <data name="InvalidRunPostBuildEvent" xml:space="preserve">
- <value>Invalid RunPostBuildEvent value</value>
- </data>
- <data name="InvalidTargetFrameworkVersion" xml:space="preserve">
- <value>Invalid TargetFrameworkVersion number</value>
- </data>
- <data name="ProjectRenderFolderMultiple" xml:space="preserve">
- <value>The project '{0}' could not be opened because opening it would cause a folder to be rendered multiple times in the solution explorer. One such problematic item is '{1}'. To open this project in Visual Studio, first edit the project file and fix the problem.</value>
- </data>
- <data name="PropertyDefaultNamespace" xml:space="preserve">
- <value>Default Namespace:\nThe string for the default namespace must be a valid identifier</value>
- </data>
- <data name="TemplateNotFound" xml:space="preserve">
- <value>Template file not found: {0}</value>
- </data>
- <data name="NeedReloadToChangeTargetFx" xml:space="preserve">
- <value>Changing the Target Framework requires that the current project be closed and then reopened.\nAny unsaved changes within the project will be automatically saved.\n\nChanging Target Framework may require manual modification of project files in order to build.\n\nAre you sure you want to change the Target Framework for this project?</value>
- </data>
- <data name="AddReferenceDialogTitle" xml:space="preserve">
- <value>Add Reference</value>
- </data>
- <data name="6004" xml:space="preserve">
- <value>Type Providers</value>
- </data>
- <data name="6005" xml:space="preserve">
- <value>Change path and command line arguments passed to the F# Interactive</value>
- </data>
- <data name="6006" xml:space="preserve">
- <value>Enable or disable Type Providers</value>
- </data>
- <data name="6007" xml:space="preserve">
- <value>Visual F# Items</value>
- </data>
- <data name="TPTOP_Assembly" xml:space="preserve">
- <value>Assembly</value>
- <comment>Tools-Options-F# tools-Type Providers: column header</comment>
- </data>
- <data name="TPTOP_Description" xml:space="preserve">
- <value>Using a Type Provider from a source that is unknown or not trusted can expose your computer to security threats, as it will run under the privileges of the current user.</value>
- <comment>Tools-Options-F# tools-Type Providers: overall description</comment>
- </data>
- <data name="TPTOP_Trusted" xml:space="preserve">
- <value>Trusted</value>
- <comment>Tools-Options-F# tools-Type Providers: column header</comment>
- </data>
- <data name="AddReferenceDialogTitle_Dev11" xml:space="preserve">
- <value>Reference Manager - {0}</value>
- </data>
- <data name="Dev11SupportsOnlySilverlight5" xml:space="preserve">
- <value>F# projects in the current version of Visual Studio support only Silverlight 5.</value>
- </data>
- <data name="AddReferenceAssemblyPageDialogRetargetingText" xml:space="preserve">
- <value>The project will be retargeted, and its targeted frameworks will be reduced.</value>
- </data>
- <data name="AddReferenceAssemblyPageDialogNoItemsText" xml:space="preserve">
- <value>All of the Framework assemblies are already referenced. Please use the Object Browser to explore the references in the Framework.</value>
- </data>
- <data name="FSharpCoreVersionIsNotCompatibleWithDev11" xml:space="preserve">
- <value>Referencing this version of FSharp.Core will cause your project to be incompatible with older versions of Visual Studio. Do you want to continue?</value>
- </data>
-</root>
\ No newline at end of file
diff --git a/vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj b/vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
index 7266062..81daf39 100644
--- a/vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
+++ b/vsintegration/src/vs/FsPkgs/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
@@ -59,7 +59,7 @@
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0.dll" />
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.10.0.dll" />
<Reference Include="Microsoft.VisualStudio.Designer.Interfaces" />
- <Reference Include="Microsoft.VisualStudio.CommonIDE" />
+ <Reference Include ="Microsoft.VisualStudio.CommonIDE, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.VSHelp.dll" />
<Reference Include="Microsoft.VisualStudio.CoreUtility" />
<Reference Include="Microsoft.VisualStudio.Text.Data" />
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git
More information about the Pkg-cli-apps-commits
mailing list