dotnet · jaredpar · Jan 1, 2019 · Jan 1, 2019 · Jan 2, 2019 · Jan 3, 2019
diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
@@ -20,18 +20,26 @@ pr:
 
 jobs:
 - job: Windows_VisualStudio_Integration_Tests
-  pool: dotnet-external-temp-vs2017
+  pool: dotnet-external-vs2019-preview
   strategy:
-    maxParallel: 2
+    maxParallel: 4
     matrix:
       debug:
         _configuration: Debug
+        _useLegacyCompletion: false
       release:
         _configuration: Release
+        _useLegacyCompletion: false
+      debug_legacy:
+        _configuration: Debug
+        _useLegacyCompletion: true
+      release_legacy:
+        _configuration: Release
+        _useLegacyCompletion: true
   timeoutInMinutes: 135
 
   steps:
-    - script: eng/cibuild.cmd -configuration $(_configuration) -prepareMachine -testVsi 
+    - script: eng/cibuild.cmd -configuration $(_configuration) -prepareMachine -testVsi -testLegacyCompletion:$$(_useLegacyCompletion)
       displayName: Build and Test
 
     - task: PublishTestResults@2
@@ -40,14 +48,14 @@ jobs:
         testRunner: XUnit
         testResultsFiles: $(Build.SourcesDirectory)\artifacts\TestResults\$(_configuration)\*.xml
         mergeTestResults: true
-        testRunTitle: 'Windows Visual Studio Integration $(_configuration)' 
+        testRunTitle: 'Windows Visual Studio Integration $(_configuration)_$(_useLegacyCompletion)' 
       condition: always()
 
     - task: PublishBuildArtifacts@1
       displayName: Publish Logs
       inputs:
         PathtoPublish: '$(Build.SourcesDirectory)\artifacts\log\$(_configuration)'
-        ArtifactName: 'Windows Visual Studio Integration $(_configuration)'
+        ArtifactName: 'Windows Visual Studio Integration $(_configuration)_$(_useLegacyCompletion)'
         publishLocation: Container
       continueOnError: true
       condition: not(succeeded())
@@ -56,7 +64,7 @@ jobs:
       displayName: Publish Screenshots
       inputs:
         PathtoPublish: '$(Build.SourcesDirectory)\artifacts\bin\Microsoft.VisualStudio.LanguageServices.IntegrationTests\$(_configuration)\net472\xUnitResults'
-        ArtifactName: 'Screenshots $(_configuration)' 
+        ArtifactName: 'Screenshots $(_configuration)_$(_useLegacyCompletion)' 
         publishLocation: Container
       continueOnError: true
       condition: not(succeeded())
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
@@ -93,6 +93,15 @@ jobs:
     displayName: 'OptProf - Publish to Artifact Services - ProfilingInputs'
     condition: succeeded()
 
+  # Publish OptProf generated JSON files as a build artifact. This allows for easy inspection from
+  # a build execution.
+  - task: PublishBuildArtifacts@1
+    displayName: Publish OptProf Data Files
+    inputs:
+      PathtoPublish: '$(Build.SourcesDirectory)\artifacts\OptProf\$(BuildConfiguration)\Data'
+      ArtifactName: 'OptProf Data Files'
+    condition: succeeded()
+
   # Build VS bootstrapper
   # Generates $(Build.StagingDirectory)\MicroBuild\Output\BootstrapperInfo.json
   - task: ms-vseng.MicroBuildTasks.0e9d0d4d-71ec-4e4e-ae40-db9896f1ae74.MicroBuildBuildVSBootstrapper@2

diff --git a/docs/contributing/Building, Debugging, and Testing on Windows.md b/docs/contributing/Building, Debugging, and Testing on Windows.md
@@ -15,9 +15,9 @@ The minimal required version of .NET Framework is 4.7.2.
 
 ## Developing with Visual Studio 2019
 
-1. [Visual Studio 2019 Preview 4](https://www.visualstudio.com/vs/preview/)
+1. [Visual Studio 2019 RC](https://visualstudio.microsoft.com/downloads/#2019rc)
     - Ensure C#, VB, MSBuild, .NET Core and Visual Studio Extensibility are included in the selected work loads
-    - Ensure Visual Studio is on Version "Preview 4" or greater
+    - Ensure Visual Studio is on Version "RC1" or greater
 1. [.NET Core SDK 2.1.401](https://www.microsoft.com/net/download/core) (the installers are: [Windows x64 installer](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/2.1.401/dotnet-sdk-2.1.401-win-x64.exe), [Windows x86 installer](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/2.1.401/dotnet-sdk-2.1.401-win-x86.exe))
 1. [PowerShell 5.0 or newer](https://docs.microsoft.com/en-us/powershell/scripting/setup/installing-windows-powershell). If you are on Windows 10, you are fine; you'll only need to upgrade if you're on Windows 7. The download link is under the "upgrading existing Windows PowerShell" heading.
 1. Run Restore.cmd

diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/eng/build-utils.ps1 b/eng/build-utils.ps1
@@ -287,3 +287,30 @@ function Make-BootstrapBuild() {
 
     return $dir
 }
+
+Add-Type -AssemblyName 'System.Drawing'
+Add-Type -AssemblyName 'System.Windows.Forms'
+function Capture-Screenshot($path) {
+    $width = [System.Windows.Forms.Screen]::PrimaryScreen.Bounds.Width
+    $height = [System.Windows.Forms.Screen]::PrimaryScreen.Bounds.Height
+
+    $bitmap = New-Object System.Drawing.Bitmap $width, $height
+    try {
+        $graphics = [System.Drawing.Graphics]::FromImage($bitmap)
+        try {
+            $graphics.CopyFromScreen( `
+                [System.Windows.Forms.Screen]::PrimaryScreen.Bounds.X, `
+                [System.Windows.Forms.Screen]::PrimaryScreen.Bounds.Y, `
+                0, `
+                0, `
+                $bitmap.Size, `
+                [System.Drawing.CopyPixelOperation]::SourceCopy)
+        } finally {
+            $graphics.Dispose()
+        }
+
+        $bitmap.Save($path, [System.Drawing.Imaging.ImageFormat]::Png)
+    } finally {
+        $bitmap.Dispose()
+    }
+}
diff --git a/eng/build.ps1 b/eng/build.ps1
@@ -57,6 +57,7 @@ param (
     [switch][Alias('test')]$testDesktop,
     [switch]$testCoreClr,
     [switch]$testIOperation,
+    [switch]$testLegacyCompletion,
 
     [parameter(ValueFromRemainingArguments=$true)][string[]]$properties)
 
@@ -92,6 +93,7 @@ function Print-Usage() {
     Write-Host "  -testCoreClr              Run CoreClr unit tests"
     Write-Host "  -testVsi                  Run all integration tests"
     Write-Host "  -testIOperation           Run extra checks to validate IOperations"
+    Write-Host "  -testLegacyCompletion     Run integration tests with legacy completion"
     Write-Host ""
     Write-Host "Advanced settings:"
     Write-Host "  -ci                       Set when running on CI server"
@@ -334,6 +336,10 @@ function TestUsingOptimizedRunner() {
         $env:ROSLYN_TEST_IOPERATION = "true"
     }
 
+    if ($testLegacyCompletion) {
+        $env:ROSLYN_TEST_LEGACY_COMPLETION = "true"
+    }
+
     $testResultsDir = Join-Path $ArtifactsDir "TestResults\$configuration"
     $binDir = Join-Path $ArtifactsDir "bin" 
     $runTests = GetProjectOutputBinary "RunTests.exe"
@@ -379,7 +385,7 @@ function TestUsingOptimizedRunner() {
     if ($ci) {
         $args += " -xml"
         if ($testVsi) {
-            $args += " -timeout:120"
+            $args += " -timeout:110"
         } else {
             $args += " -timeout:65"
         }
@@ -406,6 +412,9 @@ function TestUsingOptimizedRunner() {
         if ($testIOperation) {
             Remove-Item env:\ROSLYN_TEST_IOPERATION
         }
+        if ($testLegacyCompletion) {
+            Remove-Item env:\ROSLYN_TEST_LEGACY_COMPLETION
+        }
     }
 }
 
@@ -514,6 +523,47 @@ try {
     if ($ci) {
         List-Processes
         Prepare-TempDir
+
+        if ($testVsi) {
+            $screenshotPath = (Join-Path $LogDir "StartingBuild.png")
+            try {
+                Capture-Screenshot $screenshotPath
+            }
+            catch {
+                Write-Host "Screenshot failed; attempting to connect to the console"
+
+                # Keep the session open so we have a UI to interact with
+                $quserItems = ((quser $env:USERNAME | select -Skip 1) -split '\s+')
+                $sessionid = $quserItems[2]
+                if ($sessionid -eq 'Disc') {
+                    # When the session isn't connected, the third value is 'Disc' instead of the ID
+                    $sessionid = $quserItems[1]
+                }
+
+                if ($quserItems[1] -eq 'console') {
+                    Write-Host "Disconnecting from console before attempting reconnection"
+                    try {
+                        tsdiscon
+                    } catch {
+                        # ignore
+                    }
+
+                    # Disconnection is asynchronous, so wait a few seconds for it to complete
+                    Start-Sleep -Seconds 3
+                    query user
+                }
+
+                Write-Host "tscon $sessionid /dest:console"
+                tscon $sessionid /dest:console
+
+                # Connection is asynchronous, so wait a few seconds for it to complete
+                Start-Sleep 3
+                query user
+
+                # Make sure we can capture a screenshot. An exception at this point will fail-fast the build.
+                Capture-Screenshot $screenshotPath
+            }
+        }
     }
 
     if ($bootstrap) {

diff --git a/eng/targets/Imports.targets b/eng/targets/Imports.targets
@@ -14,7 +14,7 @@
 
     <!-- Only generate our runtimeconfig.json files for net core apps. It's unnecessary in desktop projects
          but gets included in lots of output items like VSIX. -->
-    <GenerateRuntimeConfigurationFiles Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">false</GenerateRuntimeConfigurationFiles>
+    <GenerateRuntimeConfigurationFiles Condition="'$(TargetFramework)' != 'netcoreapp1.1' AND '$(TargetFramework)' != 'netcoreapp2.1'">false</GenerateRuntimeConfigurationFiles>
 
     <!-- Place VS insertion (CoreXT) packages to a separate directory -->
     <PackageOutputPath Condition="'$(IsVisualStudioInsertionPackage)' == 'true'">$(DevDivPackagesDir)</PackageOutputPath>

diff --git a/eng/targets/VisualStudio.targets b/eng/targets/VisualStudio.targets
@@ -101,10 +101,6 @@
                              or '%(FileName)' == 'Microsoft.VisualStudio.Shell.Interop.11.0'">
         <EmbedInteropTypes>false</EmbedInteropTypes>
       </ReferencePath>
-
-      <ReferencePath Condition="'%(FileName)' == 'Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime'">
-        <EmbedInteropTypes>true</EmbedInteropTypes>
-      </ReferencePath>
     </ItemGroup>
   </Target>
 </Project>
diff --git a/global.json b/global.json
@@ -2,9 +2,9 @@
   "tools": {
     "dotnet": "2.1.401",
     "vs": {
-      "version": "15.8"
+      "version": "16.0"
     },
-    "xcopy-msbuild": "15.9.0-alpha"
+    "xcopy-msbuild": "16.0.0-rc1-alpha"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19157.23"

diff --git a/src/CodeStyle/CSharp/Analyzers/PublicAPI.Unshipped.txt b/src/CodeStyle/CSharp/Analyzers/PublicAPI.Unshipped.txt
@@ -43,13 +43,13 @@ static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBef
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodCallParentheses.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptyMethodDeclarationParentheses.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceBetweenEmptySquareBrackets.get -> Microsoft.CodeAnalysis.Options.Option<bool>
+static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacesIgnoreAroundVariableDeclaration.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinCastParentheses.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinExpressionParentheses.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodCallParentheses.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinMethodDeclarationParenthesis.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinOtherParentheses.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpaceWithinSquareBrackets.get -> Microsoft.CodeAnalysis.Options.Option<bool>
-static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacesIgnoreAroundVariableDeclaration.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAfterMethodDeclarationName.get -> Microsoft.CodeAnalysis.Options.Option<bool>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.SpacingAroundBinaryOperator.get -> Microsoft.CodeAnalysis.Options.Option<Microsoft.CodeAnalysis.CSharp.Formatting.BinaryOperatorSpacingOptions>
 static Microsoft.CodeAnalysis.CSharp.Formatting.CSharpFormattingOptions.WrappingKeepStatementsOnSingleLine.get -> Microsoft.CodeAnalysis.Options.Option<bool>

diff --git a/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.cs.xlf b/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.cs.xlf
@@ -4,17 +4,17 @@
     <body>
       <trans-unit id="Indentation_preferences">
         <source>Indentation preferences</source>
-        <target state="new">Indentation preferences</target>
+        <target state="translated">Předvolby odsazení</target>
         <note />
       </trans-unit>
       <trans-unit id="Space_preferences">
         <source>Space preferences</source>
-        <target state="new">Space preferences</target>
+        <target state="translated">Předvolby mezer</target>
         <note />
       </trans-unit>
       <trans-unit id="Wrapping_preferences">
         <source>Wrapping preferences</source>
-        <target state="new">Wrapping preferences</target>
+        <target state="translated">Předvolby zalamování</target>
         <note />
       </trans-unit>
     </body>

diff --git a/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.de.xlf b/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.de.xlf
@@ -4,17 +4,17 @@
     <body>
       <trans-unit id="Indentation_preferences">
         <source>Indentation preferences</source>
-        <target state="new">Indentation preferences</target>
+        <target state="translated">Einstellungen für Einrückung</target>
         <note />
       </trans-unit>
       <trans-unit id="Space_preferences">
         <source>Space preferences</source>
-        <target state="new">Space preferences</target>
+        <target state="translated">Einstellungen für Abstände</target>
         <note />
       </trans-unit>
       <trans-unit id="Wrapping_preferences">
         <source>Wrapping preferences</source>
-        <target state="new">Wrapping preferences</target>
+        <target state="translated">Einstellungen für Umbrüche</target>
         <note />
       </trans-unit>
     </body>

diff --git a/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.es.xlf b/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.es.xlf
@@ -4,17 +4,17 @@
     <body>
       <trans-unit id="Indentation_preferences">
         <source>Indentation preferences</source>
-        <target state="new">Indentation preferences</target>
+        <target state="translated">Preferencias de indentación</target>
         <note />
       </trans-unit>
       <trans-unit id="Space_preferences">
         <source>Space preferences</source>
-        <target state="new">Space preferences</target>
+        <target state="translated">Preferencias de espacio</target>
         <note />
       </trans-unit>
       <trans-unit id="Wrapping_preferences">
         <source>Wrapping preferences</source>
-        <target state="new">Wrapping preferences</target>
+        <target state="translated">Preferencias de ajuste</target>
         <note />
       </trans-unit>
     </body>

diff --git a/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.fr.xlf b/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.fr.xlf
@@ -4,17 +4,17 @@
     <body>
       <trans-unit id="Indentation_preferences">
         <source>Indentation preferences</source>
-        <target state="new">Indentation preferences</target>
+        <target state="translated">Préférences de mise en retrait</target>
         <note />
       </trans-unit>
       <trans-unit id="Space_preferences">
         <source>Space preferences</source>
-        <target state="new">Space preferences</target>
+        <target state="translated">Préférences d'espace</target>
         <note />
       </trans-unit>
       <trans-unit id="Wrapping_preferences">
         <source>Wrapping preferences</source>
-        <target state="new">Wrapping preferences</target>
+        <target state="translated">Préférences d'inclusion dans un wrapper</target>
         <note />
       </trans-unit>
     </body>

diff --git a/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.it.xlf b/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.it.xlf
@@ -4,17 +4,17 @@
     <body>
       <trans-unit id="Indentation_preferences">
         <source>Indentation preferences</source>
-        <target state="new">Indentation preferences</target>
+        <target state="translated">Preferenze per rientro</target>
         <note />
       </trans-unit>
       <trans-unit id="Space_preferences">
         <source>Space preferences</source>
-        <target state="new">Space preferences</target>
+        <target state="translated">Preferenze per spazi</target>
         <note />
       </trans-unit>
       <trans-unit id="Wrapping_preferences">
         <source>Wrapping preferences</source>
-        <target state="new">Wrapping preferences</target>
+        <target state="translated">Preferenze per ritorno a capo</target>
         <note />
       </trans-unit>
     </body>

diff --git a/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.ja.xlf b/src/CodeStyle/CSharp/Analyzers/xlf/CSharpCodeStyleResources.ja.xlf
@@ -4,17 +4,17 @@
     <body>
       <trans-unit id="Indentation_preferences">
         <source>Indentation preferences</source>
-        <target state="new">Indentation preferences</target>
+        <target state="translated">インデント設定</target>
         <note />
       </trans-unit>
       <trans-unit id="Space_preferences">
         <source>Space preferences</source>
-        <target state="new">Space preferences</target>
+        <target state="translated">スペース設定</target>
         <note />
       </trans-unit>
       <trans-unit id="Wrapping_preferences">
         <source>Wrapping preferences</source>
-        <target state="new">Wrapping preferences</target>
+        <target state="translated">折り返しの設定</target>
         <note />
       </trans-unit>
     </body>