Merge branch 'main' into dmkorolev/ja4

Author: DeagleGross

.azure/pipelines/jobs/default-build.yml

@@ -66,7 +66,6 @@ parameters:
 
   configuration: 'Release'
   container: ''
-  enableRichCodeNavigation: ''
   installNodeJs: true
   timeoutInMinutes: 180
   testRunTitle: $(AgentOsName)-$(BuildConfiguration)
@@ -86,9 +85,6 @@ jobs:
       dependsOn: ${{ parameters.dependsOn }}
       ${{ if ne(parameters.condition, '') }}:
         condition: ${{ parameters.condition }}
-      ${{ if ne(parameters.enableRichCodeNavigation, '') }}:
-        enableRichCodeNavigation: true
-        richCodeNavigationLanguage: 'csharp,typescript,java'
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
       ${{ if and(eq(parameters.isAzDOTestingJob, true), ne(parameters.enablePublishTestResults, false)) }}:
@@ -296,9 +292,6 @@ jobs:
       dependsOn: ${{ parameters.dependsOn }}
       ${{ if ne(parameters.condition, '') }}:
         condition: ${{ parameters.condition }}
-      ${{ if ne(parameters.enableRichCodeNavigation, '') }}:
-        enableRichCodeNavigation: true
-        richCodeNavigationLanguage: 'csharp,typescript,java'
       timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
       cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
       ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:

.github/policies/resourceManagement.yml

@@ -551,7 +551,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0.4
+          milestone: 9.0.5
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
     - if:
       - payloadType: Pull_Request
@@ -562,7 +562,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 8.0.15
+          milestone: 8.0.16
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues

.github/workflows/markdownlint.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Use Node.js
-      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+      uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
       with:
         node-version: 16.x
     - name: Run Markdownlint

.github/workflows/update-jquery-validate.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: '20.x'
 

.github/workflows/validate-npm-package-lock-json.yml

@@ -20,7 +20,7 @@ jobs:
           submodules: false
 
       - name: Set up Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 20.x
 

Directory.Build.props

@@ -8,7 +8,9 @@
     <!-- $(RepoRoot) is normally set globally and Arcade overrides it to ensure a trailing slash. -->
     <RepoRoot Condition=" '$(RepoRoot)' == '' OR !HasTrailingSlash('$(RepoRoot)') ">$(MSBuildThisFileDirectory)</RepoRoot>
 
-    <RepositoryUrl>https://github.com/dotnet/aspnetcore</RepositoryUrl>
+    <DefaultRepositoryUrl>https://github.com/dotnet/aspnetcore</DefaultRepositoryUrl>
+    <RepositoryUrl>$(DefaultRepositoryUrl)</RepositoryUrl>
+    <PackageProjectUrl>$(DefaultRepositoryUrl)</PackageProjectUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 

eng/Common.props

@@ -37,4 +37,15 @@
   <PropertyGroup Condition=" '$(DotNetBuildPass)' == '2' " >
     <RestoreUsingNuGetTargets>false</RestoreUsingNuGetTargets>
   </PropertyGroup>
+
+  <PropertyGroup>
+      <!--
+      Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
+      - If we're building outside of the VMR, publish these assets from the Windows job.
+      - If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
+    -->
+    <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
+                                                or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
+                                                    and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
+  </PropertyGroup>
 </Project>

eng/Publishing.props

@@ -1,5 +1,4 @@
 <Project>
-
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
 
@@ -14,16 +13,6 @@
 
     <!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
     <AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
-
-    <!--
-      Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
-      - If we're building outside of the VMR, publish these assets from the Windows job.
-      - If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
-    -->
-    <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
-                                                or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
-                                                    and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
-    <PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
   </PropertyGroup>
 
   <!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->

eng/Signing.props

@@ -15,6 +15,10 @@
     <FileSignInfo Include="Mono.Cecil.Mdb.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Mono.Cecil.Pdb.dll" CertificateName="3PartySHA2" />
     <FileSignInfo Include="Mono.Cecil.Rocks.dll" CertificateName="3PartySHA2" />
+    
+    <!-- Ensure that azl files get the mariner cert -->
+    <AzureLinuxRPM Include="$(ArtifactsPackagesDir)**/*-azl-*.rpm" />
+    <FileSignInfo Include="@(AzureLinuxRPM->'%(Filename)%(Extension)')" CertificateName="LinuxSignMariner" />
   </ItemGroup>
 
   <PropertyGroup>