Skip to content

Commit 9f11437

Browse files
EvangelinkEvangelink
authored
Replace XUnitV3Project with MTPProject in helix.proj (#38397)
Prepare a PR to fix helix rename from PR dotnet/arcade#16986 This will only need to be merged when the new arcade will flow (I would expect the arcade flow PR to fail).
1 parent 33d476d commit 9f11437

1 file changed

Lines changed: 40 additions & 40 deletions

File tree

‎eng/helix.proj‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -41,96 +41,96 @@
4141
</ItemGroup>
4242

4343
<ItemGroup>
44-
<XUnitV3Project Include="$(RepoRoot)/test/**/*.csproj"/>
45-
<XUnitV3Project Include="$(RepoRoot)/test/**/*.fsproj"/>
46-
<XUnitV3Project Remove="$(RepoRoot)/test/EFCore.Specification.Tests/*.csproj"/>
47-
<XUnitV3Project Remove="$(RepoRoot)/test/EFCore.AspNet.Specification.Tests/*.csproj"/>
48-
<XUnitV3Project Remove="$(RepoRoot)/test/EFCore.Relational.Specification.Tests/*.csproj"/>
44+
<MTPProject Include="$(RepoRoot)/test/**/*.csproj"/>
45+
<MTPProject Include="$(RepoRoot)/test/**/*.fsproj"/>
46+
<MTPProject Remove="$(RepoRoot)/test/EFCore.Specification.Tests/*.csproj"/>
47+
<MTPProject Remove="$(RepoRoot)/test/EFCore.AspNet.Specification.Tests/*.csproj"/>
48+
<MTPProject Remove="$(RepoRoot)/test/EFCore.Relational.Specification.Tests/*.csproj"/>
4949
<!-- The trimming and NativeAOT test projects are console programs -->
50-
<XUnitV3Project Remove="$(RepoRoot)/test/EFCore.TrimmingTests/*.csproj"/>
51-
<XUnitV3Project Remove="$(RepoRoot)/test/EFCore.NativeAotTests/*.csproj"/>
50+
<MTPProject Remove="$(RepoRoot)/test/EFCore.TrimmingTests/*.csproj"/>
51+
<MTPProject Remove="$(RepoRoot)/test/EFCore.NativeAotTests/*.csproj"/>
5252
<!-- API baseline tests require source files and cannot run in Helix -->
53-
<XUnitV3Project Remove="$(RepoRoot)/test/EFCore.ApiBaseline.Tests/*.csproj"/>
53+
<MTPProject Remove="$(RepoRoot)/test/EFCore.ApiBaseline.Tests/*.csproj"/>
5454
</ItemGroup>
5555

5656
<!-- Work-around for https://github.com/dotnet/runtime/issues/70758 -->
5757
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))'">
58-
<XUnitV3Project Update="$(RepoRoot)/test/EFCore.InMemory.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.Sqlite.FunctionalTests/*.csproj;$(RepoRoot)/test/ef.Tests/*.csproj">
58+
<MTPProject Update="$(RepoRoot)/test/EFCore.InMemory.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.Sqlite.FunctionalTests/*.csproj;$(RepoRoot)/test/ef.Tests/*.csproj">
5959
<PreCommands>$(PreCommands); export COMPlus_EnableWriteXorExecute=0</PreCommands>
60-
</XUnitV3Project>
60+
</MTPProject>
6161
</ItemGroup>
6262

6363
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows.10.Amd64`))'">
64-
<XUnitV3Project Remove="$(CosmosTests)"/>
65-
<XUnitV3Project Remove="$(SqlServerTests)"/>
66-
<XUnitV3Project Update="@(XUnitV3Project)">
64+
<MTPProject Remove="$(CosmosTests)"/>
65+
<MTPProject Remove="$(SqlServerTests)"/>
66+
<MTPProject Update="@(MTPProject)">
6767
<PreCommands>$(PreCommands); set "Test__SqlServer__DefaultConnection=Data Source="</PreCommands>
68-
</XUnitV3Project>
68+
</MTPProject>
6969
</ItemGroup>
7070

7171
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows.11.Arm64`))'">
72-
<XUnitV3Project Remove="$(SqlServerTests)"/>
73-
<XUnitV3Project Remove="$(CosmosTests)"/>
74-
<XUnitV3Project Update="@(XUnitV3Project)">
72+
<MTPProject Remove="$(SqlServerTests)"/>
73+
<MTPProject Remove="$(CosmosTests)"/>
74+
<MTPProject Update="@(MTPProject)">
7575
<PreCommands>$(PreCommands); set "Test__SqlServer__DefaultConnection=Data Source="</PreCommands>
76-
</XUnitV3Project>
76+
</MTPProject>
7777
</ItemGroup>
7878

7979
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows.11.Amd64.Client`))'">
80-
<XUnitV3Project Remove="$(RepoRoot)/test/**/*.csproj"/>
81-
<XUnitV3Project Remove="$(RepoRoot)/test/**/*.fsproj"/>
82-
<XUnitV3Project Include="$(SqlServerTests)">
80+
<MTPProject Remove="$(RepoRoot)/test/**/*.csproj"/>
81+
<MTPProject Remove="$(RepoRoot)/test/**/*.fsproj"/>
82+
<MTPProject Include="$(SqlServerTests)">
8383
<PreCommands>$(PreCommands); SqlLocalDB start</PreCommands>
84-
</XUnitV3Project>
84+
</MTPProject>
8585
</ItemGroup>
8686

8787
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows.Server2025.Amd64`))'">
88-
<XUnitV3Project Remove="$(RepoRoot)/test/**/*.csproj"/>
89-
<XUnitV3Project Remove="$(RepoRoot)/test/**/*.fsproj"/>
90-
<XUnitV3Project Include="$(CosmosTests)">
88+
<MTPProject Remove="$(RepoRoot)/test/**/*.csproj"/>
89+
<MTPProject Remove="$(RepoRoot)/test/**/*.fsproj"/>
90+
<MTPProject Include="$(CosmosTests)">
9191
<PreCommands>$(PreCommands); call %HELIX_CORRELATION_PAYLOAD%\testing\WaitCosmosEmulator.cmd; set Test__Cosmos__DefaultConnection=https://localhost:8081; set Test__Cosmos__SkipConnectionCheck=true</PreCommands>
92-
</XUnitV3Project>
92+
</MTPProject>
9393
</ItemGroup>
9494

9595
<!-- Start SqlServer instance for test projects which uses SqlServer on docker. Only run SqlServer tests. -->
9696
<ItemGroup Condition = "'$(HelixTargetQueue.Contains(`helix-sqlserver`))'">
97-
<XUnitV3Project Remove="$(RepoRoot)/test/**/*.csproj"/>
98-
<XUnitV3Project Remove="$(RepoRoot)/test/**/*.fsproj"/>
99-
<XUnitV3Project Include="$(SqlServerTests)">
97+
<MTPProject Remove="$(RepoRoot)/test/**/*.csproj"/>
98+
<MTPProject Remove="$(RepoRoot)/test/**/*.fsproj"/>
99+
<MTPProject Include="$(SqlServerTests)">
100100
<PreCommands>$(PreCommands); export MSSQL_SA_PASSWORD=$(MSSQL_SA_PASSWORD); export Test__SqlServer__DefaultConnection="Server=localhost;;Database=master;;User=sa;;Password=$(MSSQL_SA_PASSWORD);;Connect Timeout=60;;ConnectRetryCount=0;;TrustServerCertificate=True"; /opt/mssql/bin/sqlservr --accept-eula &amp;; sleep 120; </PreCommands>
101-
</XUnitV3Project>
101+
</MTPProject>
102102
</ItemGroup>
103103

104104
<!-- Run Cosmos tests on Ubuntu with Docker support (testcontainer auto-starts the emulator) -->
105105
<ItemGroup Condition = "'$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.XL.Open' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.XL'">
106-
<XUnitV3Project Remove="$(RepoRoot)/test/**/*.csproj"/>
107-
<XUnitV3Project Remove="$(RepoRoot)/test/**/*.fsproj"/>
108-
<XUnitV3Project Include="$(CosmosTests)"/>
106+
<MTPProject Remove="$(RepoRoot)/test/**/*.csproj"/>
107+
<MTPProject Remove="$(RepoRoot)/test/**/*.fsproj"/>
108+
<MTPProject Include="$(CosmosTests)"/>
109109
</ItemGroup>
110110

111111
<!-- Run tests that don't need SqlServer or Cosmos on bare Ubuntu -->
112112
<ItemGroup Condition = "'$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.Open' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64'">
113-
<XUnitV3Project Remove="$(SqlServerTests)"/>
114-
<XUnitV3Project Remove="$(CosmosTests)"/>
113+
<MTPProject Remove="$(SqlServerTests)"/>
114+
<MTPProject Remove="$(CosmosTests)"/>
115115
</ItemGroup>
116116

117117
<!-- Remove test projects which require SqlServer or Cosmos from OSX -->
118118
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))'">
119-
<XUnitV3Project Remove="$(SqlServerTests)"/>
120-
<XUnitV3Project Remove="$(CosmosTests)"/>
119+
<MTPProject Remove="$(SqlServerTests)"/>
120+
<MTPProject Remove="$(CosmosTests)"/>
121121
</ItemGroup>
122122

123123
<!--
124124
Skip tests tagged with the "failing" category. Microsoft.DotNet.XUnitV3Extensions attributes
125125
such as [ConditionalClass]/[ConditionalAssembly] add `category=failing` to tests whose
126126
condition evaluates to false; this filter is what actually skips them at the runner.
127127
128-
This must run AFTER any per-queue ItemGroup that re-Includes XUnitV3Project items.
128+
This must run AFTER any per-queue ItemGroup that re-Includes MTPProject items.
129129
-->
130130
<ItemGroup>
131-
<XUnitV3Project Update="@(XUnitV3Project)">
131+
<MTPProject Update="@(MTPProject)">
132132
<Arguments>$(XUnitV3Arguments) --filter-not-trait category=failing --ignore-exit-code 8</Arguments>
133-
</XUnitV3Project>
133+
</MTPProject>
134134
</ItemGroup>
135135

136136
<PropertyGroup>

0 commit comments

Comments
 (0)
⚡