Merge branch 'feature/string-interp' into feature/string-interp

FSharpBuild.Directory.Build.targets

@@ -19,6 +19,7 @@
       <_ReplacementText>$([System.IO.File]::ReadAllText('%(NoneSubstituteText.FullPath)'))</_ReplacementText>
       <_ReplacementText Condition="'%(NoneSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern1)', '%(NoneSubstituteText.Replacement1)'))</_ReplacementText>
       <_ReplacementText Condition="'%(NoneSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern2)', '%(NoneSubstituteText.Replacement2)'))</_ReplacementText>
+      <_ReplacementText Condition="'%(NoneSubstituteText.Pattern3)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern3)', '%(NoneSubstituteText.Replacement3)'))</_ReplacementText>
 
       <_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
       <_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>

fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

@@ -10,7 +10,6 @@
     <DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
     <DefineConstants>$(DefineConstants);ENABLE_MONO_SUPPORT</DefineConstants>
     <DefineConstants>$(DefineConstants);NO_STRONG_NAMES</DefineConstants>
-    <DefineConstants>$(DefineConstants);LOCALIZATION_FSCOMP</DefineConstants>
     <FsLexOutputFolder Condition="'$(TargetFramework)' != ''">$(TargetFramework)\</FsLexOutputFolder>
     <FsYaccOutputFolder Condition="'$(TargetFramework)' != ''">$(TargetFramework)\</FsYaccOutputFolder>
     <OtherFlags>$(OtherFlags) /warnon:1182</OtherFlags>
@@ -289,6 +288,7 @@
     <Compile Include="$(FSharpSourcesRoot)\fsharp\SimulatedMSBuildReferenceResolver.fs">
       <Link>ReferenceResolution/SimulatedMSBuildReferenceResolver.fs</Link>
     </Compile>
+    <EmbeddedText Include="$(FSharpSourcesRoot)\utils\UtilsStrings.txt" />
     <Compile Include="$(FSharpSourcesRoot)/utils/CompilerLocationUtils.fs">
       <Link>CompilerLocation/CompilerLocationUtils.fs</Link>
     </Compile>

src/absil/ilnativeres.fs

@@ -279,8 +279,10 @@ type VersionHelper() =
     /// <summary>
     /// Parses a version string of the form "major [ '.' minor [ '.' build [ '.' revision ] ] ]".
     /// </summary>
+    ///
     /// <param name="s">The version string to parse.</param>
     /// <param name="version">If parsing succeeds, the parsed version. Otherwise a version that represents as much of the input as could be parsed successfully.</param>
+    ///
     /// <returns>True when parsing succeeds completely (i.e. every character in the string was consumed), false otherwise.</returns>
     static member TryParse(s: string, [<Out>] version: byref<Version>) = 
         VersionHelper.TryParse (s, false, UInt16.MaxValue, true, ref version)
@@ -289,12 +291,14 @@ type VersionHelper() =
     /// Parses a version string of the form "major [ '.' minor [ '.' ( '*' | ( build [ '.' ( '*' | revision ) ] ) ) ] ]"
     /// as accepted by System.Reflection.AssemblyVersionAttribute.
     /// </summary>
+    ///
     /// <param name="s">The version string to parse.</param>
     /// <param name="allowWildcard">Indicates whether or not a wildcard is accepted as the terminal component.</param>
     /// <param name="version">
     /// If parsing succeeded, the parsed version. Otherwise a version instance with all parts set to zero.
     /// If <paramref name="s"/> contains * the version build and/or revision numbers are set to <see cref="ushort.MaxValue"/>.
     /// </param>
+    ///
     /// <returns>True when parsing succeeds completely (i.e. every character in the string was consumed), false otherwise.</returns>
 
     static member TryParseAssemblyVersion (s: string, allowWildcard: bool, [<Out>] version: byref<Version>) = 
@@ -306,6 +310,7 @@ type VersionHelper() =
     /// Parses a version string of the form "major [ '.' minor [ '.' ( '*' | ( build [ '.' ( '*' | revision ) ] ) ) ] ]"
     /// as accepted by System.Reflection.AssemblyVersionAttribute.
     /// </summary>
+    ///
     /// <param name="s">The version string to parse.</param>
     /// <param name="allowWildcard">Indicates whether or not we're parsing an assembly version string. If so, wildcards are accepted and each component must be less than 65535.</param>
     /// <param name="maxValue">The maximum value that a version component may have.</param>
@@ -314,6 +319,7 @@ type VersionHelper() =
     /// If parsing succeeded, the parsed version. When <paramref name="allowPartialParse"/> is true a version with values up to the first invalid character set. Otherwise a version with all parts set to zero.
     /// If <paramref name="s"/> contains * and wildcard is allowed the version build and/or revision numbers are set to <see cref="ushort.MaxValue"/>.
     /// </param>
+    ///
     /// <returns>True when parsing succeeds completely (i.e. every character in the string was consumed), false otherwise.</returns>
     static member private TryParse(s: string, allowWildcard: bool, maxValue: uint16, allowPartialParse: bool, [<Out>] version: byref<Version>) = 
         Debug.Assert (not allowWildcard || maxValue < UInt16.MaxValue)

src/fsharp/AttributeChecking.fs

@@ -299,7 +299,11 @@ let CheckFSharpAttributes (g:TcGlobals) attribs m =
                 match namedArgs with 
                 | ExtractAttribNamedArg "IsError" (AttribBoolArg v) -> v 
                 | _ -> false 
-            if isError && (not g.compilingFslib || n <> 1204) then ErrorD msg else WarnD msg
+            // If we are using a compiler that supports nameof then error 3501 is always suppressed.
+            // See attribute on FSharp.Core 'nameof'
+            if n = 3501 then CompleteD
+            elif isError && (not g.compilingFslib || n <> 1204) then ErrorD msg 
+            else WarnD msg
         | _ -> 
             CompleteD
         ) ++ (fun () -> 

src/fsharp/CompileOps.fs

@@ -2422,8 +2422,7 @@ type TcConfigBuilder =
           deterministic = false
           preferredUiLang = None
           lcid = None
-          // See bug 6071 for product banner spec
-          productNameForBannerText = FSComp.SR.buildProductName(FSharpEnvironment.FSharpBannerVersion)
+          productNameForBannerText = FSharpEnvironment.FSharpProductName
           showBanner = true
           showTimes = false
           showLoadedAssemblies = false

src/fsharp/FSComp.txt

@@ -34,8 +34,6 @@ tupleRequiredInAbstractMethod,"\nA tuple type is required for one or more argume
 203,buildInvalidWarningNumber,"Invalid warning number '%s'"
 204,buildInvalidVersionString,"Invalid version string '%s'"
 205,buildInvalidVersionFile,"Invalid version file '%s'"
-buildProductName,"Microsoft (R) F# Compiler version %s"
-buildProductNameCommunity,"F# Compiler for F# %s"
 206,buildProblemWithFilename,"Problem with filename '%s': %s"
 207,buildNoInputsSpecified,"No inputs specified"
 209,buildPdbRequiresDebug,"The '--pdb' option requires the '--debug' option to be used"
@@ -1494,7 +1492,6 @@ notAFunctionButMaybeDeclaration,"This value is not a function and cannot be appl
 3352,typrelInterfaceMemberNoMostSpecificImplementation,"Interface member '%s' does not have a most specific implementation."
 3353,chkFeatureNotSupportedInLibrary,"Feature '%s' requires the F# library for language version %s or greater."
 useSdkRefs,"Use reference assemblies for .NET framework references when available (Enabled by default)."
-fSharpBannerVersion,"%s for F# %s"
 optsLangVersion,"Display the allowed values for language version, specify language version such as 'latest' or 'preview'"
 optsSupportedLangVersions,"Supported language versions:"
 nativeResourceFormatError,"Stream does not begin with a null resource and is not in '.RES' format."
@@ -1536,3 +1533,4 @@ forFormatInvalidForInterpolated4,"Interpolated strings used as type IFormattable
 3380,parsEofInInterpolatedVerbatimString,"Incomplete interpolated verbatim string begun at or before here"
 3381,parsEofInInterpolatedTripleQuoteString,"Incomplete interpolated triple-quote string begun at or before here"
 3382,parsEmptyFillInInterpolatedString,"Invalid interpolated string. This interpolated string expression fill is empty, an expression was expected."
+3501   "This construct is not supported by your version of the F# compiler" CompilerMessage(ExperimentalAttributeMessages.NotSupportedYet, 3501, IsError=true)

src/fsharp/FSharp.Build/FSBuild.txt

@@ -1,3 +1,2 @@
 # FSharp.Build resource strings 
 toolpathUnknown,"ToolPath is unknown; specify the path to the tool."
-fSharpBannerVersion,"%s for F# %s"

src/fsharp/FSharp.Build/FSharp.Build.fsproj

@@ -18,6 +18,7 @@
   <ItemGroup>
     <InternalsVisibleTo Include="VisualFSharp.UnitTests" />
     <EmbeddedText Include="FSBuild.txt" />
+    <EmbeddedText Include="..\..\utils\UtilsStrings.txt" />
     <Compile Include="..\..\utils\CompilerLocationUtils.fs" />
     <Compile Include="FSharpCommandLineBuilder.fs" />
     <Compile Include="Fsc.fs" />
@@ -36,6 +37,8 @@
       <Replacement1>$(FSharpCoreShippedPackageVersion)</Replacement1>
       <Pattern2>{{FSharpCorePreviewPackageVersion}}</Pattern2>
       <Replacement2>$(FSharpCorePreviewPackageVersion)</Replacement2>
+      <Pattern3>{{FSCorePackageVersion}}</Pattern3>
+      <Replacement3>$(FSCorePackageVersion)</Replacement3>
     </NoneSubstituteText>
     <None Include="Microsoft.FSharp.Overrides.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>

src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props

@@ -74,12 +74,32 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
 
   <PropertyGroup>
     <DefaultValueTuplePackageVersion>4.4.0</DefaultValueTuplePackageVersion>
-    <DefaultFSharpCorePackageVersion>{{FSharpCoreShippedPackageVersion}}</DefaultFSharpCorePackageVersion>
-    <DefaultFSharpCorePreviewPackageVersion>{{FSharpCorePreviewPackageVersion}}</DefaultFSharpCorePreviewPackageVersion>
     <ValueTupleImplicitPackageVersion>$(DefaultValueTuplePackageVersion)</ValueTupleImplicitPackageVersion>
-    <FSharpCoreImplicitPackageVersion>$(DefaultFSharpCorePackageVersion)</FSharpCoreImplicitPackageVersion>
+    <FSharpCoreShippedPackageVersion>{{FSharpCoreShippedPackageVersion}}</FSharpCoreShippedPackageVersion>
+    <FSharpCorePreviewPackageVersion>{{FSharpCorePreviewPackageVersion}}</FSharpCorePreviewPackageVersion>
+    <FSCorePackageVersion>{{FSCorePackageVersion}}</FSCorePackageVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+
+    <PackageReference
+        Include="FSharp.Core" Version="$(FSharpCoreImplicitPackageVersion)"
+        Condition = "'$(DisableImplicitFSharpCoreReference)' != 'true' and '$(FSharpCoreImplicitPackageVersion)' != ''"/>
+
+    <PackageReference
+        Include="FSharp.Core" Version="$(FSharpCoreShippedPackageVersion)"
+        Condition="'$(DisableImplicitFSharpCoreReference)' != 'true' and '$(FSharpCoreImplicitPackageVersion)' == '' and '$(_NETCoreSdkIsPreview)' == 'true' and '$(DisableFSharpCorePreviewCheck)' == 'true'"/>
+
+    <PackageReference
+        Include="FSharp.Core" Version="$(FSharpCorePreviewPackageVersion)"
+        Condition="'$(DisableImplicitFSharpCoreReference)' != 'true' and '$(FSharpCoreImplicitPackageVersion)' == '' and '$(_NETCoreSdkIsPreview)' == 'true' and '$(DisableFSharpCorePreviewCheck)' != 'true'"/>
+
+    <PackageReference
+        Include="FSharp.Core" Version="$(FSCorePackageVersion)"
+        Condition="'$(DisableImplicitFSharpCoreReference)' != 'true' and '$(FSharpCoreImplicitPackageVersion)' == '' and '$(_NETCoreSdkIsPreview)' != 'true'"/>
+
+  </ItemGroup>
+
   <ItemGroup Condition="'$(DisableImplicitSystemValueTupleReference)' != 'true'
                         and ('$(TargetFrameworkIdentifier)' == '.NETFramework'
                              and ('$(_TargetFrameworkVersionWithoutV)' == ''
@@ -94,10 +114,6 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <PackageReference Include="System.ValueTuple" Version="$(ValueTupleImplicitPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(DisableImplicitFSharpCoreReference)' != 'true'">
-    <PackageReference Include="FSharp.Core" Version="$(FSharpCoreImplicitPackageVersion)" />
-  </ItemGroup>
-
   <ItemDefinitionGroup>
     <PackageReference>
       <GeneratePathProperty>true</GeneratePathProperty>

src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets

@@ -52,10 +52,8 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackageFSharpDesignTimeTools</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
 
-  <!-- When the developer specifies UseFSharpPreview=true then resolve the highest preview package from the F# myget feed -->
-  <PropertyGroup Condition="'$(UseFSharpPreview)' == 'true'">
-    <FSharpCoreImplicitPackageVersion>$(DefaultFSharpCorePreviewPackageVersion)</FSharpCoreImplicitPackageVersion>
-    <RestoreSources>$(RestoreSources); https://dotnet.myget.org/F/fsharp/api/v3/index.json</RestoreSources>
+  <PropertyGroup>
+    <RestoreAdditionalProjectSources Condition="'$(_NETCoreSdkIsPreview)' != 'false'">$(RestoreAdditionalProjectSources);https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json</RestoreAdditionalProjectSources>
   </PropertyGroup>
 
   <Target Name="CollectFSharpDesignTimeTools" BeforeTargets="BeforeCompile" DependsOnTargets="_GetFrameworkAssemblyReferences">

src/fsharp/FSharp.Build/xlf/FSBuild.txt.cs.xlf

@@ -2,11 +2,6 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="cs" original="../FSBuild.resx">
     <body>
-      <trans-unit id="fSharpBannerVersion">
-        <source>{0} for F# {1}</source>
-        <target state="translated">{0} pro F# {1}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="toolpathUnknown">
         <source>ToolPath is unknown; specify the path to the tool.</source>
         <target state="translated">Parametr ToolPath není známý. Zadejte cestu k nástroji.</target>

src/fsharp/FSharp.Build/xlf/FSBuild.txt.de.xlf

@@ -2,11 +2,6 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="de" original="../FSBuild.resx">
     <body>
-      <trans-unit id="fSharpBannerVersion">
-        <source>{0} for F# {1}</source>
-        <target state="translated">{0} für F# {1}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="toolpathUnknown">
         <source>ToolPath is unknown; specify the path to the tool.</source>
         <target state="translated">ToolPath unbekannt. Geben Sie den Pfad zum Tool an.</target>

src/fsharp/FSharp.Build/xlf/FSBuild.txt.es.xlf

@@ -2,11 +2,6 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="es" original="../FSBuild.resx">
     <body>
-      <trans-unit id="fSharpBannerVersion">
-        <source>{0} for F# {1}</source>
-        <target state="translated">{0} para F# {1}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="toolpathUnknown">
         <source>ToolPath is unknown; specify the path to the tool.</source>
         <target state="translated">ToolPath se desconoce; especifique la ruta de acceso a la herramienta.</target>

src/fsharp/FSharp.Build/xlf/FSBuild.txt.fr.xlf

@@ -2,11 +2,6 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="fr" original="../FSBuild.resx">
     <body>
-      <trans-unit id="fSharpBannerVersion">
-        <source>{0} for F# {1}</source>
-        <target state="translated">{0} pour F# {1}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="toolpathUnknown">
         <source>ToolPath is unknown; specify the path to the tool.</source>
         <target state="translated">ToolPath est inconnu, spécifiez le chemin de l'outil.</target>

src/fsharp/FSharp.Build/xlf/FSBuild.txt.it.xlf

@@ -2,11 +2,6 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="it" original="../FSBuild.resx">
     <body>
-      <trans-unit id="fSharpBannerVersion">
-        <source>{0} for F# {1}</source>
-        <target state="translated">{0} per F# {1}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="toolpathUnknown">
         <source>ToolPath is unknown; specify the path to the tool.</source>
         <target state="translated">Il valore di ToolPath è sconosciuto. Specificare il percorso dello strumento.</target>

src/fsharp/FSharp.Build/xlf/FSBuild.txt.ja.xlf

@@ -2,11 +2,6 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="ja" original="../FSBuild.resx">
     <body>
-      <trans-unit id="fSharpBannerVersion">
-        <source>{0} for F# {1}</source>
-        <target state="translated">F# {1} のための {0}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="toolpathUnknown">
         <source>ToolPath is unknown; specify the path to the tool.</source>
         <target state="translated">ToolPath が不明です。ツールンパスを指定します。</target>

src/fsharp/FSharp.Build/xlf/FSBuild.txt.ko.xlf

@@ -2,11 +2,6 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="ko" original="../FSBuild.resx">
     <body>
-      <trans-unit id="fSharpBannerVersion">
-        <source>{0} for F# {1}</source>
-        <target state="translated">F# {1}용 {0}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="toolpathUnknown">
         <source>ToolPath is unknown; specify the path to the tool.</source>
         <target state="translated">ToolPath를 알 수 없습니다. 도구 경로를 지정하세요.</target>

src/fsharp/FSharp.Build/xlf/FSBuild.txt.pl.xlf

@@ -2,11 +2,6 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="pl" original="../FSBuild.resx">
     <body>
-      <trans-unit id="fSharpBannerVersion">
-        <source>{0} for F# {1}</source>
-        <target state="translated">{0} dla języka F# {1}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="toolpathUnknown">
         <source>ToolPath is unknown; specify the path to the tool.</source>
         <target state="translated">Właściwość ToolPath jest nieznana. Określ ścieżkę do narzędzia.</target>

src/fsharp/FSharp.Build/xlf/FSBuild.txt.pt-BR.xlf

@@ -2,11 +2,6 @@
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en" target-language="pt-BR" original="../FSBuild.resx">
     <body>
-      <trans-unit id="fSharpBannerVersion">
-        <source>{0} for F# {1}</source>
-        <target state="translated">{0} para F# {1}</target>
-        <note />
-      </trans-unit>
       <trans-unit id="toolpathUnknown">
         <source>ToolPath is unknown; specify the path to the tool.</source>
         <target state="translated">ToolPath desconhecido. Especifique o caminho para a ferramenta.</target>