Skip to content

Commit 3d7acc8

Browse files
yangpanMSyangpanMS
authored
Copy all profiles regardless of OS (#228)
1 parent 4360e10 commit 3d7acc8

File tree

3 files changed

+7
-117
lines changed

3 files changed

+7
-117
lines changed

‎.pipelines/azure-pipelines-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resources:
1616
options: --entrypoint=""
1717

1818
variables:
19-
VcVersion : 1.13.6
19+
VcVersion : 1.13.7
2020
ROOT: $(Build.SourcesDirectory)
2121
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2222
ENABLE_PRS_DELAYSIGN: 1

‎.pipelines/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pool:
1818
vmImage: windows-latest
1919

2020
variables:
21-
VcVersion : 1.13.6
21+
VcVersion : 1.13.7
2222
ROOT: $(Build.SourcesDirectory)
2323
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2424
ENABLE_PRS_DELAYSIGN: 1

‎src/VirtualClient/VirtualClient.Main/VirtualClient.Main.csproj

Lines changed: 5 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -51,126 +51,16 @@
5151
<None Update="profiles\*.json" CopyToOutputDirectory="Always" CopyToPublishDirectory="Never" />
5252
</ItemGroup>
5353

54-
<ItemGroup>
55-
<!--
56-
Windows-specific Profiles
57-
The following profiles run on Windows and will be published to the VirtualClient
58-
NuGet package in the /content/win-x64|win-arm64/profiles folder
59-
-->
60-
<WindowsProfiles Include="profiles\GET-STARTED-OPENSSL.json" />
61-
<WindowsProfiles Include="profiles\BOOTSTRAP-DEPENDENCIES.json" />
62-
<WindowsProfiles Include="profiles\PERF-ASPNETBENCH.json" />
63-
<WindowsProfiles Include="profiles\PERF-BLENDER-AMD.json" />
64-
<WindowsProfiles Include="profiles\PERF-COMPRESSION.json" />
65-
<WindowsProfiles Include="profiles\PERF-CPU-COREMARK.json" />
66-
<WindowsProfiles Include="profiles\PERF-CPU-COREMARKPRO.json" />
67-
<WindowsProfiles Include="profiles\PERF-GPU-3DMARK-AMD.json" />
68-
<WindowsProfiles Include="profiles\PERF-GPU-SPECVIEW-AMD.json" />
69-
<WindowsProfiles Include="profiles\PERF-CPU-GEEKBENCH.json" />
70-
<WindowsProfiles Include="profiles\PERF-CPU-LAPACK.json" />
71-
<WindowsProfiles Include="profiles\PERF-CPU-OPENSSL.json" />
72-
<WindowsProfiles Include="profiles\PERF-SQL-POSTGRESQL.json" />
73-
<WindowsProfiles Include="profiles\PERF-CPU-PRIME95.json" />
74-
<WindowsProfiles Include="profiles\PERF-IO-DISKSPD.json" />
75-
<WindowsProfiles Include="profiles\PERF-IO-DISKSPD-2.json" />
76-
<WindowsProfiles Include="profiles\PERF-IO-FIO.json" />
77-
<WindowsProfiles Include="profiles\PERF-IO-FIO-DISCOVERY.json" />
78-
<WindowsProfiles Include="profiles\PERF-IO-FIO-MULTITHROUGHPUT.json" />
79-
<WindowsProfiles Include="profiles\PERF-NETWORK-PING.json" />
80-
<WindowsProfiles Include="profiles\PERF-NETWORK.json" />
81-
<WindowsProfiles Include="profiles\PERF-NETWORK-CTSTRAFFIC.json" />
82-
<WindowsProfiles Include="profiles\PERF-NETWORK-2.json" />
83-
<WindowsProfiles Include="profiles\PERF-OPENFOAM.json" />
84-
<WindowsProfiles Include="profiles\PERF-SPECJVM.json" />
85-
<WindowsProfiles Include="profiles\PERF-SPECJBB.json" />
86-
<WindowsProfiles Include="profiles\PERF-SPECCPU-FPSPEED.json" />
87-
<WindowsProfiles Include="profiles\PERF-SPECCPU-FPRATE.json" />
88-
<WindowsProfiles Include="profiles\PERF-SPECCPU-INTSPEED.json" />
89-
<WindowsProfiles Include="profiles\PERF-SPECCPU-INTRATE.json" />
90-
<WindowsProfiles Include="profiles\POWER-SPEC30.json" />
91-
<WindowsProfiles Include="profiles\POWER-SPEC50.json" />
92-
<WindowsProfiles Include="profiles\POWER-SPEC70.json" />
93-
<WindowsProfiles Include="profiles\POWER-SPEC100.json" />
94-
<WindowsProfiles Include="profiles\SETUP-AMD-GPU-DRIVER.json" />
95-
</ItemGroup>
96-
97-
<ItemGroup>
98-
<!--
99-
Linux-specific Profiles
100-
The following profiles run on Linux and will be published to the VirtualClient
101-
NuGet package in the /content/linux-x64|linux-arm64/profiles folder.
102-
-->
103-
<LinuxProfiles Include="profiles\GET-STARTED-OPENSSL.json" />
104-
<LinuxProfiles Include="profiles\GET-STARTED-REDIS.json" />
105-
<LinuxProfiles Include="profiles\BOOTSTRAP-DEPENDENCIES.json" />
106-
<LinuxProfiles Include="profiles\PERF-ASPNETBENCH.json" />
107-
<LinuxProfiles Include="profiles\PERF-COMPRESSION.json" />
108-
<LinuxProfiles Include="profiles\PERF-COMPRESSION-LZBENCH.json" />
109-
<LinuxProfiles Include="profiles\PERF-CPU-COREMARK.json" />
110-
<LinuxProfiles Include="profiles\PERF-CPU-COREMARKPRO.json" />
111-
<LinuxProfiles Include="profiles\PERF-CPU-HPCG.json" />
112-
<LinuxProfiles Include="profiles\PERF-CPU-HPLINPACK.json" />
113-
<LinuxProfiles Include="profiles\PERF-CPU-GEEKBENCH.json" />
114-
<LinuxProfiles Include="profiles\PERF-CPU-OPENSSL.json" />
115-
<LinuxProfiles Include="profiles\PERF-CPU-PRIME95.json" />
116-
<LinuxProfiles Include="profiles\PERF-GPU-SUPERBENCH.json" />
117-
<LinuxProfiles Include="profiles\PERF-GPU-SUPERBENCH-NVIDIA.json" />
118-
<LinuxProfiles Include="profiles\PERF-GPU-MLPERF.json" />
119-
<LinuxProfiles Include="profiles\PERF-GPU-MLPERF-NVIDIA.json" />
120-
<LinuxProfiles Include="profiles\PERF-GRAPH500.json" />
121-
<LinuxProfiles Include="profiles\PERF-HPC-NASPARALLELBENCH.json" />
122-
<LinuxProfiles Include="profiles\PERF-IO-FIO.json" />
123-
<LinuxProfiles Include="profiles\PERF-IO-FIO-DISCOVERY.json" />
124-
<LinuxProfiles Include="profiles\PERF-IO-FIO-MULTITHROUGHPUT.json" />
125-
<LinuxProfiles Include="profiles\PERF-CPU-LAPACK.json" />
126-
<LinuxProfiles Include="profiles\PERF-SPECCPU-FPSPEED.json" />
127-
<LinuxProfiles Include="profiles\PERF-SPECCPU-FPRATE.json" />
128-
<LinuxProfiles Include="profiles\PERF-SPECCPU-INTSPEED.json" />
129-
<LinuxProfiles Include="profiles\PERF-SPECCPU-INTRATE.json" />
130-
<LinuxProfiles Include="profiles\PERF-STRESSNG.json" />
131-
<LinuxProfiles Include="profiles\PERF-MEM-LMBENCH.json" />
132-
<LinuxProfiles Include="profiles\PERF-MEM-STRESSAPPTEST.json" />
133-
<LinuxProfiles Include="profiles\PERF-SQL-POSTGRESQL.json" />
134-
<LinuxProfiles Include="profiles\PERF-MYSQL-SYSBENCH-OLTP.json" />
135-
<LinuxProfiles Include="profiles\PERF-REDIS.json" />
136-
<LinuxProfiles Include="profiles\PERF-MEMCACHED.json" />
137-
<LinuxProfiles Include="profiles\PERF-NETWORK-PING.json" />
138-
<LinuxProfiles Include="profiles\PERF-NETWORK.json" />
139-
<LinuxProfiles Include="profiles\PERF-NETWORK-DEATHSTARBENCH.json" />
140-
<LinuxProfiles Include="profiles\PERF-NETWORK-2.json" />
141-
<LinuxProfiles Include="profiles\PERF-SPECJBB.json" />
142-
<LinuxProfiles Include="profiles\PERF-SPECJVM.json" />
143-
<LinuxProfiles Include="profiles\PERF-OPENFOAM.json" />
144-
<LinuxProfiles Include="profiles\POWER-SPEC30.json" />
145-
<LinuxProfiles Include="profiles\POWER-SPEC50.json" />
146-
<LinuxProfiles Include="profiles\POWER-SPEC70.json" />
147-
<LinuxProfiles Include="profiles\POWER-SPEC100.json" />
148-
<LinuxProfiles Include="profiles\SETUP-AMD-GPU-DRIVER.json" />
149-
<LinuxProfiles Include="profiles\QUAL-GPU-DCGMI.json" />
150-
</ItemGroup>
151-
152-
<ItemGroup>
153-
<MonitorProfiles Include="profiles\MONITORS-DEFAULT.json" />
154-
<MonitorProfiles Include="profiles\MONITORS-FILE-UPLOAD.json" />
155-
<MonitorProfiles Include="profiles\MONITORS-GPU-NVIDIA.json" />
156-
<MonitorProfiles Include="profiles\MONITORS-NONE.json" />
157-
</ItemGroup>
158-
54+
15955
<ItemGroup>
16056
<Folder Include="Properties\" />
16157
</ItemGroup>
16258

16359
<Target Name="PublishProfiles" AfterTargets="Publish">
164-
<Message Importance="high" Text="RuntimeIdentifier = $(RuntimeIdentifier)" />
165-
166-
<!-- Windows-supported workload profiles -->
167-
<Copy Condition="'$(RuntimeIdentifier)' == 'win-x64' or '$(RuntimeIdentifier)' == 'win-arm64'" SourceFiles="@(WindowsProfiles)" DestinationFiles="@(WindowsProfiles->'$(OutputPath)publish\profiles\%(Filename)%(Extension)')" />
168-
169-
<!-- Linux-supported workload profiles -->
170-
<Copy Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'" SourceFiles="@(LinuxProfiles)" DestinationFiles="@(LinuxProfiles->'$(OutputPath)publish\profiles\%(Filename)%(Extension)')" />
171-
172-
<!-- Monitoring profiles -->
173-
<Copy SourceFiles="@(MonitorProfiles)" DestinationFiles="@(MonitorProfiles->'$(OutputPath)publish\profiles\%(Filename)%(Extension)')" />
60+
<ItemGroup>
61+
<ProfileFiles Include="profiles\*.json" />
62+
</ItemGroup>
63+
<Copy SourceFiles="@(ProfileFiles)" DestinationFiles="@(ProfileFiles->'$(OutputPath)publish\profiles\%(Filename)%(Extension)')" />
17464
</Target>
17565

17666
<!--

0 commit comments

Comments
 (0)