Skip to content

Commit 7fa1dad

Browse files
committed
update
1 parent cc1a292 commit 7fa1dad

File tree

1 file changed

+39
-39
lines changed

1 file changed

+39
-39
lines changed

eng/SendToHelix.proj

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,55 +24,55 @@
2424
</ItemGroup>
2525
</Target>
2626

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>
3031

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>
3940

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>
4445

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>
5051

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>
5960

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>
6465

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>
7071

71-
<!--<PropertyGroup Condition=" '$(RunWithCoreWcfService)' == 'true' AND '$(TestJob)' == 'Linux'" >
72+
<!--<PropertyGroup Condition=" '$(RunWithCoreWcfService)' == 'true' AND '$(TestJob)' == 'Linux'" >
7273
<HelixPreCommands>$(HelixPreCommands);$HELIX_CORRELATION_PAYLOAD/SelfHostedCoreWCFService bootstrap:true</HelixPreCommands>
7374
</PropertyGroup>-->
7475

75-
<Target Name="RunTests" DependsOnTargets="InstallDotNet">
7676
<PropertyGroup Condition="'$(TestJob)' == 'Windows'">
7777
<HelixPreCommands>$(HelixPreCommands);dir C:\ /s /b /o:gn | find "SelfHostedCoreWCFService"</HelixPreCommands>
7878
<HelixPreCommands>$(HelixPreCommands);%HELIX_CORRELATION_PAYLOAD%\SelfHostedCoreWCFService\Release\net6.0\SelfHostedCoreWCFService bootstrap:true</HelixPreCommands>

0 commit comments

Comments
 (0)