diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index f41e785..2eb4dd3 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -12,14 +12,14 @@ jobs: packages: read steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup CodeQL uses: github/codeql-action/init@v3 with: languages: csharp build-mode: none - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 8.0.x diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 85789eb..3580fd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: dotnet-version: | 8.0.x diff --git a/Directory.Build.props b/Directory.Build.props index e8751a4..406c9c5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,7 +9,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/examples/Aspire.AppHost/Examples.Aspire.AppHost.csproj b/examples/Aspire.AppHost/Examples.Aspire.AppHost.csproj index c8d6d49..e2bd918 100644 --- a/examples/Aspire.AppHost/Examples.Aspire.AppHost.csproj +++ b/examples/Aspire.AppHost/Examples.Aspire.AppHost.csproj @@ -8,9 +8,9 @@ true true - + - + diff --git a/examples/Aspire.AppHost/Program.cs b/examples/Aspire.AppHost/Program.cs index 55482d1..27c2ace 100644 --- a/examples/Aspire.AppHost/Program.cs +++ b/examples/Aspire.AppHost/Program.cs @@ -5,17 +5,19 @@ // Add example website. var website = builder.AddProject("Website", options => -{ - // Do not use endpoint configuration found in the Website project. We let aspire set up everything. - options.ExcludeLaunchProfile = true; - options.ExcludeKestrelEndpoints = true; -}) + { + // Do not use endpoint configuration found in the Website project. We let aspire set up everything. + options.ExcludeLaunchProfile = true; + options.ExcludeKestrelEndpoints = true; + }) // Add a HTTP endpoint. The reverse proxy will set up a secure HTTPS endpoint for you to connect to this resource. .WithHttpEndpoint(); // Add reverse proxy website. var reverseProxy = builder .AddProject("Reverse-Proxy") + // Configure reverse proxy to use https on port 443. + .WithHttpsEndpoint(443) // Map a host name to the endpoint of the example website. .WithReverseProxyReference("Website", website.GetEndpoint("http"), "example-website.local"); diff --git a/examples/Aspire.ReverseProxy/Examples.Aspire.ReverseProxy.csproj b/examples/Aspire.ReverseProxy/Examples.Aspire.ReverseProxy.csproj index c3f90a2..b5f8ae7 100644 --- a/examples/Aspire.ReverseProxy/Examples.Aspire.ReverseProxy.csproj +++ b/examples/Aspire.ReverseProxy/Examples.Aspire.ReverseProxy.csproj @@ -3,6 +3,7 @@ net9.0 true + true diff --git a/examples/Aspire.ReverseProxy/Properties/launchSettings.json b/examples/Aspire.ReverseProxy/Properties/launchSettings.json deleted file mode 100644 index b2838f7..0000000 --- a/examples/Aspire.ReverseProxy/Properties/launchSettings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", - "profiles": { - "https": { - "commandName": "Project", - "applicationUrl": "https://localhost:443" - } - } -} diff --git a/examples/Aspire.ServiceDefaults/Examples.Aspire.ServiceDefaults.csproj b/examples/Aspire.ServiceDefaults/Examples.Aspire.ServiceDefaults.csproj index ddd82c9..a3c2d57 100644 --- a/examples/Aspire.ServiceDefaults/Examples.Aspire.ServiceDefaults.csproj +++ b/examples/Aspire.ServiceDefaults/Examples.Aspire.ServiceDefaults.csproj @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/examples/Aspire.Website/Examples.Aspire.Website.csproj b/examples/Aspire.Website/Examples.Aspire.Website.csproj index cb2d44b..f1ba4cc 100644 --- a/examples/Aspire.Website/Examples.Aspire.Website.csproj +++ b/examples/Aspire.Website/Examples.Aspire.Website.csproj @@ -3,6 +3,7 @@ net9.0 true + true diff --git a/examples/Aspire.Website/Properties/launchSettings.json b/examples/Aspire.Website/Properties/launchSettings.json deleted file mode 100644 index b4ace90..0000000 --- a/examples/Aspire.Website/Properties/launchSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "profiles": { - "Examples.Aspire.Website": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "https://localhost:60013;http://localhost:60014" - } - } -} \ No newline at end of file diff --git a/examples/Aspire.Website/appsettings.Development.json b/examples/Aspire.Website/appsettings.Development.json deleted file mode 100644 index 0c208ae..0000000 --- a/examples/Aspire.Website/appsettings.Development.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft.AspNetCore": "Warning" - } - } -} diff --git a/src/ReverseProxy.Aspire/ReverseProxy.Aspire.csproj b/src/ReverseProxy.Aspire/ReverseProxy.Aspire.csproj index 99c7e49..9188217 100644 --- a/src/ReverseProxy.Aspire/ReverseProxy.Aspire.csproj +++ b/src/ReverseProxy.Aspire/ReverseProxy.Aspire.csproj @@ -31,7 +31,7 @@ - + diff --git a/test/ReverseProxy.Aspire.UnitTest/ReverseProxy.Aspire.UnitTest.csproj b/test/ReverseProxy.Aspire.UnitTest/ReverseProxy.Aspire.UnitTest.csproj index 827f4f1..524a44c 100644 --- a/test/ReverseProxy.Aspire.UnitTest/ReverseProxy.Aspire.UnitTest.csproj +++ b/test/ReverseProxy.Aspire.UnitTest/ReverseProxy.Aspire.UnitTest.csproj @@ -19,10 +19,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/ReverseProxy.UnitTest/ReverseProxy.UnitTest.csproj b/test/ReverseProxy.UnitTest/ReverseProxy.UnitTest.csproj index 487c38b..a2b35b7 100644 --- a/test/ReverseProxy.UnitTest/ReverseProxy.UnitTest.csproj +++ b/test/ReverseProxy.UnitTest/ReverseProxy.UnitTest.csproj @@ -19,10 +19,10 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive