Merge branch 'main' into GH-59564-webapiaot-openapi

Author: sander1095

.azure/pipelines/localization.yml

@@ -25,13 +25,42 @@ parameters:
 variables:
 - name: _TeamName
   value: AspNetCore
-- template: /eng/common/templates/variables/pool-providers.yml
-
-jobs:
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
-  - template: /eng/common/templates/job/onelocbuild.yml
-    parameters:
-      CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
-      LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
-      LclSource: lclFilesFromPackage
-      MirrorRepo: aspnetcore
+- template: /eng/common/templates-official/variables/pool-providers.yml@self
+
+
+resources:
+  repositories:
+  # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
+  - repository: 1esPipelines
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    sdl:
+      sourceAnalysisPool:
+        name: $(DncEngInternalBuildPool)
+        image: 1es-windows-2022
+        os: windows
+      codeql:
+        compiled:
+          enabled: false
+          justificationForDisabling: "This pipeline doesn't build any code. The product code is already scanned in the main pipeline (aspnetcore-ci)"
+    pool:
+      name: $(DncEngInternalBuildPool)
+      image: 1es-windows-2022
+      os: windows
+
+    stages:
+    - stage: build
+      displayName: Build
+      jobs:
+      - ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
+        - template: /eng/common/templates-official/job/onelocbuild.yml@self
+          parameters:
+            CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
+            LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
+            LclSource: lclFilesFromPackage
+            MirrorRepo: aspnetcore

.github/policies/resourceManagement.yml

@@ -377,18 +377,18 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-preview2
+          milestone: 10.0-preview3
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview1
+          branch: release/10.0-preview2
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview1
+          milestone: 10.0-preview2
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
     - if:
       - payloadType: Issues

AspNetCore.sln

@@ -278,9 +278,9 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <!-- Set the arcade before common targets so we compute ExcludeFromBuild before arcade uses it. -->
-    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonTargets>
-    <CustomBeforeMicrosoftCommonCrossTargetingTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonCrossTargetingTargets>
+    <!-- Set the before common targets so we compute ExcludeFromBuild before arcade uses it. -->
+    <CustomBeforeMicrosoftCommonTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets;$(CustomBeforeMicrosoftCommonTargets)</CustomBeforeMicrosoftCommonTargets>
+    <CustomBeforeMicrosoftCommonCrossTargetingTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets;$(CustomBeforeMicrosoftCommonCrossTargetingTargets)</CustomBeforeMicrosoftCommonCrossTargetingTargets>
   </PropertyGroup>
 
   <Import Project="eng\Workarounds.props" />

Directory.Build.props

@@ -86,7 +86,6 @@ and are generated based on the last package release.
     <LatestPackageReference Include="System.Net.Http.Json" />
     <LatestPackageReference Include="System.Net.Sockets" />
     <LatestPackageReference Include="System.Net.ServerSentEvents" />
-    <LatestPackageReference Include="System.Private.Uri" />
     <LatestPackageReference Include="System.Reflection.Metadata" />
     <LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <LatestPackageReference Include="System.Runtime.Caching" />
@@ -223,6 +222,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="StackExchange.Redis" />
     <LatestPackageReference Include="Swashbuckle.AspNetCore" />
     <LatestPackageReference Include="System.Reactive.Linq" />
+    <LatestPackageReference Include="Verify.SourceGenerators" />
     <LatestPackageReference Include="Verify.Xunit" />
     <LatestPackageReference Include="xunit.abstractions" />
     <LatestPackageReference Include="xunit.analyzers" />

docs/area-owners.md

@@ -14,42 +14,18 @@
     <UseDotNetCertificate>true</UseDotNetCertificate>
   </PropertyGroup>
 
-  <!-- Files that should be always be signed between in-build and post-build signing -->
+  <!-- Files that should be always be signed -->
   <ItemGroup Label="Common Files to Sign">
-    <CommonFilesToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
-    <CommonFilesToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
-    <CommonFilesToSign Include="$(ArtifactsPackagesDir)**\*.jar"  />
-    <CommonFilesToSign Include="$(ArtifactsDir)packages\$(Configuration)\**\*.zip" />
-    <CommonFilesToSign Remove="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" Condition="'$(PostBuildSign)' != 'true'" />
+    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
+    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.exe" />
+    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.msi" />
+    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.jar"  />
+    <ItemsToSign Include="$(ArtifactsDir)packages\$(Configuration)\**\*.zip" />
+    <ItemsToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
+    <ItemsToSign Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" />
+    <ItemsToSign Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" />
+    <ItemsToSign Remove="$(ArtifactsPackagesDir)**\*symbols.nupkg" />
   </ItemGroup>
-  <Choose>
-    <!-- When post build signing is false - Sign as normal.
-         When post build signing is true - Sign all of our signable artifacts
-          that we would publish. Use a different ItemGroup name so that
-          the signing stage signs nothing. We then set ItemToSign during
-          publishing to this ItemGroup.
-        -->
-    <When Condition="'$(PostBuildSign)' != 'true'">
-      <ItemGroup Label="Files To Sign">
-        <ItemsToSign Include="@(CommonFilesToSign)" />
-        <ItemsToSign Remove="$(ArtifactsPackagesDir)**\*symbols.nupkg" />
-      </ItemGroup>
-    </When>
-    <When Condition="'$(PostBuildSign)' == 'true'">
-      <PropertyGroup>
-        <AllowEmptySignList>true</AllowEmptySignList>
-      </PropertyGroup>
-      <ItemGroup Label="Files To Sign">
-        <!-- Sign symbol nupkgs so that shared files between layouts and msis end up identical. -->
-        <ItemsToSignPostBuild Include="@(CommonFilesToSign)" />
-        <ItemsToSignPostBuild Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" />
-        <ItemsToSignPostBuild Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" />
-        <!-- Wixlibs are signed because they are containers of other files -->
-        <ItemsToSignPostBuild Include="$(ArtifactsDir)installers\$(Configuration)\**\*.wixlib" />
-      </ItemGroup>
-    </When>
-  </Choose>
-
 
   <ItemGroup Label="File signing information">
     <!--