|
24 | 24 | </ItemGroup>
|
25 | 25 | </Target>
|
26 | 26 |
|
27 |
| - <ItemGroup> |
28 |
| - <ProjectsToBuild Include="..\src\System.Private.ServiceModel\tools\SelfHostedCoreWcfService\SelfHostedCoreWCFService.csproj"/> |
29 |
| - </ItemGroup> |
| 27 | + <Target Name="RunTests" DependsOnTargets="InstallDotNet"> |
| 28 | + <ItemGroup> |
| 29 | + <ProjectsToBuild Include="..\src\System.Private.ServiceModel\tools\SelfHostedCoreWcfService\SelfHostedCoreWCFService.csproj"/> |
| 30 | + </ItemGroup> |
30 | 31 |
|
31 |
| - <ItemGroup> |
32 |
| - <XUnitProject Include="..\src\System.Private.ServiceModel\tests\Scenarios\**\*.IntegrationTests.csproj"> |
33 |
| - <TargetFramework>$(XUnitPublishTargetFramework)</TargetFramework> |
34 |
| - </XUnitProject> |
35 |
| - <XUnitProject Include="..\src\System.ServiceModel.*\tests\*.Tests.csproj"> |
36 |
| - <TargetFramework>$(XUnitPublishTargetFramework)</TargetFramework> |
37 |
| - </XUnitProject> |
38 |
| - </ItemGroup> |
| 32 | + <ItemGroup> |
| 33 | + <XUnitProject Include="..\src\System.Private.ServiceModel\tests\Scenarios\**\*.IntegrationTests.csproj"> |
| 34 | + <TargetFramework>$(XUnitPublishTargetFramework)</TargetFramework> |
| 35 | + </XUnitProject> |
| 36 | + <XUnitProject Include="..\src\System.ServiceModel.*\tests\*.Tests.csproj"> |
| 37 | + <TargetFramework>$(XUnitPublishTargetFramework)</TargetFramework> |
| 38 | + </XUnitProject> |
| 39 | + </ItemGroup> |
39 | 40 |
|
40 |
| - <ItemGroup Condition="'$(TestJob)' == 'Windows' AND '$(RunAsPublic)' == 'true'" > |
41 |
| - <HelixTargetQueue Include="windows.11.amd64.client.open" /> |
42 |
| - <HelixTargetQueue Include="windows.amd64.server2022.open" /> |
43 |
| - </ItemGroup> |
| 41 | + <ItemGroup Condition="'$(TestJob)' == 'Windows' AND '$(RunAsPublic)' == 'true'" > |
| 42 | + <HelixTargetQueue Include="windows.11.amd64.client.open" /> |
| 43 | + <HelixTargetQueue Include="windows.amd64.server2022.open" /> |
| 44 | + </ItemGroup> |
44 | 45 |
|
45 |
| - <ItemGroup Condition="'$(TestJob)' == 'Windows' AND '$(RunAsInternal)'" > |
46 |
| - <HelixTargetQueue Include="windows.11.amd64.client" /> |
47 |
| - < HelixTargetQueue Include= "(Debian.11.Amd64)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64" /> |
48 |
| - < HelixTargetQueue Include= "(Mariner.2.0.Amd64)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64" /> |
49 |
| - </ItemGroup> |
| 46 | + <ItemGroup Condition="'$(TestJob)' == 'Windows' AND '$(RunAsInternal)'" > |
| 47 | + <HelixTargetQueue Include="windows.11.amd64.client" /> |
| 48 | + < HelixTargetQueue Include= "(Debian.11.Amd64)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64" /> |
| 49 | + < HelixTargetQueue Include= "(Mariner.2.0.Amd64)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64" /> |
| 50 | + </ItemGroup> |
50 | 51 |
|
51 |
| - <ItemGroup Condition="'$(TestJob)' == 'Linux'" > |
52 |
| - <HelixTargetQueue Include="SLES.15.Amd64.Open" /> |
53 |
| - < HelixTargetQueue Include= "(Fedora.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-38-helix" /> |
54 |
| - <HelixTargetQueue Include="Ubuntu.2204.Amd64.Open" /> |
55 |
| - < HelixTargetQueue Include= "(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64" /> |
56 |
| - < HelixTargetQueue Include= "(Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64" /> |
57 |
| - < HelixTargetQueue Include= "(openSUSE.15.2.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64" /> |
58 |
| - </ItemGroup> |
| 52 | + <ItemGroup Condition="'$(TestJob)' == 'Linux'" > |
| 53 | + <HelixTargetQueue Include="SLES.15.Amd64.Open" /> |
| 54 | + < HelixTargetQueue Include= "(Fedora.38.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-38-helix" /> |
| 55 | + <HelixTargetQueue Include="Ubuntu.2204.Amd64.Open" /> |
| 56 | + < HelixTargetQueue Include= "(Debian.11.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-11-helix-amd64" /> |
| 57 | + < HelixTargetQueue Include= "(Mariner.2.0.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64" /> |
| 58 | + < HelixTargetQueue Include= "(openSUSE.15.2.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:opensuse-15.2-helix-amd64" /> |
| 59 | + </ItemGroup> |
59 | 60 |
|
60 |
| - <ItemGroup Condition="'$(TestJob)' == 'MacOS'" > |
61 |
| - <HelixTargetQueue Include="OSX.1200.Amd64.Open" /> |
62 |
| - <HelixTargetQueue Include="OSX.1200.Arm64.Open" /> |
63 |
| - </ItemGroup> |
| 61 | + <ItemGroup Condition="'$(TestJob)' == 'MacOS'" > |
| 62 | + <HelixTargetQueue Include="OSX.1200.Amd64.Open" /> |
| 63 | + <HelixTargetQueue Include="OSX.1200.Arm64.Open" /> |
| 64 | + </ItemGroup> |
64 | 65 |
|
65 |
| - <PropertyGroup Condition=" '$(RunAsPublic)' == 'true' "> |
66 |
| - <IsExternal>true</IsExternal> |
67 |
| - <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator> |
68 |
| - <Creator Condition=" '$(Creator)' == ''">anon</Creator> |
69 |
| - </PropertyGroup> |
| 66 | + <PropertyGroup Condition=" '$(RunAsPublic)' == 'true' "> |
| 67 | + <IsExternal>true</IsExternal> |
| 68 | + <Creator>$(BUILD_SOURCEVERSIONAUTHOR)</Creator> |
| 69 | + <Creator Condition=" '$(Creator)' == ''">anon</Creator> |
| 70 | + </PropertyGroup> |
70 | 71 |
|
71 |
| - <!--<PropertyGroup Condition=" '$(RunWithCoreWcfService)' == 'true' AND '$(TestJob)' == 'Linux'" > |
| 72 | + <!--<PropertyGroup Condition=" '$(RunWithCoreWcfService)' == 'true' AND '$(TestJob)' == 'Linux'" > |
72 | 73 | <HelixPreCommands>$(HelixPreCommands);$HELIX_CORRELATION_PAYLOAD/SelfHostedCoreWCFService bootstrap:true</HelixPreCommands>
|
73 | 74 | </PropertyGroup>-->
|
74 | 75 |
|
75 |
| - <Target Name="RunTests" DependsOnTargets="InstallDotNet"> |
76 | 76 | <PropertyGroup Condition="'$(TestJob)' == 'Windows'">
|
77 | 77 | <HelixPreCommands>$(HelixPreCommands);dir C:\ /s /b /o:gn | find "SelfHostedCoreWCFService"</HelixPreCommands>
|
78 | 78 | <HelixPreCommands>$(HelixPreCommands);%HELIX_CORRELATION_PAYLOAD%\SelfHostedCoreWCFService\Release\net6.0\SelfHostedCoreWCFService bootstrap:true</HelixPreCommands>
|
|
0 commit comments