From 36b64946d09f68c1216116997270ffd83bde4c5d Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 16 May 2019 13:48:52 -0700 Subject: [PATCH 1/9] Allow targetting of preview FSharp.Core. Parameterize dsharp.core versions --- FSharpBuild.Directory.Build.targets | 15 ++++++++------- eng/Versions.props | 7 +++++++ src/fsharp/FSharp.Build/FSharp.Build.fsproj | 7 ++++++- .../FSharp.Build/Microsoft.FSharp.NetSdk.props | 3 ++- .../FSharp.Build/Microsoft.FSharp.NetSdk.targets | 8 +++++++- src/fsharp/xlf/FSComp.txt.es.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.cs.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.de.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.es.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.fr.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.it.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.ja.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.ko.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.pl.xlf | 2 +- ...rosoft.VisualStudio.Editors.Designer.pt-BR.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.ru.xlf | 2 +- ...Microsoft.VisualStudio.Editors.Designer.tr.xlf | 2 +- ...soft.VisualStudio.Editors.Designer.zh-Hans.xlf | 2 +- ...soft.VisualStudio.Editors.Designer.zh-Hant.xlf | 2 +- 19 files changed, 44 insertions(+), 24 deletions(-) diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets index 1d9828726b9..758f17e5ed7 100644 --- a/FSharpBuild.Directory.Build.targets +++ b/FSharpBuild.Directory.Build.targets @@ -4,21 +4,22 @@ - - $(CompileDependsOn);CopyAndSubstituteTextFiles - - + Outputs="@(CopyAndSubstituteText->'$(OutDir)%(Filename)%(Extension)')" + BeforeTargets="BeforeBuild"> + <_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)')) <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)')) <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)')) - + - + + + + diff --git a/eng/Versions.props b/eng/Versions.props index b7706f695e1..8290a588045 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,6 +9,7 @@ true true + beta @@ -16,13 +17,17 @@ $(FSCoreMajorVersion).3 $(FSCoreMajorVersion).0 $(FSCoreVersionPrefix).0 + 4.6.2 + $(FSCorePackageVersion)-beta.* + 10.4 $(FSPackageMajorVersion).3 $(FSPackageVersion) $(FSPackageVersion).0 + 16 0 @@ -30,6 +35,7 @@ $(VSMajorVersion).$(VSMinorVersion).0 $(VSAssemblyVersionPrefix).0 + $(FSCoreVersionPrefix) @@ -39,6 +45,7 @@ $(VersionPrefix).0 + + + $(DefaultFSharpCorePreviewPackageVersion) + $(RestoreSources); https://dotnet.myget.org/F/fsharp/api/v3/index.json + + fsharp41 tools - + diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index f3c85065ce9..9709b6c3abf 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -109,7 +109,7 @@ All branches of a pattern match expression must return values of the same type as the first branch, which here is '{0}'. This branch returns a value of type '{1}'. - Todas las ramas de una expresión de coincidencia de patrón deben devolver valores del mismo tipo. La primera rama devolvió un valor de tipo "{0}", pero esta rama devolvió un valor de tipo "\{1 \}". + All branches of a pattern match expression must return values of the same type as the first branch, which here is '{0}'. This branch returns a value of type '{1}'. diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.cs.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.cs.xlf index 96c40e377d2..34d3f8e9398 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.cs.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.cs.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.de.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.de.xlf index 5af40395147..65b4328fdc2 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.de.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.de.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.es.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.es.xlf index 40d73cd4e8b..e6d3f880327 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.es.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.es.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.fr.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.fr.xlf index 83a941758ad..d6eb96345c5 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.fr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.fr.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.it.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.it.xlf index fd7d41daa5b..44ff0d0304d 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.it.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.it.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ja.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ja.xlf index cd4de3e846c..b40e0489413 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ja.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ja.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ko.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ko.xlf index 8951b09f127..c8b592b4d37 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ko.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ko.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pl.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pl.xlf index e75adbf3699..a1396dd274e 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pl.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pl.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pt-BR.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pt-BR.xlf index 3cd57027203..3e8a1693485 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pt-BR.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pt-BR.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ru.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ru.xlf index 94a58397fe8..2b5303d91de 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ru.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ru.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.tr.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.tr.xlf index 84703a61bdb..b6029ff9b5b 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.tr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.tr.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.zh-Hans.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.zh-Hans.xlf index ccdc1a19394..7296c365e67 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.zh-Hans.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.zh-Hans.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.zh-Hant.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.zh-Hant.xlf index 11c81c6df1c..16b7339b2a4 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.zh-Hant.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.zh-Hant.xlf @@ -1828,7 +1828,7 @@ CONSIDER: get this from CodeDom {0} x {1} - {0} x {1} + {0} x {1} Format string for showing a graphic's size # {0} = width (as an integer) From cc7e3322bc5e43c5ca7f92b039423d1e54a70a26 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Thu, 16 May 2019 16:55:53 -0700 Subject: [PATCH 2/9] Parameterise app.config generation --- FSharpBuild.Directory.Build.targets | 9 +++++++++ src/fsharp/FSharp.Build/FSharp.Build.fsproj | 1 + src/fsharp/fsc/{app.config => fsc.exe.config} | 2 +- src/fsharp/fsc/fsc.fsproj | 6 +++++- src/fsharp/fsi/{app.config => fsi.exe.config} | 5 ++++- src/fsharp/fsi/fsi.fsproj | 6 +++++- .../fsiAnyCpu/{app.config => fsiAnyCpu.exe.config} | 2 +- src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj | 6 +++++- .../{App.config => VisualFSharp.UnitTests.dll.config} | 2 +- .../tests/UnitTests/VisualFSharp.UnitTests.fsproj | 11 +++++------ 10 files changed, 37 insertions(+), 13 deletions(-) rename src/fsharp/fsc/{app.config => fsc.exe.config} (87%) rename src/fsharp/fsi/{app.config => fsi.exe.config} (76%) rename src/fsharp/fsiAnyCpu/{app.config => fsiAnyCpu.exe.config} (87%) rename vsintegration/tests/UnitTests/{App.config => VisualFSharp.UnitTests.dll.config} (96%) diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets index 758f17e5ed7..7093843fe2c 100644 --- a/FSharpBuild.Directory.Build.targets +++ b/FSharpBuild.Directory.Build.targets @@ -13,8 +13,17 @@ <_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)')) <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)')) <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)')) + <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern3)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern3)', '%(CopyAndSubstituteText.Replacement3)')) + <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern4)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern4)', '%(CopyAndSubstituteText.Replacement4)')) + <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern5)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern5)', '%(CopyAndSubstituteText.Replacement5)')) + <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern6)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern6)', '%(CopyAndSubstituteText.Replacement6)')) + <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern7)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern7)', '%(CopyAndSubstituteText.Replacement7)')) + <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern8)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern8)', '%(CopyAndSubstituteText.Replacement8)')) + <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern9)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern9)', '%(CopyAndSubstituteText.Replacement9)')) + + diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 477ac77ed08..7e9b0d631c0 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -29,6 +29,7 @@ + Microsoft.FSharp.NetSdk.props {{FSharpCoreShippedPackageVersion}} $(FSharpCoreShippedPackageVersion) {{FSharpCorePreviewPackageVersion}} diff --git a/src/fsharp/fsc/app.config b/src/fsharp/fsc/fsc.exe.config similarity index 87% rename from src/fsharp/fsc/app.config rename to src/fsharp/fsc/fsc.exe.config index 68fff88101e..3e0f05bbf95 100644 --- a/src/fsharp/fsc/app.config +++ b/src/fsharp/fsc/fsc.exe.config @@ -6,7 +6,7 @@ - + diff --git a/src/fsharp/fsc/fsc.fsproj b/src/fsharp/fsc/fsc.fsproj index 9cec3fb3140..07642b24983 100644 --- a/src/fsharp/fsc/fsc.fsproj +++ b/src/fsharp/fsc/fsc.fsproj @@ -11,6 +11,7 @@ true $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 true + false @@ -21,11 +22,14 @@ fscmain.fs - default.win32manifest PreserveNewest + + {{FSCoreVersion}} + $(FSCoreVersion) + diff --git a/src/fsharp/fsi/app.config b/src/fsharp/fsi/fsi.exe.config similarity index 76% rename from src/fsharp/fsi/app.config rename to src/fsharp/fsi/fsi.exe.config index 818ebc93b43..674f58d5eaa 100644 --- a/src/fsharp/fsi/app.config +++ b/src/fsharp/fsi/fsi.exe.config @@ -5,7 +5,7 @@ - + @@ -13,4 +13,7 @@ + + + diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj index 4b92a354abe..19fa71c7a8f 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -12,6 +12,7 @@ $(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1 fsi.res true + false @@ -22,7 +23,10 @@ - + + {{FSCoreVersion}} + $(FSCoreVersion) + diff --git a/src/fsharp/fsiAnyCpu/app.config b/src/fsharp/fsiAnyCpu/fsiAnyCpu.exe.config similarity index 87% rename from src/fsharp/fsiAnyCpu/app.config rename to src/fsharp/fsiAnyCpu/fsiAnyCpu.exe.config index 6e8f1eb9084..af303c8db16 100644 --- a/src/fsharp/fsiAnyCpu/app.config +++ b/src/fsharp/fsiAnyCpu/fsiAnyCpu.exe.config @@ -6,7 +6,7 @@ - + diff --git a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj index dbe31f6ec2a..6371da50137 100644 --- a/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj +++ b/src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj @@ -13,6 +13,7 @@ ..\fsi\fsi.res true true + false @@ -22,7 +23,10 @@ - + + {{FSCoreVersion}} + $(FSCoreVersion) + diff --git a/vsintegration/tests/UnitTests/App.config b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.dll.config similarity index 96% rename from vsintegration/tests/UnitTests/App.config rename to vsintegration/tests/UnitTests/VisualFSharp.UnitTests.dll.config index 768fbe1d137..6df63308b27 100644 --- a/vsintegration/tests/UnitTests/App.config +++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.dll.config @@ -40,7 +40,7 @@ - + diff --git a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj index e67623fd9fc..3b76b1fd84f 100644 --- a/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj +++ b/vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj @@ -15,6 +15,7 @@ true false true + false @@ -165,12 +166,10 @@ Roslyn\DocumentHighlightsServiceTests.fs - - - PreserveNewest - - - + + {{FSCoreVersion}} + $(FSCoreVersion) + From 11a5e67ece14eff66fa9b32ac2e31ca3cf056eeb Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 17 May 2019 03:17:01 -0700 Subject: [PATCH 3/9] parameterize banner text --- FSharpBuild.Directory.Build.targets | 31 ++++++++++++++----- eng/Versions.props | 5 +-- .../FSharp.Compiler.Service.fsproj | 1 + src/fsharp/FSComp.txt | 1 + src/fsharp/FSharp.Build/FSBuild.txt | 3 +- src/fsharp/FSharp.Build/FSharp.Build.fsproj | 1 + .../FSharp.Build/xlf/FSBuild.txt.cs.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.de.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.es.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.fr.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.it.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.ja.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.ko.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.pl.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.pt-BR.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.ru.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.tr.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.zh-Hans.xlf | 5 +++ .../FSharp.Build/xlf/FSBuild.txt.zh-Hant.xlf | 5 +++ .../FSharp.Compiler.Private.fsproj | 1 + src/fsharp/fsi/fsi.exe.config | 3 -- src/fsharp/xlf/FSComp.txt.cs.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.de.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.es.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.fr.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.it.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.ja.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.ko.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.pl.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.pt-BR.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.ru.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.tr.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.zh-Hans.xlf | 5 +++ src/fsharp/xlf/FSComp.txt.zh-Hant.xlf | 5 +++ src/utils/CompilerLocationUtils.fs | 10 +++++- 35 files changed, 172 insertions(+), 14 deletions(-) diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets index 7093843fe2c..74615e236eb 100644 --- a/FSharpBuild.Directory.Build.targets +++ b/FSharpBuild.Directory.Build.targets @@ -13,13 +13,6 @@ <_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)')) <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)')) <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)')) - <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern3)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern3)', '%(CopyAndSubstituteText.Replacement3)')) - <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern4)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern4)', '%(CopyAndSubstituteText.Replacement4)')) - <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern5)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern5)', '%(CopyAndSubstituteText.Replacement5)')) - <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern6)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern6)', '%(CopyAndSubstituteText.Replacement6)')) - <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern7)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern7)', '%(CopyAndSubstituteText.Replacement7)')) - <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern8)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern8)', '%(CopyAndSubstituteText.Replacement8)')) - <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern9)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern9)', '%(CopyAndSubstituteText.Replacement9)')) @@ -28,9 +21,33 @@ + + + + + <_BuildPropertyLines Remove="@(_BuildPropertyLines)" /> + <_BuildPropertyLines Include="// <auto-generated >" /> + <_BuildPropertyLines Include="// <Generated by the FSharp WriteCodeFragment class./>" /> + <_BuildPropertyLines Include="// </auto-generated/>" /> + <_BuildPropertyLines Include="//" /> + <_BuildPropertyLines Include="module internal FSharp.BuildProperties" /> + <_BuildPropertyLines Include="let fsProductVersion = "$(FSPRODUCTVERSION)"" /> + <_BuildPropertyLines Include="let fsLanguageVersion = "$(FSLANGUAGEVERSION)"" /> + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index 8290a588045..43698a623e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,12 +13,13 @@ beta - 4.6 + 4.6 + $(FSLanguageVersion) $(FSCoreMajorVersion).3 $(FSCoreMajorVersion).0 $(FSCoreVersionPrefix).0 4.6.2 - $(FSCorePackageVersion)-beta.* + $(FSCorePackageVersion)-$(PreReleaseVersionLabel).* diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 81db7f54c59..1c04e0766c3 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -8,6 +8,7 @@ $(DefineConstants);COMPILER $(DefineConstants);ENABLE_MONO_SUPPORT $(DefineConstants);NO_STRONG_NAMES + $(DefineConstants);LOCALIZATION_FCOMP $(TargetFramework)\ $(TargetFramework)\ $(OtherFlags) /warnon:1182 diff --git a/src/fsharp/FSComp.txt b/src/fsharp/FSComp.txt index c28343c01bc..ee2b41f2e9d 100644 --- a/src/fsharp/FSComp.txt +++ b/src/fsharp/FSComp.txt @@ -1462,3 +1462,4 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl 3300,chkInvalidFunctionParameterType,"The parameter '%s' has an invalid type '%s'. This is not permitted by the rules of Common IL." 3301,chkInvalidFunctionReturnType,"The function or method has an invalid return type '%s'. This is not permitted by the rules of Common IL." useSdkRefs,"Use reference assemblies for .NET framework references when available (Enabled by default)." +fSharpBannerVersion,"%s for F# %s" diff --git a/src/fsharp/FSharp.Build/FSBuild.txt b/src/fsharp/FSharp.Build/FSBuild.txt index 10fdedb2151..47d1ee7431d 100644 --- a/src/fsharp/FSharp.Build/FSBuild.txt +++ b/src/fsharp/FSharp.Build/FSBuild.txt @@ -1,2 +1,3 @@ # FSharp.Build resource strings -toolpathUnknown,"ToolPath is unknown; specify the path to the tool." \ No newline at end of file +toolpathUnknown,"ToolPath is unknown; specify the path to the tool." +fSharpBannerVersion,"%s for F# %s" diff --git a/src/fsharp/FSharp.Build/FSharp.Build.fsproj b/src/fsharp/FSharp.Build/FSharp.Build.fsproj index 7e9b0d631c0..ef4d013dc1f 100644 --- a/src/fsharp/FSharp.Build/FSharp.Build.fsproj +++ b/src/fsharp/FSharp.Build/FSharp.Build.fsproj @@ -11,6 +11,7 @@ true $(OtherFlags) --maxerrors:20 --extraoptimizationloops:1 true + $(DefineConstants);LOCALIZATION_FSBUILD diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.cs.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.cs.xlf index 374f1770bbb..64e44dc099e 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.cs.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.cs.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. Parametr ToolPath není známý. Zadejte cestu k nástroji. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.de.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.de.xlf index c5a6cb42c9f..1865fb58fea 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.de.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.de.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. ToolPath unbekannt. Geben Sie den Pfad zum Tool an. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.es.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.es.xlf index 4791cd16b2c..05929de6032 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.es.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.es.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. ToolPath se desconoce; especifique la ruta de acceso a la herramienta. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.fr.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.fr.xlf index 79ddfd7ab24..22d534392f1 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.fr.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.fr.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. ToolPath est inconnu, spécifiez le chemin de l'outil. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.it.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.it.xlf index a7dd116bb44..2e707f25086 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.it.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.it.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. Il valore di ToolPath è sconosciuto. Specificare il percorso dello strumento. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf index e26503cb96f..627dc44db2d 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. ToolPath が不明です。ツールンパスを指定します。 diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ko.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ko.xlf index 4c141658672..f337b0ad289 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ko.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ko.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. ToolPath를 알 수 없습니다. 도구 경로를 지정하세요. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.pl.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.pl.xlf index b7734b58a75..f88076689ac 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.pl.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.pl.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. Właściwość ToolPath jest nieznana. Określ ścieżkę do narzędzia. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.pt-BR.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.pt-BR.xlf index 865c593fd07..e6c5b3c6011 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.pt-BR.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.pt-BR.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. ToolPath desconhecido. Especifique o caminho para a ferramenta. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ru.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ru.xlf index b1fef639ee0..b84d44d49d4 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ru.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.ru.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. Путь к инструменту (ToolPath) неизвестен, укажите путь к инструменту. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.tr.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.tr.xlf index 4dd43b35531..02194a2720b 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.tr.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.tr.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. ToolPath bilinmiyor; aracın yolunu belirtin. diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hans.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hans.xlf index bf5016a3685..12ae0131cbd 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hans.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hans.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. ToolPath 未知；请指定工具的路径。 diff --git a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hant.xlf b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hant.xlf index 0e30a5cfeca..c18392ba1dc 100644 --- a/src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hant.xlf +++ b/src/fsharp/FSharp.Build/xlf/FSBuild.txt.zh-Hant.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + ToolPath is unknown; specify the path to the tool. ToolPath 未知; 請指定工具的路徑。 diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj index 0bc20b90467..ebef5fb040b 100644 --- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj +++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj @@ -11,6 +11,7 @@ true $(DefineConstants);COMPILER $(DefineConstants);MSBUILD_AT_LEAST_15 + $(DefineConstants);LOCALIZATION_FCOMP $(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1 true diff --git a/src/fsharp/fsi/fsi.exe.config b/src/fsharp/fsi/fsi.exe.config index 674f58d5eaa..43f1fdd57ed 100644 --- a/src/fsharp/fsi/fsi.exe.config +++ b/src/fsharp/fsi/fsi.exe.config @@ -13,7 +13,4 @@ - - - diff --git a/src/fsharp/xlf/FSComp.txt.cs.xlf b/src/fsharp/xlf/FSComp.txt.cs.xlf index 23ea06f75a8..b3d508d0825 100644 --- a/src/fsharp/xlf/FSComp.txt.cs.xlf +++ b/src/fsharp/xlf/FSComp.txt.cs.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. Není definovaný obor názvů {0}. diff --git a/src/fsharp/xlf/FSComp.txt.de.xlf b/src/fsharp/xlf/FSComp.txt.de.xlf index 7c13cf3c311..41c117c7854 100644 --- a/src/fsharp/xlf/FSComp.txt.de.xlf +++ b/src/fsharp/xlf/FSComp.txt.de.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. Der Namespace "{0}" ist nicht definiert. diff --git a/src/fsharp/xlf/FSComp.txt.es.xlf b/src/fsharp/xlf/FSComp.txt.es.xlf index 9709b6c3abf..0afc48bb2c6 100644 --- a/src/fsharp/xlf/FSComp.txt.es.xlf +++ b/src/fsharp/xlf/FSComp.txt.es.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. El espacio de nombres "{0}" no está definido. diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index f7a5bc43329..32d85d1e78a 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. L'espace de noms '{0}' n'est pas défini. diff --git a/src/fsharp/xlf/FSComp.txt.it.xlf b/src/fsharp/xlf/FSComp.txt.it.xlf index 8e4eccbd9cd..a7e0a7b48d7 100644 --- a/src/fsharp/xlf/FSComp.txt.it.xlf +++ b/src/fsharp/xlf/FSComp.txt.it.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. Lo spazio dei nomi '{0}' non è definito. diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index b49ebd63d94..328322d38cc 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. 名前空間 '{0}' が定義されていません。 diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index 4f106b57958..720db8bff68 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. '{0}' 네임스페이스가 정의되지 않았습니다. diff --git a/src/fsharp/xlf/FSComp.txt.pl.xlf b/src/fsharp/xlf/FSComp.txt.pl.xlf index 15ac9b912c6..ef4db0d67c1 100644 --- a/src/fsharp/xlf/FSComp.txt.pl.xlf +++ b/src/fsharp/xlf/FSComp.txt.pl.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. Nie zdefiniowano przestrzeni nazw „{0}”. diff --git a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf index 1d50b7356cf..504db8484b2 100644 --- a/src/fsharp/xlf/FSComp.txt.pt-BR.xlf +++ b/src/fsharp/xlf/FSComp.txt.pt-BR.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. O namespace '{0}' não está definido. diff --git a/src/fsharp/xlf/FSComp.txt.ru.xlf b/src/fsharp/xlf/FSComp.txt.ru.xlf index 5e54c71aa4d..978ab1c59e9 100644 --- a/src/fsharp/xlf/FSComp.txt.ru.xlf +++ b/src/fsharp/xlf/FSComp.txt.ru.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. Пространство имен "{0}" не определено. diff --git a/src/fsharp/xlf/FSComp.txt.tr.xlf b/src/fsharp/xlf/FSComp.txt.tr.xlf index c3f580ec6b4..2e884168dd5 100644 --- a/src/fsharp/xlf/FSComp.txt.tr.xlf +++ b/src/fsharp/xlf/FSComp.txt.tr.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. '{0}' ad alanı tanımlı değil. diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index 99e41ca6b93..e87d047a133 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. 未定义命名空间“{0}”。 diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index 70b7a400f45..98ed811142c 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -2,6 +2,11 @@ + + {0} for F# {1} + {0} for F# {1} + + The namespace '{0}' is not defined. 未定義命名空間 '{0}'。 diff --git a/src/utils/CompilerLocationUtils.fs b/src/utils/CompilerLocationUtils.fs index 84a0dfbfd4b..41de8bb911c 100644 --- a/src/utils/CompilerLocationUtils.fs +++ b/src/utils/CompilerLocationUtils.fs @@ -12,7 +12,15 @@ open System.Runtime.InteropServices module internal FSharpEnvironment = /// The F# version reported in the banner - let FSharpBannerVersion = "10.4.0 for F# 4.6" +#if LOCALIZATION_FSBUILD + let FSharpBannerVersion = FSBuild.SR.fSharpBannerVersion(FSharp.BuildProperties.fsProductVersion, FSharp.BuildProperties.fsLanguageVersion) +#else +#if LOCALIZATION_FSCOMP + let FSharpBannerVersion = FSComp.SR.fSharpBannerVersion(FSharp.BuildProperties.fsProductVersion, FSharp.BuildProperties.fsLanguageVersion) +#else + let FSharpBannerVersion = sprintf "%s for F# %s" (FSharp.BuildProperties.fsProductVersion) (FSharp.BuildProperties.fsLanguageVersion) +#endif +#endif let versionOf<'t> = #if FX_RESHAPED_REFLECTION From 92d75d8586410a3f32211a8a7c0527affaab3ddd Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 17 May 2019 18:23:17 -0700 Subject: [PATCH 4/9] Do app.config right --- FSharpBuild.Directory.Build.targets | 20 ++++++++++--------- eng/Versions.props | 13 +++++------- .../Microsoft.FSharp.NetSdk.targets | 2 +- src/fsharp/fsc/{fsc.exe.config => App.config} | 0 src/fsharp/fsc/fsc.fsproj | 3 +-- src/fsharp/fsi/{fsi.exe.config => App.config} | 0 src/fsharp/fsi/fsi.fsproj | 3 +-- .../{fsiAnyCpu.exe.config => App.config} | 0 src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj | 3 +-- ...FSharp.UnitTests.dll.config => App.config} | 0 .../UnitTests/VisualFSharp.UnitTests.fsproj | 3 +-- 11 files changed, 21 insertions(+), 26 deletions(-) rename src/fsharp/fsc/{fsc.exe.config => App.config} (100%) rename src/fsharp/fsi/{fsi.exe.config => App.config} (100%) rename src/fsharp/fsiAnyCpu/{fsiAnyCpu.exe.config => App.config} (100%) rename vsintegration/tests/UnitTests/{VisualFSharp.UnitTests.dll.config => App.config} (100%) diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets index 74615e236eb..661ac0c4a8b 100644 --- a/FSharpBuild.Directory.Build.targets +++ b/FSharpBuild.Directory.Build.targets @@ -6,25 +6,26 @@ + <__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)') + <__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)') + <_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)')) <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)')) <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)')) - + - - + + + + - - - - - + + diff --git a/eng/Versions.props b/eng/Versions.props index 43698a623e7..40d00b05a95 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,6 @@ true true - beta @@ -18,17 +17,17 @@ $(FSCoreMajorVersion).3 $(FSCoreMajorVersion).0 $(FSCoreVersionPrefix).0 - 4.6.2 - $(FSCorePackageVersion)-$(PreReleaseVersionLabel).* + + 4.6.2 + + $(FSCorePackageVersion)-$(PreReleaseVersionLabel).* - 10.4 $(FSPackageMajorVersion).3 $(FSPackageVersion) $(FSPackageVersion).0 - 16 0 @@ -36,7 +35,6 @@ $(VSMajorVersion).$(VSMinorVersion).0 $(VSAssemblyVersionPrefix).0 - $(FSCoreVersionPrefix) @@ -46,7 +44,6 @@ $(VersionPrefix).0 - + + + + + <__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)') + <__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)') + + <_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)')) + <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)')) + <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)')) + + + + + + + + + + + + + + + + <_BuildPropertyLines Remove="@(_BuildPropertyLines)" /> + <_BuildPropertyLines Include="// <auto-generated >" /> + <_BuildPropertyLines Include="// <Generated by the FSharp WriteCodeFragment class./>" /> + <_BuildPropertyLines Include="// </auto-generated/>" /> + <_BuildPropertyLines Include="//" /> + <_BuildPropertyLines Include="module internal FSharp.BuildProperties" /> + <_BuildPropertyLines Include="let fsProductVersion = "$(FSPRODUCTVERSION)"" /> + <_BuildPropertyLines Include="let fsLanguageVersion = "$(FSLANGUAGEVERSION)"" /> + + + + + + + + + + + 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 19789a96299..7ec1082d14b 100644 --- a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj +++ b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj @@ -9,6 +9,7 @@ $(OtherFlags) --staticlink:FSharp.Core true false + diff --git a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj index 1c04e0766c3..134a3ca745d 100644 --- a/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj +++ b/fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj @@ -8,7 +8,7 @@ $(DefineConstants);COMPILER $(DefineConstants);ENABLE_MONO_SUPPORT $(DefineConstants);NO_STRONG_NAMES - $(DefineConstants);LOCALIZATION_FCOMP + $(DefineConstants);LOCALIZATION_FSCOMP $(TargetFramework)\ $(TargetFramework)\ $(OtherFlags) /warnon:1182 From 132595c3f5b3ba27187e2cc97ad3d6f0d6161265 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 17 May 2019 21:47:06 -0700 Subject: [PATCH 6/9] fcs tests --- FSharpBuild.Directory.Build.targets | 6 ++++++ fcs/Directory.Build.targets | 6 ++++++ .../FSharp.Compiler.Service.Tests.fsproj | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/FSharpBuild.Directory.Build.targets b/FSharpBuild.Directory.Build.targets index bad4ac89520..e032f972c22 100644 --- a/FSharpBuild.Directory.Build.targets +++ b/FSharpBuild.Directory.Build.targets @@ -18,6 +18,9 @@ <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)')) + @@ -44,6 +47,9 @@ <_BuildPropertyLines Include="let fsLanguageVersion = "$(FSLANGUAGEVERSION)"" /> + diff --git a/fcs/Directory.Build.targets b/fcs/Directory.Build.targets index 1b999463704..56038898bf1 100644 --- a/fcs/Directory.Build.targets +++ b/fcs/Directory.Build.targets @@ -14,6 +14,9 @@ <_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)')) + @@ -40,6 +43,9 @@ <_BuildPropertyLines Include="let fsLanguageVersion = "$(FSLANGUAGEVERSION)"" /> + diff --git a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj index 1f7ffbf6d55..9f16ede65d4 100644 --- a/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj +++ b/fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj @@ -73,7 +73,10 @@ Program.fs - + + {{FSCoreVersion}} + $(FSCoreVersion) + From 1aef952e7a97720e828711a272be88ec2b30731b Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Fri, 17 May 2019 21:55:13 -0700 Subject: [PATCH 7/9] add discriminator --- fcs/Directory.Build.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fcs/Directory.Build.targets b/fcs/Directory.Build.targets index 56038898bf1..ea3d9bd8c42 100644 --- a/fcs/Directory.Build.targets +++ b/fcs/Directory.Build.targets @@ -44,8 +44,8 @@ + Directories="$(IntermediateOutputPath)$(ProjectName)" + Condition="!Exists('$(IntermediateOutputPath)$(ProjectName)')" /> From 608c0e95102ac929f17833d97d98e545dfb3ef27 Mon Sep 17 00:00:00 2001 From: "Kevin Ransom (msft)" Date: Fri, 17 May 2019 23:11:28 -0700 Subject: [PATCH 8/9] Update FSharp.Compiler.Service.ProjectCrackerTool.fsproj --- .../FSharp.Compiler.Service.ProjectCrackerTool.fsproj | 1 - 1 file changed, 1 deletion(-) 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 7ec1082d14b..19789a96299 100644 --- a/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj +++ b/fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj @@ -9,7 +9,6 @@ $(OtherFlags) --staticlink:FSharp.Core true false - From 83ead13c5c6c100113ccc69651d52d3d626b6504 Mon Sep 17 00:00:00 2001 From: Kevin Ransom Date: Sat, 18 May 2019 11:23:04 -0700 Subject: [PATCH 9/9] remove dead file --- .../FSharp.Core/Testing.FSharp.Core.nuspec | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 src/fsharp/FSharp.Core/Testing.FSharp.Core.nuspec diff --git a/src/fsharp/FSharp.Core/Testing.FSharp.Core.nuspec b/src/fsharp/FSharp.Core/Testing.FSharp.Core.nuspec deleted file mode 100644 index 746986fc7a3..00000000000 --- a/src/fsharp/FSharp.Core/Testing.FSharp.Core.nuspec +++ /dev/null @@ -1,49 +0,0 @@ - - - - Testing.FSharp.Core - - .NET Core compatible version of the fsharp core library FSharp.Core.dll - Supported Platforms: - .NET Core (netstandard1.6) - - en-US - true - $version$ - $authors$ - $licenseUrl$ - $projectUrl$ - $tags$ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -