Merge branch 'main' into taparik/playwright

Author: TanayParikh

.azure/pipelines/ci.yml

@@ -87,7 +87,7 @@ variables:
            /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
   # Variables for source indexing afterBuild step and job.
   - name: sourceIndexPackageVersion
-    value: 1.0.1-20210614.1
+    value: 1.0.1-20221220.2
   - name: sourceIndexPackageSource
     value: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   - group: source-dot-net stage1 variables
@@ -375,10 +375,10 @@ stages:
         ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(parameters.testSourceIndexing, 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
           afterBuild:
           - task: UseDotNet@2
-            displayName: Use .NET Core sdk 3.1
+            displayName: Use .NET Core SDK 6
             inputs:
               packageType: sdk
-              version: 3.1.x
+              version: 6.0.x
               installationPath: $(Build.SourcesDirectory)/.dotnet
               workingDirectory: $(Build.SourcesDirectory)
           - powershell: . $(Build.SourcesDirectory)/activate.ps1;
@@ -783,19 +783,20 @@ stages:
             publishOnError: true
             includeForks: true
 
-    # Source build
-    - template: /eng/common/templates/job/source-build.yml
-      parameters:
-        platform:
-          name: 'Managed'
-          container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
-          buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
-          skipPublishValidation: true
-          jobProperties:
-            timeoutInMinutes: 120
-            variables:
-              # Log environment variables in binary logs to ease debugging
-              MSBUILDLOGALLENVIRONMENTVARIABLES: true
+    # Source build - skip until https://github.com/dotnet/source-build/issues/3111 is resolved
+    - ${{ if False }}:
+      - template: /eng/common/templates/job/source-build.yml
+        parameters:
+          platform:
+            name: 'Managed'
+            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
+            buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks'
+            skipPublishValidation: true
+            jobProperties:
+              timeoutInMinutes: 120
+              variables:
+                # Log environment variables in binary logs to ease debugging
+                MSBUILDLOGALLENVIRONMENTVARIABLES: true
 
     # Publish to the BAR and perform source indexing. Wait until everything else is done.
     - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@@ -881,10 +882,10 @@ stages:
                 cleanDestinationFolder: true
             # Ignore repository's global.json and any existing .NET SDK.
             - task: UseDotNet@2
-              displayName: Use .NET Core sdk 3.1
+              displayName: Use .NET Core SDK 6
               inputs:
                 packageType: sdk
-                version: 3.1.x
+                version: 6.0.x
                 installationPath: $(Agent.TempDirectory)/.dotnet
                 workingDirectory: $(Agent.TempDirectory)
             - script: $(Agent.TempDirectory)/.dotnet/dotnet tool install UploadIndexStage1

.editorconfig

@@ -92,6 +92,18 @@ dotnet_diagnostic.CA1305.severity = warning
 # CA1507: Use nameof to express symbol names
 dotnet_diagnostic.CA1507.severity = warning
 
+# CA1510: Use ArgumentNullException throw helper
+dotnet_diagnostic.CA1510.severity = warning
+
+# CA1511: Use ArgumentException throw helper
+dotnet_diagnostic.CA1511.severity = warning
+
+# CA1512: Use ArgumentOutOfRangeException throw helper
+dotnet_diagnostic.CA1512.severity = warning
+
+# CA1513: Use ObjectDisposedException throw helper
+dotnet_diagnostic.CA1513.severity = warning
+
 # CA1725: Parameter names should match base declaration
 dotnet_diagnostic.CA1725.severity = suggestion
 
@@ -187,6 +199,18 @@ dotnet_diagnostic.CA1852.severity = warning
 # CA1854: Prefer the IDictionary.TryGetValue(TKey, out TValue) method
 dotnet_diagnostic.CA1854.severity = warning
 
+# CA1855: Prefer 'Clear' over 'Fill'
+dotnet_diagnostic.CA1855.severity = warning
+
+# CA1856: Incorrect usage of ConstantExpected attribute
+dotnet_diagnostic.CA1856.severity = error
+
+# CA1857: A constant is expected for the parameter
+dotnet_diagnostic.CA1857.severity = warning
+
+# CA1858: Use 'StartsWith' instead of 'IndexOf'
+dotnet_diagnostic.CA1858.severity = warning
+
 # CA2007: Consider calling ConfigureAwait on the awaited task
 dotnet_diagnostic.CA2007.severity = warning
 
@@ -295,6 +319,14 @@ dotnet_diagnostic.IDE2000.severity = warning
 dotnet_diagnostic.CA1018.severity = suggestion
 # CA1507: Use nameof to express symbol names
 dotnet_diagnostic.CA1507.severity = suggestion
+# CA1510: Use ArgumentNullException throw helper
+dotnet_diagnostic.CA1510.severity = suggestion
+# CA1511: Use ArgumentException throw helper
+dotnet_diagnostic.CA1511.severity = suggestion
+# CA1512: Use ArgumentOutOfRangeException throw helper
+dotnet_diagnostic.CA1512.severity = suggestion
+# CA1513: Use ObjectDisposedException throw helper
+dotnet_diagnostic.CA1513.severity = suggestion
 # CA1802: Use literals where appropriate
 dotnet_diagnostic.CA1802.severity = suggestion
 # CA1805: Do not initialize unnecessarily
@@ -333,6 +365,14 @@ dotnet_diagnostic.CA1847.severity = suggestion
 dotnet_diagnostic.CA1852.severity = suggestion
 # CA1854: Prefer the IDictionary.TryGetValue(TKey, out TValue) method
 dotnet_diagnostic.CA1854.severity = suggestion
+# CA1855: Prefer 'Clear' over 'Fill'
+dotnet_diagnostic.CA1855.severity = suggestion
+# CA1856: Incorrect usage of ConstantExpected attribute
+dotnet_diagnostic.CA1856.severity = suggestion
+# CA1857: A constant is expected for the parameter
+dotnet_diagnostic.CA1857.severity = suggestion
+# CA1858: Use 'StartsWith' instead of 'IndexOf'
+dotnet_diagnostic.CA1858.severity = suggestion
 # CA2007: Consider calling ConfigureAwait on the awaited task
 dotnet_diagnostic.CA2007.severity = suggestion
 # CA2008: Do not create tasks without passing a TaskScheduler

.github/CODEOWNERS

@@ -35,7 +35,7 @@
 /src/JSInterop/                                                                   @dotnet/aspnet-blazor-eng
 /src/Middleware/                                                                  @tratcher @BrennanConroy
 /src/Middleware/**/PublicAPI.*Shipped.txt                                         @dotnet/aspnet-api-review @tratcher @BrennanConroy
-/src/Mvc/                                                                         @dotnet/aspnet-blazor-eng
+/src/Mvc/                                                                         @dotnet/minimal-apis
 /src/Mvc/Mvc.ApiExplorer                                                          @captainsafia @halter73 @brunolins16
 /src/Mvc/**/PublicAPI.*Shipped.txt                                                @dotnet/aspnet-api-review @dotnet/aspnet-blazor-eng
 /src/OpenApi                                                                      @captainsafia @dotnet/minimal-apis

.github/dependabot.yml

@@ -1,55 +1,64 @@
 version: 2
+registries:
+  azure.com:
+    token: ${{secrets.DEPENDABOT_NPM_TOKEN}}
+    type: npm-registry
+    url: https://pkgs.dev.azure.com/
+
 updates:
-  # Keep submodules up to date in 'main'.
-  - package-ecosystem: "gitsubmodule"
+  - package-ecosystem: npm
     directory: "/"
+    # Perform only security updates of our npm dependencies.
+    open-pull-requests-limit: 0
+    registries:
+    - azure.com
+    # Schedule should be ignored for security updates.
     schedule:
-      # Weekly interval opens PRs on Monday.
-      interval: "weekly"
-    allow:
-      - dependency-type: "all"
-    commit-message:
-      prefix: "[main] "
-      include: scope
-    labels:
-      - area-infrastructure
+      interval: monthly
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      # Weekly interval opens PRs on Monday.
+      day: monday
       interval: "weekly"
+      time: 05:00
+      timezone: "America/Los_Angeles"
     commit-message:
       prefix: "[main] "
       include: scope
     labels:
       - area-infrastructure
 
-  # Keep submodules up to date in 'release/*' branches. (Unfortunately Dependabot security PRs can't target these.)
-  # Monthly interval opens PRs on the first of each month.
+  # Keep submodules up to date in 'main'.
   - package-ecosystem: "gitsubmodule"
     directory: "/"
     schedule:
-      interval: "monthly"
+      day: monday
+      interval: "weekly"
+      time: 05:00
+      timezone: "America/Los_Angeles"
     allow:
       - dependency-type: "all"
     commit-message:
-      prefix: "[release/2.1] "
+      prefix: "[main] "
       include: scope
     labels:
       - area-infrastructure
-    target-branch: "release/2.1"
+
+  # Keep submodules up to date in 'release/*' branches. (Unfortunately Dependabot security PRs can't target these.)
+  # Monthly interval opens PRs on the first of each month.
   - package-ecosystem: "gitsubmodule"
     directory: "/"
     schedule:
       interval: "monthly"
     allow:
       - dependency-type: "all"
     commit-message:
-      prefix: "[release/3.1] "
+      prefix: "[release/2.1] "
       include: scope
     labels:
       - area-infrastructure
-    target-branch: "release/3.1"
+    target-branch: "release/2.1"
   - package-ecosystem: "gitsubmodule"
     directory: "/"
     schedule: