Skip to content

Commit

Permalink
Merge branch 'main' into wps2
Browse files Browse the repository at this point in the history
  • Loading branch information
@vicancy
vicancy authored Mar 12, 2024
2 parents 9fd6a9d + c1f59e5 commit 33aae24
Show file tree
Hide file tree
Showing 494 changed files with 12,690 additions and 6,429 deletions.
56 changes: 40 additions & 16 deletions Aspire.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,13 +273,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureStorageEndToEnd.AppHos
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureStorageEndToEnd.ApiService", "playground\AzureStorageEndToEnd\AzureStorageEndToEnd.ApiService\AzureStorageEndToEnd.ApiService.csproj", "{921CB408-5E37-4354-B4CF-EAE517F633DC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.NATS.Net.Tests", "tests\Aspire.NATS.Net.Tests\Aspire.NATS.Net.Tests.csproj", "{C774BE00-EE93-4148-B866-8F0F2BA1E473}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.NATS.Net.Tests", "tests\Aspire.NATS.Net.Tests\Aspire.NATS.Net.Tests.csproj", "{C774BE00-EE93-4148-B866-8F0F2BA1E473}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Dashboard.Components.Tests", "tests\Aspire.Dashboard.Components.Tests\Aspire.Dashboard.Components.Tests.csproj", "{0870A667-FB0C-4758-AEAF-9E5F092AD7C1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nats.Backend", "playground\nats\Nats.Backend\Nats.Backend.csproj", "{C4833DEC-0A4F-4504-B8D0-06C60B84119C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nats.Backend", "playground\nats\Nats.Backend\Nats.Backend.csproj", "{C4833DEC-0A4F-4504-B8D0-06C60B84119C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Nats.Common", "playground\nats\Nats.Common\Nats.Common.csproj", "{9CA94707-E801-444F-A582-D5BD0104CF9B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Nats.Common", "playground\nats\Nats.Common\Nats.Common.csproj", "{9CA94707-E801-444F-A582-D5BD0104CF9B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Testing", "Testing", "{A7C6452C-FEDB-4883-9AE7-29892D260AA3}"
EndProject
Expand Down Expand Up @@ -319,15 +319,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProxylessEndToEnd.ApiServic
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProxylessEndToEnd.AppHost", "playground\ProxylessEndToEnd\ProxylessEndToEnd.AppHost\ProxylessEndToEnd.AppHost.csproj", "{0244203D-7491-4414-9C88-10BFED9C5B2D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.Seq", "src\Components\Aspire.Seq\Aspire.Seq.csproj", "{42F560BA-BEB0-4A95-B673-5E50BF3EFB5E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.Seq", "src\Components\Aspire.Seq\Aspire.Seq.csproj", "{42F560BA-BEB0-4A95-B673-5E50BF3EFB5E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Seq.ServiceDefaults", "playground\seq\Seq.ServiceDefaults\Seq.ServiceDefaults.csproj", "{E785C7A8-F8A3-49D6-9600-9D8E10FB5624}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Seq.ServiceDefaults", "playground\seq\Seq.ServiceDefaults\Seq.ServiceDefaults.csproj", "{E785C7A8-F8A3-49D6-9600-9D8E10FB5624}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "seq", "seq", "{78117273-982B-46F2-BA69-402C42294335}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Seq.ApiService", "playground\seq\Seq.ApiService\Seq.ApiService.csproj", "{CE25EF01-58F6-49C8-A5ED-292489DD9E62}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Seq.ApiService", "playground\seq\Seq.ApiService\Seq.ApiService.csproj", "{CE25EF01-58F6-49C8-A5ED-292489DD9E62}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Seq.AppHost", "playground\seq\Seq.AppHost\Seq.AppHost.csproj", "{D30ED884-BAB5-4FE7-9E78-C66411050F7B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Seq.AppHost", "playground\seq\Seq.AppHost\Seq.AppHost.csproj", "{D30ED884-BAB5-4FE7-9E78-C66411050F7B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cdk", "cdk", "{C3F48531-87D9-4E52-90AC-715A3E55751A}"
EndProject
Expand All @@ -349,6 +349,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebPubSubAppHost", "playgro
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebPubSubWeb", "playground\webpubsub\WebPubSubWeb\WebPubSubWeb.csproj", "{B1EB813D-1CAA-406F-9786-756939B7232C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Stress", "Stress", "{CFDA7AC5-251C-43C7-B334-71AE8040A147}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stress.AppHost", "playground\Stress\Stress.AppHost\Stress.AppHost.csproj", "{A74C1916-231A-410A-B718-A0E7BDB1DD7F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stress.TelemetryService", "playground\Stress\Stress.TelemetryService\Stress.TelemetryService.csproj", "{9114FFB4-328C-43FC-B2E4-EB6A16659113}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stress.ApiService", "playground\Stress\Stress.ApiService\Stress.ApiService.csproj", "{1167077B-F696-4A1C-BB0B-6EF70D530BB8}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -863,14 +871,6 @@ Global
{0244203D-7491-4414-9C88-10BFED9C5B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0244203D-7491-4414-9C88-10BFED9C5B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0244203D-7491-4414-9C88-10BFED9C5B2D}.Release|Any CPU.Build.0 = Release|Any CPU
{A357411A-5909-4A49-9519-12A935F84395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A357411A-5909-4A49-9519-12A935F84395}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A357411A-5909-4A49-9519-12A935F84395}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A357411A-5909-4A49-9519-12A935F84395}.Release|Any CPU.Build.0 = Release|Any CPU
{4601F5A2-E445-41B2-9C1F-2CE016642E62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4601F5A2-E445-41B2-9C1F-2CE016642E62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4601F5A2-E445-41B2-9C1F-2CE016642E62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4601F5A2-E445-41B2-9C1F-2CE016642E62}.Release|Any CPU.Build.0 = Release|Any CPU
{42F560BA-BEB0-4A95-B673-5E50BF3EFB5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{42F560BA-BEB0-4A95-B673-5E50BF3EFB5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42F560BA-BEB0-4A95-B673-5E50BF3EFB5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -887,6 +887,14 @@ Global
{D30ED884-BAB5-4FE7-9E78-C66411050F7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D30ED884-BAB5-4FE7-9E78-C66411050F7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D30ED884-BAB5-4FE7-9E78-C66411050F7B}.Release|Any CPU.Build.0 = Release|Any CPU
{A357411A-5909-4A49-9519-12A935F84395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A357411A-5909-4A49-9519-12A935F84395}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A357411A-5909-4A49-9519-12A935F84395}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A357411A-5909-4A49-9519-12A935F84395}.Release|Any CPU.Build.0 = Release|Any CPU
{4601F5A2-E445-41B2-9C1F-2CE016642E62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4601F5A2-E445-41B2-9C1F-2CE016642E62}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4601F5A2-E445-41B2-9C1F-2CE016642E62}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4601F5A2-E445-41B2-9C1F-2CE016642E62}.Release|Any CPU.Build.0 = Release|Any CPU
{4231B6F1-1110-4992-A727-8F1176A47440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4231B6F1-1110-4992-A727-8F1176A47440}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4231B6F1-1110-4992-A727-8F1176A47440}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -929,6 +937,18 @@ Global
{D30ED884-BAB5-4FE7-9E78-C66411050F7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E785C7A8-F8A3-49D6-9600-9D8E10FB5624}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E785C7A8-F8A3-49D6-9600-9D8E10FB5624}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A74C1916-231A-410A-B718-A0E7BDB1DD7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A74C1916-231A-410A-B718-A0E7BDB1DD7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A74C1916-231A-410A-B718-A0E7BDB1DD7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A74C1916-231A-410A-B718-A0E7BDB1DD7F}.Release|Any CPU.Build.0 = Release|Any CPU
{9114FFB4-328C-43FC-B2E4-EB6A16659113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9114FFB4-328C-43FC-B2E4-EB6A16659113}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9114FFB4-328C-43FC-B2E4-EB6A16659113}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9114FFB4-328C-43FC-B2E4-EB6A16659113}.Release|Any CPU.Build.0 = Release|Any CPU
{1167077B-F696-4A1C-BB0B-6EF70D530BB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1167077B-F696-4A1C-BB0B-6EF70D530BB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1167077B-F696-4A1C-BB0B-6EF70D530BB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1167077B-F696-4A1C-BB0B-6EF70D530BB8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1082,8 +1102,8 @@ Global
{51654CD7-2E05-4664-B2EB-95308A300609} = {9C30FFD6-2262-45E7-B010-24B30E0433C2}
{0244203D-7491-4414-9C88-10BFED9C5B2D} = {9C30FFD6-2262-45E7-B010-24B30E0433C2}
{42F560BA-BEB0-4A95-B673-5E50BF3EFB5E} = {27381127-6C45-4B4C-8F18-41FF48DFE4B2}
{78117273-982B-46F2-BA69-402C42294335} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{E785C7A8-F8A3-49D6-9600-9D8E10FB5624} = {78117273-982B-46F2-BA69-402C42294335}
{78117273-982B-46F2-BA69-402C42294335} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{CE25EF01-58F6-49C8-A5ED-292489DD9E62} = {78117273-982B-46F2-BA69-402C42294335}
{D30ED884-BAB5-4FE7-9E78-C66411050F7B} = {78117273-982B-46F2-BA69-402C42294335}
{C3F48531-87D9-4E52-90AC-715A3E55751A} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
Expand All @@ -1096,6 +1116,10 @@ Global
{90A70EFA-F26A-49E0-A375-DB461E4E0E25} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{36B782B3-9515-4AF0-BDB1-52062CECF6FD} = {90A70EFA-F26A-49E0-A375-DB461E4E0E25}
{B1EB813D-1CAA-406F-9786-756939B7232C} = {90A70EFA-F26A-49E0-A375-DB461E4E0E25}
{CFDA7AC5-251C-43C7-B334-71AE8040A147} = {D173887B-AF42-4576-B9C1-96B9E9B3D9C0}
{A74C1916-231A-410A-B718-A0E7BDB1DD7F} = {CFDA7AC5-251C-43C7-B334-71AE8040A147}
{9114FFB4-328C-43FC-B2E4-EB6A16659113} = {CFDA7AC5-251C-43C7-B334-71AE8040A147}
{1167077B-F696-4A1C-BB0B-6EF70D530BB8} = {CFDA7AC5-251C-43C7-B334-71AE8040A147}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6DCEDFEC-988E-4CB3-B45B-191EB5086E0C}
Expand Down
15 changes: 9 additions & 6 deletions Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<Import Project="eng/Versions.props" Condition="'$(MajorVersion)' == '' and Exists('eng/Versions.props')"/>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<TestcontainersPackageVersion>3.7.0</TestcontainersPackageVersion>
</PropertyGroup>
<ItemGroup>
<!-- Azure SDK for .NET dependencies -->
Expand All @@ -23,10 +24,10 @@
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.2" />
<!-- Azure Management SDK for .NET dependencies -->
<PackageVersion Include="Azure.ResourceManager" Version="1.11.0-alpha.20240222.6" />
<PackageVersion Include="Azure.ResourceManager.Authorization" Version="1.2.0-alpha.20240227.2" />
<PackageVersion Include="Azure.ResourceManager.KeyVault" Version="1.3.0-alpha.20240222.2" />
<PackageVersion Include="Azure.ResourceManager.Resources" Version="1.8.0-alpha.20240222.2" />
<PackageVersion Include="Azure.Provisioning" Version="1.0.0-alpha.20240305.3" />
<PackageVersion Include="Azure.ResourceManager.Authorization" Version="1.2.0-alpha.20240309.1" />
<PackageVersion Include="Azure.ResourceManager.KeyVault" Version="1.3.0-alpha.20240310.2" />
<PackageVersion Include="Azure.ResourceManager.Resources" Version="1.8.0-alpha.20240309.1" />
<PackageVersion Include="Azure.Provisioning" Version="1.0.0-alpha.20240311.2" />
<!-- ASP.NET Core dependencies -->
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(MicrosoftAspNetCoreOpenApiPackageVersion)" />
<PackageVersion Include="Microsoft.AspNetCore.OutputCaching.StackExchangeRedis" Version="$(MicrosoftAspNetCoreOutputCachingStackExchangeRedisPackageVersion)" />
Expand Down Expand Up @@ -75,13 +76,14 @@
<PackageVersion Include="Dapper" Version="2.1.28" />
<PackageVersion Include="Dapr.AspNetCore" Version="1.12.0" />
<PackageVersion Include="DnsClient" Version="1.7.0" />
<PackageVersion Include="Google.Protobuf" Version="3.24.0" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.60.0" />
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.60.0" />
<PackageVersion Include="Grpc.Tools" Version="2.61.0" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="KubernetesClient" Version="13.0.11" />
<PackageVersion Include="JsonSchema.Net" Version="6.0.4" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.4.2-preview.24065.20" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.5.0" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.2.0" />
<PackageVersion Include="MongoDB.Driver" Version="2.24.0" />
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.4.0" />
Expand Down Expand Up @@ -131,7 +133,8 @@
<PackageVersion Include="bUnit" Version="1.27.17" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsDiagnosticsTestingPackageVersion)" />
<PackageVersion Include="Microsoft.NET.Runtime.WorkloadTesting.Internal" Version="$(MicrosoftNETRuntimeWorkloadTestingInternalVersion)" />
<PackageVersion Include="Testcontainers.RabbitMq" Version="3.7.0" />
<PackageVersion Include="Testcontainers.RabbitMq" Version="$(TestcontainersPackageVersion)" />
<PackageVersion Include="Testcontainers.MongoDb" Version="$(TestcontainersPackageVersion)" />
<!-- Pinned version for Component Governance - Remove when root dependencies are updated -->
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<!-- Introduced by Microsoft.Azure.Cosmos, https://github.com/Azure/azure-cosmos-dotnet-v3/issues/4302 -->
Expand Down
4 changes: 0 additions & 4 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
<add key="azure-sdk-for-net-dev" value="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<!-- used for installing test workloads for resolving aspire workload manifest -->
<packageSource key="nuget-local">
<package pattern="*Aspire*" />
</packageSource>
<packageSource key="dotnet9-transport">
<package pattern="*WorkloadBuildTasks*" />
</packageSource>
Expand Down
Loading

0 comments on commit 33aae24

Please sign in to comment.