Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/sdk_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ jobs:
NUPKG_OUTDIR: bin/Release/nugets
steps:
- uses: actions/checkout@v1
with:
clean: true
- name: Parse release version
run: python ./.github/scripts/get_release_version.py
- name: Setup .NET Core
uses: actions/setup-dotnet@v3
with:
dotnet-version: 9.0.x
dotnet-version: 10.0.x
dotnet-quality: 'ga'
- name: Restore dependencies
run: dotnet restore
Expand Down
14 changes: 7 additions & 7 deletions all.sln
Original file line number Diff line number Diff line change
Expand Up @@ -221,9 +221,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "new", "new", "{8462B106-175
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapr.Workflow.Abstractions", "src\Dapr.Workflow.Abstractions\Dapr.Workflow.Abstractions.csproj", "{CE5D4439-5B3C-4E97-B7E3-EB8610AEA3EF}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapr.TestContainers", "src\Dapr.TestContainers\Dapr.TestContainers.csproj", "{A05D1519-6A82-498F-B7C9-3D14E08D35CA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapr.Testcontainers", "src\Dapr.Testcontainers\Dapr.Testcontainers.csproj", "{A05D1519-6A82-498F-B7C9-3D14E08D35CA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapr.TestContainers.Test", "test\Dapr.TestContainers.Test\Dapr.TestContainers.Test.csproj", "{D410F7FA-BAB7-4B13-9A9D-8531FCA932AA}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dapr.Testcontainers.Test", "test\Dapr.Testcontainers.Test\Dapr.Testcontainers.Test.csproj", "{5A93F96B-4D0E-479D-B540-29678A0998FA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -587,10 +587,10 @@ Global
{A05D1519-6A82-498F-B7C9-3D14E08D35CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A05D1519-6A82-498F-B7C9-3D14E08D35CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A05D1519-6A82-498F-B7C9-3D14E08D35CA}.Release|Any CPU.Build.0 = Release|Any CPU
{D410F7FA-BAB7-4B13-9A9D-8531FCA932AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D410F7FA-BAB7-4B13-9A9D-8531FCA932AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D410F7FA-BAB7-4B13-9A9D-8531FCA932AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D410F7FA-BAB7-4B13-9A9D-8531FCA932AA}.Release|Any CPU.Build.0 = Release|Any CPU
{5A93F96B-4D0E-479D-B540-29678A0998FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5A93F96B-4D0E-479D-B540-29678A0998FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5A93F96B-4D0E-479D-B540-29678A0998FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5A93F96B-4D0E-479D-B540-29678A0998FA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -699,7 +699,7 @@ Global
{FB21FAC7-09F7-4F68-910C-224EE7150B35} = {8462B106-175A-423A-BA94-BE0D39D0BD8E}
{CE5D4439-5B3C-4E97-B7E3-EB8610AEA3EF} = {27C5D71D-0721-4221-9286-B94AB07B58CF}
{A05D1519-6A82-498F-B7C9-3D14E08D35CA} = {27C5D71D-0721-4221-9286-B94AB07B58CF}
{D410F7FA-BAB7-4B13-9A9D-8531FCA932AA} = {0AF0FE8D-C234-4F04-8514-32206ACE01BD}
{5A93F96B-4D0E-479D-B540-29678A0998FA} = {0AF0FE8D-C234-4F04-8514-32206ACE01BD}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {65220BF2-EAE1-4CB2-AA58-EBE80768CB40}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@

using System;
using System.Threading.Tasks;
using Dapr.TestContainers.Common.Options;
using Dapr.TestContainers.Common.Testing;
using Dapr.TestContainers.Harnesses;
using Dapr.Testcontainers.Common.Options;
using Dapr.Testcontainers.Common.Testing;
using Dapr.Testcontainers.Harnesses;

namespace Dapr.TestContainers.Common;
namespace Dapr.Testcontainers.Common;

/// <summary>
/// Builds the Dapr harnesses for different building blocks.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// limitations under the License.
// ------------------------------------------------------------------------

namespace Dapr.TestContainers.Common;
namespace Dapr.Testcontainers.Common;

/// <summary>
/// A hostname and port value pair.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using System.Threading;
using System.Threading.Tasks;

namespace Dapr.TestContainers.Common;
namespace Dapr.Testcontainers.Common;

/// <summary>
/// Represents a harness that's created for test purposes.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using System.Threading;
using System.Threading.Tasks;

namespace Dapr.TestContainers.Common;
namespace Dapr.Testcontainers.Common;

/// <summary>
/// Represents a resource that can be started and stopped.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// limitations under the License.
// ------------------------------------------------------------------------

namespace Dapr.TestContainers.Common.Options;
namespace Dapr.Testcontainers.Common.Options;

/// <summary>
/// A configurable log level.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

using System;

namespace Dapr.TestContainers.Common.Options;
namespace Dapr.Testcontainers.Common.Options;

/// <summary>
/// The various options used to spin up the Dapr containers.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
using System.Net;
using System.Net.Sockets;

namespace Dapr.TestContainers.Common;
namespace Dapr.Testcontainers.Common;

/// <summary>
/// Provides port-related utilities.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
using System.IO;
using System.Runtime.InteropServices;

namespace Dapr.TestContainers.Common;
namespace Dapr.Testcontainers.Common;

/// <summary>
/// Provides test directory management utilities.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@

using System;
using System.Threading.Tasks;
using Dapr.TestContainers.Harnesses;
using Dapr.Testcontainers.Harnesses;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;

namespace Dapr.TestContainers.Common.Testing;
namespace Dapr.Testcontainers.Common.Testing;

/// <summary>
/// Represents a running Dapr test application.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Dapr.TestContainers.Harnesses;
using Dapr.Testcontainers.Harnesses;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;

namespace Dapr.TestContainers.Common.Testing;
namespace Dapr.Testcontainers.Common.Testing;

/// <summary>
/// Fluent builder for creating test applications with Dapr harnesses.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// limitations under the License.
// ------------------------------------------------------------------------

namespace Dapr.TestContainers.Configuration;
namespace Dapr.Testcontainers.Configuration;

/// <summary>
/// Base Dapr configuration settings.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// limitations under the License.
// ------------------------------------------------------------------------

namespace Dapr.TestContainers.Configuration;
namespace Dapr.Testcontainers.Configuration;

/// <summary>
/// Configuration settings for OTEL tracing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using System.Linq;
using System.Text;

namespace Dapr.TestContainers.Configuration;
namespace Dapr.Testcontainers.Configuration;

/// <summary>
/// Builds out a collection of secret scopes to the Dapr configuration.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// limitations under the License.
// ------------------------------------------------------------------------

namespace Dapr.TestContainers.Configuration;
namespace Dapr.Testcontainers.Configuration;

/// <summary>
/// Configuration settings for Zipkin tracing.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// limitations under the License.
// ------------------------------------------------------------------------

namespace Dapr.TestContainers;
namespace Dapr.Testcontainers;

/// <summary>
/// Various constants used throughout the project.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
using System.Collections.Generic;
using System.Linq;

namespace Dapr.TestContainers.Containers.Components;
namespace Dapr.Testcontainers.Containers.Components;

/// <summary>
/// Represents a Dapr component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
// limitations under the License.
// ------------------------------------------------------------------------

namespace Dapr.TestContainers.Containers.Components;
namespace Dapr.Testcontainers.Containers.Components;

/// <summary>
/// Provides the name and value for a metadata record in a component.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Dapr.TestContainers.Common;
using Dapr.TestContainers.Common.Options;
using Dapr.Testcontainers.Common;
using Dapr.Testcontainers.Common.Options;
using DotNet.Testcontainers.Builders;
using DotNet.Testcontainers.Containers;
using DotNet.Testcontainers.Networks;

namespace Dapr.TestContainers.Containers.Dapr;
namespace Dapr.Testcontainers.Containers.Dapr;

/// <summary>
/// The container for the Dapr placement service.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using Dapr.TestContainers.Common;
using Dapr.TestContainers.Common.Options;
using Dapr.Testcontainers.Common;
using Dapr.Testcontainers.Common.Options;
using DotNet.Testcontainers.Builders;
using DotNet.Testcontainers.Configurations;
using DotNet.Testcontainers.Containers;
using DotNet.Testcontainers.Networks;

namespace Dapr.TestContainers.Containers.Dapr;
namespace Dapr.Testcontainers.Containers.Dapr;

/// <summary>
/// The container for the Dapr scheduler service.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Dapr.TestContainers.Common;
using Dapr.TestContainers.Common.Options;
using Dapr.Testcontainers.Common;
using Dapr.Testcontainers.Common.Options;
using DotNet.Testcontainers;
using DotNet.Testcontainers.Builders;
using DotNet.Testcontainers.Configurations;
using DotNet.Testcontainers.Containers;
using DotNet.Testcontainers.Networks;

namespace Dapr.TestContainers.Containers.Dapr;
namespace Dapr.Testcontainers.Containers.Dapr;

/// <summary>
/// The container for the Dapr runtime.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

using System.IO;

namespace Dapr.TestContainers.Containers;
namespace Dapr.Testcontainers.Containers;

/// <summary>
/// This is an odd one because it's not actually a container - just the entry point for the YAML file builder.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using Dapr.TestContainers.Common;
using Dapr.Testcontainers.Common;
using DotNet.Testcontainers.Builders;
using DotNet.Testcontainers.Containers;
using DotNet.Testcontainers.Networks;

namespace Dapr.TestContainers.Containers;
namespace Dapr.Testcontainers.Containers;

/// <summary>
/// Provides an Ollama container.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using Dapr.TestContainers.Common;
using Dapr.Testcontainers.Common;
using DotNet.Testcontainers;
using DotNet.Testcontainers.Builders;
using DotNet.Testcontainers.Containers;
using DotNet.Testcontainers.Networks;

namespace Dapr.TestContainers.Containers;
namespace Dapr.Testcontainers.Containers;

/// <summary>
/// Provides a RabbitMQ container.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using Dapr.TestContainers.Common;
using Dapr.Testcontainers.Common;
using DotNet.Testcontainers.Builders;
using DotNet.Testcontainers.Containers;
using DotNet.Testcontainers.Networks;

namespace Dapr.TestContainers.Containers;
namespace Dapr.Testcontainers.Containers;

/// <summary>
/// Provides a Redis container.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Nullable>enable</Nullable>
<PackageId>Dapr.TestContainers</PackageId>
<PackageId>Dapr.Testcontainers</PackageId>
<Title>Dapr TestContainers implementation</Title>
<Description>TestContainers for validating Dapr applications</Description>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Dapr.TestContainers.Common.Options;
using Dapr.TestContainers.Containers;
using Dapr.TestContainers.Containers.Dapr;
using Dapr.Testcontainers.Common.Options;
using Dapr.Testcontainers.Containers;
using Dapr.Testcontainers.Containers.Dapr;

namespace Dapr.TestContainers.Harnesses;
namespace Dapr.Testcontainers.Harnesses;

/// <summary>
/// Provides an implementation harness for Dapr's actor building block.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Dapr.TestContainers.Common;
using Dapr.TestContainers.Common.Options;
using Dapr.TestContainers.Containers.Dapr;
using Dapr.Testcontainers.Common;
using Dapr.Testcontainers.Common.Options;
using Dapr.Testcontainers.Containers.Dapr;
using DotNet.Testcontainers.Networks;

namespace Dapr.TestContainers.Harnesses;
namespace Dapr.Testcontainers.Harnesses;

/// <summary>
/// Provides a base harness for building Dapr building block harnesses.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using Dapr.TestContainers.Common.Options;
using Dapr.TestContainers.Containers;
using Dapr.Testcontainers.Common.Options;
using Dapr.Testcontainers.Containers;

namespace Dapr.TestContainers.Harnesses;
namespace Dapr.Testcontainers.Harnesses;

/// <summary>
/// Provides an implementation harness for conversation functionality.
Expand Down
Loading