Merge branch 'main' into merge/release/7.0.2xx-to-main

dotnet · Oct 6, 2022 · 81fd7ea · 81fd7ea
2 parents 9b4ca48 + 8f9568f
commit 81fd7ea
Show file tree

Hide file tree

Showing 164 changed files with 3,783 additions and 1,268 deletions.
diff --git a/.github/fabricbot.json b/.github/fabricbot.json
@@ -137,6 +137,39 @@
           }
         ]
       }
+    },
+    {
+      "taskType": "trigger",
+      "capabilityId": "IssueResponder",
+      "subCapability": "IssuesOnlyResponder",
+      "version": "1.0",
+      "config": {
+        "conditions": {
+          "operator": "and",
+          "operands": [
+            {
+              "name": "labelAdded",
+              "parameters": {
+                "label": "Area-ILLink"
+              }
+            }
+          ]
+        },
+        "eventType": "issue",
+        "eventNames": [
+          "issues",
+          "project_card"
+        ],
+        "taskName": "Notify linker of new untriaged bugs",
+        "actions": [
+          {
+            "name": "addReply",
+            "parameters": {
+              "comment": "@dotnet/linker-contrib a new issue has been filed in the ILLink area, please triage"
+            }
+          }
+        ]
+      }
     }
   ],
   "userGroups": []

diff --git a/.vsts-ci-richnav.yml b/.vsts-ci-richnav.yml
@@ -10,14 +10,6 @@ pr: none
 variables:
   - name: teamName
     value: Roslyn-Project-System
-  - name: _DotNetPublishToBlobFeed
-    value: false
-  - name: _DotNetArtifactsCategory
-    value: .NETCore
-  - name: _DotNetValidationArtifactsCategory
-    value: .NETCore
-  - name: _PublishToAzure
-    value: false
   - name: PostBuildSign
     value: true
 
@@ -32,8 +24,8 @@ stages:
         richCodeNavigationLanguage: 'csharp'
         richCodeNavigationEnvironment: 'production'
         pool:
-            name: NetCore-Svc-Public
-            demands: ImageOverride -equals windows.vs2019.amd64.open  
+            name: NetCore-Public
+            demands: ImageOverride -equals windows.vs2019.amd64.open   
         timeoutInMinutes: 180
         strategy:
           matrix:

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -2,7 +2,6 @@ trigger:
   batch: true
   branches:
     include:
-    - master
     - main
     - release/*
     - internal/release/3.*
@@ -35,11 +34,13 @@ variables:
       value: ''
     - name: _OfficialBuildArgs
       value: ''
+    - name: "skipComponentGovernanceDetection"
+      value: "true"
   - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-    - name: _DotNetPublishToBlobFeed
-      value: true
     - name: _OfficialBuildArgs
       value: /p:OfficialBuilder=Microsoft
+    - name: Codeql.Enabled
+      value: true
     - group: DotNetBuilds storage account read tokens
     - name: _InternalRuntimeDownloadArgs
       value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal 
@@ -56,7 +57,7 @@ stages:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         vmImage: 'windows-2019'
       ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        name: NetCore1ESPool-Svc-Internal
+        name: NetCore1ESPool-Internal
         demands: ImageOverride -equals windows.vs2019.amd64
     steps:
       - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration
@@ -69,7 +70,7 @@ stages:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           vmImage: 'windows-2022'
         ${{ if ne(variables['System.TeamProject'], 'public') }}:
-          name: NetCore1ESPool-Svc-Internal
+          name: NetCore1ESPool-Internal
           demands: ImageOverride -equals windows.vs2022preview.amd64
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
@@ -99,7 +100,7 @@ stages:
           ${{ if eq(variables['System.TeamProject'], 'public') }}:
             vmImage: 'windows-2022'
           ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            name: NetCore1ESPool-Svc-Internal
+            name: NetCore1ESPool-Internal
             demands: ImageOverride -equals windows.vs2022preview.amd64
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           helixTargetQueue: Windows.Amd64.VS2022.Pre.Open
@@ -125,7 +126,7 @@ stages:
           ${{ if eq(variables['System.TeamProject'], 'public') }}:
             vmImage: 'windows-2019'
           ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            name: NetCore1ESPool-Svc-Internal
+            name: NetCore1ESPool-Internal
             demands: ImageOverride -equals windows.vs2019.amd64
         strategy:
           matrix:
@@ -141,7 +142,7 @@ stages:
           ${{ if eq(variables['System.TeamProject'], 'public') }}:
             vmImage: 'ubuntu-22.04'
           ${{ if ne(variables['System.TeamProject'], 'public') }}:
-            name: NetCore1ESPool-Svc-Internal
+            name: NetCore1ESPool-Internal
             demands: ImageOverride -equals 1es-ubuntu-2204
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           helixTargetQueue: 'ubuntu.2204.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-amd64-20220813234317-1b9461f'
@@ -178,11 +179,12 @@ stages:
     - template: /eng/common/templates/job/publish-build-assets.yml
       parameters:
         publishUsingPipelines: true
+        publishAssetsImmediately: true
         dependsOn:
           - Windows_NT
           - Source_Build_Managed
         pool:
-          name: NetCore1ESPool-Svc-Internal
+          name: NetCore1ESPool-Internal
           demands: ImageOverride -equals windows.vs2019.amd64
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: /eng/common/templates/post-build/post-build.yml
@@ -193,6 +195,7 @@ stages:
       enableNugetValidation: false
       enableSourceLinkValidation: false
       publishInstallersAndChecksums: true
+      publishAssetsImmediately: true
       SDLValidationParameters:
         enable: false
         params: ' -SourceToolsList @("policheck","credscan")

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -12,19 +12,19 @@
 /src/Tests/Microsoft.NET.Sdk.Publish.Tasks.Tests/ @vijayrkn
 
 # Area-AspNetCore
-/src/BlazorWasmSdk/ @captainsafia @mkArtakMSFT @TanayParikh @javiercn
-/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @captainsafia @mkArtakMSFT
-/src/Assets/TestProjects/BlazorHosted/ @captainsafia @mkArtakMSFT
-/src/Assets/TestProjects/BlazorHostedRID/ @captainsafia @mkArtakMSFT
-/src/Assets/TestProjects/BlazorWasmMinimal/ @captainsafia @mkArtakMSFT
-/src/Assets/TestProjects/BlazorWasmWithLibrary/ @captainsafia @mkArtakMSFT
-/src/RazorSdk/ @captainsafia @mkArtakMSFT
-/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @mkArtakMSFT @TanayParikh @javiercn
-/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ @captainsafia @mkArtakMSFT
-/src/Tests/Microsoft.NET.Sdk.Razor.Tool.Tests/ @captainsafia @mkArtakMSFT
-/src/Assets/TestPackages/PackageLibraryDirectDependency/ @captainsafia @mkArtakMSFT
-/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @captainsafia @mkArtakMSFT
-/src/src/Assets/TestProjects/Razor*/ @captainsafia @mkArtakMSFT
+/src/BlazorWasmSdk/ @dotnet/aspnet-blazor-eng
+/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/ @dotnet/aspnet-blazor-eng
+/src/Assets/TestProjects/BlazorHosted/ @dotnet/aspnet-blazor-eng
+/src/Assets/TestProjects/BlazorHostedRID/ @dotnet/aspnet-blazor-eng
+/src/Assets/TestProjects/BlazorWasmMinimal/ @dotnet/aspnet-blazor-eng
+/src/Assets/TestProjects/BlazorWasmWithLibrary/ @dotnet/aspnet-blazor-eng
+/src/RazorSdk/ @dotnet/aspnet-blazor-eng
+/src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.AoT.Tests/ @dotnet/aspnet-blazor-eng
+/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ @dotnet/aspnet-blazor-eng
+/src/Tests/Microsoft.NET.Sdk.Razor.Tool.Tests/ @dotnet/aspnet-blazor-eng
+/src/Assets/TestPackages/PackageLibraryDirectDependency/ @dotnet/aspnet-blazor-eng
+/src/Assets/TestPackages/PackageLibraryTransitiveDependency/ @dotnet/aspnet-blazor-eng
+/src/src/Assets/TestProjects/Razor*/ @dotnet/aspnet-blazor-eng
 
 # Area-Format
 /src/Cli/dotnet/commands/dotnet-format @jmarolf @JoeRobich
@@ -66,10 +66,11 @@
 /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak
 
 # Area-Watch
-/src/Assets/TestProjects/Watch*/     @captainsafia @mkArtakMSFT
-/src/Tests/dotnet-watch.Tests/       @captainsafia @mkArtakMSFT
-/src/Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/       @captainsafia @mkArtakMSFT
-/src/BuiltInTools/   @captainsafia @mkArtakMSFT
+/src/Assets/TestProjects/Watch*/     @tmat @arkalyanms
+/src/Tests/dotnet-watch.Tests/       @tmat @arkalyanms
+/src/Tests/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/       @dotnet/aspnet-blazor-eng
+/src/BuiltInTools/*   @tmat @arkalyanms
+/src/BuiltInTools/BrowserRefresh   @dotnet/aspnet-blazor-eng
 
 # ApiCompat tools owned by runtime team
 # Area-ApiCompat

diff --git a/NuGet.config b/NuGet.config
@@ -20,6 +20,8 @@
     <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
+    <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
+    <add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />

diff --git a/documentation/specs/runtime-configuration-file.md b/documentation/specs/runtime-configuration-file.md
@@ -183,7 +183,7 @@ This section contains a union of all the dependencies found in the various targe
 * `path` - in the `package` library this is a relative path where to find the assets.
 * `serviceable` - a boolean indicating if the library can be serviced (only for `package`-typed libraries)
 * `sha512` - SHA-512 hash of the package file (`package`-typed libraries).
-* `hashPath` - in the `package` library this is a relative path to the `.nupkg.sha512` has file.
+* `hashPath` - in the `package` library this is a relative path to the `.nupkg.sha512` hash file.
 
 ### `runtimes` Section (`.deps.json`)
 
@@ -349,7 +349,7 @@ The path to a runtime-specific asset is resolved in the same way as a normal ass
 
 Each entry in the `runtime` or `runtimeTargets` sections can also have `assemblyVersion` and `fileVersion` properties. These specify the assembly and file version of the assembly being referenced. These versions are used when resolving assemblies based on roll-forward settings. See the [Multi Level Shared FX Lookup](https://github.com/dotnet/core-setup/blob/main/Documentation/design-docs/multilevel-sharedfx-lookup.md#hostpolicy-changes-for-21) for more details.
 
-## Additional information on runtimeconfig.json frammework settings (3.0+)
+## Additional information on runtimeconfig.json framework settings (3.0+)
 With the addition of the `frameworks` section in 3.0, an application (or another framework) can reference multiple frameworks. This is necessary when more than one framework is being used by the application (or framework). Previously, an application or framework could only reference one framework, causing a "chain" of frameworks. Now, with multiple frameworks at each level, a "graph" or "tree" of frameworks is supported.
 
 In addition to specifying a dependency on more than one framework, the `frameworks` section can also be used to override settings from a framework's `runtimeconfig.json`; this should only be done with the understanding of all consequences including preventing roll-forward compatibility to future versions. The settings include `version`, `rollForwardOnNoCandidateFx` and `applyPatches`, with `version` the most likely value to be changed.