Merge branch 'dotnet:main' into main

Author: sander1095

.azure/pipelines/ci-public.yml

@@ -640,6 +640,38 @@ stages:
           publishOnError: true
           includeForks: true
 
+    # Local development validation
+    - template: jobs/default-build.yml
+      parameters:
+        jobName: Local_Windows
+        jobDisplayName: 'Test: Windows local development validation'
+        agentOs: Windows
+        timeoutInMinutes: 240
+        steps:
+        - script: git submodule update --init
+          displayName: Update submodules
+        - script: ./restore.cmd
+          displayName: Run restore.cmd
+        - script: npm run build
+          displayName: Build JS
+        - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
+          displayName: Build (Debug)
+        - script: ./eng/build.cmd -all -noBuildJava -pack -c Release
+          displayName: Build (Release)
+        - script: ./src/ProjectTemplates/build.cmd
+                  -test
+                  -NoRestore
+                  -NoBuild
+                  -NoBuildDeps
+                  -configuration Release
+          displayName: Run project template tests
+
+        artifacts:
+        - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
+          path: artifacts/log/
+          publishOnError: true
+          includeForks: true
+
   # Source build
   - template: /eng/common/templates/job/source-build.yml
     parameters:

.azure/pipelines/ci.yml

@@ -701,6 +701,39 @@ extends:
               publishOnError: true
               includeForks: true
 
+        # Local development validation
+        - ${{ if in(variables['Build.Reason'], 'PullRequest', 'Manual') }}:
+          - template: .azure/pipelines/jobs/default-build.yml@self
+            parameters:
+              jobName: Local_Windows
+              jobDisplayName: 'Test: Windows local development validation'
+              agentOs: Windows
+              timeoutInMinutes: 240
+              steps:
+              - script: git submodule update --init
+                displayName: Update submodules
+              - script: ./restore.cmd
+                displayName: Run restore.cmd
+              - script: npm run build
+                displayName: Build JS
+              - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
+                displayName: Build (Debug)
+              - script: ./eng/build.cmd -all -noBuildJava -pack -c Release
+                displayName: Build (Release)
+              - script: ./src/ProjectTemplates/build.cmd
+                        -test
+                        -NoRestore
+                        -NoBuild
+                        -NoBuildDeps
+                        -configuration Release
+                displayName: Run project template tests
+
+              artifacts:
+              - name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
+                path: artifacts/log/
+                publishOnError: true
+                includeForks: true
+
       # Source build
       - template: /eng/common/templates-official/job/source-build.yml@self
         parameters:

.azure/pipelines/helix-matrix.yml

@@ -13,6 +13,7 @@ schedules:
     include:
     - release/6.0
     - release/8.0
+    - release/9.0
   always: false
 
 variables:

.azure/pipelines/identitymodel-helix-matrix.yml

@@ -8,6 +8,7 @@ schedules:
     include:
     - main
     - release/8.0
+    - release/9.0
   always: true
 
 variables:

.github/dependabot.yml

@@ -86,3 +86,15 @@ updates:
     labels:
       - area-infrastructure
     target-branch: "release/8.0"
+  - package-ecosystem: "gitsubmodule"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    allow:
+      - dependency-type: "all"
+    commit-message:
+      prefix: "[release/9.0] "
+      include: scope
+    labels:
+      - area-infrastructure
+    target-branch: "release/9.0"

.github/policies/resourceManagement.yml

@@ -293,130 +293,6 @@ configuration:
       - addLabel:
           label: 'Attention: Shared Code Modified'
       description: '[Shared Code PRs] Flag PRs that affect shared code src/Shared/Runtime'
-    - if:
-      - payloadType: Pull_Request
-      then:
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Components/
-            - src/ProjectTemplates/BlazorWasm.ProjectTemplates/
-        then:
-        - addLabel:
-            label: area-blazor
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Tools/
-        then:
-        - addLabel:
-            label: area-commandlinetools
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/DataProtection/
-        then:
-        - addLabel:
-            label: area-dataprotection
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Identity/
-        then:
-        - addLabel:
-            label: area-identity
-      - if:
-        - includesModifiedFiles:
-            files:
-            - global.json
-            - .azure
-            - .config
-            - .github
-            - eng
-            - src/Framework/
-            - src/Installers/
-        then:
-        - addLabel:
-            label: area-infrastructure
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/ProjectTemplates/
-            - src/Razor/
-            - src/Mvc/Mvc.Localization/
-            - src/Mvc/Mvc.DataAnnotations/
-            - src/Mvc/Mvc.Razor.RuntimeCompilation/
-            - src/Mvc/Mvc.Razor/
-            - src/Mvc/Mvc.RazorPages/
-            - src/Mvc/Mvc.TagHelpers/
-            - src/Mvc/Mvc.ViewFeatures/
-        then:
-        - addLabel:
-            label: area-mvc
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Security/
-            - src/Azure/AzureAD/
-        then:
-        - addLabel:
-            label: area-security
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Servers/
-            - src/Http/
-            - src/Azure/AzureAppServicesIntegration/
-            - src/Azure/AzureAppServices.HostingStartup/
-            - src/Middleware/
-            - src/HttpClientFactory/
-            - src/SiteExtensions/
-        then:
-        - addLabel:
-            label: area-networking
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/SignalR/
-        then:
-        - addLabel:
-            label: area-signalr
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Grpc/
-        then:
-        - addLabel:
-            label: area-grpc
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/Mvc/Mvc.Abstractions/
-            - src/Mvc/Mvc.Analyzers/
-            - src/Mvc/Mvc.Api.Analyzers/
-            - src/Mvc/Mvc.ApiExplorer/
-            - src/Mvc/Mvc.Core/
-            - src/Mvc/Mvc.Cors/
-            - src/Mvc/Mvc.Formatters.Json/
-            - src/Mvc/Mvc.Formatters.Xml/
-            - src/Mvc/Mvc.NewtonsoftJson/
-            - src/Mvc/Mvc.Testing.Tasks/src/
-            - src/Mvc/Mvc.Testing/
-            - src/Mvc/Mvc/
-            - src/OpenApi/
-            - src/Mvc/perf/
-        then:
-        - addLabel:
-            label: area-mvc
-      - if:
-        - includesModifiedFiles:
-            files:
-            - src/DefaultBuilder/
-            - src/Hosting/
-        then:
-        - addLabel:
-            label: area-hosting
-      description: '[PR Labelling] Apply `area-` labels to PRs'
     - if:
       - payloadType: Pull_Request
       - labelAdded:
@@ -592,6 +468,21 @@ configuration:
       - addReply:
           reply: 'Hi @${issueAuthor}. We have added the "Needs: Author Feedback" label to this issue, which indicates that we have an open question for you before we can take further action. This issue will be closed automatically in 7 days if we do not hear back from you by then - please feel free to re-open it if you come back to this issue after that time.'
       description: Add comment when 'Needs Author Feedback' is applied to issue
+    - if:
+      - payloadType: Pull_Request
+      - isAction:
+          action: Opened
+      - targetsBranch:
+          branch: release/9.0
+      then:
+      - addMilestone:
+          milestone: 9.0.x
+      - addReply:
+          reply: >-
+            Hi @${issueAuthor}. If this is not a tell-mode PR, please make sure to follow the instructions laid out in the [servicing process](https://aka.ms/aspnet/servicing) document.
+
+            Otherwise, please add `tell-mode` label.
+      description: Add release/9.0 targeting PRs to the servicing project
     - if:
       - payloadType: Pull_Request
       - isAction:

AspNetCore.sln

@@ -1788,12 +1788,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Components.WasmRemoteAuthen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "src\OpenApi\sample\Sample.csproj", "{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Hybrid", "Hybrid", "{2D64CA23-6E81-488E-A7D3-9BDF87240098}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Hybrid", "src\Caching\Hybrid\src\Microsoft.Extensions.Caching.Hybrid.csproj", "{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.Hybrid.Tests", "src\Caching\Hybrid\test\Microsoft.Extensions.Caching.Hybrid.Tests.csproj", "{CF63C942-895A-4F6B-888A-7653D7C4991A}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MicroBenchmarks", "MicroBenchmarks", "{6469F11E-8CEE-4292-820B-324DFFC88EBC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Caching.MicroBenchmarks", "src\Caching\perf\MicroBenchmarks\Microsoft.Extensions.Caching.MicroBenchmarks\Microsoft.Extensions.Caching.MicroBenchmarks.csproj", "{8D2CC6ED-5105-4F52-8757-C21F4DE78589}"
@@ -10821,38 +10815,6 @@ Global
 		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|x64.Build.0 = Release|Any CPU
 		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|x86.ActiveCfg = Release|Any CPU
 		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52}.Release|x86.Build.0 = Release|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Debug|arm64.Build.0 = Debug|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Debug|x64.Build.0 = Debug|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Debug|x86.Build.0 = Debug|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Release|arm64.ActiveCfg = Release|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Release|arm64.Build.0 = Release|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Release|x64.ActiveCfg = Release|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Release|x64.Build.0 = Release|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Release|x86.ActiveCfg = Release|Any CPU
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9}.Release|x86.Build.0 = Release|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Debug|arm64.Build.0 = Debug|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Debug|x64.Build.0 = Debug|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Debug|x86.Build.0 = Debug|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Release|arm64.ActiveCfg = Release|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Release|arm64.Build.0 = Release|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Release|x64.ActiveCfg = Release|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Release|x64.Build.0 = Release|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Release|x86.ActiveCfg = Release|Any CPU
-		{CF63C942-895A-4F6B-888A-7653D7C4991A}.Release|x86.Build.0 = Release|Any CPU
 		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8D2CC6ED-5105-4F52-8757-C21F4DE78589}.Debug|arm64.ActiveCfg = Debug|Any CPU
@@ -11880,9 +11842,6 @@ Global
 		{433F91E4-E39D-4EB0-B798-2998B3969A2C} = {6126DCE4-9692-4EE2-B240-C65743572995}
 		{8A021D6D-7935-4AB3-BB47-38D4FF9B0D13} = {6126DCE4-9692-4EE2-B240-C65743572995}
 		{6DEC24A8-A166-432F-8E3B-58FFCDA92F52} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
-		{2D64CA23-6E81-488E-A7D3-9BDF87240098} = {0F39820F-F4A5-41C6-9809-D79B68F032EF}
-		{2B60E6D3-9E7C-427A-AD4E-BBE9A6D935B9} = {2D64CA23-6E81-488E-A7D3-9BDF87240098}
-		{CF63C942-895A-4F6B-888A-7653D7C4991A} = {2D64CA23-6E81-488E-A7D3-9BDF87240098}
 		{6469F11E-8CEE-4292-820B-324DFFC88EBC} = {0F39820F-F4A5-41C6-9809-D79B68F032EF}
 		{8D2CC6ED-5105-4F52-8757-C21F4DE78589} = {6469F11E-8CEE-4292-820B-324DFFC88EBC}
 		{9DC6B242-457B-4767-A84B-C3D23B76C642} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}

Directory.Build.props

@@ -130,6 +130,9 @@
     <!-- xUnit1004 = warns about skipped tests. Make this a non-fatal build warning. -->
     <WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
 
+    <!-- don't warn about calling ConfigureAwait in test methods. we already commonly get off the xunit threads because they cause issues. -->
+    <NoWarn>$(NoWarn);xUnit1030</NoWarn>
+
     <!-- don't warn about unnecessary trim warning suppressions. can be removed with preview 6. -->
     <NoWarn>$(NoWarn);IL2121</NoWarn>
 
@@ -239,6 +242,18 @@
     <ArchiveExtension Condition="'$(TargetOsName)' == 'win'">.zip</ArchiveExtension>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- PackageReadmeFile specifies the package readme file name in the package. PackageReadmeFilePath points to the package readme file on disk. -->
+    <EnableDefaultPackageReadmeFile Condition="'$(EnableDefaultPackageReadmeFile)' == '' and '$(IsShipping)' != 'false'">true</EnableDefaultPackageReadmeFile>
+    <PackageReadmeFilePath Condition="'$(PackageReadmeFilePath)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true'">PACKAGE.md</PackageReadmeFilePath>
+    <PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and '$(EnableDefaultPackageReadmeFile)' == 'true' and Exists('$(PackageReadmeFilePath)' )">PACKAGE.md</PackageReadmeFile>
+  </PropertyGroup>
+
+  <!-- Add a package README file -->
+  <ItemGroup Condition="'$(PackageReadmeFilePath)' != '' and Exists('$(PackageReadmeFilePath)' )">
+    <None Include="$(PackageReadmeFilePath)" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
   <PropertyGroup>
     <!-- Set the arcade before common targets so we compute ExcludeFromBuild before arcade uses it. -->
     <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonTargets>

NuGet.config

@@ -4,17 +4,15 @@
     <clear />
     <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" />
+    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
+    <add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
     <add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
     <add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
-    <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/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" />
-    <!-- Used for the SiteExtension bits that are included in the 8.0 build -->
-    <add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
-    <add key="dotnet5-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json" />
+    <!-- Used for the SiteExtension bits -->
     <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
-    <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
     <!-- Used for the Rich Navigation indexing task -->
     <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
   </packageSources>

eng/Npm.Workspace.nodeproj

@@ -36,7 +36,7 @@
 
     <Message Text="Building NPM packages..." Importance="high" />
 
-    <Exec Condition="'$(ContinuousIntegrationBuild)' == 'true'"
+    <Exec
       Command="node $(MSBuildThisFileDirectory)scripts/npm/pack-workspace.mjs --update-versions $(RepoRoot)package.json $(PackageVersion) $(PackageOutputPath) $(IntermediateOutputPath)"
       EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)" />
 
@@ -58,6 +58,8 @@
     </PropertyGroup>
     <Message Text="Packing NPM packages..." Importance="high" />
     <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists('$(PackageOutputPath)')" />
+    <MakeDir Directories="$(IntermediateOutputPath)" Condition="!Exists('$(IntermediateOutputPath)')" />
+
     <Exec
       Command="node $(MSBuildThisFileDirectory)scripts/npm/pack-workspace.mjs --create-packages $(RepoRoot)package.json $(PackageVersion) $(PackageOutputPath) $(IntermediateOutputPath)"
       EnvironmentVariables="$(_NpmAdditionalEnvironmentVariables)" />