Merge branch 'main' into merge/release/9.0-to-main

Author: wtgodbe

.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:

.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:
@@ -508,12 +384,12 @@ configuration:
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/9.0-rc1
+          branch: release/9.0-rc2
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0-rc1
-      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-rc1 branch'
+          milestone: 9.0-rc2
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-rc2 branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
@@ -523,7 +399,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0-rc2
+          milestone: 9.0.0
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
     - if:
       - payloadType: Issues

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>
 

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)" />

eng/SourceBuildPrebuiltBaseline.xml

@@ -34,7 +34,7 @@
 
     <!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
     <UsagePattern IdentityGlob="Microsoft.NET.ILLink.Tasks/*9.0.*" />
-    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*9.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*10.0.*" />
 
     <!-- Transivite dependency of Microsoft.CodeAnalysis.ExternalAccess.AspNetCore -> Microsoft.CodeAnalysis.Features.
          In product build the dependency is bumped to latest, which also bumps the version of DiaSymReader  -->
@@ -47,4 +47,10 @@
     <!-- Transitive dependency of System.Security.Cryptography.Pkcs.5.0.*. -->
     <UsagePattern IdentityGlob="System.Formats.Asn1/6.0.0" />
   </IgnorePatterns>
+
+  <!-- Transitive dependencies, suppressed as per https://github.com/dotnet/aspnetcore/pull/57887#issuecomment-2362241518-->
+  <Usages>
+    <Usage Id="Newtonsoft.Json" Version="13.0.1" />
+    <Usage Id="System.Security.Cryptography.Xml" Version="6.0.0" />
+  </Usages>
 </UsageData>