diff --git a/.gitignore b/.gitignore index 39ae5993b06..9af90b57c94 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,8 @@ scripts/*.patch /tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll /tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb /tests/Xnet40-fsharpqa-suite-failures.log.* +/tests/fsharp/typeProviders/splitAssemblyTools/provider.dll +/tests/fsharp/typeProviders/splitAssemblyTypeproviders/provider.dll /vsintegration/src/service/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi /vsintegration/src/service/FsPkgs/FSharp.Project/FS/ctofiles/ /tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll diff --git a/build-everything.proj b/build-everything.proj index 4dc7d128a4e..ba905ad0365 100644 --- a/build-everything.proj +++ b/build-everything.proj @@ -76,6 +76,7 @@ + diff --git a/build.cmd b/build.cmd index 277cee2fb0e..52627bc653f 100644 --- a/build.cmd +++ b/build.cmd @@ -650,7 +650,6 @@ if "%NEEDS_DOTNET_CLI_TOOLS%" == "1" ( :: Restore the Tools directory call %~dp0init-tools.cmd ) - set _dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe set NUGET_PACKAGES=%~dp0Packages @@ -677,6 +676,32 @@ if not "%PB_PackageVersionPropsUrl%" == "" ( if ERRORLEVEL 1 echo Error restoring dependency uptake packages && goto :failure ) +echo ----------- Done with package restore, starting dependency uptake check ------------- + +if not "%PB_PackageVersionPropsUrl%" == "" ( + set dependencyUptakeDir=%~dp0Tools\dependencyUptake + if not exist "!dependencyUptakeDir!" mkdir "!dependencyUptakeDir!" + + :: download package version overrides + echo powershell -noprofile -executionPolicy RemoteSigned -command "Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'" + powershell -noprofile -executionPolicy RemoteSigned -command "Invoke-WebRequest -Uri '%PB_PackageVersionPropsUrl%' -OutFile '!dependencyUptakeDir!\PackageVersions.props'" + if ERRORLEVEL 1 echo Error downloading package version properties && goto :failure + + :: prepare dependency uptake files + echo %_msbuildexe% %msbuildflags% %~dp0build\projects\PrepareDependencyUptake.proj /t:Build + %_msbuildexe% %msbuildflags% %~dp0build\projects\PrepareDependencyUptake.proj /t:Build + if ERRORLEVEL 1 echo Error building dependency uptake files && goto :failure + + :: restore dependencies + %_nugetexe% restore !dependencyUptakeDir!\packages.config -PackagesDirectory packages -ConfigFile !dependencyUptakeDir!\NuGet.config + if ERRORLEVEL 1 echo Error restoring dependency uptake packages && goto :failure +) + +set _dotnetcliexe=%~dp0Tools\dotnetcli\dotnet.exe +set _dotnet20exe=%~dp0Tools\dotnet20\dotnet.exe +set NUGET_PACKAGES=%~dp0Packages +set path=%~dp0Tools\dotnet20\;%path% + set _fsiexe="packages\FSharp.Compiler.Tools.4.1.27\tools\fsi.exe" if not exist %_fsiexe% echo Error: Could not find %_fsiexe% && goto :failure %_ngenexe% install %_fsiexe% /nologo diff --git a/build/targets/AssemblyVersions.props b/build/targets/AssemblyVersions.props index c8d0dd7316b..63e5f4426c5 100644 --- a/build/targets/AssemblyVersions.props +++ b/build/targets/AssemblyVersions.props @@ -22,7 +22,7 @@ 4.4.3.0 10.1.1.0 10.1.4 - 15.6.0.0 + 15.7.0.0 $(FSCoreVersion) diff --git a/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj b/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj index 7e96d797f77..e6c23231971 100644 --- a/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj +++ b/fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj @@ -48,5 +48,18 @@ $(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Tasks.v12.0.dll false + + + $(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll + false + + + + + FSharp.Compiler.Service + {2e4d67b4-522d-4cf7-97e4-ba940f0b18f3} + True + + \ No newline at end of file diff --git a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj index 871579de358..cef5d5448a1 100644 --- a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj +++ b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj @@ -20,6 +20,11 @@ + + + $(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll + false + $(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll diff --git a/src/FSharpSource.Settings.targets b/src/FSharpSource.Settings.targets index 7b9434be24d..6da259ca178 100644 --- a/src/FSharpSource.Settings.targets +++ b/src/FSharpSource.Settings.targets @@ -23,7 +23,7 @@ 4.4.3.0 10.1.1.0 10.1.4 - 15.6.0.0 + 15.7.0.0 @@ -97,16 +97,16 @@ 1.1.0 1.2.0 - - obj\$(Configuration)\$(TargetDotnetProfile)\ - obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\ - 4.1.19 4.1 4.3.5 4.3 + + obj\$(Configuration)\$(TargetDotnetProfile)\ + obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\ + 10.1.0 10.2.0 diff --git a/src/absil/ilwritepdb.fs b/src/absil/ilwritepdb.fs index f8baa3aea4c..760ac9e428a 100644 --- a/src/absil/ilwritepdb.fs +++ b/src/absil/ilwritepdb.fs @@ -423,22 +423,15 @@ let generatePortablePdb (embedAllSource:bool) (embedSourceList:string list) (sou list.ToArray() |> Array.sortWith scopeSorter collectScopes scope |> Seq.iter(fun s -> - if s.Children.Length = 0 then - metadata.AddLocalScope(MetadataTokens.MethodDefinitionHandle(minfo.MethToken), - Unchecked.defaultof, - nextHandle lastLocalVariableHandle, - Unchecked.defaultof, - 0, s.EndOffset - s.StartOffset ) |>ignore - else - metadata.AddLocalScope(MetadataTokens.MethodDefinitionHandle(minfo.MethToken), - Unchecked.defaultof, - nextHandle lastLocalVariableHandle, - Unchecked.defaultof, - s.StartOffset, s.EndOffset - s.StartOffset) |>ignore - - for localVariable in s.Locals do - lastLocalVariableHandle <- metadata.AddLocalVariable(LocalVariableAttributes.None, localVariable.Index, metadata.GetOrAddString(localVariable.Name)) - ) + metadata.AddLocalScope(MetadataTokens.MethodDefinitionHandle(minfo.MethToken), + Unchecked.defaultof, + nextHandle lastLocalVariableHandle, + Unchecked.defaultof, + s.StartOffset, s.EndOffset - s.StartOffset ) |>ignore + + for localVariable in s.Locals do + lastLocalVariableHandle <- metadata.AddLocalVariable(LocalVariableAttributes.None, localVariable.Index, metadata.GetOrAddString(localVariable.Name)) + ) match minfo.RootScope with | None -> () diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props index fdc2b69ab82..c0d6b91fdbf 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props @@ -32,6 +32,8 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and false false + 4.3.1 + 4.3.4 @@ -63,4 +65,15 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and $(MSBuildThisFileDirectory) RunFsc.sh + + + + true + + + + true + + + diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets index 341c9e4bd2a..6226a670f47 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets @@ -53,14 +53,11 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and $(MSBuildProjectFullPath) - - 4.3.* - - - + <_FrameworkNeedsValueTupleReference Condition=" ('$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == '.NETCoreApp') and !('$(_TargetFrameworkVersionWithoutV)' >= '2.0') ">true <_FrameworkNeedsValueTupleReference Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' and - ('$(_TargetFrameworkVersionWithoutV)' == '4.0' or + ('$(_TargetFrameworkVersionWithoutV)' == '' or + '$(_TargetFrameworkVersionWithoutV)' == '4.0' or '$(_TargetFrameworkVersionWithoutV)' == '4.5' or '$(_TargetFrameworkVersionWithoutV)' == '4.6' or '$(_TargetFrameworkVersionWithoutV)' == '4.6.1' or @@ -68,14 +65,47 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and '$(_TargetFrameworkVersionWithoutV)' == '4.7') ">true - - - - + + $(TargetsForTfmSpecificContentInPackage);PackageFSharpDesignTimeTools + - - $(TargetsForTfmSpecificContentInPackage);PackageFSharpDesignTimeTools - + + + + + + + + + + + + + + + + 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 03d1dc689a6..91eadb4875e 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 @@ -4,7 +4,7 @@ $(MSBuildProjectDirectory)\..\.. FSharp - true + true diff --git a/src/fsharp/FSharp.Core/prim-types.fs b/src/fsharp/FSharp.Core/prim-types.fs index 6d013312673..384b62939ef 100644 --- a/src/fsharp/FSharp.Core/prim-types.fs +++ b/src/fsharp/FSharp.Core/prim-types.fs @@ -337,12 +337,12 @@ namespace Microsoft.FSharp.Core [] type OptionalArgumentAttribute() = inherit System.Attribute() - + [] [] type GeneralizableValueAttribute() = inherit System.Attribute() - + [] [] type RequiresExplicitTypeArgumentsAttribute() = @@ -352,7 +352,7 @@ namespace Microsoft.FSharp.Core [] type RequireQualifiedAccessAttribute() = inherit System.Attribute() - + [] [] type AutoOpenAttribute(path:string) = @@ -360,6 +360,14 @@ namespace Microsoft.FSharp.Core member x.Path = path new() = AutoOpenAttribute("") + /// This Attribute is used to make Value bindings like + /// let x = some code + /// operate like static properties. + [] + [] + type ValueAsStaticPropertyAttribute() = + inherit System.Attribute() + [] type float<[] 'Measure> = float [] type float32<[] 'Measure> = float32 [] type decimal<[] 'Measure> = decimal @@ -510,14 +518,19 @@ namespace Microsoft.FSharp.Core module LanguagePrimitives = module (* internal *) ErrorStrings = - // inline functions cannot call GetString, so we must make these bits public + // inline functions cannot call GetString, so we must make these bits public + [] let AddressOpNotFirstClassString = SR.GetString(SR.addressOpNotFirstClass) + [] let NoNegateMinValueString = SR.GetString(SR.noNegateMinValue) // needs to be public to be visible from inline function 'average' and others + [] let InputSequenceEmptyString = SR.GetString(SR.inputSequenceEmpty) // needs to be public to be visible from inline function 'average' and others + [] let InputArrayEmptyString = SR.GetString(SR.arrayWasEmpty) // needs to be public to be visible from inline function 'average' and others + [] let InputMustBeNonNegativeString = SR.GetString(SR.inputMustBeNonNegative) [] // nested module OK diff --git a/src/fsharp/PostInferenceChecks.fs b/src/fsharp/PostInferenceChecks.fs index c22fb3f4098..379687a5d2e 100644 --- a/src/fsharp/PostInferenceChecks.fs +++ b/src/fsharp/PostInferenceChecks.fs @@ -1251,7 +1251,8 @@ let CheckModuleBinding cenv env (TBind(v,e,_) as bind) = // Having a field makes the binding a static initialization trigger IsSimpleSyntacticConstantExpr cenv.g e && // Check the thing is actually compiled as a property - IsCompiledAsStaticProperty cenv.g v + IsCompiledAsStaticProperty cenv.g v || + (cenv.g.compilingFslib && v.Attribs |> List.exists(fun (Attrib(tc,_,_,_,_,_,_)) -> tc.CompiledName = "ValueAsStaticPropertyAttribute")) then v.SetIsCompiledAsStaticPropertyWithoutField() diff --git a/src/fsharp/tast.fs b/src/fsharp/tast.fs index dce289d26dc..b6dbf5e0f34 100755 --- a/src/fsharp/tast.fs +++ b/src/fsharp/tast.fs @@ -2419,7 +2419,9 @@ and [] member x.HasBeenReferenced = x.val_flags.HasBeenReferenced /// Indicates if the backing field for a static value is suppressed. - member x.IsCompiledAsStaticPropertyWithoutField = x.val_flags.IsCompiledAsStaticPropertyWithoutField + member x.IsCompiledAsStaticPropertyWithoutField = + let hasValueAsStaticProperty = x.Attribs |> List.exists(fun (Attrib(tc,_,_,_,_,_,_)) -> tc.CompiledName = "ValueAsStaticPropertyAttribute") + x.val_flags.IsCompiledAsStaticPropertyWithoutField || hasValueAsStaticProperty /// Indicates if the value is pinned/fixed member x.IsFixed = x.val_flags.IsFixed diff --git a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs index c009617c500..0434153fbb6 100644 --- a/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs +++ b/tests/FSharp.Core.UnitTests/FSharp.Core/Microsoft.FSharp.Core/BigIntType.fs @@ -195,7 +195,6 @@ type BigIntType() = [] member this.One() = Assert.AreEqual(BigInteger.One,1I) - () [] diff --git a/tests/fsharp/SDKTests/AllSdkTargetsTests.proj b/tests/fsharp/SDKTests/AllSdkTargetsTests.proj new file mode 100644 index 00000000000..8aecfd0263e --- /dev/null +++ b/tests/fsharp/SDKTests/AllSdkTargetsTests.proj @@ -0,0 +1,18 @@ + + + + release + + + + + + + + + + + + + + diff --git a/tests/fsharp/SDKTests/tests/DefaultImplicitReferenceTest.proj b/tests/fsharp/SDKTests/tests/DefaultImplicitReferenceTest.proj new file mode 100644 index 00000000000..caf76645e6b --- /dev/null +++ b/tests/fsharp/SDKTests/tests/DefaultImplicitReferenceTest.proj @@ -0,0 +1,19 @@ + + + + + + + + + true + $(DefaultFSharpPackageVersion) + + true + $(DefaultValueTuplePackageVersion) + + + + + + diff --git a/tests/fsharp/SDKTests/tests/DisableImplicitReferenceTest.proj b/tests/fsharp/SDKTests/tests/DisableImplicitReferenceTest.proj new file mode 100644 index 00000000000..7f874c55e70 --- /dev/null +++ b/tests/fsharp/SDKTests/tests/DisableImplicitReferenceTest.proj @@ -0,0 +1,20 @@ + + + + + + true + true + + + + + + + false + false + + + + + diff --git a/tests/fsharp/SDKTests/tests/DisableImplicitReferenceWithInclude.proj b/tests/fsharp/SDKTests/tests/DisableImplicitReferenceWithInclude.proj new file mode 100644 index 00000000000..bdc77f8d859 --- /dev/null +++ b/tests/fsharp/SDKTests/tests/DisableImplicitReferenceWithInclude.proj @@ -0,0 +1,28 @@ + + + + + + true + true + + + + + + + + + + + + true + 99.99.99 + + true + 44.44.44 + + + + + diff --git a/tests/fsharp/SDKTests/tests/SetImplicitReferenceTest.proj b/tests/fsharp/SDKTests/tests/SetImplicitReferenceTest.proj new file mode 100644 index 00000000000..f5b878d572b --- /dev/null +++ b/tests/fsharp/SDKTests/tests/SetImplicitReferenceTest.proj @@ -0,0 +1,23 @@ + + + + + + 99.99.99 + 44.44.44 + + + + + + + true + 99.99.99 + + true + 44.44.44 + + + + + diff --git a/tests/fsharp/SDKTests/tests/Test.props b/tests/fsharp/SDKTests/tests/Test.props new file mode 100644 index 00000000000..26358af053b --- /dev/null +++ b/tests/fsharp/SDKTests/tests/Test.props @@ -0,0 +1,15 @@ + + + + net46 + release + $(MSBuildThisFileDirectory)..\..\..\..\$(Configuration)\net40\bin + + + AnyCPU + $(MSBuildThisFileDirectory) + + + + + diff --git a/tests/fsharp/SDKTests/tests/Test.targets b/tests/fsharp/SDKTests/tests/Test.targets new file mode 100644 index 00000000000..f9b54a33ede --- /dev/null +++ b/tests/fsharp/SDKTests/tests/Test.targets @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/fsharp/SDKTests/tests/UpdateReference.proj b/tests/fsharp/SDKTests/tests/UpdateReference.proj new file mode 100644 index 00000000000..31a0f4c1b64 --- /dev/null +++ b/tests/fsharp/SDKTests/tests/UpdateReference.proj @@ -0,0 +1,21 @@ + + + + + + + + + + + + + true + 99.99.99 + true + 44.44.44 + + + + + diff --git a/vsintegration/Vsix/RegisterFsharpPackage.pkgdef b/vsintegration/Vsix/RegisterFsharpPackage.pkgdef index d7c59b2b380..be452176e4b 100644 --- a/vsintegration/Vsix/RegisterFsharpPackage.pkgdef +++ b/vsintegration/Vsix/RegisterFsharpPackage.pkgdef @@ -62,42 +62,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.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.FSharp, Version=15.7.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.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.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.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.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.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.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.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.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.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" +"Assembly"="FSharp.ProjectSystem.PropertyPages, Version=15.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ThreadingModel"="Both" @="Microsoft.VisualStudio.Editors.PropertyPages.FSharpReferencePathsPropPageComClass" diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj index db88b5bff79..74e2d0998ee 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj @@ -269,6 +269,10 @@ + + $(SuiteBinPath)\FSharp + + diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.resx b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/ApplicationPropPage.resx index d8769c30908..9e1be19307d 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.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Editors.PropertyPages.ApplicationPropPageBase, FSharp.ProjectSystem.PropertyPages, Version=15.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/BuildPropPage.resx b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/BuildPropPage.resx index 6e71272e553..32bc19edbec 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.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.7.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 f245dd33eea..9e6fc8ccfb5 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.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Editors.PropertyPages.DebugPropPage+MultilineTextBoxRejectsEnter, FSharp.ProjectSystem.PropertyPages, Version=15.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a overarchingTableLayoutPanel @@ -982,6 +982,6 @@ DebugPropPage - Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + Microsoft.VisualStudio.Editors.PropertyPages.PropPageUserControlBase, FSharp.ProjectSystem.PropertyPages, Version=15.7.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 c511d7e926f..b17e3baa8e8 100644 --- a/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj +++ b/vsintegration/src/FSharp.UIResources/FSharp.UIResources.csproj @@ -5,6 +5,7 @@ net46 Library + $(NoWarn);1591 false Microsoft.VisualStudio.FSharp.UIResources @@ -33,8 +34,6 @@ - -