Skip to content

Commit 4a92c37

Browse files
LoopedBard3LoopedBard3
committed
Update scenarios.proj to use the prepare scenarios properly.
1 parent bcd5e3c commit 4a92c37

File tree

1 file changed

+99
-32
lines changed

1 file changed

+99
-32
lines changed

‎eng/performance/scenarios.proj‎

Lines changed: 99 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -20,89 +20,157 @@
2020
</PropertyGroup>
2121

2222
<ItemDefinitionGroup>
23-
<HelixWorkItem>
23+
<HelixWorkItem>
2424
<Timeout>4:00</Timeout>
2525
</HelixWorkItem>
2626
</ItemDefinitionGroup>
27-
27+
28+
<PropertyGroup>
29+
<AfterPreparePayloadWorkItemCommand>$(Python) post.py</AfterPreparePayloadWorkItemCommand>
30+
<PreparePayloadOutDirectoryName>scenarios_out</PreparePayloadOutDirectoryName>
31+
<PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' == 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)\</PreparePayloadWorkItemBaseDirectory>
32+
<PreparePayloadWorkItemBaseDirectory Condition="'$(TargetsWindows)' != 'true'">$(CorrelationPayloadDirectory)$(PreparePayloadOutDirectoryName)/</PreparePayloadWorkItemBaseDirectory>
33+
</PropertyGroup>
34+
2835

2936
<ItemGroup>
3037
<Scenario Include="Static Console Template">
31-
<PayloadDirectory>$(ScenariosDir)staticconsoletemplate</PayloadDirectory>
38+
<ScenarioDirectoryName>staticconsoletemplate</ScenarioDirectoryName>
39+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
3240
</Scenario>
3341
<Scenario Include="Static VB Console Template">
34-
<PayloadDirectory>$(ScenariosDir)staticvbconsoletemplate</PayloadDirectory>
42+
<ScenarioDirectoryName>staticvbconsoletemplate</ScenarioDirectoryName>
43+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
44+
</Scenario>
45+
<Scenario Include="Static F# Console Template">
46+
<ScenarioDirectoryName>staticfsconsoletemplate</ScenarioDirectoryName>
47+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
3548
</Scenario>
3649
<!-- <Scenario Include="Static Winforms Template" Condition="'$(_Framework)' != 'netcoreapp5.0'">
37-
<PayloadDirectory>$(ScenariosDir)staticwinformstemplate</PayloadDirectory>
50+
<ScenarioDirectoryName>staticwinformstemplate</ScenarioDirectoryName>
51+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
3852
</Scenario> -->
3953
<Scenario Include="New Console Template">
40-
<PayloadDirectory>$(ScenariosDir)emptyconsoletemplate</PayloadDirectory>
54+
<ScenarioDirectoryName>emptyconsoletemplate</ScenarioDirectoryName>
55+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
4156
</Scenario>
4257
<Scenario Include="New VB Console Template">
43-
<PayloadDirectory>$(ScenariosDir)emptyvbconsoletemplate</PayloadDirectory>
58+
<ScenarioDirectoryName>emptyvbconsoletemplate</ScenarioDirectoryName>
59+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
4460
</Scenario>
61+
<UIScenario Include="WinForms Large" Condition="'$(TargetsWindows)' == 'true'">
62+
<ScenarioDirectoryName>windowsformslarge</ScenarioDirectoryName>
63+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
64+
</UIScenario>
65+
<UIScenario Include="WPF Template" Condition="'$(TargetsWindows)' == 'true'">
66+
<ScenarioDirectoryName>wpf</ScenarioDirectoryName>
67+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
68+
</UIScenario>
69+
<UIScenario Include="WPF SFC" Condition="'$(TargetsWindows)' == 'true'">
70+
<ScenarioDirectoryName>wpfsfc</ScenarioDirectoryName>
71+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
72+
</UIScenario>
73+
<UIScenario Include="PaintDotNet" Condition="'$(TargetsWindows)' == 'true' And $(BUILD_REPOSITORY_PROVIDER) == 'TfsGit'">
74+
<ScenarioDirectoryName>paintdotnet</ScenarioDirectoryName>
75+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
76+
</UIScenario>
77+
<MAUIScenario Include="Desktop Maui" Condition="'$(TargetsWindows)' == 'true' And '$(Architecture)' != 'arm64' And '$(Architecture)' != 'arm'">
78+
<ScenarioDirectoryName>mauidesktop</ScenarioDirectoryName>
79+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
80+
</MAUIScenario>
81+
<MAUIScenario Include="Desktop Maui Blazor" Condition="'$(TargetsWindows)' == 'true' And '$(Architecture)' != 'arm64' And '$(Architecture)' != 'arm'">
82+
<ScenarioDirectoryName>mauiblazordesktop</ScenarioDirectoryName>
83+
<PayloadDirectory>$(ScenariosDir)%(ScenarioDirectoryName)</PayloadDirectory>
84+
</MAUIScenario>
85+
</ItemGroup>
86+
87+
88+
<ItemGroup>
89+
<PreparePayloadWorkItem Include="@(UIScenario)">
90+
<Command>$(Python) pre.py publish -f $(_Framework) -c Release --windowsui -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)_fdd</Command>
91+
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
92+
</PreparePayloadWorkItem>
93+
<PreparePayloadWorkItem Include="@(Scenario)">
94+
<Command>$(Python) pre.py publish -f $(_Framework) -c Release -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)_fdd</Command>
95+
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
96+
</PreparePayloadWorkItem>
97+
<PreparePayloadWorkItem Include="@(Scenario)">
98+
<Command>$(Python) pre.py publish -f $(_Framework) -c Release -r $(RID) -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)_scd</Command>
99+
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
100+
</PreparePayloadWorkItem>
101+
<PreparePayloadWorkItem Include="@(Scenario)">
102+
<Command>$(Python) pre.py build -c Release -f $(_Framework) -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)_build</Command>
103+
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
104+
</PreparePayloadWorkItem>
105+
<PreparePayloadWorkItem Include="@(MAUIScenario)">
106+
<Command>$(Python) pre.py publish -c Release -f $(_Framework)-windows10.0.19041.0 -o $(PreparePayloadWorkItemBaseDirectory)%(PreparePayloadWorkItem.ScenarioDirectoryName)_fdd</Command>
107+
<WorkingDirectory>%(PreparePayloadWorkItem.PayloadDirectory)</WorkingDirectory>
108+
</PreparePayloadWorkItem>
109+
</ItemGroup>
110+
111+
112+
<!-- UI Startup FDD publish -->
113+
<ItemGroup>
114+
<HelixWorkItem Include="@(UIScenario -> 'Startup - %(Identity) - FDD Publish')">
115+
<PreCommands Condition="'$(TargetsWindows)' == 'true'">xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)_fdd %HELIX_WORKITEM_ROOT%\pub /E /I /Y</PreCommands>
116+
<PreCommands Condition="'$(TargetsWindows)' != 'true'">cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName)_fdd $HELIX_WORKITEM_ROOT/pub</PreCommands>
117+
<Command>$(Python) test.py startup --scenario-name &quot;%(Identity)&quot;</Command>
118+
</HelixWorkItem>
45119
</ItemGroup>
46120

47121
<!-- Startup FDD publish -->
48122
<ItemGroup>
49123
<HelixWorkItem Include="@(Scenario -> 'Startup - %(Identity) - FDD Publish')">
50-
<PreCommands>$(Python) pre.py publish -f $(_Framework) -c Release</PreCommands>
124+
<PreCommands Condition="'$(TargetsWindows)' == 'true'">xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)_fdd %HELIX_WORKITEM_ROOT%\pub /E /I /Y</PreCommands>
125+
<PreCommands Condition="'$(TargetsWindows)' != 'true'">cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName)_fdd $HELIX_WORKITEM_ROOT/pub</PreCommands>
51126
<Command>$(Python) test.py startup --scenario-name &quot;%(Identity)&quot;</Command>
52127
</HelixWorkItem>
53128
</ItemGroup>
54129

55130
<!-- SOD FDD publish -->
56131
<ItemGroup>
57132
<HelixWorkItem Include="@(Scenario -> 'SOD - %(Identity) - FDD Publish')">
58-
<PreCommands>$(Python) pre.py publish -f $(_Framework) -c Release</PreCommands>
133+
<PreCommands Condition="'$(TargetsWindows)' == 'true'">xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)_fdd %HELIX_WORKITEM_ROOT%\pub /E /I /Y</PreCommands>
134+
<PreCommands Condition="'$(TargetsWindows)' != 'true'">cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName)_fdd $HELIX_WORKITEM_ROOT/pub</PreCommands>
59135
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
60136
</HelixWorkItem>
61137
</ItemGroup>
62138

63139
<!-- SOD SCD publish w/ RID -->
64140
<ItemGroup>
65141
<HelixWorkItem Include="@(Scenario -> 'SOD - %(Identity) - SCD Publish')">
66-
<PreCommands>$(Python) pre.py publish -f $(_Framework) -c Release -r $(RID)</PreCommands>
142+
<PreCommands Condition="'$(TargetsWindows)' == 'true'">xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)_scd %HELIX_WORKITEM_ROOT%\pub /E /I /Y</PreCommands>
143+
<PreCommands Condition="'$(TargetsWindows)' != 'true'">cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName)_scd $HELIX_WORKITEM_ROOT/pub</PreCommands>
67144
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
68145
</HelixWorkItem>
69146
</ItemGroup>
70147

71148
<!-- SOD build -->
72149
<ItemGroup>
73150
<HelixWorkItem Include="@(Scenario -> 'SOD - %(Identity) - Build')">
74-
<PreCommands>$(Python) pre.py build -c Release -f $(_Framework)</PreCommands>
151+
<PreCommands Condition="'$(TargetsWindows)' == 'true'">xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)_build %HELIX_WORKITEM_ROOT%\bin /E /I /Y</PreCommands>
152+
<PreCommands Condition="'$(TargetsWindows)' != 'true'">cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName)_build $HELIX_WORKITEM_ROOT/bin</PreCommands>
75153
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
76154
</HelixWorkItem>
77155
</ItemGroup>
78156

79-
<!-- SOD & Device Startup for Windows Desktop MAUI -->
157+
<!-- MAUI -->
80158
<ItemGroup>
81-
<HelixWorkItem Include="SOD - Desktop Maui Unpackaged" Condition="'$(TargetsWindows)' == 'true'">
82-
<PayloadDirectory>$(ScenariosDir)mauidesktop</PayloadDirectory>
83-
<PreCommands>$(Python) pre.py publish -c Release -f $(_Framework)-windows10.0.19041.0</PreCommands>
159+
<HelixWorkItem Include="@(MAUIScenario -> 'SOD - %(Identity) Unpackaged')">
160+
<PreCommands Condition="'$(TargetsWindows)' == 'true'">xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)_fdd %HELIX_WORKITEM_ROOT%\pub /E /I /Y</PreCommands>
161+
<PreCommands Condition="'$(TargetsWindows)' != 'true'">cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName)_fdd $HELIX_WORKITEM_ROOT/pub</PreCommands>
84162
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
85163
</HelixWorkItem>
86-
<HelixWorkItem Include="Device Startup - Desktop Maui Default" Condition="'$(TargetsWindows)' == 'true'">
87-
<PayloadDirectory>$(ScenariosDir)mauidesktop</PayloadDirectory>
88-
<PreCommands>$(Python) pre.py publish -c Release -f $(_Framework)-windows10.0.19041.0</PreCommands>
164+
<HelixWorkItem Include="@(MAUIScenario -> 'Device Startup - %(Identity) Default')">
165+
<PreCommands Condition="'$(TargetsWindows)' == 'true'">xcopy %HELIX_CORRELATION_PAYLOAD%\$(PreparePayloadOutDirectoryName)\%(HelixWorkItem.ScenarioDirectoryName)_fdd %HELIX_WORKITEM_ROOT%\pub /E /I /Y</PreCommands>
166+
<PreCommands Condition="'$(TargetsWindows)' != 'true'">cp -r $HELIX_CORRELATION_PAYLOAD/$(PreparePayloadOutDirectoryName)/%(HelixWorkItem.ScenarioDirectoryName)_fdd $HELIX_WORKITEM_ROOT/pub</PreCommands>
89167
<Command>$(Python) test.py startup --scenario-name &quot;%(Identity)&quot;</Command>
90168
</HelixWorkItem>
91169
</ItemGroup>
92170

93-
<!-- SOD & Device Startup for Windows Desktop MAUI Blazor -->
94-
<ItemGroup>
95-
<HelixWorkItem Include="SOD - Desktop Maui Blazor Unpackaged" Condition="'$(TargetsWindows)' == 'true'">
96-
<PayloadDirectory>$(ScenariosDir)mauiblazordesktop</PayloadDirectory>
97-
<PreCommands>$(Python) pre.py publish -c Release -f $(_Framework)-windows10.0.19041.0</PreCommands>
98-
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
99-
</HelixWorkItem>
100-
<HelixWorkItem Include="Device Startup - Desktop Maui Blazor Default" Condition="'$(TargetsWindows)' == 'true'">
101-
<PayloadDirectory>$(ScenariosDir)mauiblazordesktop</PayloadDirectory>
102-
<PreCommands>$(Python) pre.py publish -c Release -f $(_Framework)-windows10.0.19041.0</PreCommands>
103-
<Command>$(Python) test.py startup --scenario-name &quot;%(Identity)&quot;</Command>
104-
</HelixWorkItem>
105-
</ItemGroup>
171+
172+
<Import Project="PreparePayloadWorkItems.targets" />
173+
106174

107175
<!--
108176
This is useful for local testing to print the produced helix items
@@ -121,6 +189,5 @@
121189
post: %(HelixWorkItem.PostCommands)
122190
timeout: %(HelixWorkItem.Timeout) '"/>
123191
</Target> -->
124-
<Import Project="PreparePayloadWorkItems.targets" />
125192

126193
</Project>

0 commit comments

Comments
 (0)