Skip to content

Commit de20fcf

Browse files
author
Rakeshwar Reddy Kambaiahgari
committed
Merge upstream/main: resolve delete/modify conflict on aspnetbench-prof
iles.md
2 parents de92136 + 08d1fc1 commit de20fcf

179 files changed

Lines changed: 5971 additions & 1914 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Directory.Packages.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
3434
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
3535
<PackageVersion Include="System.Diagnostics.EventLog" Version="9.0.9" />
36+
<PackageVersion Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
3637
<PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="9.0.9" />
3738
<PackageVersion Include="System.IO.Abstractions" Version="22.0.14" />
3839
<PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.3
1+
3.0.14

website/docs/workloads/mlperf/mlperf-developer-guide.md renamed to src/VirtualClient/Archive/Docs/mlperf/mlperf-developer-guide.md

File renamed without changes.

website/docs/workloads/mlperf/mlperf-profiles.md renamed to src/VirtualClient/Archive/Docs/mlperf/mlperf-profiles.md

File renamed without changes.

website/docs/workloads/mlperf/mlperf-trainining-bert-preprocessing-data.md renamed to src/VirtualClient/Archive/Docs/mlperf/mlperf-trainining-bert-preprocessing-data.md

File renamed without changes.

website/docs/workloads/mlperf/mlperf.md renamed to src/VirtualClient/Archive/Docs/mlperf/mlperf.md

File renamed without changes.

src/VirtualClient/VirtualClient.Main/profiles/PERF-GPU-MLPERF-NVIDIA.json renamed to src/VirtualClient/Archive/Profiles/PERF-GPU-MLPERF-NVIDIA.json

File renamed without changes.

src/VirtualClient/VirtualClient.Main/profiles/PERF-GPU-MLPERF-TRAINING-NVIDIA.json renamed to src/VirtualClient/Archive/Profiles/PERF-GPU-MLPERF-TRAINING-NVIDIA.json

File renamed without changes.

src/VirtualClient/VirtualClient.Main/profiles/PERF-GPU-MLPERF.json renamed to src/VirtualClient/Archive/Profiles/PERF-GPU-MLPERF.json

File renamed without changes.

src/VirtualClient/VirtualClient.Main/profiles/PERF-GPU-SUPERBENCH-NVIDIA.json renamed to src/VirtualClient/Archive/Profiles/PERF-GPU-SUPERBENCH-NVIDIA.json

File renamed without changes.

0 commit comments

Comments
 (0)