diff --git a/RoslynPackageVersion.txt b/RoslynPackageVersion.txt
index f0add9e0811..fd1d6f6d9bc 100644
--- a/RoslynPackageVersion.txt
+++ b/RoslynPackageVersion.txt
@@ -1 +1 @@
-3.0.0-beta4-19170-01
+3.1.0-beta3-19222-02
diff --git a/eng/Versions.props b/eng/Versions.props
index 40d00b05a95..ee246da3bd7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,7 +30,7 @@
16
- 0
+ 1$(VSMajorVersion).0$(VSMajorVersion).$(VSMinorVersion).0$(VSAssemblyVersionPrefix).0
@@ -44,21 +44,6 @@
$(VersionPrefix).0
-
-
- <_BuildNumber>$(OfficialBuildId)
- <_BuildNumber Condition="'$(OfficialBuildId)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd)).0
- $(_BuildNumber.Split('.')[0])
- $(VSMajorVersion).$(VSMinorVersion).$(VsixVersionDateStampFix)
-
@@ -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 @@
$(RoslynVersion)$(RoslynVersion)$(RoslynVersion)
+ $(RoslynVersion)$(RoslynVersion)$(RoslynVersion)
diff --git a/eng/targets/NuGet.targets b/eng/targets/NuGet.targets
index c2db06b6c1a..dc8f32e24d6 100644
--- a/eng/targets/NuGet.targets
+++ b/eng/targets/NuGet.targets
@@ -5,16 +5,4 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/fsharp/NameResolution.fs b/src/fsharp/NameResolution.fs
index 8a9b46298d4..1809fdaf3b0 100644
--- a/src/fsharp/NameResolution.fs
+++ b/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
diff --git a/src/fsharp/fsc.fs b/src/fsharp/fsc.fs
index 89b2d6ec395..27150984738 100644
--- a/src/fsharp/fsc.fs
+++ b/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()
diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf
index 2567d3f26f2..c43178fe80a 100644
--- a/src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf
+++ b/src/fsharp/fsi/xlf/FSIstrings.txt.cs.xlf
@@ -99,7 +99,7 @@
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->Options->F# Interactive for Visual Studio and enter '--fsi-server-no-unicode'.
- 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->Možnosti->F# Interactive a zadat: --fsi-server-no-unicode.
+ 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->Možnosti->F# Interactive a zadat: --fsi-server-no-unicode.
@@ -264,7 +264,7 @@
Prevents references from being locked by the F# Interactive process
- Znemožňuje zamknutí referencí interaktivním procesem jazyka F#.
+ Znemožňuje zamknutí referencí procesem F# Interactive.
diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf
index 6c4abe48cce..404171af9a3 100644
--- a/src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf
+++ b/src/fsharp/fsi/xlf/FSIstrings.txt.de.xlf
@@ -264,7 +264,7 @@