-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* #61 : Updated target frameworks, package versions, and method for adding headers Updated the target frameworks across multiple projects to `net8.0` and updated various package versions in `dapr_sidekick_csharp.props`, `ActorSample.ActorClient.csproj`, `ActorSample.DemoActor.csproj`, `ActorSample.IDemoActor.csproj`, `AppConfigurationSample.csproj`, `ConsulSample.Receiver.csproj`, `ConsulSample.Sender.csproj`, `ControllerSample.csproj`, `ServiceInvocationSample.csproj`, `Directory.build.props`, `Man.Dapr.Sidekick.csproj`, `Man.Dapr.Sidekick.AspNetCore.Tests.csproj`, `Man.Dapr.Sidekick.Extensions.Logging.Tests.csproj`, and `Man.Dapr.Sidekick.Tests.csproj`. Also replaced the `Add` method with the `Append` method for adding headers in `HttpContextInvocationHandlerTests.cs`. * #61 : Add Sentry compatibility with Dapr 1.12+, and SentrySample project * #61 : Add Placement compatibility with Dapr 1.12+, and PlacementSample project
- Loading branch information
Showing
57 changed files
with
608 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
samples/Actor/ActorSample/ActorSample.DemoActor/ActorSample.DemoActor.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
samples/Actor/ActorSample/ActorSample.IDemoActor/ActorSample.IDemoActor.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.1</TargetFramework> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Dapr.Actors" Version="1.2.0" /> | ||
| <PackageReference Include="Dapr.Actors" Version="1.13.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
14 changes: 7 additions & 7 deletions
14
...es/AspNetCore/AppConfigurationSample/AppConfigurationSample/AppConfigurationSample.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
samples/AspNetCore/ConsulSample/ConsulSample.Receiver/ConsulSample.Receiver.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 4 additions & 3 deletions
7
samples/AspNetCore/ConsulSample/ConsulSample.Sender/ConsulSample.Sender.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
samples/AspNetCore/ControllerSample/ControllerSample/ControllerSample.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
samples/AspNetCore/PlacementSample/PlacementSample/PlacementSample.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\..\..\..\src\Man.Dapr.Sidekick.AspNetCore\Man.Dapr.Sidekick.AspNetCore.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Update="dapr\**\*.*"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </None> | ||
| <None Update="placement\**\*.*"> | ||
| <CopyToOutputDirectory>Always</CopyToOutputDirectory> | ||
| </None> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
39 changes: 39 additions & 0 deletions
39
samples/AspNetCore/PlacementSample/PlacementSample/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| using Man.Dapr.Sidekick; | ||
| using Serilog; | ||
|
|
||
| // Add Serilog for enhanced console logging. | ||
| Log.Logger = new LoggerConfiguration() | ||
| .Enrich.FromLogContext() | ||
| .WriteTo.Console() | ||
| .CreateLogger(); | ||
|
|
||
| var builder = WebApplication.CreateBuilder(args); | ||
|
|
||
| builder.Services.AddControllers(); | ||
|
|
||
| // Add Dapr Sidekick with Placement | ||
| builder.Services.AddDaprSidekick(builder.Configuration) | ||
| .AddPlacement(); | ||
|
|
||
| builder.Host.UseSerilog(); | ||
|
|
||
| var app = builder.Build(); | ||
|
|
||
| app.MapGet("/status", (IDaprSidecarHost sidecarHost, IDaprPlacementHost placementHost) => Results.Ok(new | ||
| { | ||
| sidecar = new | ||
| { | ||
| process = sidecarHost.GetProcessInfo(), // Information about the sidecar process such as if it is running | ||
| options = sidecarHost.GetProcessOptions() // The sidecar options if running, including ports and locations | ||
| }, | ||
| placement = new | ||
| { | ||
| process = placementHost.GetProcessInfo(), // Information about the sentry process such as if it is running | ||
| options = placementHost.GetProcessOptions() // The sentry options if running, including ports and locations | ||
| }, | ||
| })); | ||
|
|
||
| // For Dapr | ||
| app.MapHealthChecks("/health"); | ||
|
|
||
| app.Run(); |
13 changes: 13 additions & 0 deletions
13
samples/AspNetCore/PlacementSample/PlacementSample/Properties/launchSettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "profiles": { | ||
| "PlacementSample": { | ||
| "commandName": "Project", | ||
| "launchBrowser": true, | ||
| "launchUrl": "status", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| }, | ||
| "applicationUrl": "http://localhost:5000" | ||
| } | ||
| } | ||
| } |
8 changes: 8 additions & 0 deletions
8
samples/AspNetCore/PlacementSample/PlacementSample/appsettings.Development.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| { | ||
| "Logging": { | ||
| "LogLevel": { | ||
| "Default": "Information", | ||
| "Microsoft.AspNetCore": "Warning" | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.