Skip to content

Commit 6e862fe

Browse files
Merging main into darc-main-db56c806-e5ae-4e03-b8ed-84f20a94003a
2 parents 7c7f56f + 029dbea commit 6e862fe

File tree

60 files changed

+955
-434
lines changed

Some content is hidden

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

60 files changed

+955
-434
lines changed

.azure/pipelines/ci.yml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -534,32 +534,32 @@ extends:
534534
parameters:
535535
inputName: Linux_musl_arm64
536536

537+
- template: .azure/pipelines/jobs/default-build.yml@self
538+
parameters:
539+
jobName: Windows_Test
540+
jobDisplayName: "Test: Windows Server x64"
541+
agentOs: Windows
542+
isAzDOTestingJob: true
543+
# Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
544+
cancelTimeoutInMinutes: 30
545+
buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
546+
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunBlazorPlaywrightTemplateTests=true /p:DoNotCleanUpTemplates=true
547+
$(_InternalRuntimeDownloadArgs)
548+
beforeBuild:
549+
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
550+
displayName: Setup IISExpress test certificates and schema
551+
artifacts:
552+
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
553+
path: artifacts/log/
554+
publishOnError: true
555+
includeForks: true
556+
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
557+
path: artifacts/TestResults/
558+
publishOnError: true
559+
includeForks: true
560+
537561
- ${{ if and(ne(parameters.skipTests, 'true'), in(variables['Build.Reason'], 'PullRequest', 'Manual')) }}:
538562
# Test jobs
539-
- template: .azure/pipelines/jobs/default-build.yml@self
540-
parameters:
541-
jobName: Windows_Test
542-
jobDisplayName: "Test: Windows Server x64"
543-
agentOs: Windows
544-
isAzDOTestingJob: true
545-
# Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
546-
cancelTimeoutInMinutes: 30
547-
buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
548-
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false /p:RunBlazorPlaywrightTemplateTests=true
549-
$(_InternalRuntimeDownloadArgs)
550-
beforeBuild:
551-
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
552-
displayName: Setup IISExpress test certificates and schema
553-
artifacts:
554-
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
555-
path: artifacts/log/
556-
publishOnError: true
557-
includeForks: true
558-
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
559-
path: artifacts/TestResults/
560-
publishOnError: true
561-
includeForks: true
562-
563563
- template: .azure/pipelines/jobs/default-build.yml@self
564564
parameters:
565565
jobName: MacOS_Test
@@ -748,4 +748,4 @@ extends:
748748
enableSigningValidation: false
749749
enableNugetValidation: false
750750
publishInstallersAndChecksums: true
751-
publishAssetsImmediately: true
751+
publishAssetsImmediately: true

.github/workflows/markdownlint.yml

Lines changed: 1 addition & 1 deletion
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@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
21+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2222
with:
2323
node-version: 16.x
2424
- name: Run Markdownlint

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

Lines changed: 1 addition & 1 deletion
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@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
22+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2323
with:
2424
node-version: '20.x'
2525

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

Lines changed: 1 addition & 1 deletion
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@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
23+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
2424
with:
2525
node-version: 20.x
2626

Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable>
120120

121121
<BuildHelixPayload Condition="'$(BuildHelixPayload)' == '' AND $(IsTestProject) ">true</BuildHelixPayload>
122-
<SkipTests Condition="'$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
122+
<SkipTests Condition="'$(SkipTests)' == '' AND '$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
123123
</PropertyGroup>
124124

125125
<PropertyGroup>

eng/RequiresDelayedBuildProjects.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<RequiresDelayedBuild Include="$(RepoRoot)src\Grpc\JsonTranscoding\test\testassets\Sandbox\Sandbox.csproj" />
2323
<RequiresDelayedBuild Include="$(RepoRoot)src\OpenApi\test\Microsoft.AspNetCore.OpenApi.NativeAotTests\Microsoft.AspNetCore.OpenApi.NativeAotTests.proj" />
2424
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.Tests\Templates.Blazor.Tests.csproj" />
25+
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.WebAssembly.Auth.Tests\Templates.Blazor.WebAssembly.Auth.Tests.csproj" />
26+
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.WebAssembly.Tests\Templates.Blazor.WebAssembly.Tests.csproj" />
27+
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Mvc.Tests\Templates.Mvc.Tests.csproj" />
28+
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Tests\Templates.Tests.csproj" />
2529
<RequiresDelayedBuild Include="$(RepoRoot)src\SignalR\server\SignalR\test\Microsoft.AspNetCore.SignalR.TrimmingTests\Microsoft.AspNetCore.SignalR.TrimmingTests.proj" />
2630
<RequiresDelayedBuild Include="$(RepoRoot)eng\Npm.Workspace.FunctionalTests.nodeproj" />
2731
</ItemGroup>

eng/Signing.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
<FileSignInfo Include="ancm.mof" CertificateName="None" />
3131
<!-- Exclude the apphost because this is expected to be code-signed by customers after the SDK modifies it. -->
3232
<FileSignInfo Include="apphost.exe" CertificateName="None" />
33+
<!-- We don't need to code sign .js files because they are not used in Windows Script Host. -->
34+
<FileExtensionSignInfo Update=".js" CertificateName="None" />
3335

3436
<!--
3537
These files should already be signed by the .NET Core team. They have to be listed again here because we recreate a redistributable which includes the Microsoft.NETCore.App runtime.

0 commit comments

Comments
 (0)