diff --git a/fcs/.gitignore b/fcs/.gitignore new file mode 100644 index 00000000000..176f453284c --- /dev/null +++ b/fcs/.gitignore @@ -0,0 +1,10 @@ +FSharp.Compiler.Service.netstandard/illex.fs +FSharp.Compiler.Service.netstandard/ilpars.fs +FSharp.Compiler.Service.netstandard/ilpars.fsi +FSharp.Compiler.Service.netstandard/lex.fs +FSharp.Compiler.Service.netstandard/pars.fs +FSharp.Compiler.Service.netstandard/pars.fsi +FSharp.Compiler.Service.netstandard/pplex.fs +FSharp.Compiler.Service.netstandard/pppars.fs +FSharp.Compiler.Service.netstandard/pppars.fsi + diff --git a/packages.config b/packages.config index 99063830de1..ee97e4a98da 100644 --- a/packages.config +++ b/packages.config @@ -45,7 +45,7 @@ - + diff --git a/setup/FSharp.SDK/Common.Wix.Properties.wxs b/setup/FSharp.SDK/Common.Wix.Properties.wxs index d5ade2c8d2a..5a3f1cd1b35 100644 --- a/setup/FSharp.SDK/Common.Wix.Properties.wxs +++ b/setup/FSharp.SDK/Common.Wix.Properties.wxs @@ -81,10 +81,10 @@ - - - - + + + + diff --git a/setup/FSharp.SDK/FSharp.SDK.wxs b/setup/FSharp.SDK/FSharp.SDK.wxs index 4a91e241225..21faef5e33e 100644 --- a/setup/FSharp.SDK/FSharp.SDK.wxs +++ b/setup/FSharp.SDK/FSharp.SDK.wxs @@ -2,7 +2,7 @@ - + diff --git a/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs b/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs index bec0781fed4..81dc3124845 100644 --- a/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs +++ b/setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs @@ -9,7 +9,7 @@ - + diff --git a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs index e843e8de212..e4c9ca82d31 100644 --- a/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs +++ b/setup/FSharp.SDK/component-groups/Compiler_Redist.wxs @@ -39,7 +39,7 @@ - + @@ -131,18 +131,18 @@ - - - + + + - - - - + + + + - + diff --git a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs index 44bf70904a2..de1467d1bd4 100644 --- a/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs +++ b/setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs @@ -51,7 +51,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -167,7 +167,7 @@ - + diff --git a/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs b/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs index d44607726ef..bf7e2b793c3 100644 --- a/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs +++ b/setup/FSharp.SDK/component-groups/Runtime_Redist.wxs @@ -39,6 +39,7 @@ + diff --git a/setup/FSharp.Setup.props b/setup/FSharp.Setup.props index 6f48a2b1b22..713620cd557 100644 --- a/setup/FSharp.Setup.props +++ b/setup/FSharp.Setup.props @@ -11,7 +11,7 @@ - 4.3 + 10.1 $([System.DateTime]::Now.ToString(yyyyMMdd.0)) diff --git a/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr index cb51e56c9f3..2ce5288a192 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr @@ -3,7 +3,7 @@ use vs package name=Microsoft.FSharp.SDK.Core version=$(FSharpPackageVersion) vs.package.type=msi - vs.package.providerKey=Microsoft.FSharp.SDK.Core,v4.3 + vs.package.providerKey=Microsoft.FSharp.SDK.Core,v10.1 vs.installSize SystemDrive=194670592 diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr index 95a13eb66a3..bfb98e57231 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr @@ -4,4 +4,4 @@ package name=Microsoft.FSharp.SDK.Resources version=$(FSharpPackageVersion) vs.package.language=$(LocaleSpecificCulture) vs.package.installSize=1 - vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v4.3 + vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.1 diff --git a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr index 82648036b01..d68202aac64 100644 --- a/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr +++ b/setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr @@ -4,7 +4,7 @@ package name=Microsoft.FSharp.SDK.Resources version=$(FSharpPackageVersion) vs.package.type=msi vs.package.language=$(LocaleSpecificCulture) - vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v4.3 + vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.1 vs.installSize SystemDrive=12681438 diff --git a/setup/resources/Microsoft.FSharp.NetSdk.Shim.props b/setup/resources/Microsoft.FSharp.NetSdk.Shim.props index d9fe97d9298..f70ace49bf3 100644 --- a/setup/resources/Microsoft.FSharp.NetSdk.Shim.props +++ b/setup/resources/Microsoft.FSharp.NetSdk.Shim.props @@ -1,5 +1,5 @@ - + diff --git a/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets b/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets index 7a669fd4d12..10844657e73 100644 --- a/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets +++ b/setup/resources/Microsoft.FSharp.NetSdk.Shim.targets @@ -1,5 +1,5 @@ - + diff --git a/setup/resources/Microsoft.FSharp.Shim.targets b/setup/resources/Microsoft.FSharp.Shim.targets index b1df5fba66e..406acd5d36a 100644 --- a/setup/resources/Microsoft.FSharp.Shim.targets +++ b/setup/resources/Microsoft.FSharp.Shim.targets @@ -1,5 +1,5 @@ - + diff --git a/setup/resources/Microsoft.Portable.FSharp.Shim.targets b/setup/resources/Microsoft.Portable.FSharp.Shim.targets index 22a4e746eee..0a0d927347d 100644 --- a/setup/resources/Microsoft.Portable.FSharp.Shim.targets +++ b/setup/resources/Microsoft.Portable.FSharp.Shim.targets @@ -1,5 +1,5 @@ - + diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets index 05bce49848f..c623fe55ccf 100644 --- a/src/FSharpSource.Settings.targets +++ b/src/FSharpSource.Settings.targets @@ -62,18 +62,10 @@ - - true - net40 - - - net40 - FSharp - true - true - true - - false + 4.4.3.0 + 10.1.0.0 + 10.1.0 + 15.6.0.0 2.6.0-vs-for-mac-62329-05 15.0 @@ -84,26 +76,60 @@ 15.3.23 15.3.15 - - obj\$(Configuration)\$(TargetDotnetProfile)\ - obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\ - + 4.1.19 4.1 - 4.3.0 - - 4.3.1 - 4.3 + + 10.1.0 + 10.1.1 + 10.1 + 3.5.0 3.5.0.0 $(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\net45 $(FSharpSourcesRoot)\..\packages\NUnit.ConsoleRunner\$(NUnitVersion)\tools\ + true 0.2.0-beta-000076 + + + + + fs + + + + $(FSCoreVersion) + + + $(FSProductVersion) + + + $(VSAssemblyVersion) + + + + + true + net40 + + + net40 + FSharp + true + true + true + + false + + + obj\$(Configuration)\$(TargetDotnetProfile)\ + obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\ + diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index e432279f749..8afac8cfdbd 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -3,6 +3,8 @@ $(MSBuildProjectDirectory)\..\.. + FSharp + true diff --git a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj index 59ad94d1671..5e0d312c22a 100644 --- a/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj +++ b/src/fsharp/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj @@ -3,6 +3,8 @@ $(MSBuildProjectDirectory)\..\.. + FSharp + true diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index e871d61d4c7..f812dd35693 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -3,6 +3,8 @@ $(MSBuildProjectDirectory)\..\.. + FSharp + true diff --git a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj index 7bf9cc4607a..03d1dc689a6 100644 --- a/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj +++ b/src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj @@ -3,6 +3,7 @@ $(MSBuildProjectDirectory)\..\.. + FSharp true diff --git a/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj b/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj index bb860ccbb86..763ce2f6e82 100644 --- a/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj +++ b/src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj @@ -14,7 +14,7 @@ Visual F# Compiler FSharp functional programming $(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin -rtm-$(BuildRevision.Trim())-0 - 4.2.0$(PreReleaseSuffix) + $(FSPackageVersion)$(PreReleaseSuffix) -prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)" diff --git a/src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec b/src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec index 84ca12cf79f..19e0476dac0 100644 --- a/src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec +++ b/src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec @@ -4,7 +4,7 @@ FSharp.Core - FSharp.Core redistributables from Visual F# 4.1.0 + FSharp.Core redistributables from Visual F# 10.1.0 Supported Platforms: .NET 2.0 (net20) .NET 4.0 (net40) diff --git a/src/fsharp/FSharp.Core.nuget/FSharp.Core.LatestNuget.nuspec b/src/fsharp/FSharp.Core.nuget/FSharp.Core.LatestNuget.nuspec index e04681e3613..a250800f445 100644 --- a/src/fsharp/FSharp.Core.nuget/FSharp.Core.LatestNuget.nuspec +++ b/src/fsharp/FSharp.Core.nuget/FSharp.Core.LatestNuget.nuspec @@ -3,10 +3,10 @@ FSharp.Core - FSharp.Core for F# 4.3 - FSharp.Core for F# 4.3 + FSharp.Core for F# 4.1 + FSharp.Core for F# 4.1 - FSharp.Core redistributables from Visual F# 4.3.0 + FSharp.Core redistributables from Visual F# Tools version 10.1 For F# 4.1 Supported Platforms: .NET 4.5+ (net45) netstandard1.6 (netstandard1.6) diff --git a/src/fsharp/Fsc/Fsc.fsproj b/src/fsharp/Fsc/Fsc.fsproj index 589dddf52bf..7550e3257ae 100644 --- a/src/fsharp/Fsc/Fsc.fsproj +++ b/src/fsharp/Fsc/Fsc.fsproj @@ -4,6 +4,8 @@ $(MSBuildProjectDirectory)\..\.. + FSharp + true diff --git a/src/fsharp/fsi/Fsi.fsproj b/src/fsharp/fsi/Fsi.fsproj index 465cf5980ac..e5a435cf6dc 100644 --- a/src/fsharp/fsi/Fsi.fsproj +++ b/src/fsharp/fsi/Fsi.fsproj @@ -3,6 +3,8 @@ $(MSBuildProjectDirectory)\..\.. + FSharp + true diff --git a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj index 374ceb90560..dfd78843ceb 100644 --- a/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj +++ b/src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj @@ -3,6 +3,8 @@ $(MSBuildProjectDirectory)\..\.. + FSharp + true diff --git a/src/utils/CompilerLocationUtils.fs b/src/utils/CompilerLocationUtils.fs index e9961da9bb2..9bfcbf3fc21 100644 --- a/src/utils/CompilerLocationUtils.fs +++ b/src/utils/CompilerLocationUtils.fs @@ -12,7 +12,7 @@ open System.Runtime.InteropServices module internal FSharpEnvironment = /// The F# version reported in the banner - let FSharpBannerVersion = "4.3" + let FSharpBannerVersion = "10.1.0 for F# 4.1" let versionOf<'t> = #if FX_RESHAPED_REFLECTION @@ -210,31 +210,28 @@ module internal FSharpEnvironment = let result = tryAppConfig "fsharp-compiler-location" match result with | Some _ -> result - | None -> - + | None -> + let safeExists f = (try File.Exists(f) with _ -> false) // Look in the probePoint if given, e.g. look for a compiler alongside of FSharp.Build.dll match probePoint with | Some p when safeExists (Path.Combine(p,"FSharp.Core.dll")) -> Some p | _ -> - + // On windows the location of the compiler is via a registry key // Note: If the keys below change, be sure to update code in: // Property pages (ApplicationPropPage.vb) - - let key1 = @"Software\Microsoft\FSharp\4.1\Runtime\v4.0" - let key2 = @"Software\Microsoft\FSharp\4.0\Runtime\v4.0" - - let result = tryRegKey key1 - match result with - | Some _ -> result - | None -> - let result = tryRegKey key2 - match result with - | Some _ -> result + let keys = + [| + @"Software\Microsoft\FSharp\10.1\Runtime\v4.0"; + @"Software\Microsoft\FSharp\4.1\Runtime\v4.0"; + @"Software\Microsoft\FSharp\4.0\Runtime\v4.0" + |] + let path = keys |> Seq.tryPick(fun k -> tryRegKey k) + match path with + | Some _ -> path | None -> - // On Unix we let you set FSHARP_COMPILER_BIN. I've rarely seen this used and its not documented in the install instructions. let result = let var = System.Environment.GetEnvironmentVariable("FSHARP_COMPILER_BIN") diff --git a/tests/service/data/Test1.fsproj b/tests/service/data/Test1.fsproj index 18028581455..2d813e2b2eb 100644 --- a/tests/service/data/Test1.fsproj +++ b/tests/service/data/Test1.fsproj @@ -35,7 +35,7 @@ - ..\..\..\packages\Microsoft.Portable.FSharp.Core.4.3.0\lib\profiles\net40\FSharp.Core.dll + ..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\net40\FSharp.Core.dll false diff --git a/tests/service/data/Test2.fsproj b/tests/service/data/Test2.fsproj index 1ae856b278c..8ce5a58a268 100644 --- a/tests/service/data/Test2.fsproj +++ b/tests/service/data/Test2.fsproj @@ -36,7 +36,7 @@ - ..\..\..\packages\Microsoft.Portable.FSharp.Core.4.3.0\lib\profiles\net40\FSharp.Core.dll + ..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\net40\FSharp.Core.dll false diff --git a/tests/service/data/Test3.fsproj b/tests/service/data/Test3.fsproj index 22a810bb241..cc3a3501041 100644 --- a/tests/service/data/Test3.fsproj +++ b/tests/service/data/Test3.fsproj @@ -36,7 +36,7 @@ - ..\..\..\packages\Microsoft.Portable.FSharp.Core.4.3.0\lib\profiles\net40\FSharp.Core.dll + ..\..\..\packages\Microsoft.Portable.FSharp.Core.10.1.0\lib\profiles\net40\FSharp.Core.dll false diff --git a/vsintegration/Vsix/RegisterFsharpPackage.pkgdef b/vsintegration/Vsix/RegisterFsharpPackage.pkgdef index 827a62ed67d..08ed3674116 100644 --- a/vsintegration/Vsix/RegisterFsharpPackage.pkgdef +++ b/vsintegration/Vsix/RegisterFsharpPackage.pkgdef @@ -53,7 +53,7 @@ "1"="{92EF0900-2251-11D2-B72E-0000F87572EF}" [$RootKey$\Packages\{91a04a73-4f2c-4e7c-ad38-c1a68e7da05c}] -"ProductVersion"="4.3" +"ProductVersion"="10.1" "ProductName"="Visual F#" "CompanyName"="Microsoft Corp." @@ -63,42 +63,42 @@ [$RootKey$\CLSID\{e1194663-db3c-49eb-8b45-276fcdc440ea}] "InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL" "Class"="Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpBuildPropertyPage" -"Assembly"="FSharp.ProjectSystem.FSharp, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.FSharp, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ThreadingModel"="Both" @="Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpBuildPropertyPage" [$RootKey$\CLSID\{6d2d9b56-2691-4624-a1bf-d07a14594748}] "InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL" "Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpApplicationPropPageComClass" -"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ThreadingModel"="Both" @="Microsoft.VisualStudio.Editors.PropertyPages.FSharpApplicationPropPageComClass" [$RootKey$\CLSID\{dd84aa8f-71bb-462a-8ef8-c9992cb325b7}] "InprocServer32"="$System$mscoree.dll" "Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildEventsPropPageComClass" -"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ThreadingModel"="Both" @="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildEventsPropPageComClass" [$RootKey$\CLSID\{fac0a17e-2e70-4211-916a-0d34fb708bff}] "InprocServer32"="$System$mscoree.dll" "Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildPropPageComClass" -"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ThreadingModel"="Both" @="Microsoft.VisualStudio.Editors.PropertyPages.FSharpBuildPropPageComClass" [$RootKey$\CLSID\{9cfbeb2a-6824-43e2-bd3b-b112febc3772}] "InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL" "Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpDebugPropPageComClass" -"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ThreadingModel"="Both" @="Microsoft.VisualStudio.Editors.PropertyPages.FSharpDebugPropPageComClass" [$RootKey$\CLSID\{df16b1a2-0e91-4499-ae60-c7144e614bf1}] "InprocServer32"="$WinDir$\SYSTEM32\MSCOREE.DLL" "Class"="Microsoft.VisualStudio.Editors.PropertyPages.FSharpReferencePathsPropPageComClass" -"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ThreadingModel"="Both" @="Microsoft.VisualStudio.Editors.PropertyPages.FSharpReferencePathsPropPageComClass" diff --git a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj index 327df4246eb..954c8ac8c34 100644 --- a/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj +++ b/vsintegration/Vsix/VisualFSharpFull/VisualFSharpFull.csproj @@ -53,7 +53,7 @@ $(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin VisualFSharpFull $(RootBinPath) - 15.4.3.0 + true cs false diff --git a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj index fcb4d3303b7..7aa2bb60aa9 100644 --- a/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj +++ b/vsintegration/Vsix/VisualFSharpOpenSource/VisualFSharpOpenSource.csproj @@ -53,7 +53,7 @@ $(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin VisualFSharpOpenSource $(RootBinPath) - 15.4.3.0 + true cs diff --git a/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj b/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj index 39e0ebf671a..4080b65175b 100644 --- a/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj +++ b/vsintegration/Vsix/VisualFSharpTemplates/VisualFSharpTemplates.csproj @@ -51,7 +51,7 @@ $(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin VisualFSharpTemplate $(RootBinPath) - 15.4.3.0 + true cs false diff --git a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj index b19e3fd07f3..8d1c8c695fb 100644 --- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj +++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj @@ -4,7 +4,7 @@ $(MSBuildProjectDirectory)\..\..\..\src CSharp - 15.4.3.0 + true cs diff --git a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj index 72cb1c12636..e934e149a64 100644 --- a/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj +++ b/vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj @@ -7,7 +7,6 @@ FSharp v4.6 true - true false false true diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj index 4d3035b43da..20748be4ff1 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj @@ -6,7 +6,7 @@ CSharp 11 3001,3002,3003,3005,3008,3009,3021,3024 - 15.4.3.0 + true cs $(VsSDKTools) diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/AppConfigHelper.fs b/vsintegration/src/FSharp.ProjectSystem.FSharp/AppConfigHelper.fs index 4a8bb83157e..376eaa39fac 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/AppConfigHelper.fs +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/AppConfigHelper.fs @@ -362,7 +362,7 @@ namespace Microsoft.VisualStudio.FSharp.ProjectSystem "4.3.0.0", "4.4.3.0", ["2.0.0.0"; "2.3.0.0"; "2.3.5.0"; "4.0.0.0"; "4.3.0.0"] "4.3.1.0", "4.4.3.0", ["3.3.1.0"; "2.3.5.1"; "3.78.3.1"; "3.259.3.1"; "4.3.1.0"] "4.4.0.0", "4.4.3.0", ["3.47.4.0"; "3.78.4.0"; "3.259.4.0"; "4.4.0.0"] - "4.4.1.0", "4.4.3.0", ["3.47.41.0"; "3.78.41.0"; "3.259.41.0"; "4.4.0.0"; "4.4.3.0"] + "4.4.1.0", "4.4.3.0", ["3.47.41.0"; "3.78.41.0"; "3.259.41.0"; "4.4.1.0"; "4.4.3.0"] ] |> Seq.where(fun (min, max, _) -> targetFSharpCoreVersion >= min && targetFSharpCoreVersion <= max) // some helpers to simplify work with XLinq @@ -392,7 +392,7 @@ namespace Microsoft.VisualStudio.FSharp.ProjectSystem el let createRedirect p (oldVersion, newVersion) = - create p (xnameAsmV1 BindingRedirect) [xname OldVersion, oldVersion; xname NewVersion, newVersion] |> ignore + if oldVersion < newVersion then create p (xnameAsmV1 BindingRedirect) [xname OldVersion, oldVersion; xname NewVersion, newVersion] |> ignore let getOrCreate(p : System.Xml.Linq.XElement) name = match p.Element(name) with diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx b/vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx index a9e740e8581..96eb52761ec 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/VSPackage.resx @@ -468,19 +468,19 @@ Customizes the environment to maximize code editor screen space and improve the visibility of F# commands and tool windows. - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 1.0 - Microsoft Visual F# + Microsoft Visual F# Tools - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 F# Interactive diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf index 92e34270ea1..6c12879261e 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.cs.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf index ad58acbe8c7..225f5a01446 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.de.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.en.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.en.xlf index 33f84375183..47c5e09b12d 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.en.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.en.xlf @@ -433,13 +433,13 @@ - Microsoft Visual F# 4.3 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 + Microsoft Visual F# Tools 10.1 for F# 4.1 - Microsoft Visual F# 4.3 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 + Microsoft Visual F# Tools 10.1 for F# 4.1 @@ -448,13 +448,13 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# Tools - Visual F# 4.3 - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 + Visual F# Tools 10.1 for F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf index 5d8440dac62..c905201e46f 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.es.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf index 3b224b66f8d..ca6e834ef37 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.fr.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.it.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.it.xlf index 0e9ee32b47c..f6b954d7f1a 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.it.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.it.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ja.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ja.xlf index 5c78991d0a7..11cd810b6a2 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ja.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ja.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ko.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ko.xlf index 55924f3b8ba..0f81736c59b 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ko.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ko.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pl.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pl.xlf index 8a3a0dc0bc5..5937f9a66f5 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pl.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pl.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pt-BR.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pt-BR.xlf index 14f7dd51aa1..ea13b97eca3 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pt-BR.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.pt-BR.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ru.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ru.xlf index fcc92564a65..49dd2c071b5 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ru.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.ru.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.tr.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.tr.xlf index 815d48396a2..5a04d4e69a5 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.tr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.tr.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hans.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hans.xlf index 3e48a1f9139..7430f25d6dd 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hans.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hans.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hant.xlf b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hant.xlf index 148b5f8d97f..9f75cd89bcd 100644 --- a/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hant.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.FSharp/xlf/VSPackage.zh-Hant.xlf @@ -433,12 +433,12 @@ - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 - Microsoft Visual F# 4.3 + Microsoft Visual F# Tools 10.1 for F# 4.1 Microsoft Visual F# 4.1 @@ -448,12 +448,12 @@ - Microsoft Visual F# - Microsoft Visual F# + Microsoft Visual F# Tools + Microsoft Visual F# - Visual F# 4.3 + Visual F# Tools 10.1 for F# 4.1 Visual F# 4.1 diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj index f268836caec..36e4f696d5f 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj @@ -4,7 +4,7 @@ $(MSBuildProjectDirectory)\..\..\..\src VisualBasic - 15.4.3.0 + true vb diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.resx b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.resx index e1668f2208c..d8769c30908 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.resx +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.resx @@ -661,6 +661,6 @@ ApplicationPropPage - Microsoft.VisualStudio.Editors.PropertyPages.ApplicationPropPageBase, FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Editors.PropertyPages.ApplicationPropPageBase, FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.vb b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.vb index fc307096bf3..b5f34639104 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.vb +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.vb @@ -80,8 +80,8 @@ Namespace Microsoft.VisualStudio.Editors.PropertyPages Dim v40FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.0\Runtime\v4.0" #End If #If VS_VERSION_DEV15 Then - Dim v20FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.3\Runtime\v2.0" - Dim v40FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\4.3\Runtime\v4.0" + Dim v20FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\10.1\Runtime\v2.0" + Dim v40FSharpRedistKey As String = "HKEY_LOCAL_MACHINE\Software\Microsoft\FSharp\10.1\Runtime\v4.0" #End If m_v20FSharpRedistInstalled = Not (IsNothing(Microsoft.Win32.Registry.GetValue(v20FSharpRedistKey, Nothing, Nothing))) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/BuildPropPage.resx b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/BuildPropPage.resx index 4377119cfef..6e71272e553 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/BuildPropPage.resx +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/BuildPropPage.resx @@ -1351,6 +1351,6 @@ BuildPropPage - Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/DebugPropPage.resx b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/DebugPropPage.resx index fab0a10653a..f245dd33eea 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/DebugPropPage.resx +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/DebugPropPage.resx @@ -523,7 +523,7 @@ StartArguments - Microsoft.VisualStudio.Editors.PropertyPages.DebugPropPage+MultilineTextBoxRejectsEnter, FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Editors.PropertyPages.DebugPropPage+MultilineTextBoxRejectsEnter, FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a overarchingTableLayoutPanel @@ -982,6 +982,6 @@ DebugPropPage - Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.4.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj b/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj index d04dceba35b..11f403d214e 100644 --- a/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj +++ b/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj @@ -4,7 +4,7 @@ $(MSBuildProjectDirectory)\..\..\..\src CSharp - 15.4.3.0 + true cs diff --git a/vsintegration/src/SupportedRuntimes/SupportedRuntimes.xml b/vsintegration/src/SupportedRuntimes/SupportedRuntimes.xml index 6b9322207ab..c92ea3c4592 100644 --- a/vsintegration/src/SupportedRuntimes/SupportedRuntimes.xml +++ b/vsintegration/src/SupportedRuntimes/SupportedRuntimes.xml @@ -11,7 +11,7 @@ - +