Skip to content

Commit 880651a

Browse files
DeagleGrossDeagleGross
committed
Merge branch 'main' into dmkorolev/ja4
2 parents d3c8c66 + bd4a063 commit 880651a

File tree

52 files changed

+2348
-1456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2348
-1456
lines changed

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

-7
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ parameters:
6666

6767
configuration: 'Release'
6868
container: ''
69-
enableRichCodeNavigation: ''
7069
installNodeJs: true
7170
timeoutInMinutes: 180
7271
testRunTitle: $(AgentOsName)-$(BuildConfiguration)
@@ -86,9 +85,6 @@ jobs:
8685
dependsOn: ${{ parameters.dependsOn }}
8786
${{ if ne(parameters.condition, '') }}:
8887
condition: ${{ parameters.condition }}
89-
${{ if ne(parameters.enableRichCodeNavigation, '') }}:
90-
enableRichCodeNavigation: true
91-
richCodeNavigationLanguage: 'csharp,typescript,java'
9288
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
9389
cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
9490
${{ if and(eq(parameters.isAzDOTestingJob, true), ne(parameters.enablePublishTestResults, false)) }}:
@@ -296,9 +292,6 @@ jobs:
296292
dependsOn: ${{ parameters.dependsOn }}
297293
${{ if ne(parameters.condition, '') }}:
298294
condition: ${{ parameters.condition }}
299-
${{ if ne(parameters.enableRichCodeNavigation, '') }}:
300-
enableRichCodeNavigation: true
301-
richCodeNavigationLanguage: 'csharp,typescript,java'
302295
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
303296
cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }}
304297
${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}:

‎.github/policies/resourceManagement.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ configuration:
551551
then:
552552
- removeMilestone
553553
- addMilestone:
554-
milestone: 9.0.4
554+
milestone: 9.0.5
555555
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
556556
- if:
557557
- payloadType: Pull_Request
@@ -562,7 +562,7 @@ configuration:
562562
then:
563563
- removeMilestone
564564
- addMilestone:
565-
milestone: 8.0.15
565+
milestone: 8.0.16
566566
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
567567
- if:
568568
- payloadType: Issues

‎.github/workflows/markdownlint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
- name: Use Node.js
21-
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
21+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2222
with:
2323
node-version: 16.x
2424
- name: Run Markdownlint

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020

2121
- name: Setup Node.js
22-
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
22+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2323
with:
2424
node-version: '20.x'
2525

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
submodules: false
2121

2222
- name: Set up Node.js
23-
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
23+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
2424
with:
2525
node-version: 20.x
2626

‎Directory.Build.props

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
<!-- $(RepoRoot) is normally set globally and Arcade overrides it to ensure a trailing slash. -->
99
<RepoRoot Condition=" '$(RepoRoot)' == '' OR !HasTrailingSlash('$(RepoRoot)') ">$(MSBuildThisFileDirectory)</RepoRoot>
1010

11-
<RepositoryUrl>https://github.com/dotnet/aspnetcore</RepositoryUrl>
11+
<DefaultRepositoryUrl>https://github.com/dotnet/aspnetcore</DefaultRepositoryUrl>
12+
<RepositoryUrl>$(DefaultRepositoryUrl)</RepositoryUrl>
13+
<PackageProjectUrl>$(DefaultRepositoryUrl)</PackageProjectUrl>
1214
<RepositoryType>git</RepositoryType>
1315
</PropertyGroup>
1416

‎eng/Common.props

+11
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,15 @@
3737
<PropertyGroup Condition=" '$(DotNetBuildPass)' == '2' " >
3838
<RestoreUsingNuGetTargets>false</RestoreUsingNuGetTargets>
3939
</PropertyGroup>
40+
41+
<PropertyGroup>
42+
<!--
43+
Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
44+
- If we're building outside of the VMR, publish these assets from the Windows job.
45+
- If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
46+
-->
47+
<PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
48+
or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
49+
and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
50+
</PropertyGroup>
4051
</Project>

‎eng/Publishing.props

-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project>
2-
32
<PropertyGroup>
43
<ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
54

@@ -14,16 +13,6 @@
1413

1514
<!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
1615
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
17-
18-
<!--
19-
Some assets are produced in all jobs, but only one job can publish them. We follow the following rules in that case:
20-
- If we're building outside of the VMR, publish these assets from the Windows job.
21-
- If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
22-
-->
23-
<PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
24-
or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
25-
and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
26-
<PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
2716
</PropertyGroup>
2817

2918
<!-- $(InstallersOutputPath), $(SymbolsOutputPath), and $(ChecksumExtensions) are not defined. Root Directory.Build.props is not imported. -->

‎eng/Signing.props

+4
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
<FileSignInfo Include="Mono.Cecil.Mdb.dll" CertificateName="3PartySHA2" />
1616
<FileSignInfo Include="Mono.Cecil.Pdb.dll" CertificateName="3PartySHA2" />
1717
<FileSignInfo Include="Mono.Cecil.Rocks.dll" CertificateName="3PartySHA2" />
18+
19+
<!-- Ensure that azl files get the mariner cert -->
20+
<AzureLinuxRPM Include="$(ArtifactsPackagesDir)**/*-azl-*.rpm" />
21+
<FileSignInfo Include="@(AzureLinuxRPM->'%(Filename)%(Extension)')" CertificateName="LinuxSignMariner" />
1822
</ItemGroup>
1923

2024
<PropertyGroup>

0 commit comments

Comments
 (0)