move out more shared files from workload testing for use in other pro…

…jects
radical · Jul 16, 2024 · edf4b75 · edf4b75
1 parent 6e07d55
commit edf4b75
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/tests/Aspire.Workload.Tests/Aspire.Workload.Tests.csproj b/tests/Aspire.Workload.Tests/Aspire.Workload.Tests.csproj
@@ -24,9 +24,6 @@
   <ItemGroup>
     <Compile Include="$(RepoRoot)src\Aspire.Hosting.Redis\RedisContainerImageTags.cs" />
 
-    <None Include="data\**\*" CopyToOutputDirectory="PreserveNewest" />
-    <None Include="$(RepoRoot)eng\helix\runtests.*" CopyToOutputDirectory="PreserveNewest" />
-
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
   </ItemGroup>

diff --git a/...estproject/Directory.Packages.Helix.props → ...sting/data/Directory.Packages.Helix.props b/...estproject/Directory.Packages.Helix.props → ...sting/data/Directory.Packages.Helix.props
@@ -1,19 +1,28 @@
 <Project>
-  <PropertyGroup>
-    <_DirectoryPackagesRepoProps>$(MSBuildThisFileDirectory)Directory.Packages.repo.props</_DirectoryPackagesRepoProps>
-  </PropertyGroup>
-  <Import Project="$(_DirectoryPackagesRepoProps)" Condition="Exists($(_DirectoryPackagesRepoProps))" />
+  <Import Project="$(MSBuildThisFileDirectory)Directory.Packages.Versions.props" />
 
-  <ItemGroup>
+  <ItemGroup Label="Aspire packages">
+    <PackageVersion Include="Aspire.Azure.AI.OpenAI" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Azure.Data.Tables" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Azure.Messaging.EventHubs" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Azure.Messaging.ServiceBus" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Azure.Messaging.WebPubSub" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Azure.Search.Documents" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Azure.Security.KeyVault" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Azure.Storage.Blobs" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Azure.Storage.Queues" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Confluent.Kafka" Version="$(PackageVersion)" />
+
+    <PackageVersion Include="Aspire.Hosting" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Hosting.AWS" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.AppConfiguration" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.ApplicationInsights" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.CognitiveServices" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.CosmosDB" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.EventHubs" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Azure.KeyVault" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.OperationalInsights" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.PostgreSQL" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.Redis" Version="$(PackageVersion)" />
@@ -22,6 +31,8 @@
     <PackageVersion Include="Aspire.Hosting.Azure.SignalR" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.Sql" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Azure.WebPubSub" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Dapr" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Garnet" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Kafka" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Milvus" Version="$(PackageVersion)" />
@@ -30,24 +41,40 @@
     <PackageVersion Include="Aspire.Hosting.Nats" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.NodeJs" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Oracle" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Orleans" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Python" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Qdrant" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Redis" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Sdk" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Seq" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.SqlServer" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Hosting.Testing" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Hosting.Valkey" Version="$(PackageVersion)" />
+
     <PackageVersion Include="Aspire.Microsoft.Azure.Cosmos" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Microsoft.Data.SqlClient" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.Cosmos" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Microsoft.EntityFrameworkCore.SqlServer" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Milvus.Client" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.MongoDB.Driver" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.MySqlConnector" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.NATS.Net" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Npgsql" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Oracle.EntityFrameworkCore" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.Pomelo.EntityFrameworkCore.MySql" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Qdrant.Client" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.RabbitMQ.Client" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.Seq" Version="$(PackageVersion)" />
     <PackageVersion Include="Aspire.StackExchange.Redis" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.StackExchange.Redis.DistributedCaching" Version="$(PackageVersion)" />
+    <PackageVersion Include="Aspire.StackExchange.Redis.OutputCaching" Version="$(PackageVersion)" />
+
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(PackageVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Abstractions" Version="$(PackageVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Dns" Version="$(PackageVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery.Yarp" Version="$(PackageVersion)" />
   </ItemGroup>
 </Project>
diff --git a/.../Aspire.Workload.Tests/data/nuget8.config → ...Shared/WorkloadTesting/data/nuget8.config b/.../Aspire.Workload.Tests/data/nuget8.config → ...Shared/WorkloadTesting/data/nuget8.config
@@ -8,6 +8,7 @@
     <clear />
     <add key="built-local" value="%BUILT_NUGETS_PATH%" />
     <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
+    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>