Merge master to features/module-initializers

.editorconfig

@@ -37,6 +37,10 @@ indent_size = 2
 
 # Dotnet code style settings:
 [*.{cs,vb}]
+
+# IDE0055: Fix formatting
+dotnet_diagnostic.IDE0055.severity = warning
+
 # Sort using and Import directives with System.* appearing first
 dotnet_sort_system_directives_first = true
 dotnet_separate_import_directive_groups = false
@@ -137,6 +141,9 @@ dotnet_naming_symbols.all_members.applicable_kinds = *
 
 dotnet_naming_style.pascal_case_style.capitalization = pascal_case
 
+# error RS2008: Enable analyzer release tracking for the analyzer project containing rule '{0}'
+dotnet_diagnostic.RS2008.severity = none
+
 # IDE0073: File header
 dotnet_diagnostic.IDE0073.severity = warning
 file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.\nSee the LICENSE file in the project root for more information.

.vscode/tasks.json

@@ -5,26 +5,35 @@
   "tasks": [
     {
         "label": "build",
-        "command": "./build.cmd",
+        "command": "./build.sh",
         "type": "shell",
         "args": [
         ],
+        "windows": {
+          "command": "./build.cmd",
+        },
         "problemMatcher": "$msCompile",
         "group": "build"
     },
     {
         "label": "build skip analyzers",
-        "command": "./build.cmd",
+        "command": "./build.sh",
         "type": "shell",
         "args": [
-          "-skipAnalyzers"
+          "--skipAnalyzers"
         ],
+        "windows": {
+          "command": "./build.cmd",
+          "args": [
+            "-skipAnalyzers"
+          ],
+        },
         "problemMatcher": "$msCompile",
         "group": "build"
     },
     {
         "label": "build csc skip analyzers",
-        "command": "dotnet",
+        "command": "./.dotnet/dotnet",
         "type": "shell",
         "args": [
           "msbuild",
@@ -36,17 +45,136 @@
         "group": "build"
     },
     {
-        "label": "build directory skip analyzers",
-        "command": "dotnet",
+        "label": "build current project skip analyzers",
         "type": "shell",
+        "command": "./.dotnet/dotnet",
         "args": [
-          "msbuild",
-          "-p:UseRoslynAnalyzers=false",
-          "-p:GenerateFullPaths=true",
-          "${fileDirname}"
+          "pwsh",
+          "${workspaceRoot}/scripts/vscode-build.ps1",
+          "-filePath",
+          "${file}",
+          "-msbuildEngine",
+          "dotnet"
         ],
+        "windows": {
+          "command": "powershell",
+          "args": [
+            "${workspaceRoot}/scripts/vscode-build.ps1",
+            "-filePath",
+            "${file}",
+            "-msbuildEngine",
+            "dotnet"
+          ],
+        },
+        "problemMatcher": "$msCompile",
+        "group": "build"
+    },
+    {
+        "label": "msbuild current project skip analyzers",
+        "type": "shell",
+        "command": "echo 'Task not supported on this OS'",
+        "windows": {
+          "command": "powershell",
+          "args": [
+            "${workspaceRoot}/scripts/vscode-build.ps1",
+            "-filePath",
+            "${file}",
+            "-msbuildEngine",
+            "vs"
+          ],
+        },
         "problemMatcher": "$msCompile",
         "group": "build"
+    },
+    {
+        "label": "generate compiler code",
+        "command": "./.dotnet/dotnet",
+        "type": "shell",
+        "args": [
+          "pwsh",
+          "${workspaceRoot}/eng/generate-compiler-code.ps1"
+        ],
+        "problemMatcher": "$msCompile",
+        "group": "build"
+    },
+    {
+        "label": "update xlf files",
+        "command": "./build.sh",
+        "type": "shell",
+        "args": [
+          "--skipAnalyzers"
+        ],
+        "windows": {
+          "command": "./build.cmd",
+          "args": [
+            "-skipAnalyzers"
+          ],
+        },
+        "options": {
+          "env": { "UpdateXlfOnBuild": "true" }
+        },
+        "problemMatcher": "$msCompile",
+        "group": "build"
+    },
+    {
+        "label": "run tests in current file (netcoreapp3.1)",
+        "command": "./.dotnet/dotnet",
+        "type": "shell",
+        "args": [
+          "pwsh",
+          "${workspaceRoot}/scripts/vscode-run-tests.ps1",
+          "-filePath",
+          "${file}",
+          "-framework",
+          "netcoreapp3.1",
+          "-filter",
+          "${fileBasenameNoExtension}"
+        ],
+        "problemMatcher": "$msCompile",
+        "group": "test"
+    },
+    {
+        "label": "run tests in current project (netcoreapp3.1)",
+        "command": "./.dotnet/dotnet",
+        "type": "shell",
+        "args": [
+          "pwsh",
+          "${workspaceRoot}/scripts/vscode-run-tests.ps1",
+          "-filePath",
+          "${file}",
+          "-framework",
+          "netcoreapp3.1"
+        ],
+        "problemMatcher": "$msCompile",
+        "group": "test"
+    },
+    {
+        "label": "run tests in current file (all frameworks)",
+        "command": "./.dotnet/dotnet",
+        "type": "shell",
+        "args": [
+          "pwsh",
+          "${workspaceRoot}/scripts/vscode-run-tests.ps1",
+          "-filePath",
+          "${file}",
+          "-filter",
+          "${fileBasenameNoExtension}"
+        ],
+        "problemMatcher": "$msCompile",
+        "group": "test"
+    },
+    {
+        "label": "run tests in current project (all frameworks)",
+        "command": "./.dotnet/dotnet",
+        "type": "shell",
+        "args": [
+          "pwsh",
+          "${workspaceRoot}/scripts/vscode-run-tests.ps1",
+          "-filePath",
+          "${file}"
+        ],
+        "problemMatcher": "$msCompile",
+        "group": "test"
     }
   ]
 }

NuGet.config

@@ -7,19 +7,19 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="dotnet-corefxtestdata" value="https://dotnet.myget.org/F/dotnet-corefxtestdata/api/v3/index.json" />
+    <!-- Microsoft.VisualStudio.* packages (e.g. Microsoft.VisualStudio.LanguageServer.Protocol.Extensions): https://github.com/dotnet/roslyn/issues/43242 -->
     <add key="experimental-vs-packages" value="https://dotnet.myget.org/F/experimental-vs-packages/api/v3/index.json" />
-    <add key="symreader-native" value="https://dotnet.myget.org/F/symreader-native/api/v3/index.json" />
-    <add key="interactive-window" value="https://dotnet.myget.org/F/interactive-window/api/v3/index.json" />
-    <add key="roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
+    <!-- Microsoft.CodeAnalysis.Test.Resource.Proprietary -->
     <add key="roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
     <add key="roslyn-analyzers" value="https://dotnet.myget.org/F/roslyn-analyzers/api/v3/index.json" />
-    <add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
-    <add key="vs-devcore" value="https://myget.org/F/vs-devcore/api/v3/index.json" />
+    <!-- Microsoft.VisualStudio.* packages (e.g. Microsoft.VisualStudio.ImageCatalog): https://github.com/dotnet/roslyn/issues/43242 -->
     <add key="vs-editor" value="https://myget.org/F/vs-editor/api/v3/index.json" />
+    <!-- Microsoft.VisualStudio.ProjectSystem.Managed -->
+    <add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
     <add key="roslyn_concord" value="https://myget.org/F/roslyn_concord/api/v3/index.json" />
     <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
+    <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

azure-pipelines-official.yml

@@ -18,6 +18,7 @@ variables:
     value: .NETCore
   - name: _DotNetValidationArtifactsCategory
     value: .NETCoreValidation
+  - group: DotNet-Roslyn-SDLValidation-Params
 
 stages:
 - stage: build
@@ -291,3 +292,17 @@ stages:
       enableSourceLinkValidation: false
       validateDependsOn:
         - SetValidateDependency
+      # Enable SDL validation, passing through values from the 'DotNet-Roslyn-SDLValidation-Params' group.
+      SDLValidationParameters:
+        enable: true
+        params: >-
+          -SourceToolsList @("policheck","credscan")
+          -TsaInstanceURL $(_TsaInstanceURL)
+          -TsaProjectName $(_TsaProjectName)
+          -TsaNotificationEmail $(_TsaNotificationEmail)
+          -TsaCodebaseAdmin $(_TsaCodebaseAdmin)
+          -TsaBugAreaPath $(_TsaBugAreaPath)
+          -TsaIterationPath $(_TsaIterationPath)
+          -TsaRepositoryName $(_TsaRepositoryName)
+          -TsaCodebaseName $(_TsaCodebaseName)
+          -TsaPublish $True