Merge main to features/improved-definite-assignment

azure-pipelines-integration-lsp.yml

@@ -8,13 +8,7 @@ trigger:
 - features/*
 - demos/*
 
-# Branches that trigger builds on PR
-pr:
-- main
-- main-vs-deps
-- release/*
-- features/*
-- demos/*
+pr: none
 
 jobs:
 - job: VS_Integration_LSP

azure-pipelines-official.yml

@@ -45,6 +45,12 @@ stages:
   displayName: Build and Test
 
   jobs:
+  - template: /eng/common/templates/job/onelocbuild.yml
+    parameters:
+      CreatePr: false
+      LclSource: lclFilesfromPackage
+      LclPackageId: 'LCL-JUNO-PROD-ROSLYN'
+
   - job: OfficialBuild
     displayName: Official Build
     timeoutInMinutes: 360

azure-pipelines.yml

@@ -118,7 +118,7 @@ jobs:
     jobName: Build_Unix_Debug
     testArtifactName: Transport_Artifacts_Unix_Debug
     configuration: Debug
-    vmImageName: 'ubuntu-16.04'
+    vmImageName: 'ubuntu-18.04'
 
 - template: eng/pipelines/test-unix-job.yml
   parameters:
@@ -127,7 +127,7 @@ jobs:
     buildJobName: Build_Unix_Debug
     testArtifactName: Transport_Artifacts_Unix_Debug
     configuration: Debug
-    testArguments: --testCoreClr --helixQueueName Ubuntu.1604.Amd64.Open
+    testArguments: --testCoreClr --helixQueueName Ubuntu.1804.Amd64.Open
 
 - template: eng/pipelines/test-unix-job-single-machine.yml
   parameters:
@@ -137,7 +137,7 @@ jobs:
     testArtifactName: Transport_Artifacts_Unix_Debug
     configuration: Debug
     testArguments: --testCoreClr
-    queueName: 'BuildPool.Ubuntu.1604.amd64.Open'
+    queueName: 'BuildPool.Ubuntu.1804.amd64.Open'
 
 - template: eng/pipelines/test-unix-job.yml
   parameters:
@@ -201,7 +201,7 @@ jobs:
 - job: Correctness_SourceBuild
   pool:
    name: NetCorePublic-Pool
-   queue: BuildPool.Ubuntu.1604.amd64.Open
+   queue: BuildPool.Ubuntu.1804.amd64.Open
   timeoutInMinutes: 90
   steps:
     - template: eng/pipelines/checkout-unix-task.yml

docs/contributing/Building, Debugging, and Testing on Windows.md

@@ -176,6 +176,12 @@ under `AppData`, not from `Program File`).
     - add `<RestoreAdditionalProjectSources><PATH-TO-YOUR-ROSLYN-ENLISTMENT>\artifacts\packages\Debug\Shipping\</RestoreAdditionalProjectSources>` using the local path to your `roslyn` repo to `Directory.Build.props`
     - add `<MicrosoftNetCompilersToolsetVersion>3.9.0-dev</MicrosoftNetCompilersToolsetVersion>` with the package version you just packed (look in above artifacts folder) to `eng/Versions.props`
 
+### Testing with extra IOperation validation
+
+Run `build.cmd -testIOperation` which sets the `ROSLYN_TEST_IOPERATION` environment variable to `true` and runs the tests.  
+For running those tests in an IDE, the easiest is to find the `//#define ROSLYN_TEST_IOPERATION` directive and uncomment it.  
+See more details in the [IOperation test hook](https://github.com/dotnet/roslyn/blob/main/docs/compilers/IOperation%20Test%20Hook.md) doc.
+
 ## Contributing
 
 Please see [Contributing Code](https://github.com/dotnet/roslyn/blob/main/CONTRIBUTING.md) for details on contributing changes back to the code.

docs/ide/README.md

@@ -2,6 +2,8 @@
 
 ## TOC
  * [Dev16](#prod-16)
+   * [Dev 16.9](#prod-16-9)
+   * [Dev 16.8](#prod-16-8) 
    * [Dev 16.7](#prod-16-7)
    * [Dev 16.6](#prod-16-6)
    * [Dev 16.5](#prod-16-5)
@@ -20,11 +22,59 @@
 
 ## <a id="prod-16"></a> dev16
 
-### <a id="prod-16-7"></a> 16.7 ([release notes](https://docs.microsoft.com/visualstudio/releases/2019/release-notes))
-
-TO BE ADDED
-
-### <a id="prod-16-6"></a> 16.6 ([release notes](https://docs.microsoft.com/visualstudio/releases/2019/release-notes-archive-v16.6))
+### <a id="prod-16-7"></a> 16.9 ([release notes](https://docs.microsoft.com/visualstudio/releases/2019/release-notes-v16.9))
+* There is now IntelliSense completion for preprocessor symbols.
+* Solution Explorer now displays the new .NET 5.0 Source Generators.
+* Go To All won't display duplicate results across netcoreapp3.1 and netcoreapp2.0.
+* Quick Info now displays compiler warning IDs or numbers for suppressions.
+* Using directives will now automatically get added when copying and pasting types to a new file.
+* When pressing `;` to accept a method from a completion list, IntelliSense will now automatically insert the parentheses along with a semicolon for object creation and method calls.
+* Semantic colorization for C# 9.0 [records](https://docs.microsoft.com/en-us/dotnet/csharp/whats-new/csharp-9#record-types&preserve-view=true).
+* Refactoring that removes unnecessary discards.
+* Refactoring that converts a verbatim and regular string to an interpolated string preserving curly braces that were intended to go in the output.
+* Code fix in Visual Basic that removes the shared keyword when you convert methods that are shared to a module.
+* A refactoring that suggests using `new(…)` in non-contentious scenarios
+* A code fix that removes redundant equality expressions for both C# and Visual Basic
+* The .NET Code Style (IDE) analyzers can now be enforced on build
+* The Syntax Visualizer shows the current foreground color for enhanced colors
+* A new tooltip when hovering over the diagnostic ID for pragma warnings
+* When you type the return key from within a comment the new line is now automatically commented out
+* Inline parameter name hints enhancements
+* .NET Core Debugging with WSL 2
+
+### <a id="prod-16-7"></a> 16.8 ([release notes](https://docs.microsoft.com/visualstudio/releases/2019/release-notes-v16.8))
+* Roslyn analyzers are now included in the .NET 5.0 SDK
+* Refactoring that introduces the new C# 9 `not` pattern matching syntax when a suppression operator is present
+* Inline method refactoring to help replace usages of static, instance, and extension method within a single statement body
+* Code fix to convert instances of `typeof` to `nameof` in C# and `GetType` to `NameOf` in Visual Basic
+* C# and Visual Basic support for inline parameter name hints that inserts adornments for literals, casted literals, and object instantiations prior to each argument in function calls
+* Refactoring that extracts members from a selected class to a new base class in both C# and Visual Basic
+* Code cleanup has new configuration options that can apply formatting and file header preferences set in your EditorConfig file across a single file or an entire solution
+* Code fix to remove the `in` keyword where the argument should not be passed by reference
+* Refactoring that introduces the new C#9 pattern combinators and pattern matching suggestions such as converting `==` to use `is` where applicable
+* Code fix to make a class abstract when you are trying to write an abstract method in a class that is not abstract
+* IntelliSense completion in `DateTime` and `TimeSpan` string literals automatically appear when the first quote is typed
+* Code fix to remove unnecessary `pragma suppressions` and unnecessary `SuppressMessageAttributes`
+* `Rename` and `Find All` References understands references to symbols within the target string of global `SuppressMessageAttributes`
+* _ByVal_ fades to say it's not necessary along with a code fix to remove the unnecessary _ByVal_ in Visual Basic
+* Interactive window support for multiple runtimes, such as .NET Framework and .NET Core.
+* Added a new _RegisterAdditionalFileAction_ API that allows analyzer authors to create an analyzer for additional files.
+
+### <a id="prod-16-7"></a> 16.7 ([release notes](https://docs.microsoft.com/visualstudio/releases/2019/release-notes-v16.7))
+* There is now a warning and code fix when a suppression operator is present but has no effect
+* A second code fix suggesting the correct negating expression is also available
+* You can now generate properties when generating a constructor in a type
+* Quick Info now displays the diagnostic ID along with a help link
+* There is now a quick action to add a debugger display attribute to a class
+* There is now a code fix for accidental assignments or comparisons to the same variable
+* You can now generate comparison operators for types that implement IComparable
+* You can now generate IEquatable operators when generating .Equals for structs
+* You can now create and assign properties or fields for all unused constructor parameters
+* There is now IntelliSense completion in DateTime and TimeSpan string literals
+* You can now add a parameter within the Change Signature dialog
+* Analyzer authors can now use CompletionProviders for IntelliSense completions when shipping their analyzers with NuGet
+
+### <a id="prod-16-6"></a> 16.6 ([release notes](https://docs.microsoft.com/visualstudio/releases/2019/release-notes-v16.6))
 * Add explicit cast code fix
 * Simplify conditional expressions refactoring
 * Convert regular string literals to verbatim string literals (and back) refactoring
@@ -33,7 +83,7 @@ TO BE ADDED
 * Add file headers to existing files, projects, and solutions with EditorConfig
 * [Microsoft Fakes support for .NET Core](https://docs.microsoft.com/visualstudio/releases/2019/release-notes#microsoft-fakes-for-net-core-and-sdk-style-projects) and SDK-style projects
 
-### <a id="prod-16-5"></a> 16.5 ([release notes](https://docs.microsoft.com/visualstudio/releases/2019/release-notes-archive-v16.5))
+### <a id="prod-16-5"></a> 16.5 ([release notes](https://docs.microsoft.com/visualstudio/releases/2019/release-notes-v16.5))
 * You can now use System.HashCode to implement the GetHashCode method when System.HashCode is available.
 * Refactoring to convert if statements to switch statements or switch expressions.
 * IntelliSense completion for unimported extension methods. You will first need to turn this option on in **Tools > Options > Text Editor > C# > Intellisense > and select Show items from unimported namespaces**.

eng/Version.Details.xml

@@ -7,9 +7,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-3.21216.10">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-3.21223.23">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>9bfe989ad46e3f457d33ed800c3be012cec5afc6</Sha>
+      <Sha>9b40ab852a3b59ce9cef33b3e97c17af13c8e694</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21167.3">
       <Uri>https://github.com/dotnet/arcade</Uri>

eng/Versions.props

@@ -5,10 +5,10 @@
     Roslyn version
   -->
   <PropertyGroup>
-    <MajorVersion>3</MajorVersion>
-    <MinorVersion>10</MinorVersion>
+    <MajorVersion>4</MajorVersion>
+    <MinorVersion>0</MinorVersion>
     <PatchVersion>0</PatchVersion>
-    <PreReleaseVersionLabel>3</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>2</PreReleaseVersionLabel>
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <!--
       By default the assembly version in official builds is "$(MajorVersion).$(MinorVersion).0.0".
@@ -23,7 +23,7 @@
     </MajorVersion>
     <MinorVersion>
     </MinorVersion>
-    <MicrosoftNetCompilersToolsetVersion>3.10.0-3.21216.10</MicrosoftNetCompilersToolsetVersion>
+    <MicrosoftNetCompilersToolsetVersion>3.10.0-3.21223.23</MicrosoftNetCompilersToolsetVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Versions used by several individual references below -->
@@ -233,7 +233,8 @@
     <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
     <SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
     <UIAComWrapperVersion>1.1.0.14</UIAComWrapperVersion>
-    <MicrosoftVSSDKBuildToolsVersion>16.8.3036</MicrosoftVSSDKBuildToolsVersion>
+    <MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>
+    <MicrosoftVSSDKBuildToolsVersion>17.0.63-dev17-g3f11f5ab</MicrosoftVSSDKBuildToolsVersion>
     <MicrosoftVSSDKVSDConfigToolVersion>16.0.2032702</MicrosoftVSSDKVSDConfigToolVersion>
     <VSLangProjVersion>7.0.3301</VSLangProjVersion>
     <VSLangProj140Version>14.0.25030</VSLangProj140Version>

eng/build.sh

@@ -30,7 +30,6 @@ usage()
   echo ""
   echo "Advanced settings:"
   echo "  --ci                       Building in CI"
-  echo "  --docker                   Run in a docker container if applicable"
   echo "  --bootstrap                Build using a bootstrap compilers"
   echo "  --runAnalyzers             Run analyzers during build operations"
   echo "  --skipDocumentation        Skip generation of XML documentation files"
@@ -76,7 +75,6 @@ warn_as_error=false
 properties=""
 source_build=false
 
-docker=false
 args=""
 
 if [[ $# = 0 ]]
@@ -157,11 +155,6 @@ while [[ $# > 0 ]]; do
     --warnaserror)
       warn_as_error=true
       ;;
-    --docker)
-      docker=true
-      shift
-      continue
-      ;;
     --sourcebuild)
       source_build=true
       ;;
@@ -178,27 +171,6 @@ while [[ $# > 0 ]]; do
   shift
 done
 
-if [[ "$docker" == true ]]
-then
-  echo "Docker exec: $args"
-
-  # Run this script with the same arguments (except for --docker) in a container that has Mono installed.
-  BUILD_COMMAND=/opt/code/eng/build.sh "$scriptroot"/docker/mono.sh $args
-  lastexitcode=$?
-  if [[ $lastexitcode != 0 ]]; then
-    echo "Docker build failed (exit code '$lastexitcode')." >&2
-    exit $lastexitcode
-  fi
-
-  # Ensure that all docker containers are stopped.
-  # Hence exit with true even if "kill" failed as it will fail if they stopped gracefully
-  if [[ "$prepare_machine" == true ]]; then
-    docker kill $(docker ps -q) || true
-  fi
-
-  exit
-fi
-
 # Import Arcade functions
 . "$scriptroot/common/tools.sh"
 

eng/common/generate-locproject.ps1

@@ -38,7 +38,7 @@ if ($allXlfFiles) {
     $langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
 }
 $langXlfFiles | ForEach-Object {
-    $null = $_.Name -Match "([^.]+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf'
+    $null = $_.Name -Match "(.+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf
 
     $destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
     $xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
@@ -52,7 +52,7 @@ $locJson = @{
             LanguageSet = $LanguageSet
             LocItems = @(
                 $locFiles | ForEach-Object {
-                    $outputPath = "Localize\$(($_.DirectoryName | Resolve-Path -Relative) + "\")" 
+                    $outputPath = "$(($_.DirectoryName | Resolve-Path -Relative) + "\")" 
                     $continue = $true
                     foreach ($exclusion in $exclusions.Exclusions) {
                         if ($outputPath.Contains($exclusion))
@@ -66,10 +66,19 @@ $locJson = @{
                     }
                     if ($continue)
                     {
-                        return @{
-                            SourceFile = $sourceFile
-                            CopyOption = "LangIDOnName"
-                            OutputPath = $outputPath
+                        if ($_.Directory.Name -eq 'en' -and $_.Extension -eq '.json') {
+                            return @{
+                                SourceFile = $sourceFile
+                                CopyOption = "LangIDOnPath"
+                                OutputPath = "$($_.Directory.Parent.FullName | Resolve-Path -Relative)\"
+                            }
+                        }
+                        else {
+                            return @{
+                                SourceFile = $sourceFile
+                                CopyOption = "LangIDOnName"
+                                OutputPath = $outputPath
+                            }
                         }
                     }
                 }
@@ -79,7 +88,7 @@ $locJson = @{
 }
 
 $json = ConvertTo-Json $locJson -Depth 5
-Write-Host "(NETCORE_ENGINEERING_TELEMETRY=Build) LocProject.json generated:`n`n$json`n`n"
+Write-Host "LocProject.json generated:`n`n$json`n`n"
 Pop-Location
 
 if (!$UseCheckedInLocProjectJson) {
@@ -91,7 +100,7 @@ else {
     Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
 
     if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
-        Write-PipelineTaskError -Type "warning" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
+        Write-PipelineTelemetryError -Category "OneLocBuild" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
 
         exit 1
     }

eng/common/templates/job/onelocbuild.yml

@@ -11,6 +11,7 @@ parameters:
 
   SourcesDirectory: $(Build.SourcesDirectory)
   CreatePr: true
+  AutoCompletePr: false
   UseCheckedInLocProjectJson: false
   LanguageSet: VS_Main_Languages
   LclSource: lclFilesInRepo
@@ -46,16 +47,21 @@ jobs:
 
     - task: OneLocBuild@2
       displayName: OneLocBuild
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       inputs:
         locProj: Localize/LocProject.json
         outDir: $(Build.ArtifactStagingDirectory)
         lclSource: ${{ parameters.LclSource }}
         lclPackageId: ${{ parameters.LclPackageId }}
         isCreatePrSelected: ${{ parameters.CreatePr }}
-        repoType: ${{ parameters.RepoType }}
-        gitHubPatVariable: "${{ parameters.GithubPat }}"
+        ${{ if eq(parameters.CreatePr, true) }}:
+          isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }}
         packageSourceAuth: patAuth
         patVariable: ${{ parameters.CeapexPat }}
+        ${{ if eq(parameters.RepoType, 'gitHub') }}:
+          repoType: ${{ parameters.RepoType }}
+          gitHubPatVariable: "${{ parameters.GithubPat }}"
       condition: always()
 
     - task: PublishBuildArtifacts@1

eng/config/PublishData.json

@@ -176,11 +176,22 @@
         "Shipping",
         "NonShipping"
       ],
-      "version": "3.10.*",
+      "version": "4.0.*",
       "packageFeeds": "default",
       "channels": [],
       "vsBranch": "main",
-      "vsMajorVersion": 16
+      "vsMajorVersion": 17
+    },
+    "release/dev17.0-preview1-nopia-vs-deps": {
+      "nugetKind": [
+        "Shipping",
+        "NonShipping"
+      ],
+      "version": "4.0.*",
+      "packageFeeds": "default",
+      "channels": [],
+      "vsBranch": "feature/d17initial",
+      "vsMajorVersion": 17
     },
     "release/dev17.0-preview1-vs-deps": {
       "nugetKind": [
@@ -209,11 +220,11 @@
         "Shipping",
         "NonShipping"
       ],
-      "version": "3.10.*",
+      "version": "4.0.*",
       "packageFeeds": "arcade",
       "channels": [],
       "vsBranch": "main",
-      "vsMajorVersion": 16
+      "vsMajorVersion": 17
     },
     "features/NullableReferenceTypes": {
       "nugetKind": "PerBuildPreRelease",