Skip to content
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.

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

[net9.0] Fix test related issues #20639

Merged
merged 4 commits into from Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/cake/dotnet.cake
Expand Up @@ -217,13 +217,13 @@ Task("dotnet-test")
var tests = new []
{
"**/Controls.Core.UnitTests.csproj",
// "**/Controls.Core.Design.UnitTests.csproj",
// "**/Controls.Core.Design.UnitTests.csproj",
"**/Controls.Xaml.UnitTests.csproj",
"**/Core.UnitTests.csproj",
"**/Essentials.UnitTests.csproj",
"**/Resizetizer.UnitTests.csproj",
"**/Graphics.Tests.csproj",
// "**/Compatibility.Core.UnitTests.csproj",
"**/Compatibility.Core.UnitTests.csproj",
};

var success = true;
Expand Down
44 changes: 22 additions & 22 deletions eng/pipelines/common/ui-tests.yml
Expand Up @@ -88,28 +88,28 @@ stages:
provisionatorChannel: ${{ parameters.provisionatorChannel }}
agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}

- stage: winui_ui_tests
displayName: WinUI UITests
dependsOn: []
jobs:
- ${{ each project in parameters.projects }}:
- ${{ if ne(project.winui, '') }}:
- job: winui_ui_tests_${{ project.name }}
timeoutInMinutes: 240 # how long to run the job before automatically cancelling
workspace:
clean: all
displayName: ${{ coalesce(project.desc, project.name) }}
pool: ${{ parameters.windowsPool }}
steps:
- template: ui-tests-steps.yml
parameters:
platform: windows
version: "10.0.19041"
device: windows10
path: ${{ project.winui }}
app: ${{ project.app }}
provisionatorChannel: ${{ parameters.provisionatorChannel }}
agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
# - stage: winui_ui_tests
# displayName: WinUI UITests
# dependsOn: []
# jobs:
# - ${{ each project in parameters.projects }}:
# - ${{ if ne(project.winui, '') }}:
# - job: winui_ui_tests_${{ project.name }}
# timeoutInMinutes: 240 # how long to run the job before automatically cancelling
# workspace:
# clean: all
# displayName: ${{ coalesce(project.desc, project.name) }}
# pool: ${{ parameters.windowsPool }}
# steps:
# - template: ui-tests-steps.yml
# parameters:
# platform: windows
# version: "10.0.19041"
# device: windows10
# path: ${{ project.winui }}
# app: ${{ project.app }}
# provisionatorChannel: ${{ parameters.provisionatorChannel }}
# agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}

- stage: mac_ui_tests
displayName: macOS UITests
Expand Down
Expand Up @@ -10,8 +10,8 @@
<!--<DefineConstants>$(DefineConstants);HAVE_OPENTK</DefineConstants>-->
<!--<MtouchLink Condition="'$(CI)' == 'true'">Full</MtouchLink>-->
<NoWarn>0612</NoWarn>
<SupportedOSPlatformVersion>11.0</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>11.0</TargetPlatformMinVersion>
<SupportedOSPlatformVersion>12.2</SupportedOSPlatformVersion>
<TargetPlatformMinVersion>12.2</TargetPlatformMinVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
Expand Down