Skip to content

Build Windows local test job in official builds #61519

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Apr 24, 2025
Merged

Build Windows local test job in official builds #61519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5499af7
Run windows local dev job in internal builds
wtgodbe Apr 16, 2025
500d451
Fixaroonie
wtgodbe Apr 16, 2025
183261b
Only on main
wtgodbe Apr 16, 2025
6399558
Never mind
wtgodbe Apr 16, 2025
c1f59b5
Don't delete project template content in CI
wtgodbe Apr 22, 2025
1b31e6f
-ci
wtgodbe Apr 22, 2025
ba92489
Static
wtgodbe Apr 22, 2025
f9c8ccc
Try this
wtgodbe Apr 22, 2025
ee01182
NoBuildRepoTasks
wtgodbe Apr 23, 2025
95ed989
Maybe this
wtgodbe Apr 23, 2025
610e5b3
Message
wtgodbe Apr 23, 2025
7358474
This should work
wtgodbe Apr 23, 2025
0fb5caa
This shouldn't work
wtgodbe Apr 23, 2025
806d725
Different approach
wtgodbe Apr 23, 2025
8c4531a
Fix print
wtgodbe Apr 23, 2025
9a8e62a
This oughta do er
wtgodbe Apr 23, 2025
e0d3dca
Delayed
wtgodbe Apr 23, 2025
95d324a
No message
wtgodbe Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,32 +534,32 @@ extends:
parameters:
inputName: Linux_musl_arm64

- template: .azure/pipelines/jobs/default-build.yml@self
parameters:
jobName: Windows_Test
jobDisplayName: "Test: Windows Server x64"
agentOs: Windows
isAzDOTestingJob: true
# Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
cancelTimeoutInMinutes: 30
buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunBlazorPlaywrightTemplateTests=true /p:DoNotCleanUpTemplates=true
$(_InternalRuntimeDownloadArgs)
beforeBuild:
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
displayName: Setup IISExpress test certificates and schema
artifacts:
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
path: artifacts/TestResults/
publishOnError: true
includeForks: true

- ${{ if and(ne(parameters.skipTests, 'true'), in(variables['Build.Reason'], 'PullRequest', 'Manual')) }}:
# Test jobs
- template: .azure/pipelines/jobs/default-build.yml@self
parameters:
jobName: Windows_Test
jobDisplayName: "Test: Windows Server x64"
agentOs: Windows
isAzDOTestingJob: true
# Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
cancelTimeoutInMinutes: 30
buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
/p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false /p:RunBlazorPlaywrightTemplateTests=true
$(_InternalRuntimeDownloadArgs)
beforeBuild:
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
displayName: Setup IISExpress test certificates and schema
artifacts:
- name: Windows_Test_Logs_Attempt_$(System.JobAttempt)
path: artifacts/log/
publishOnError: true
includeForks: true
- name: Windows_Test_Results_Attempt_$(System.JobAttempt)
path: artifacts/TestResults/
publishOnError: true
includeForks: true

- template: .azure/pipelines/jobs/default-build.yml@self
parameters:
jobName: MacOS_Test
Expand Down Expand Up @@ -748,4 +748,4 @@ extends:
enableSigningValidation: false
enableNugetValidation: false
publishInstallersAndChecksums: true
publishAssetsImmediately: true
publishAssetsImmediately: true
2 changes: 1 addition & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
<IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable>

<BuildHelixPayload Condition="'$(BuildHelixPayload)' == '' AND $(IsTestProject) ">true</BuildHelixPayload>
<SkipTests Condition="'$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
<SkipTests Condition="'$(SkipTests)' == '' AND '$(SkipHelixReadyTests)' == 'true' AND '$(BuildHelixPayload)' == 'true'">true</SkipTests>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 4 additions & 0 deletions eng/RequiresDelayedBuildProjects.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
<RequiresDelayedBuild Include="$(RepoRoot)src\Grpc\JsonTranscoding\test\testassets\Sandbox\Sandbox.csproj" />
<RequiresDelayedBuild Include="$(RepoRoot)src\OpenApi\test\Microsoft.AspNetCore.OpenApi.NativeAotTests\Microsoft.AspNetCore.OpenApi.NativeAotTests.proj" />
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.Tests\Templates.Blazor.Tests.csproj" />
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.WebAssembly.Auth.Tests\Templates.Blazor.WebAssembly.Auth.Tests.csproj" />
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Blazor.WebAssembly.Tests\Templates.Blazor.WebAssembly.Tests.csproj" />
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Mvc.Tests\Templates.Mvc.Tests.csproj" />
<RequiresDelayedBuild Include="$(RepoRoot)src\ProjectTemplates\test\Templates.Tests\Templates.Tests.csproj" />
<RequiresDelayedBuild Include="$(RepoRoot)src\SignalR\server\SignalR\test\Microsoft.AspNetCore.SignalR.TrimmingTests\Microsoft.AspNetCore.SignalR.TrimmingTests.proj" />
<RequiresDelayedBuild Include="$(RepoRoot)eng\Npm.Workspace.FunctionalTests.nodeproj" />
</ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion src/ProjectTemplates/Shared/Project.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,13 @@ internal async Task RunDotNetNewRawAsync(string arguments)

public void Dispose()
{
DeleteOutputDirectory();
var doNotCleanUpTemplates = typeof(ProjectFactoryFixture).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
.Single(attribute => attribute.Key == "DoNotCleanUpTemplates")
.Value;
if (string.Equals(doNotCleanUpTemplates, "false", StringComparison.OrdinalIgnoreCase))
{
DeleteOutputDirectory();
}
}

public void DeleteOutputDirectory()
Expand Down
8 changes: 8 additions & 0 deletions src/ProjectTemplates/TestInfrastructure/PrepareForTest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@
<_Parameter1>ContinuousIntegrationBuild</_Parameter1>
<_Parameter2>true</_Parameter2>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(DoNotCleanUpTemplates)' == 'true'">
<_Parameter1>DoNotCleanUpTemplates</_Parameter1>
<_Parameter2>true</_Parameter2>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(DoNotCleanUpTemplates)' != 'true'">
<_Parameter1>DoNotCleanUpTemplates</_Parameter1>
<_Parameter2>false</_Parameter2>
</AssemblyAttribute>
</ItemGroup>

<Target Name="GenerateTesDevCert" BeforeTargets="AssignTargetPaths">
Expand Down
1 change: 1 addition & 0 deletions src/ProjectTemplates/test/Templates.Blazor.Tests/Templates.Blazor.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
<RunBlazorPlaywrightTemplateTests Condition="'$(RunBlazorPlaywrightTemplateTests)' == ''">$(RunTemplateTests)</RunBlazorPlaywrightTemplateTests>
<SkipTests Condition="'$(RunBlazorPlaywrightTemplateTests)' != 'true'">true</SkipTests>
<SkipTests Condition="'$(RunBlazorPlaywrightTemplateTests)' == 'true'">false</SkipTests>
<BuildHelixPayload Condition="'$(RunBlazorPlaywrightTemplateTests)' != 'true'">false</BuildHelixPayload>

<BaseOutputPath />
Expand Down
3 changes: 3 additions & 0 deletions ...st/Templates.Blazor.WebAssembly.Auth.Tests/Templates.Blazor.WebAssembly.Auth.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
<TestGroupName>ProjectTemplates.Blazor.WebAssembly.Auth.Tests</TestGroupName>
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>

<RequiresDelayedBuild>true</RequiresDelayedBuild>

<RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
<SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
<SkipTests Condition="'$(RunTemplateTests)' == 'true'">false</SkipTests>
<BuildHelixPayload Condition="'$(RunTemplateTests)' != 'true'">false</BuildHelixPayload>

<BaseOutputPath />
Expand Down
3 changes: 3 additions & 0 deletions ...mplates/test/Templates.Blazor.WebAssembly.Tests/Templates.Blazor.WebAssembly.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
<TestGroupName>ProjectTemplates.Blazor.WebAssembly.Tests</TestGroupName>
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>

<RequiresDelayedBuild>true</RequiresDelayedBuild>

<RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
<SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
<SkipTests Condition="'$(RunTemplateTests)' == 'true'">false</SkipTests>
<BuildHelixPayload Condition="'$(RunTemplateTests)' != 'true'">false</BuildHelixPayload>

<BaseOutputPath />
Expand Down
3 changes: 3 additions & 0 deletions src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
<TestGroupName>ProjectTemplates.Mvc.Tests</TestGroupName>
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>

<RequiresDelayedBuild>true</RequiresDelayedBuild>

<RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
<SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
<SkipTests Condition="'$(RunTemplateTests)' == 'true'">false</SkipTests>
<BuildHelixPayload Condition="'$(RunTemplateTests)' != 'true'">false</BuildHelixPayload>

<BaseOutputPath />
Expand Down
3 changes: 3 additions & 0 deletions src/ProjectTemplates/test/Templates.Tests/Templates.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
<TestGroupName>ProjectTemplates.Tests</TestGroupName>
<DefineConstants>$(DefineConstants);XPLAT</DefineConstants>

<RequiresDelayedBuild>true</RequiresDelayedBuild>

<RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
<SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
<SkipTests Condition="'$(RunTemplateTests)' == 'true'">false</SkipTests>
<BuildHelixPayload Condition="'$(RunTemplateTests)' != 'true'">false</BuildHelixPayload>

<BaseOutputPath />
Expand Down
Loading