Integrate FCS API: Other changes

dotnet · Jan 19, 2016 · 6e23d59 · 6e23d59
1 parent f3508a5
commit 6e23d59
Show file tree

Hide file tree

Showing 49 changed files with 17 additions and 11 deletions.
diff --git a/DEVGUIDE.md b/DEVGUIDE.md
@@ -103,10 +103,10 @@ Prior to a **Release** test run, you need to do **all** of these:
 
 ## 4. [Optional] Install the Visual F# IDE Tools and Clobber the F# SDK on the machine
 
-**Note:** Step #3 will install a VSIX extension into Visual Studio 2015 that changes the Visual F# IDE Tools 
+**Note:** Step #2 below will install a VSIX extension into Visual Studio 2015 that changes the Visual F# IDE Tools 
 components installed into Visual Studio 2015.  You can revert this step by disabling or uninstalling the addin.
 
-**Note:** Step #4 will clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsi.exe``/``fsiAnyCpu.exe`` used 
+**Note:** Step #3 below will clobber the machine-wide installed F# SDK on your machine. This replaces the ``fsi.exe``/``fsiAnyCpu.exe`` used 
 by Visual F# Interactive and the ``fsc.exe`` used by ``Microsoft.FSharp.targets``.  Repairing Visual Studio 2015 is currently the 
 only way to revert this step.  
 

diff --git a/packages.config b/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FsCheck" version="2.0.3" />
-  <package id="NUnit.Runners" version="2.6.4" targetFramework="net45" />
+  <package id="NUnit.Runners" version="3.0.0" targetFramework="net45" />
   <package id="NUnit" version="3.0.0" targetFramework="net45" />
   <package id="NUnit.Console" version="3.0.0" targetFramework="net45" />
 </packages>
diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets
@@ -75,6 +75,8 @@
   <PropertyGroup>
     <DefineConstants Condition="'$(VisualStudioVersion)'=='12.0' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV12=True</DefineConstants>
     <DefineConstants Condition="'$(VisualStudioVersion)'=='12.0' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV12</DefineConstants>
+    <DefineConstants Condition="'$(VisualStudioVersion)'=='14.0' AND '$(ProjectLanguage)' == 'VisualBasic'">$(DefineConstants),VS_VERSION_DEV14=True</DefineConstants>
+    <DefineConstants Condition="'$(VisualStudioVersion)'=='14.0' AND '$(ProjectLanguage)' != 'VisualBasic'">$(DefineConstants);VS_VERSION_DEV14</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/absil/il.fs b/src/absil/il.fs
diff --git a/src/fsharp/CompileOps.fs b/src/fsharp/CompileOps.fs
diff --git a/src/fsharp/CompileOps.fsi b/src/fsharp/CompileOps.fsi
diff --git a/src/fsharp/ErrorLogger.fs b/src/fsharp/ErrorLogger.fs
diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs
diff --git a/src/fsharp/ExtensionTyping.fsi b/src/fsharp/ExtensionTyping.fsi
diff --git a/src/fsharp/InternalCollections.fs b/src/fsharp/InternalCollections.fs
diff --git a/src/fsharp/InternalCollections.fsi b/src/fsharp/InternalCollections.fsi
diff --git a/src/fsharp/LexFilter.fs b/src/fsharp/LexFilter.fs
diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs
diff --git a/src/fsharp/NameResolution.fsi b/src/fsharp/NameResolution.fsi
diff --git a/src/fsharp/NicePrint.fs b/src/fsharp/NicePrint.fs
diff --git a/src/fsharp/PrettyNaming.fs b/src/fsharp/PrettyNaming.fs
diff --git a/src/fsharp/QuotationTranslator.fsi b/src/fsharp/QuotationTranslator.fsi
diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs
diff --git a/src/fsharp/TastOps.fsi b/src/fsharp/TastOps.fsi
diff --git a/src/fsharp/TastPickle.fs b/src/fsharp/TastPickle.fs
diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs
diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
diff --git a/src/fsharp/TypeRelations.fs b/src/fsharp/TypeRelations.fs
diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs
diff --git a/src/fsharp/fsc.fsi b/src/fsharp/fsc.fsi
diff --git a/src/fsharp/infos.fs b/src/fsharp/infos.fs
diff --git a/src/fsharp/lib.fs b/src/fsharp/lib.fs
diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy
diff --git a/src/fsharp/range.fs b/src/fsharp/range.fs
diff --git a/src/fsharp/range.fsi b/src/fsharp/range.fsi
diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs
diff --git a/src/fsharp/vs/IncrementalBuild.fs b/src/fsharp/vs/IncrementalBuild.fs
diff --git a/src/fsharp/vs/IncrementalBuild.fsi b/src/fsharp/vs/IncrementalBuild.fsi
diff --git a/src/fsharp/vs/Reactor.fs b/src/fsharp/vs/Reactor.fs
diff --git a/src/fsharp/vs/Reactor.fsi b/src/fsharp/vs/Reactor.fsi
diff --git a/src/fsharp/vs/ServiceDeclarations.fsi b/src/fsharp/vs/ServiceDeclarations.fsi
diff --git a/src/fsharp/vs/ServiceLexing.fs b/src/fsharp/vs/ServiceLexing.fs
diff --git a/src/fsharp/vs/ServiceLexing.fsi b/src/fsharp/vs/ServiceLexing.fsi
diff --git a/src/fsharp/vs/ServiceNavigation.fs b/src/fsharp/vs/ServiceNavigation.fs
diff --git a/src/fsharp/vs/ServiceNavigation.fsi b/src/fsharp/vs/ServiceNavigation.fsi
diff --git a/src/fsharp/vs/ServiceParamInfoLocations.fs b/src/fsharp/vs/ServiceParamInfoLocations.fs
diff --git a/src/fsharp/vs/ServiceParamInfoLocations.fsi b/src/fsharp/vs/ServiceParamInfoLocations.fsi
diff --git a/src/fsharp/vs/ServiceParseTreeWalk.fs b/src/fsharp/vs/ServiceParseTreeWalk.fs
diff --git a/src/fsharp/vs/ServiceUntypedParse.fs b/src/fsharp/vs/ServiceUntypedParse.fs
diff --git a/src/fsharp/vs/ServiceUntypedParse.fsi b/src/fsharp/vs/ServiceUntypedParse.fsi
diff --git a/src/fsharp/vs/service.fs b/src/fsharp/vs/service.fs
diff --git a/src/fsharp/vs/service.fsi b/src/fsharp/vs/service.fsi
diff --git a/src/utils/CompilerLocationUtils.fs b/src/utils/CompilerLocationUtils.fs
@@ -214,10 +214,13 @@ module internal FSharpEnvironment =
                 // Property pages (ApplicationPropPage.vb)
 
                 let key20 = @"Software\Microsoft\.NETFramework\AssemblyFolders\Microsoft.FSharp-" + FSharpTeamVersionNumber 
-#if FX_ATLEAST_45
-                let key40 = @"Software\Microsoft\FSharp\4.1\Runtime\v4.0"
+#if VS_VERSION_DEV12
+                let key40 = @"Software\Microsoft\FSharp\3.1\Runtime\v4.0"
+#endif
+#if VS_VERSION_DEV14
+                let key40 = @"Software\Microsoft\FSharp\4.0\Runtime\v4.0"
 #else
-                let key40 = @"Software\Microsoft\FSharp\2.0\Runtime\v4.0"
+                let key40 = @"Software\Microsoft\FSharp\4.1\Runtime\v4.0"
 #endif
                 let key1,key2 = 
                     match FSharpCoreLibRunningVersion with 

diff --git a/vsintegration/update-vsintegration.cmd b/vsintegration/update-vsintegration.cmd
@@ -37,7 +37,7 @@ set SN64="%WINSDKNETFXTOOLS%x64\sn.exe"
 set NGEN32=%windir%\Microsoft.NET\Framework\v4.0.30319\ngen.exe
 set NGEN64=%windir%\Microsoft.NET\Framework64\v4.0.30319\ngen.exe
 
-set COMPILERSDKPATH=%X86_PROGRAMFILES%\Microsoft SDKs\F#\4.1\Framework\v4.0
+set COMPILERSDKPATH=%X86_PROGRAMFILES%\Microsoft SDKs\F#\4.0\Framework\v4.0
 mkdir "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\fsc.exe" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\fsc.exe.config" "%COMPILERSDKPATH%"
@@ -50,6 +50,7 @@ copy /y "%BINDIR%\FsiAnyCPU.exe" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\FsiAnyCPU.exe.config" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\Microsoft.FSharp.targets" "%COMPILERSDKPATH%"
 copy /y "%BINDIR%\Microsoft.Portable.FSharp.targets" "%COMPILERSDKPATH%"
+copy /y "%BINDIR%\SupportedRuntimes.xml" "%COMPILERSDKPATH%"
 
 set COMPILERMAINASSEMBLIESPATH=%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055
 mkdir "%COMPILERMAINASSEMBLIESPATH%"
@@ -89,11 +90,11 @@ copy /y "%BINDIR%\..\..\portable47\bin\FSharp.Core.xml" "%COMPILER47ASSEMBLIESPA
 REM echo ^<configuration^>^<runtime^>^<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1" appliesTo="v4.0.30319"^>^<dependentAssembly^>^<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /^> ^<bindingRedirect oldVersion="2.0.0.0-4.4.1.0" newVersion="4.4.1.9055"/^>^</dependentAssembly^>^</assemblyBinding^>^</runtime^>^</configuration^> > "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055\pub.config"
 
 if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" (
-    REG ADD "HKLM\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\F# 4.1 Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055\
-    REG ADD "HKLM\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.50709\AssemblyFoldersEx\F# 4.1 Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055\
+    REG ADD "HKLM\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\F# 4.0 Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055\
+    REG ADD "HKLM\SOFTWARE\Wow6432Node\Microsoft\.NETFramework\v4.0.50709\AssemblyFoldersEx\F# 4.0 Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055\
 )
-REG ADD "HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\F# 4.1 Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055\
-REG ADD "HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.50709\AssemblyFoldersEx\F# 4.1 Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055\
+REG ADD "HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\F# 4.0 Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055\
+REG ADD "HKLM\SOFTWARE\Microsoft\.NETFramework\v4.0.50709\AssemblyFoldersEx\F# 4.0 Core Assemblies (Open Source)" /ve /t REG_SZ /f /d "%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\FSharp\.NETFramework\v4.0\4.4.1.9055\