Merge master to release/dev16.2

RoslynPackageVersion.txt

@@ -1 +1 @@
-3.0.0-beta4-19170-01
+3.1.0-beta3-19222-02

eng/Versions.props

@@ -30,7 +30,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <VSMajorVersion>16</VSMajorVersion>
-    <VSMinorVersion>0</VSMinorVersion>
+    <VSMinorVersion>1</VSMinorVersion>
     <VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
     <VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
     <VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
@@ -44,21 +44,6 @@
     <AssemblyVersion Condition="'$(OfficialBuildId)' == ''">$(VersionPrefix).0</AssemblyVersion>
     <!-- PR builds should explicitly specify a version number -->
   </PropertyGroup>
-  <PropertyGroup>
-    <!--
-    The F# tools inserted into the RTM version of dev16 is 16.0.20190320.5, but due to a change in version number
-    computation, the current nightly package versions are 16.0.0.1920512 which won't allow for an upgrade.  To enable
-    this to work for nightly package upgrade we re-insert the build number (date) so that it's always increasing.  The
-    result is a nightly package version of 16.0.20190405.1920512 which satisfies the requirement of being larger than
-    the shipping version.
-    This change should not flow into dev16.1 as we've never published a package with a version number that looks like
-    16.1.<date>.x; they've all looked like 16.1.0.x.
-    -->
-    <_BuildNumber>$(OfficialBuildId)</_BuildNumber>
-    <_BuildNumber Condition="'$(OfficialBuildId)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd)).0</_BuildNumber>
-    <VsixVersionDateStampFix>$(_BuildNumber.Split('.')[0])</VsixVersionDateStampFix>
-    <VsixVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).$(VsixVersionDateStampFix)</VsixVersionPrefix>
-  </PropertyGroup>
   <PropertyGroup>
     <!-- default package sources -->
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
@@ -71,6 +56,7 @@
       https://api.nuget.org/v3/index.json;
       https://dotnet.myget.org/F/roslyn/api/v3/index.json;
       https://dotnet.myget.org/F/symreader-converter/api/v3/index.json;
+      https://dotnet.myget.org/F/interactive-window/api/v3/index.json;
       https://myget.org/F/vs-devcore/api/v3/index.json;
       https://myget.org/F/vs-editor/api/v3/index.json;
       https://vside.myget.org/F/vssdk/api/v3/index.json;
@@ -111,6 +97,7 @@
     <MicrosoftCodeAnalysisEditorFeaturesVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
     <MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
     <MicrosoftCodeAnalysisEditorFeaturesWpfVersion>$(RoslynVersion)</MicrosoftCodeAnalysisEditorFeaturesWpfVersion>
+    <MicrosoftCodeAnalysisExternalAccessFSharpVersion>$(RoslynVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
     <MicrosoftCodeAnalysisWorkspacesCommonVersion>$(RoslynVersion)</MicrosoftCodeAnalysisWorkspacesCommonVersion>
     <MicrosoftVisualStudioLanguageServicesVersion>$(RoslynVersion)</MicrosoftVisualStudioLanguageServicesVersion>
     <!-- Microsoft Build packages -->

eng/targets/NuGet.targets

@@ -5,16 +5,4 @@
     <NuspecProperty Include="Owners=$(Authors)" />
   </ItemGroup>
 
-  <Target Name="_GeneratePackGroupOutput"
-          DependsOnTargets="_GetOutputItemsFromPack;Pack">
-    <ItemGroup>
-      <PackGroupOutput Include="@(_OutputPackItems->'%(FullPath)')" Condition="'%(_OutputPackItems.Extension)' == '.nupkg'" />
-    </ItemGroup>
-  </Target>
-
-  <Target Name="PackOutputGroup"
-          Outputs="@(PackGroupOutput)"
-          DependsOnTargets="_GeneratePackGroupOutput">
-  </Target>
-
 </Project>

src/fsharp/NameResolution.fs

@@ -1586,7 +1586,7 @@ type TcResultsSinkImpl(g, ?sourceText: ISourceText) =
             // results in duplication of textual variables. So we ensure we never record two name resolutions
             // for the same identifier at the same location.
             if allowedRange m then
-                if replace then 
+                if replace then
                     capturedNameResolutions.RemoveAll(fun cnr -> Range.equals cnr.Range m) |> ignore
                     capturedMethodGroupResolutions.RemoveAll(fun cnr -> Range.equals cnr.Range m) |> ignore
                 else

src/fsharp/fsc.fs

@@ -148,8 +148,8 @@ type InProcErrorLoggerProvider() =
                             CollectDiagnostic
                                 (tcConfigBuilder.implicitIncludeDir, tcConfigBuilder.showFullPaths,
                                  tcConfigBuilder.flatErrors, tcConfigBuilder.errorStyle, isError, err, true)
-                        let container = if isError then errors else warnings 
-                        container.AddRange errs } 
+                        let container = if isError then errors else warnings
+                        container.AddRange(errs) }
                 :> ErrorLogger }
 
     member __.CapturedErrors = errors.ToArray()

src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf

@@ -99,7 +99,7 @@
       </trans-unit>
       <trans-unit id="fsiConsoleProblem">
         <source>A problem occurred starting the F# Interactive process. This may be due to a known problem with background process console support for Unicode-enabled applications on some Windows systems. Try selecting Tools-&gt;Options-&gt;F# Interactive for Visual Studio and enter '--fsi-server-no-unicode'.</source>
-        <target state="translated">Při spuštění procesu F# Interactive se vyskytl problém. Ten mohly způsobit známé potíže s podporou konzoly procesu na pozadí pro aplikace umožňující kódování Unicode v některých systémech Windows. V případě Visual Studia zkuste vybrat Nástroje-&gt;Možnosti-&gt;F# Interactive a zadat: --fsi-server-no-unicode.</target>
+        <target state="translated">Při spuštění procesu F# Interactive se vyskytl problém. Ten mohly způsobit známé potíže s podporou konzoly procesu na pozadí pro aplikace umožňující kódování Unicode v některých systémech Windows. V případě sady Visual Studio zkuste vybrat Nástroje-&gt;Možnosti-&gt;F# Interactive a zadat: --fsi-server-no-unicode.</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiInvalidAssembly">
@@ -264,7 +264,7 @@
       </trans-unit>
       <trans-unit id="shadowCopyReferences">
         <source>Prevents references from being locked by the F# Interactive process</source>
-        <target state="translated">Znemožňuje zamknutí referencí interaktivním procesem jazyka F#.</target>
+        <target state="translated">Znemožňuje zamknutí referencí procesem F# Interactive.</target>
         <note />
       </trans-unit>
     </body>

src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf

@@ -264,7 +264,7 @@
       </trans-unit>
       <trans-unit id="shadowCopyReferences">
         <source>Prevents references from being locked by the F# Interactive process</source>
-        <target state="translated">Verhindert, dass Verweise vom interaktiven Prozess F# gesperrt werden</target>
+        <target state="translated">Verhindert, dass Verweise vom F# Interactive-Prozess gesperrt werden.</target>
         <note />
       </trans-unit>
     </body>

src/fsharp/fsi/xlf/FSIstrings.txt.es.xlf

@@ -139,7 +139,7 @@
       </trans-unit>
       <trans-unit id="fsiIntroTextHeader1directives">
         <source>  F# Interactive directives:</source>
-        <target state="translated">  Directivas de F#:</target>
+        <target state="translated">Directivas de F# interactivo:</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiIntroTextHashrInfo">
@@ -259,7 +259,7 @@
       </trans-unit>
       <trans-unit id="fsiProductNameCommunity">
         <source>F# Interactive for F# {0}</source>
-        <target state="translated">F# Interactive para F# {0}</target>
+        <target state="translated">F# interactivo para F# {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="shadowCopyReferences">

src/fsharp/fsi/xlf/FSIstrings.txt.ja.xlf

@@ -99,7 +99,7 @@
       </trans-unit>
       <trans-unit id="fsiConsoleProblem">
         <source>A problem occurred starting the F# Interactive process. This may be due to a known problem with background process console support for Unicode-enabled applications on some Windows systems. Try selecting Tools-&gt;Options-&gt;F# Interactive for Visual Studio and enter '--fsi-server-no-unicode'.</source>
-        <target state="translated">F# Interactive のプロセスの開始中に問題が発生しました。この原因は、一部の Windows システム上での Unicode 対応アプリケーションのバックグラウンド プロセス コンソールのサポートに関する既知の問題にある可能性があります。[ツール]5D; の [オプション]5D; から [F# Interactive for Visual Studio]5D; を選択し、「--fsi-server-no-unicode」と入力してください。</target>
+        <target state="translated">F# インタラクティブのプロセスの開始中に問題が発生しました。この原因は、一部の Windows システム上での Unicode 対応アプリケーションのバックグラウンド プロセス コンソールのサポートに関する既知の問題にある可能性があります。[ツール]5D; の [オプション]5D; から [F# Interactive for Visual Studio]5D; を選択し、「--fsi-server-no-unicode」と入力してください。</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiInvalidAssembly">
@@ -214,7 +214,7 @@
       </trans-unit>
       <trans-unit id="fsiDidAHashrWithLockWarning">
         <source>--&gt; Referenced '{0}' (file may be locked by F# Interactive process)</source>
-        <target state="translated">--&gt; '{0}' を参照しました (ファイルが F# Interactive のプロセスによってロックされている可能性があります)</target>
+        <target state="translated">--&gt; '{0}' を参照しました (ファイルが F# インタラクティブのプロセスによってロックされている可能性があります)</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiDidAHashrWithStaleWarning">
@@ -259,12 +259,12 @@
       </trans-unit>
       <trans-unit id="fsiProductNameCommunity">
         <source>F# Interactive for F# {0}</source>
-        <target state="translated">F# {0} の F# Interactive</target>
+        <target state="translated">F# {0} の F# インタラクティブ</target>
         <note />
       </trans-unit>
       <trans-unit id="shadowCopyReferences">
         <source>Prevents references from being locked by the F# Interactive process</source>
-        <target state="translated">参照が F# 対話型プロセスによってロックされないようにします。</target>
+        <target state="translated">参照が F# インタラクティブ プロセスによってロックされないようにします。</target>
         <note />
       </trans-unit>
     </body>

src/fsharp/fsi/xlf/FSIstrings.txt.tr.xlf

@@ -99,7 +99,7 @@
       </trans-unit>
       <trans-unit id="fsiConsoleProblem">
         <source>A problem occurred starting the F# Interactive process. This may be due to a known problem with background process console support for Unicode-enabled applications on some Windows systems. Try selecting Tools-&gt;Options-&gt;F# Interactive for Visual Studio and enter '--fsi-server-no-unicode'.</source>
-        <target state="translated">F# Interactive işlemi başlatılırken bir sorun oluştu. Bu durum, bazı Windows sistemlerindeki Unicode kullanan uygulamalara yönelik arka plan işlemi konsol desteğinde bilinen bir soruna bağlı olabilir. Visual Studio için Araçlar-&gt;Seçenekler-&gt;F# Interactive'i seçmeyi deneyin ve '--fsi-server-no-unicode' girin.</target>
+        <target state="translated">F# Etkileşimli işlemi başlatılırken bir sorun oluştu. Bu durum, bazı Windows sistemlerindeki Unicode kullanan uygulamalara yönelik arka plan işlemi konsol desteğinde bilinen bir soruna bağlı olabilir. Visual Studio için Araçlar-&gt;Seçenekler-&gt;F# Etkileşimli'yi seçmeyi deneyin ve '--fsi-server-no-unicode' girin.</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiInvalidAssembly">
@@ -139,7 +139,7 @@
       </trans-unit>
       <trans-unit id="fsiIntroTextHeader1directives">
         <source>  F# Interactive directives:</source>
-        <target state="translated">  F# Interactive yönergeleri:</target>
+        <target state="translated">F# Etkileşimli yönergeleri:</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiIntroTextHashrInfo">
@@ -214,7 +214,7 @@
       </trans-unit>
       <trans-unit id="fsiDidAHashrWithLockWarning">
         <source>--&gt; Referenced '{0}' (file may be locked by F# Interactive process)</source>
-        <target state="translated">--&gt; '{0}' öğesine başvuruldu (dosya F# Interactive işlemi tarafından kilitlenmiş olabilir)</target>
+        <target state="translated">--&gt; '{0}' öğesine başvuruldu (dosya F# Etkileşimli işlemi tarafından kilitlenmiş olabilir)</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiDidAHashrWithStaleWarning">
@@ -254,12 +254,12 @@
       </trans-unit>
       <trans-unit id="fsiProductName">
         <source>Microsoft (R) F# Interactive version {0}</source>
-        <target state="translated">Microsoft (R) F# Interactive sürüm {0}</target>
+        <target state="translated">Microsoft (R) F# Etkileşimli sürüm {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiProductNameCommunity">
         <source>F# Interactive for F# {0}</source>
-        <target state="translated">F# {0} için F# Interactive</target>
+        <target state="translated">F# {0} için F# Etkileşimli</target>
         <note />
       </trans-unit>
       <trans-unit id="shadowCopyReferences">

src/fsharp/fsi/xlf/FSIstrings.txt.zh-Hans.xlf

@@ -99,7 +99,7 @@
       </trans-unit>
       <trans-unit id="fsiConsoleProblem">
         <source>A problem occurred starting the F# Interactive process. This may be due to a known problem with background process console support for Unicode-enabled applications on some Windows systems. Try selecting Tools-&gt;Options-&gt;F# Interactive for Visual Studio and enter '--fsi-server-no-unicode'.</source>
-        <target state="translated">启动 F# 交互进程时发生问题。此情况可能是由一个已知问题导致的，即某些 Windows 系统上的后台进程控制台不支持启用了 Unicode 的应用程序。请尝试选择“工具”-&gt;“选项”-&gt;“F# 交互 for Visual Studio”，然后输入“--fsi-server-no-unicode”。</target>
+        <target state="translated">启动 F# 交互窗口进程时发生问题。此情况可能是由一个已知问题导致的，即某些 Windows 系统上的后台进程控制台不支持启用了 Unicode 的应用程序。请尝试选择“工具”-&gt;“选项”-&gt;“Visual Studio 的 F# 交互窗口”，然后输入“--fsi-server-no-unicode”。</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiInvalidAssembly">
@@ -139,7 +139,7 @@
       </trans-unit>
       <trans-unit id="fsiIntroTextHeader1directives">
         <source>  F# Interactive directives:</source>
-        <target state="translated">  F# 交互窗口指令: </target>
+        <target state="translated">F# 交互窗口指令:</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiIntroTextHashrInfo">
@@ -174,7 +174,7 @@
       </trans-unit>
       <trans-unit id="fsiIntroTextHeader2commandLine">
         <source>  F# Interactive command line options:</source>
-        <target state="translated">  F# 交互命令行选项: </target>
+        <target state="translated">F# 交互窗口命令行选项:</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiIntroTextHeader3">
@@ -214,7 +214,7 @@
       </trans-unit>
       <trans-unit id="fsiDidAHashrWithLockWarning">
         <source>--&gt; Referenced '{0}' (file may be locked by F# Interactive process)</source>
-        <target state="translated">--&gt; 已引用“{0}”(文件可能由 F# 交互进程锁定)</target>
+        <target state="translated">--&gt; 已引用“{0}”(文件可能由 F# 交互窗口进程锁定)</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiDidAHashrWithStaleWarning">
@@ -254,7 +254,7 @@
       </trans-unit>
       <trans-unit id="fsiProductName">
         <source>Microsoft (R) F# Interactive version {0}</source>
-        <target state="translated">Microsoft(R) F# 交互版本 {0}</target>
+        <target state="translated">Microsoft(R) F# 交互窗口版本 {0}</target>
         <note />
       </trans-unit>
       <trans-unit id="fsiProductNameCommunity">
@@ -264,7 +264,7 @@
       </trans-unit>
       <trans-unit id="shadowCopyReferences">
         <source>Prevents references from being locked by the F# Interactive process</source>
-        <target state="translated">防止引用被 F# 交互式进程锁定</target>
+        <target state="translated">防止引用被 F# 交互窗口进程锁定</target>
         <note />
       </trans-unit>
     </body>