diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6a2fc0f0a..3f39f8e36 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -22,8 +22,8 @@ A clear and concise description of what you expected to happen. - Sample name: [e.g. RabbitMQ Connector, Discovery, etc.] - Platform: [e.g. Cloud Foundry, Azure, etc.) - OS: [e.g. Windows, Linux, Mac OSX] - - .NET Version [e.g. .NET Core 2.1.0, .NET Framework 4.7.1, etc.] - - Steeltoe Version [e.g. 2.3.0] + - .NET Version [e.g. .NET Core 3.1.0, .NET Framework 4.7.1, etc.] + - Steeltoe Version [e.g. 2.5.0] - Any other library versions to note ## Screenshots diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Fortune-Teller-Service.csproj b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Fortune-Teller-Service.csproj index 08f3a0766..53c37b57a 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Fortune-Teller-Service.csproj +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Fortune-Teller-Service.csproj @@ -1,8 +1,7 @@  - - netcoreapp3.1;netcoreapp2.1;net461; + netcoreapp3.1;net5.0 @@ -15,17 +14,11 @@ - - - - - - - - - + + + diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Program.cs b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Program.cs index d55618333..7e47fffd8 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Program.cs +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Discovery.Client; using Steeltoe.Extensions.Configuration.CloudFoundry; @@ -14,8 +15,8 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseCloudFoundryHosting(5000) - .AddCloudFoundry() + .UseCloudHosting(5000) + .AddCloudFoundryConfiguration() .AddServiceDiscovery() .UseStartup() .Build(); diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/README.md b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/README.md index 7989ed76b..f344014e2 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/README.md +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/README.md @@ -12,7 +12,7 @@ Refer to [common tasks](/CommonTasks.md#Spring-Cloud-Eureka-Server) for detailed 1. Clone this repository. (`git clone https://github.com/SteeltoeOSS/Samples`) 1. `cd samples/CircuitBreaker/src/AspDotNetCore/Fortune-Teller/Fortune-Teller-Service` -1. `dotnet run -f netcoreapp2.1` +1. `dotnet run -f netcoreapp3.1` ## What to expect - Local @@ -20,7 +20,7 @@ After building and running the app, you should see something like the following: ```bash $ cd samples/CircuitBreaker/src/AspDotNetCore/Fortune-Teller/Fortune-Teller-Service -$ dotnet run -f netcoreapp2.1 +$ dotnet run -f netcoreapp3.1 info: Microsoft.Data.Entity.Storage.Internal.InMemoryStore[1] Saved 50 entities to in-memory store. Hosting environment: Production @@ -34,7 +34,7 @@ At this point the Fortune Teller Service is up and waiting for the Fortune Telle 1. Installed Pivotal CloudFoundry 1. Installed Spring Cloud Services -1. Install .Net Core SDK 2.1.300+ +1. Install .Net Core SDK ### Setup Service Registry on CloudFoundry @@ -45,10 +45,10 @@ Using the service instance name of `myDiscoveryService`, complete the [common ta 1. Login and target your desired space/org: `cf target -o myorg -s myspace` 1. `cd samples/CircuitBreaker/src/AspDotNetCore/Fortune-Teller/Fortune-Teller-Service` 1. Publish the app, selecting the framework and runtime you want to run on: - - `dotnet publish -f netcoreapp2.1 -r ubuntu.18.04-x64` + - `dotnet publish -f netcoreapp3.1 -r linux-x64` 1. Push the app using the appropriate manifest: - - `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.18.04-x64/publish` - - `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish` + - `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + - `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` ## What to expect - CloudFoundry diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Startup.cs b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Startup.cs index 61a2526ca..4259af619 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Startup.cs +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/Startup.cs @@ -27,29 +27,16 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); // Add framework services. -#if NETCOREAPP3_1 services.AddControllers(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app) { app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif SampleData.InitializeFortunesAsync(app.ApplicationServices).Wait(); } diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/nuget.config b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-Service/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Fortune-Teller-UI.csproj b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Fortune-Teller-UI.csproj index 45fa05b89..2705b941d 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Fortune-Teller-UI.csproj +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Fortune-Teller-UI.csproj @@ -1,34 +1,23 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - TRACE;DEBUG;NETCOREAPP2_1 - - - - - - - - - - - - + + + + - + - + diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Program.cs b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Program.cs index 1b24f827b..58ce1fc9f 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Program.cs +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Discovery.Client; using Steeltoe.Extensions.Configuration.CloudFoundry; @@ -13,8 +14,8 @@ public static void Main(string[] args) } public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseCloudFoundryHosting(5555) - .AddCloudFoundry() + .UseCloudHosting(5555) + .AddCloudFoundryConfiguration() .AddServiceDiscovery() .UseStartup() .Build(); diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/README.md b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/README.md index cd5a34058..ca0ee7834 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/README.md +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/README.md @@ -14,7 +14,7 @@ This sample assumes that there is a running Spring Cloud Eureka Server on your m 1. Refer to common steps for [running a local Eureka server](/CommonTasks.md#Spring-Cloud-Eureka-Server) 1. Refer to common steps for [running a local Hystrix dashboard](/CommonTasks.md#Hystrix-Dashboard) -1. Install .Net Core SDK 2.1.300+ +1. Install .Net Core SDK ### Building & Running - Local @@ -23,7 +23,7 @@ This sample assumes that there is a running Spring Cloud Eureka Server on your m 1. Set the `BUILD` environment variable to `LOCAL` (i.e. SET BUILD=LOCAL, export BUILD=LOCAL) 1. Set PORT to listen on (i.e SET PORT=5555, export PORT=5555) 1. `dotnet restore` -1. `dotnet run -f netcoreapp2.1` +1. `dotnet run -f netcoreapp3.1` ### What to expect - Local @@ -31,7 +31,7 @@ After building and running the app, you should see something like the following: ```bash $ cd samples/CircuitBreaker/src/AspDotNetCore/Fortune-Teller/Fortune-Teller-UI -$ dotnet run -f netcoreapp2.1 +$ dotnet run -f netcoreapp3.1 Hosting environment: Production Now listening on: http://*:5555 Application started. Press Ctrl+C to shut down. @@ -54,7 +54,7 @@ Once you have the two applications communicating, you use of the Hystrix dashboa 1. Installed Pivotal CloudFoundry 1. Installed Spring Cloud Services -1. Install .NET Core SDK 2.1+ +1. Install .NET Core SDK ### Setup Service Registry on CloudFoundry @@ -70,8 +70,8 @@ Using the service instance name of `myHystrixService`, complete the [common task 1. cd samples/CircuitBreaker/src/AspDotNetCore/Fortune-Teller/Fortune-Teller-UI 1. Make sure environment variable `BUILD` is not set to `LOCAL` (i.e. SET BUILD=, unset BUILD) 1. `dotnet restore` -1. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64`) -1. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish`) +1. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp3.1 -r linux-x64`) +1. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish`) ### What to expect - CloudFoundry diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Startup.cs b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Startup.cs index 76d69f1ab..23006beab 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Startup.cs +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/Startup.cs @@ -1,10 +1,8 @@ using Fortune_Teller_UI.Services; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Steeltoe.Discovery.Client; +using Microsoft.Extensions.Hosting; using Steeltoe.CircuitBreaker.Hystrix; namespace Fortune_Teller_UI @@ -40,18 +38,14 @@ public void ConfigureServices(IServiceCollection services) services.AddHystrixCollapser("FortuneServiceCollapser", Configuration); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif // Add Hystrix metrics stream to enable monitoring services.AddHystrixMetricsStream(Configuration); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) @@ -68,17 +62,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF // Add Hystrix Metrics context to pipeline app.UseHystrixRequestContext(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif // Startup Hystrix metrics stream app.UseHystrixMetricsStream(); diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/nuget.config b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/nuget.config deleted file mode 100644 index fc374ffed..000000000 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/Fortune-Teller-UI/nuget.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/RunFortuneTeller.cmd b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/RunFortuneTeller.cmd index 6d29c5d98..ceff240b1 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/RunFortuneTeller.cmd +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/RunFortuneTeller.cmd @@ -7,5 +7,5 @@ SET BUILD= :usage echo USAGE: echo RunFortuneTeller [framework] -echo framework - target framework to publish (e.g. net461, netcoreapp2.1) +echo framework - target framework to publish (e.g. netcoreapp3.1) exit /b \ No newline at end of file diff --git a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/RunFortuneTeller.sh b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/RunFortuneTeller.sh index e6b1bada3..ea8bbd865 100644 --- a/CircuitBreaker/src/AspDotNetCore/FortuneTeller/RunFortuneTeller.sh +++ b/CircuitBreaker/src/AspDotNetCore/FortuneTeller/RunFortuneTeller.sh @@ -3,7 +3,7 @@ function printUsage() { echo "USAGE:" echo "RunFortuneTeller [framework]" - echo "framework - target framework to publish (e.g. netcoreapp2.1)" + echo "framework - target framework to publish (e.g. netcoreapp3.1)" exit } # diff --git a/CommonTasks.md b/CommonTasks.md index ef8144cbf..58260c8d2 100644 --- a/CommonTasks.md +++ b/CommonTasks.md @@ -12,13 +12,13 @@ To start a config server backed by a folder on your local disk, start the docker ```bash # Note: Ensure Docker is configured to share host drive/volume so the mount below will work correctly! -docker run --rm -ti -p 8888:8888 -v $PWD/steeltoe/config-repo:/config --name steeltoe-config steeltoeoss/configserver --spring.profiles.active=native +docker run --rm -ti -p 8888:8888 -v $PWD/steeltoe/config-repo:/config --name steeltoe-config steeltoeoss/config-server --spring.profiles.active=native ``` To start a config server backed by the spring cloud samples repo: ```bash -docker run --rm -ti -p 8888:8888 --name steeltoe-config steeltoeoss/configserver +docker run --rm -ti -p 8888:8888 --name steeltoe-config steeltoeoss/config-server ``` ### Run SCCS with Java @@ -64,6 +64,74 @@ Use the [cf cli](https://github.com/cloudfoundry/cli) to create a Service Regist 1. cf create-service p-service-registry standard myDiscoveryServiceInstanceName 1. Wait for service to be ready. (use `cf services` to check the status) +## RabbitMQ + +### Run RabbitMQ Server with Docker + +This command starts a RabbitMQ server with the management plugin enabled with no credentials and default ports: + +```script +docker run --name rabbitmq -p 5672:5672 -p 15672:15672 rabbitmq:3-management +``` + +## Consul + +### Run Consul Server with Docker + +```script +docker run --name=steeltoe-consul -p 8500:8500 consul +``` + +## Spring Boot Admin + +### Run Spring Boot Admin Server with Docker + +There are multiple Spring Boot Admin images to choose from, this is only one option: + +```script +docker run --name --rm -it --name steeltoe-springbootadmin -p 8080:8080 steeltoeoss/spring-boot-admin +``` + +## Redis + +### Run Redis server with Docker + +```script +docker run --name redis -p 6379:6379 redis +``` + +## MySQL + +### Run MySQL Server with Docker + +```script +docker run --name steeltoe-mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=steeltoe -e MYSQL_DATABASE=steeltoe -e MYSQL_USER=steeltoe -e MYSQL_PASSWORD=steeltoe mysql +``` + +## SQL Server + +### Run SQL Server with Docker + +```script +docker run --name steeltoe-sqlserver-e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=St33ltoeR0cks!' -p 1433:1433 mcr.microsoft.com/mssql/server +``` + +## PostgreSQL + +### Run PostgreSQL Server with Docker + +```script +docker run --name steeltoe-postgres -d -p 5432:5432 -e POSTGRES_DB=steeltoe -e POSTGRES_USER=steeltoe -e POSTGRES_PASSWORD=steeltoe postgres:alpine +``` + +## Zipkin + +### Run Zipkin Server with Docker + +```script +docker run --name zipkin -p 9411:9411 openzipkin/zipkin +``` + ## Hystrix Dashboard ### Run Hystrix Dashboard with Docker diff --git a/Configuration/src/AspDotNet4/AutofacCloudFoundry/AutofacCloudFoundry.csproj b/Configuration/src/AspDotNet4/AutofacCloudFoundry/AutofacCloudFoundry.csproj index 59c32b6ab..91f222eeb 100644 --- a/Configuration/src/AspDotNet4/AutofacCloudFoundry/AutofacCloudFoundry.csproj +++ b/Configuration/src/AspDotNet4/AutofacCloudFoundry/AutofacCloudFoundry.csproj @@ -55,6 +55,9 @@ ..\packages\Autofac.Mvc5.4.0.2\lib\net45\Autofac.Integration.Mvc.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -121,41 +124,50 @@ ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll + True ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Steeltoe.Common.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.dll + + ..\packages\Steeltoe.Common.2.5.5\lib\netstandard2.0\Steeltoe.Common.dll - - ..\packages\Steeltoe.Common.Autofac.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.Autofac.dll + + ..\packages\Steeltoe.Common.Autofac.2.5.5\lib\netstandard2.0\Steeltoe.Common.Autofac.dll + True - - ..\packages\Steeltoe.Common.Http.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.Http.dll + + ..\packages\Steeltoe.Common.Http.2.5.5\lib\netstandard2.0\Steeltoe.Common.Http.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryAutofac.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryAutofac.dll + + ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryAutofac.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryAutofac.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.ConfigServerAutofac.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.ConfigServerAutofac.dll + + ..\packages\Steeltoe.Extensions.Configuration.ConfigServerAutofac.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.ConfigServerAutofac.dll True - - ..\packages\Steeltoe.Extensions.Configuration.ConfigServerBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.ConfigServerBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.ConfigServerBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.ConfigServerBase.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.PlaceholderBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.PlaceholderBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.PlaceholderBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.PlaceholderBase.dll + True ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll + True + True - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll ..\packages\System.ComponentModel.Annotations.4.7.0-preview1.19504.10\lib\net461\System.ComponentModel.Annotations.dll @@ -163,9 +175,13 @@ ..\packages\System.ComponentModel.Primitives.4.3.0\lib\net45\System.ComponentModel.Primitives.dll + True + True ..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\net45\System.ComponentModel.TypeConverter.dll + True + True ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll @@ -174,64 +190,92 @@ - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll + True + True ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll True + True ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll + True + True ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + True + True ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True - - ..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - ..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True True ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + True + True ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll True + True ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll True + True ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll True + True + + + ..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll - - ..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll @@ -315,13 +359,15 @@ + - + + @@ -351,8 +397,6 @@ - - @@ -390,7 +434,7 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/Configuration/src/AspDotNet4/AutofacCloudFoundry/Web.config b/Configuration/src/AspDotNet4/AutofacCloudFoundry/Web.config index ebd7ccbd9..f58f05ce4 100644 --- a/Configuration/src/AspDotNet4/AutofacCloudFoundry/Web.config +++ b/Configuration/src/AspDotNet4/AutofacCloudFoundry/Web.config @@ -24,218 +24,218 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -272,18 +272,6 @@ - - - - - - - - - - - - @@ -336,6 +324,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -344,4 +356,4 @@ - + \ No newline at end of file diff --git a/Configuration/src/AspDotNet4/AutofacCloudFoundry/packages.config b/Configuration/src/AspDotNet4/AutofacCloudFoundry/packages.config index 76a00a302..1b4938a4a 100644 --- a/Configuration/src/AspDotNet4/AutofacCloudFoundry/packages.config +++ b/Configuration/src/AspDotNet4/AutofacCloudFoundry/packages.config @@ -37,14 +37,14 @@ - - - - - - - - + + + + + + + + diff --git a/Configuration/src/AspDotNet4/Simple/Simple.csproj b/Configuration/src/AspDotNet4/Simple/Simple.csproj index 453e7dbc1..ed6689212 100644 --- a/Configuration/src/AspDotNet4/Simple/Simple.csproj +++ b/Configuration/src/AspDotNet4/Simple/Simple.csproj @@ -49,6 +49,9 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -109,31 +112,40 @@ ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll + True + True ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Steeltoe.Common.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.dll + + ..\packages\Steeltoe.Common.2.5.5\lib\netstandard2.0\Steeltoe.Common.dll + True - - ..\packages\Steeltoe.Common.Http.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.Http.dll + + ..\packages\Steeltoe.Common.Http.2.5.5\lib\netstandard2.0\Steeltoe.Common.Http.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.ConfigServerBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.ConfigServerBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.ConfigServerBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.ConfigServerBase.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.PlaceholderBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.PlaceholderBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.PlaceholderBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.PlaceholderBase.dll + True ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll + True + True - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll ..\packages\System.ComponentModel.Annotations.4.7.0-preview1.19504.10\lib\net461\System.ComponentModel.Annotations.dll @@ -141,9 +153,13 @@ ..\packages\System.ComponentModel.Primitives.4.3.0\lib\net45\System.ComponentModel.Primitives.dll + True + True ..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\net45\System.ComponentModel.TypeConverter.dll + True + True ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll @@ -152,64 +168,92 @@ - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll + True + True ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll True + True ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll + True + True ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + True + True ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True - - ..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - ..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True True ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + True + True ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll True + True ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll True + True ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll True + True - - ..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll @@ -276,8 +320,6 @@ - - Always @@ -293,10 +335,14 @@ + + + + @@ -327,8 +373,6 @@ - - @@ -367,7 +411,7 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/Configuration/src/AspDotNet4/Simple/Web.config b/Configuration/src/AspDotNet4/Simple/Web.config index 129d01244..d856969ad 100755 --- a/Configuration/src/AspDotNet4/Simple/Web.config +++ b/Configuration/src/AspDotNet4/Simple/Web.config @@ -24,218 +24,218 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -252,18 +252,6 @@ - - - - - - - - - - - - @@ -312,6 +300,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Configuration/src/AspDotNet4/Simple/packages.config b/Configuration/src/AspDotNet4/Simple/packages.config index 4538e4424..9cf8cbbdf 100755 --- a/Configuration/src/AspDotNet4/Simple/packages.config +++ b/Configuration/src/AspDotNet4/Simple/packages.config @@ -8,6 +8,7 @@ + @@ -33,13 +34,13 @@ - - - - - + + + + + - + @@ -48,7 +49,7 @@ - + @@ -60,8 +61,8 @@ - - + + @@ -71,7 +72,7 @@ - + @@ -83,11 +84,14 @@ - + + + + diff --git a/Configuration/src/AspDotNet4/SimpleCloudFoundry/SimpleCloudFoundry.csproj b/Configuration/src/AspDotNet4/SimpleCloudFoundry/SimpleCloudFoundry.csproj index f93940c44..0266541ce 100644 --- a/Configuration/src/AspDotNet4/SimpleCloudFoundry/SimpleCloudFoundry.csproj +++ b/Configuration/src/AspDotNet4/SimpleCloudFoundry/SimpleCloudFoundry.csproj @@ -49,6 +49,9 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -115,31 +118,39 @@ ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll + True ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Steeltoe.Common.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.dll + + ..\packages\Steeltoe.Common.2.5.5\lib\netstandard2.0\Steeltoe.Common.dll + True - - ..\packages\Steeltoe.Common.Http.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.Http.dll + + ..\packages\Steeltoe.Common.Http.2.5.5\lib\netstandard2.0\Steeltoe.Common.Http.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.ConfigServerBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.ConfigServerBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.ConfigServerBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.ConfigServerBase.dll + True - - ..\packages\Steeltoe.Extensions.Configuration.PlaceholderBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.PlaceholderBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.PlaceholderBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.PlaceholderBase.dll + True ..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll + True + True - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll ..\packages\System.ComponentModel.Annotations.4.7.0-preview1.19504.10\lib\net461\System.ComponentModel.Annotations.dll @@ -147,9 +158,13 @@ ..\packages\System.ComponentModel.Primitives.4.3.0\lib\net45\System.ComponentModel.Primitives.dll + True + True ..\packages\System.ComponentModel.TypeConverter.4.3.0\lib\net45\System.ComponentModel.TypeConverter.dll + True + True ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll @@ -158,64 +173,92 @@ - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll ..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll + True + True ..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll True + True ..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll + True + True ..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + True + True ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True - - ..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll + + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - ..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll + True True ..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + True + True ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll True + True ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll True + True ..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True ..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll True + True + + + ..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll - - ..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll @@ -284,11 +327,10 @@ - - + @@ -298,14 +340,17 @@ - + + + + @@ -335,8 +380,6 @@ - - @@ -375,7 +418,7 @@ - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. diff --git a/Configuration/src/AspDotNet4/SimpleCloudFoundry/Web.config b/Configuration/src/AspDotNet4/SimpleCloudFoundry/Web.config index 5b3ab5315..11f9435d7 100755 --- a/Configuration/src/AspDotNet4/SimpleCloudFoundry/Web.config +++ b/Configuration/src/AspDotNet4/SimpleCloudFoundry/Web.config @@ -24,218 +24,218 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -268,18 +268,6 @@ - - - - - - - - - - - - @@ -328,6 +316,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Configuration/src/AspDotNet4/SimpleCloudFoundry/packages.config b/Configuration/src/AspDotNet4/SimpleCloudFoundry/packages.config index 09071943a..abcf25dfe 100755 --- a/Configuration/src/AspDotNet4/SimpleCloudFoundry/packages.config +++ b/Configuration/src/AspDotNet4/SimpleCloudFoundry/packages.config @@ -8,6 +8,7 @@ + @@ -35,13 +36,13 @@ - - - - - + + + + + - + @@ -50,7 +51,7 @@ - + @@ -62,8 +63,8 @@ - - + + @@ -73,7 +74,7 @@ - + @@ -85,11 +86,14 @@ - + + + + diff --git a/Configuration/src/AspDotNetCore/CloudFoundry/CloudFoundry.csproj b/Configuration/src/AspDotNetCore/CloudFoundry/CloudFoundry.csproj index d41d28dd0..a2e93684e 100644 --- a/Configuration/src/AspDotNetCore/CloudFoundry/CloudFoundry.csproj +++ b/Configuration/src/AspDotNetCore/CloudFoundry/CloudFoundry.csproj @@ -1,21 +1,11 @@  - - netcoreapp3.1;netcoreapp2.1;net461; + netcoreapp3.1;net5.0 - - - - - - - - - - + diff --git a/Configuration/src/AspDotNetCore/CloudFoundry/CloudFoundry.feature b/Configuration/src/AspDotNetCore/CloudFoundry/CloudFoundry.feature index 0f457c984..f570264f5 100644 --- a/Configuration/src/AspDotNetCore/CloudFoundry/CloudFoundry.feature +++ b/Configuration/src/AspDotNetCore/CloudFoundry/CloudFoundry.feature @@ -13,37 +13,28 @@ Feature: CloudFoundry Configuration Then you should see "vcap:application:application_name = cloud" @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: CloudFoundry Configuration (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: CloudFoundry Configuration (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app cloud is started When you get https://cloud.x.y.z/Home/CloudFoundry Then you should see "vcap:application:application_name = cloud" - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: CloudFoundry Configuration (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: CloudFoundry Configuration (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app cloud is started When you get https://cloud.x.y.z/Home/CloudFoundry Then you should see "vcap:application:application_name = cloud" - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: CloudFoundry Configuration (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish - And you wait until CloudFoundry app cloud is started - When you get https://cloud.x.y.z/Home/CloudFoundry - Then you should see "vcap:application:application_name = cloud" - - @net461 - @win10-x64 - Scenario: CloudFoundry Configuration (net461/win10-x64) - When you run: dotnet publish -f net461 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish + @net5.0 + @linux-x64 + Scenario: CloudFoundry Configuration (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app cloud is started When you get https://cloud.x.y.z/Home/CloudFoundry Then you should see "vcap:application:application_name = cloud" diff --git a/Configuration/src/AspDotNetCore/CloudFoundry/Program.cs b/Configuration/src/AspDotNetCore/CloudFoundry/Program.cs index 3e94a58a8..6cb200ded 100644 --- a/Configuration/src/AspDotNetCore/CloudFoundry/Program.cs +++ b/Configuration/src/AspDotNetCore/CloudFoundry/Program.cs @@ -1,23 +1,22 @@ - -using Microsoft.AspNetCore; +using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; namespace CloudFoundry { public class Program { - public static void Main(string[] args) { BuildWebHost(args).Run(); } + public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseCloudFoundryHosting() - .AddCloudFoundry() + .UseCloudHosting() + .AddCloudFoundryConfiguration() .UseStartup() .Build(); - } } diff --git a/Configuration/src/AspDotNetCore/CloudFoundry/README.md b/Configuration/src/AspDotNetCore/CloudFoundry/README.md index 19c91f8e8..0ef80befc 100644 --- a/Configuration/src/AspDotNetCore/CloudFoundry/README.md +++ b/Configuration/src/AspDotNetCore/CloudFoundry/README.md @@ -7,7 +7,7 @@ This ASP.NET Core sample app illustrates how to use the [Steeltoe Cloud Foundry ## Pre-requisites 1. Installed Pivotal CloudFoundry -1. .NET Core SDK 2.1.300 +1. .NET Core SDK ## Publish App & Push @@ -15,10 +15,10 @@ This ASP.NET Core sample app illustrates how to use the [Steeltoe Cloud Foundry 1. `cd src/AspDotNetCore/CloudFoundry` 1. `dotnet restore` 1. Publish app to a directory selecting the framework and runtime you want to run on: - - `dotnet publish -f netcoreapp2.1 -r ubuntu.18.04-x64` + - `dotnet publish -f netcoreapp3.1 -r linux-x64` 1. Push the app using the appropriate manifest: - - `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - - `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish` + - `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + - `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` ## What to expect diff --git a/Configuration/src/AspDotNetCore/CloudFoundry/Startup.cs b/Configuration/src/AspDotNetCore/CloudFoundry/Startup.cs index d0cfb4eb3..45f670248 100644 --- a/Configuration/src/AspDotNetCore/CloudFoundry/Startup.cs +++ b/Configuration/src/AspDotNetCore/CloudFoundry/Startup.cs @@ -1,13 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Steeltoe.Extensions.Configuration; +using Microsoft.Extensions.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; namespace CloudFoundry @@ -30,15 +24,11 @@ public void ConfigureServices(IServiceCollection services) services.ConfigureCloudFoundryOptions(Configuration); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -51,7 +41,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -59,14 +48,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Configuration/src/AspDotNetCore/CloudFoundry/manifest.yml b/Configuration/src/AspDotNetCore/CloudFoundry/manifest.yml index abbe15d81..bf9cd95b7 100644 --- a/Configuration/src/AspDotNetCore/CloudFoundry/manifest.yml +++ b/Configuration/src/AspDotNetCore/CloudFoundry/manifest.yml @@ -5,4 +5,4 @@ applications: - dotnet_core_buildpack memory: 128M env: - ASPNETCORE_ENVIRONMENT: development + ASPNETCORE_ENVIRONMENT: Development diff --git a/Configuration/src/AspDotNetCore/Configuration.sln b/Configuration/src/AspDotNetCore/Configuration.sln index 73009d854..89b6deb66 100644 --- a/Configuration/src/AspDotNetCore/Configuration.sln +++ b/Configuration/src/AspDotNetCore/Configuration.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.6 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30803.129 MinimumVisualStudioVersion = 15.0.26124.0 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Simple", "Simple\Simple.csproj", "{C45A50EA-B7A6-48DC-9744-AD4D74EC545C}" EndProject @@ -8,9 +8,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleCloudFoundry", "Simpl EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudFoundry", "CloudFoundry\CloudFoundry.csproj", "{3D8E61DB-F610-4546-95D9-A75202621555}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Placeholder", "Placeholder\Placeholder.csproj", "{ECC6314B-1DB2-4D2C-9C17-99406F84FDE3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Placeholder", "Placeholder\Placeholder.csproj", "{ECC6314B-1DB2-4D2C-9C17-99406F84FDE3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RandomValue", "RandomValue\RandomValue.csproj", "{6BC02BAE-39B1-4C1F-A6A7-1EB39B6A7003}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RandomValue", "RandomValue\RandomValue.csproj", "{6BC02BAE-39B1-4C1F-A6A7-1EB39B6A7003}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E0407428-4126-485F-9523-FC5AAB682BDB}" + ProjectSection(SolutionItems) = preProject + ..\..\..\config\targetframework.props = ..\..\..\config\targetframework.props + ..\..\..\config\versions.props = ..\..\..\config\versions.props + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Configuration/src/AspDotNetCore/Placeholder/Placeholder.csproj b/Configuration/src/AspDotNetCore/Placeholder/Placeholder.csproj index 0586ac45c..55af294f2 100644 --- a/Configuration/src/AspDotNetCore/Placeholder/Placeholder.csproj +++ b/Configuration/src/AspDotNetCore/Placeholder/Placeholder.csproj @@ -1,17 +1,10 @@  - - netcoreapp3.1;netcoreapp2.1;net461; + netcoreapp3.1;net5.0 InProcess - - - - - - diff --git a/Configuration/src/AspDotNetCore/Placeholder/Startup.cs b/Configuration/src/AspDotNetCore/Placeholder/Startup.cs index ab71847ad..b8c658862 100644 --- a/Configuration/src/AspDotNetCore/Placeholder/Startup.cs +++ b/Configuration/src/AspDotNetCore/Placeholder/Startup.cs @@ -18,11 +18,7 @@ public Startup(IConfiguration configuration) public void ConfigureServices(IServiceCollection services) { services.Configure(Configuration); -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -39,7 +35,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -47,14 +42,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Configuration/src/AspDotNetCore/RandomValue/RandomValue.csproj b/Configuration/src/AspDotNetCore/RandomValue/RandomValue.csproj index a7cd8e071..6ed54f53e 100644 --- a/Configuration/src/AspDotNetCore/RandomValue/RandomValue.csproj +++ b/Configuration/src/AspDotNetCore/RandomValue/RandomValue.csproj @@ -1,18 +1,10 @@  - - netcoreapp3.1;netcoreapp2.1;net461; + netcoreapp3.1;net5.0 InProcess - - - - - - - diff --git a/Configuration/src/AspDotNetCore/RandomValue/Startup.cs b/Configuration/src/AspDotNetCore/RandomValue/Startup.cs index c4a11abe3..a67ed22da 100644 --- a/Configuration/src/AspDotNetCore/RandomValue/Startup.cs +++ b/Configuration/src/AspDotNetCore/RandomValue/Startup.cs @@ -17,11 +17,7 @@ public Startup(IConfiguration configuration) // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -38,7 +34,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -46,14 +41,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Configuration/src/AspDotNetCore/Simple/README.adoc b/Configuration/src/AspDotNetCore/Simple/README.adoc index a9a1594fa..1960526e2 100755 --- a/Configuration/src/AspDotNetCore/Simple/README.adoc +++ b/Configuration/src/AspDotNetCore/Simple/README.adoc @@ -47,7 +47,7 @@ $ mvn spring-boot:run ---- $ dotnet restore -$ dotnet run -f netcoreapp2.1 # alternatively, dotnet run -f net461 +$ dotnet run -f netcoreapp3.1 # alternatively, dotnet run -f net5.0 ---- == What to Expect @@ -55,7 +55,7 @@ $ dotnet run -f netcoreapp2.1 # alternatively, dotnet run -f net461 After building and running the app, you should see something like the following: ---- -$ dotnet run -f netcoreapp2.1 +$ dotnet run -f netcoreapp3.1 Using launch settings from ... Hosting environment: development Content root path: .... diff --git a/Configuration/src/AspDotNetCore/Simple/Simple.csproj b/Configuration/src/AspDotNetCore/Simple/Simple.csproj index 67c31980e..4d03545bf 100644 --- a/Configuration/src/AspDotNetCore/Simple/Simple.csproj +++ b/Configuration/src/AspDotNetCore/Simple/Simple.csproj @@ -1,21 +1,10 @@  - - netcoreapp3.1;netcoreapp2.1;net461; + netcoreapp3.1;net5.0 - - - - - - - - - - diff --git a/Configuration/src/AspDotNetCore/Simple/Simple.feature b/Configuration/src/AspDotNetCore/Simple/Simple.feature index 7ae307c2d..88bf3bcf9 100644 --- a/Configuration/src/AspDotNetCore/Simple/Simple.feature +++ b/Configuration/src/AspDotNetCore/Simple/Simple.feature @@ -16,27 +16,14 @@ Feature: Simple Configuration Then you should see "spring:cloud:config:name = foo" And you should see "spring:cloud:config:env = MyNetCoreEnv" - @netcoreapp2.1 - Scenario: Simple Configuration (netcoreapp2.1) + @net5.0 + Scenario: Simple Configuration (net5.0) When you run: git clone https://github.com/spring-cloud/spring-cloud-config And you run: git -C spring-cloud-config checkout v2.1.4.RELEASE And you run in the background: mvn -f spring-cloud-config/spring-cloud-config-server/pom.xml spring-boot:run And you wait until process listening on port 8888 And you set env var ASPNETCORE_ENVIRONMENT to "MyNetCoreEnv" - And you run in the background: dotnet run -f netcoreapp2.1 - And you wait until process listening on port 5000 - When you get http://localhost:5000/Home/ConfigServerSettings - Then you should see "spring:cloud:config:name = foo" - And you should see "spring:cloud:config:env = MyNetCoreEnv" - - @net461 - Scenario: Simple Configuration (net461) - When you run: git clone https://github.com/spring-cloud/spring-cloud-config - And you run: git -C spring-cloud-config checkout v2.1.4.RELEASE - And you run in the background: mvn -f spring-cloud-config/spring-cloud-config-server/pom.xml spring-boot:run - And you wait until process listening on port 8888 - And you set env var ASPNETCORE_ENVIRONMENT to "MyNetCoreEnv" - And you run in the background: dotnet run -f net461 + And you run in the background: dotnet run -f net5.0 And you wait until process listening on port 5000 When you get http://localhost:5000/Home/ConfigServerSettings Then you should see "spring:cloud:config:name = foo" diff --git a/Configuration/src/AspDotNetCore/Simple/Startup.cs b/Configuration/src/AspDotNetCore/Simple/Startup.cs index c584d3b37..5f222c8c8 100755 --- a/Configuration/src/AspDotNetCore/Simple/Startup.cs +++ b/Configuration/src/AspDotNetCore/Simple/Startup.cs @@ -39,11 +39,7 @@ public void ConfigureServices(IServiceCollection services) services.AddConfiguration(Configuration); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif // Adds the configuration data POCO configured with data returned from the Spring Cloud Config Server services.Configure(Configuration); @@ -64,7 +60,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -72,15 +67,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } - } } diff --git a/Configuration/src/AspDotNetCore/Simple/docker-compose.yml b/Configuration/src/AspDotNetCore/Simple/docker-compose.yml index 600c58631..749fc9f68 100644 --- a/Configuration/src/AspDotNetCore/Simple/docker-compose.yml +++ b/Configuration/src/AspDotNetCore/Simple/docker-compose.yml @@ -1,6 +1,6 @@ version: '3.2' services: config: - image: "steeltoeoss/configserver:1.3" + image: "steeltoeoss/config-server" ports: - "8888:8888" diff --git a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/Program.cs b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/Program.cs index 0de21077e..257405b7e 100644 --- a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/Program.cs +++ b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/Program.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.ConfigServer; namespace SimpleCloudFoundry @@ -15,7 +16,7 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseCloudFoundryHosting() + .UseCloudHosting() .AddConfigServer(GetLoggerFactory()) .UseStartup() .Build(); @@ -23,12 +24,7 @@ public static IWebHost BuildWebHost(string[] args) => public static ILoggerFactory GetLoggerFactory() { IServiceCollection serviceCollection = new ServiceCollection(); - serviceCollection.AddLogging(builder => builder.SetMinimumLevel(LogLevel.Trace)); - serviceCollection.AddLogging(builder => builder.AddConsole((opts) => - { - opts.DisableColors = true; - })); - serviceCollection.AddLogging(builder => builder.AddDebug()); + serviceCollection.AddLogging(builder => builder.SetMinimumLevel(LogLevel.Trace).AddConsole()); return serviceCollection.BuildServiceProvider().GetService(); } } diff --git a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/README.md b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/README.md index fd59380b5..48226fe85 100644 --- a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/README.md +++ b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/README.md @@ -8,7 +8,7 @@ ASP.NET Core sample app illustrating how to use [Config Server for Pivotal Cloud 1. Installed Pivotal CloudFoundry 1. Installed Spring Cloud Services -1. .NET Core SDK 2.1.300+ +1. .NET Core SDK ## Setup Config Server @@ -20,10 +20,10 @@ Refer to [common tasks](/CommonTasks.md#Spring-Cloud-Config-Server) for detailed 1. `cd src/AspDotNetCore/SimpleCloudFoundry` 1. `dotnet restore` 1. Publish app to a directory selecting the framework and runtime you want to run on: - - `dotnet publish -f netcoreapp2.1 -r ubuntu.18.04-x64` + - `dotnet publish -f netcoreapp3.1 -r linux-x64` 1. Push the app using the appropriate manifest: - - `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.18.04-x64/publish` - - `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish` + - `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + - `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` ## What to expect diff --git a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/SimpleCloudFoundry.csproj b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/SimpleCloudFoundry.csproj index a9e644db0..1a7c90dde 100644 --- a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/SimpleCloudFoundry.csproj +++ b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/SimpleCloudFoundry.csproj @@ -1,21 +1,12 @@  - - netcoreapp3.1;netcoreapp2.1;net461; + netcoreapp3.1;net5.0 - - - - - - - - - + diff --git a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/SimpleCloudFoundry.feature b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/SimpleCloudFoundry.feature index b41bc31ba..8314d9db7 100644 --- a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/SimpleCloudFoundry.feature +++ b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/SimpleCloudFoundry.feature @@ -13,37 +13,28 @@ Feature: Simple CloudFoundry Configuration Then you should see "spring:cloud:config:name = foo" @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: Simple CloudFoundry Configuration (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: Simple CloudFoundry Configuration (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app foo is started When you get https://foo.x.y.z/Home/ConfigServerSettings Then you should see "spring:cloud:config:name = foo" - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: Simple CloudFoundry Configuration (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: Simple CloudFoundry Configuration (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app foo is started When you get https://foo.x.y.z/Home/ConfigServerSettings Then you should see "spring:cloud:config:name = foo" - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: Simple CloudFoundry Configuration (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish - And you wait until CloudFoundry app foo is started - When you get https://foo.x.y.z/Home/ConfigServerSettings - Then you should see "spring:cloud:config:name = foo" - - @net461 - @win10-x64 - Scenario: Simple CloudFoundry Configuration (net461/win10-x64) - When you run: dotnet publish -f net461 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish + @net5.0 + @linux-x64 + Scenario: Simple CloudFoundry Configuration (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app foo is started When you get https://foo.x.y.z/Home/ConfigServerSettings Then you should see "spring:cloud:config:name = foo" diff --git a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/Startup.cs b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/Startup.cs index 397cd1b7f..10e240f3f 100755 --- a/Configuration/src/AspDotNetCore/SimpleCloudFoundry/Startup.cs +++ b/Configuration/src/AspDotNetCore/SimpleCloudFoundry/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using SimpleCloudFoundry.Model; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Extensions.Configuration.ConfigServer; @@ -34,15 +34,15 @@ public void ConfigureServices(IServiceCollection services) // Adds the configuration data POCO configured with data returned from the Spring Cloud Config Server services.Configure(Configuration); -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. +#if NETCOREAPP3_1 || NET5_0 + public void Configure(IApplicationBuilder app, IHostEnvironment env) +#else public void Configure(IApplicationBuilder app, IHostingEnvironment env) +#endif { if (env.IsDevelopment()) { @@ -55,7 +55,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -63,14 +62,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Connectors/src/AspDotNetCore/Connectors.sln b/Connectors/src/AspDotNetCore/Connectors.sln index 42fa5224a..04d2f38c2 100644 --- a/Connectors/src/AspDotNetCore/Connectors.sln +++ b/Connectors/src/AspDotNetCore/Connectors.sln @@ -24,6 +24,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GemFire", "GemFire\GemFire. EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6297031D-2427-4A59-8D6E-73355360E72A}" ProjectSection(SolutionItems) = preProject + ..\..\..\CommonTasks.md = ..\..\..\CommonTasks.md ..\..\..\config\versions.props = ..\..\..\config\versions.props EndProjectSection EndProject diff --git a/Connectors/src/AspDotNetCore/CosmosDb/CosmosDb.csproj b/Connectors/src/AspDotNetCore/CosmosDb/CosmosDb.csproj index a2e81c7b5..b45113492 100644 --- a/Connectors/src/AspDotNetCore/CosmosDb/CosmosDb.csproj +++ b/Connectors/src/AspDotNetCore/CosmosDb/CosmosDb.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + netcoreapp3.1;net5.0 diff --git a/Connectors/src/AspDotNetCore/GemFire/GemFire.csproj b/Connectors/src/AspDotNetCore/GemFire/GemFire.csproj index 4382ee212..4fc61dda8 100644 --- a/Connectors/src/AspDotNetCore/GemFire/GemFire.csproj +++ b/Connectors/src/AspDotNetCore/GemFire/GemFire.csproj @@ -22,9 +22,10 @@ - - - + + + + diff --git a/Connectors/src/AspDotNetCore/GemFire/Program.cs b/Connectors/src/AspDotNetCore/GemFire/Program.cs index f41876029..483a67d24 100644 --- a/Connectors/src/AspDotNetCore/GemFire/Program.cs +++ b/Connectors/src/AspDotNetCore/GemFire/Program.cs @@ -15,8 +15,8 @@ public static void Main(string[] args) public static IWebHostBuilder CreateWebHostBuilder(string[] args) => WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() - .UseCloudFoundryHosting() + .AddCloudFoundryConfiguration() + .UseCloudHosting() .UseStartup() .ConfigureLogging((context, builder) => { diff --git a/Connectors/src/AspDotNetCore/MongoDb/MongoDb.csproj b/Connectors/src/AspDotNetCore/MongoDb/MongoDb.csproj index 6dc68f7e4..add468d15 100644 --- a/Connectors/src/AspDotNetCore/MongoDb/MongoDb.csproj +++ b/Connectors/src/AspDotNetCore/MongoDb/MongoDb.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + netcoreapp3.1;net5.0 diff --git a/Connectors/src/AspDotNetCore/MongoDb/Startup.cs b/Connectors/src/AspDotNetCore/MongoDb/Startup.cs index 16af10663..75b4bb5c4 100644 --- a/Connectors/src/AspDotNetCore/MongoDb/Startup.cs +++ b/Connectors/src/AspDotNetCore/MongoDb/Startup.cs @@ -1,5 +1,4 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -24,7 +23,7 @@ public void ConfigureServices(IServiceCollection services) } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IWebHostEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { diff --git a/Connectors/src/AspDotNetCore/MySql/MySql.csproj b/Connectors/src/AspDotNetCore/MySql/MySql.csproj index 9ed4ad853..e46f62e58 100644 --- a/Connectors/src/AspDotNetCore/MySql/MySql.csproj +++ b/Connectors/src/AspDotNetCore/MySql/MySql.csproj @@ -1,22 +1,12 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - - + diff --git a/Connectors/src/AspDotNetCore/MySql/MySql.feature b/Connectors/src/AspDotNetCore/MySql/MySql.feature index 723a5a990..c169cc76f 100644 --- a/Connectors/src/AspDotNetCore/MySql/MySql.feature +++ b/Connectors/src/AspDotNetCore/MySql/MySql.feature @@ -14,40 +14,30 @@ Feature: MySql Connector And you should see "Key 2 = Row2 Text" @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: MySql Connector (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: MySql Connector (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app mysql-connector is started When you get https://mysql-connector.x.y.z/Home/MySqlData Then you should see "Key 1 = Row1 Text" And you should see "Key 2 = Row2 Text" - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: MySql Connector (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: MySql Connector (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app mysql-connector is started When you get https://mysql-connector.x.y.z/Home/MySqlData Then you should see "Key 1 = Row1 Text" And you should see "Key 2 = Row2 Text" - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: MySql Connector (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish - And you wait until CloudFoundry app mysql-connector is started - When you get https://mysql-connector.x.y.z/Home/MySqlData - Then you should see "Key 1 = Row1 Text" - And you should see "Key 2 = Row2 Text" - - @net461 - @win10-x64 - Scenario: MySql Connector (net461/win10-x64) - When you run: dotnet publish -f net461 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish + @net5.0 + @linux-x64 + Scenario: MySql Connector (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app mysql-connector is started When you get https://mysql-connector.x.y.z/Home/MySqlData Then you should see "Key 1 = Row1 Text" diff --git a/Connectors/src/AspDotNetCore/MySql/Program.cs b/Connectors/src/AspDotNetCore/MySql/Program.cs index 0c8df943f..731fedb27 100644 --- a/Connectors/src/AspDotNetCore/MySql/Program.cs +++ b/Connectors/src/AspDotNetCore/MySql/Program.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using MySql.Models; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; using System; @@ -35,10 +36,10 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) { return WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .UseStartup() - .UseCloudFoundryHosting() + .UseCloudHosting() .Build(); } diff --git a/Connectors/src/AspDotNetCore/MySql/README.md b/Connectors/src/AspDotNetCore/MySql/README.md index 442a3e765..fa4357082 100644 --- a/Connectors/src/AspDotNetCore/MySql/README.md +++ b/Connectors/src/AspDotNetCore/MySql/README.md @@ -34,11 +34,11 @@ You must first create an instance of the MySql service in a org/space. 1. `cd samples/Connectors/src/AspDotNetCore/MySql` 1. `dotnet restore --configfile nuget.config` 1. Publish app to a local directory, specifying the framework and runtime (select ONE of these commands): - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f net461 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f net5 -r win10-x64` 1. Push the app using the appropriate manifest (select ONE of these commands): - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/net5/win10-x64/publish` > Note: The provided manifest will create an app named `mysql-connector` and attempt to bind the app to MySql service `myMySqlService`. diff --git a/Connectors/src/AspDotNetCore/MySql/Startup.cs b/Connectors/src/AspDotNetCore/MySql/Startup.cs index 72f5eeab1..853ed6746 100644 --- a/Connectors/src/AspDotNetCore/MySql/Startup.cs +++ b/Connectors/src/AspDotNetCore/MySql/Startup.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Steeltoe.CloudFoundry.Connector.MySql; namespace MySql @@ -21,15 +22,11 @@ public void ConfigureServices(IServiceCollection services) services.AddMySqlConnection(Configuration); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -42,7 +39,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -50,14 +46,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Connectors/src/AspDotNetCore/MySql/nuget.config b/Connectors/src/AspDotNetCore/MySql/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Connectors/src/AspDotNetCore/MySql/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/Models/TestContext.cs b/Connectors/src/AspDotNetCore/MySqlEF6/Models/TestContext.cs index 7ad31acd6..7e4abc144 100644 --- a/Connectors/src/AspDotNetCore/MySqlEF6/Models/TestContext.cs +++ b/Connectors/src/AspDotNetCore/MySqlEF6/Models/TestContext.cs @@ -1,7 +1,7 @@ -using System.ComponentModel.DataAnnotations; +using MySql.Data.EntityFramework; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Data.Entity; -using MySql.Data.Entity; namespace MySqlEF6.Models { diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/MySqlEF6.csproj b/Connectors/src/AspDotNetCore/MySqlEF6/MySqlEF6.csproj index 9a1cb1b36..e5cf8d6ed 100644 --- a/Connectors/src/AspDotNetCore/MySqlEF6/MySqlEF6.csproj +++ b/Connectors/src/AspDotNetCore/MySqlEF6/MySqlEF6.csproj @@ -1,23 +1,15 @@  - net461 - win10-x64;win10-x86 + net5.0;netcoreapp3.1; true false - - - - - - - - - - + + + diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/MySqlEF6.feature b/Connectors/src/AspDotNetCore/MySqlEF6/MySqlEF6.feature index 1e75f5a40..0deb715fd 100644 --- a/Connectors/src/AspDotNetCore/MySqlEF6/MySqlEF6.feature +++ b/Connectors/src/AspDotNetCore/MySqlEF6/MySqlEF6.feature @@ -3,11 +3,41 @@ Feature: MySqlEF6 Connector In order to show you how to use Steeltoe for connecting to MySql using EntityFramework 6 You can run some MySql using EntityFramework 6 connection samples - @net461 + @netcoreapp3.1 @win10-x64 - Scenario: MySqlEF6 Connector (net461/win10-x64) - When you run: dotnet publish -f net461 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish + Scenario: MySqlEF6 Connector (netcoreapp3.1/win10-x64) + When you run: dotnet publish -f netcoreapp3.1 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish + And you wait until CloudFoundry app mysqlef6-connector is started + When you get https://mysqlef6-connector.x.y.z/Home/MySqlData + Then you should see "Key 1 = Test Data 1" + And you should see "Key 2 = Test Data 2" + + @net5.0 + @win10-x64 + Scenario: MySqlEF6 Connector (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish + And you wait until CloudFoundry app mysqlef6-connector is started + When you get https://mysqlef6-connector.x.y.z/Home/MySqlData + Then you should see "Key 1 = Test Data 1" + And you should see "Key 2 = Test Data 2" + + @netcoreapp3.1 + @linux-x64 + Scenario: MySqlEF6 Connector (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish + And you wait until CloudFoundry app mysqlef6-connector is started + When you get https://mysqlef6-connector.x.y.z/Home/MySqlData + Then you should see "Key 1 = Test Data 1" + And you should see "Key 2 = Test Data 2" + + @net5.0 + @linux-x64 + Scenario: MySqlEF6 Connector (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app mysqlef6-connector is started When you get https://mysqlef6-connector.x.y.z/Home/MySqlData Then you should see "Key 1 = Test Data 1" diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/Program.cs b/Connectors/src/AspDotNetCore/MySqlEF6/Program.cs index 661742b6a..be981d8e6 100644 --- a/Connectors/src/AspDotNetCore/MySqlEF6/Program.cs +++ b/Connectors/src/AspDotNetCore/MySqlEF6/Program.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using MySqlEF6.Models; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; using System; @@ -34,10 +35,10 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) { return WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .UseStartup() - .UseCloudFoundryHosting() + .UseCloudHosting() .Build(); } } diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/Properties/launchSettings.json b/Connectors/src/AspDotNetCore/MySqlEF6/Properties/launchSettings.json index 9cd06e880..9a8aa0e41 100644 --- a/Connectors/src/AspDotNetCore/MySqlEF6/Properties/launchSettings.json +++ b/Connectors/src/AspDotNetCore/MySqlEF6/Properties/launchSettings.json @@ -16,7 +16,10 @@ } }, "MySqlEF6": { - "commandName": "Project" + "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } } } } \ No newline at end of file diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/README.md b/Connectors/src/AspDotNetCore/MySqlEF6/README.md index 819fa8013..fe59f4f42 100644 --- a/Connectors/src/AspDotNetCore/MySqlEF6/README.md +++ b/Connectors/src/AspDotNetCore/MySqlEF6/README.md @@ -24,9 +24,9 @@ You must first create an instance of the MySql service in a org/space. 1. `cd samples/Connectors/src/AspDotNetCore/MySqlEF6` 1. `dotnet restore --configfile nuget.config` 1. Publish app to a local directory, specifying the framework and runtime (select ONE of these commands): - * `dotnet publish -f net461 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest (select ONE of these commands): - * `cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest will create an app named `mysqlef6-connector` and attempt to bind the app to MySql service `myMySqlService`. diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/Startup.cs b/Connectors/src/AspDotNetCore/MySqlEF6/Startup.cs index 3a30bb686..89a27c9c2 100644 --- a/Connectors/src/AspDotNetCore/MySqlEF6/Startup.cs +++ b/Connectors/src/AspDotNetCore/MySqlEF6/Startup.cs @@ -1,8 +1,9 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using MySqlEF6.Models; +using Steeltoe.CloudFoundry.Connector.MySql; using Steeltoe.CloudFoundry.Connector.MySql.EF6; namespace MySqlEF6 @@ -19,15 +20,16 @@ public Startup(IConfiguration configuration) // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { - // Add framework services. - services.AddMvc(); - // Add EF6 DbContext to container and automatically bind it to CloudFoundry mySql service services.AddDbContext(Configuration); + services.AddMySqlHealthContributor(Configuration); + + // Add framework services. + services.AddControllersWithViews(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -40,12 +42,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); + app.UseRouting(); + app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); } } } diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/appsettings.Development.json b/Connectors/src/AspDotNetCore/MySqlEF6/appsettings.Development.json index f1fce5570..3f68ca4aa 100644 --- a/Connectors/src/AspDotNetCore/MySqlEF6/appsettings.Development.json +++ b/Connectors/src/AspDotNetCore/MySqlEF6/appsettings.Development.json @@ -9,8 +9,7 @@ }, "mysql": { "client": { - "sslmode": "none", - "ConnectionString": "Server=localhost;Database=steeltoe;Uid=steeltoe;Pwd=steeltoe;sslmode=none;" + "ConnectionString": "Server=localhost;Database=steeltoe;Uid=steeltoe;Pwd=steeltoe;" } } } \ No newline at end of file diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/manifest.yml b/Connectors/src/AspDotNetCore/MySqlEF6/manifest.yml new file mode 100644 index 000000000..340a852b9 --- /dev/null +++ b/Connectors/src/AspDotNetCore/MySqlEF6/manifest.yml @@ -0,0 +1,11 @@ +--- +applications: +- name: mysqlef6-connector + buildpacks: + - dotnet_core_buildpack + memory: 128M + disk_quota: 200M + env: + ASPNETCORE_ENVIRONMENT: Production + services: + - myMySqlService diff --git a/Connectors/src/AspDotNetCore/MySqlEF6/nuget.config b/Connectors/src/AspDotNetCore/MySqlEF6/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Connectors/src/AspDotNetCore/MySqlEF6/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Connectors/src/AspDotNetCore/MySqlEFCore/MySqlEFCore.csproj b/Connectors/src/AspDotNetCore/MySqlEFCore/MySqlEFCore.csproj index 5d5f246a5..ced32bbe6 100644 --- a/Connectors/src/AspDotNetCore/MySqlEFCore/MySqlEFCore.csproj +++ b/Connectors/src/AspDotNetCore/MySqlEFCore/MySqlEFCore.csproj @@ -1,26 +1,18 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + net5.0;netcoreapp3.1; - - - - - + - - - - - + + - + diff --git a/Connectors/src/AspDotNetCore/MySqlEFCore/MySqlEFCore.feature b/Connectors/src/AspDotNetCore/MySqlEFCore/MySqlEFCore.feature index 28ed9db58..62a531d65 100644 --- a/Connectors/src/AspDotNetCore/MySqlEFCore/MySqlEFCore.feature +++ b/Connectors/src/AspDotNetCore/MySqlEFCore/MySqlEFCore.feature @@ -14,30 +14,30 @@ Feature: MySqlEFCore Connector And you should see "2: Test Data 2 - EF Core TestContext B" @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: MySqlEFCore Connector (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: MySqlEFCore Connector (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app mysqlefcore-connector is started When you get https://mysqlefcore-connector.x.y.z/Home/MySqlData Then you should see "1: Test Data 1 - EF Core TestContext A" And you should see "2: Test Data 2 - EF Core TestContext B" - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: MySqlEFCore Connector (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: MySqlEFCore Connector (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app mysqlefcore-connector is started When you get https://mysqlefcore-connector.x.y.z/Home/MySqlData Then you should see "1: Test Data 1 - EF Core TestContext A" And you should see "2: Test Data 2 - EF Core TestContext B" - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: MySqlEFCore Connector (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish + @net5.0 + @linux-x64 + Scenario: MySqlEFCore Connector (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app mysqlefcore-connector is started When you get https://mysqlefcore-connector.x.y.z/Home/MySqlData Then you should see "1: Test Data 1 - EF Core TestContext A" diff --git a/Connectors/src/AspDotNetCore/MySqlEFCore/Program.cs b/Connectors/src/AspDotNetCore/MySqlEFCore/Program.cs index d9fb7797a..f37af60ea 100644 --- a/Connectors/src/AspDotNetCore/MySqlEFCore/Program.cs +++ b/Connectors/src/AspDotNetCore/MySqlEFCore/Program.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; using System; @@ -47,10 +48,10 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) { return WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .UseStartup() - .UseCloudFoundryHosting() + .UseCloudHosting() .Build(); } } diff --git a/Connectors/src/AspDotNetCore/MySqlEFCore/Properties/launchSettings.json b/Connectors/src/AspDotNetCore/MySqlEFCore/Properties/launchSettings.json index b8cf52025..70d843092 100644 --- a/Connectors/src/AspDotNetCore/MySqlEFCore/Properties/launchSettings.json +++ b/Connectors/src/AspDotNetCore/MySqlEFCore/Properties/launchSettings.json @@ -16,7 +16,10 @@ } }, "MySqlEFCore": { - "commandName": "Project" + "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } } } } \ No newline at end of file diff --git a/Connectors/src/AspDotNetCore/MySqlEFCore/README.md b/Connectors/src/AspDotNetCore/MySqlEFCore/README.md index f6dcdb75d..abd8c84e9 100644 --- a/Connectors/src/AspDotNetCore/MySqlEFCore/README.md +++ b/Connectors/src/AspDotNetCore/MySqlEFCore/README.md @@ -24,11 +24,11 @@ You must first create an instance of the MySql service in a org/space. 1. `cd samples/Connectors/src/AspDotNetCore/MySqlEFCore` 1. `dotnet restore --configfile nuget.config` 1. Publish app to a local directory, specifying the framework and runtime (select ONE of these commands): - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f net461 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest (select ONE of these commands): - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest will create an app named `mysqlefcore-connector` and attempt to bind the app to MySql service `myMySqlService`. diff --git a/Connectors/src/AspDotNetCore/MySqlEFCore/Startup.cs b/Connectors/src/AspDotNetCore/MySqlEFCore/Startup.cs index 8514c1799..7320c232f 100644 --- a/Connectors/src/AspDotNetCore/MySqlEFCore/Startup.cs +++ b/Connectors/src/AspDotNetCore/MySqlEFCore/Startup.cs @@ -1,10 +1,9 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Steeltoe.CloudFoundry.Connector.MySql; using Steeltoe.CloudFoundry.Connector.MySql.EFCore; -using Steeltoe.Management.CloudFoundry; namespace MySqlEFCore { @@ -37,15 +36,11 @@ public void ConfigureServices(IServiceCollection services) } // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -58,17 +53,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Connectors/src/AspDotNetCore/MySqlEFCore/appsettings.Development.json b/Connectors/src/AspDotNetCore/MySqlEFCore/appsettings.Development.json index c093ed6fe..bce9e307d 100644 --- a/Connectors/src/AspDotNetCore/MySqlEFCore/appsettings.Development.json +++ b/Connectors/src/AspDotNetCore/MySqlEFCore/appsettings.Development.json @@ -1,37 +1,36 @@ { - "Logging": { - "IncludeScopes": false, - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } - }, - "mysql": { - "client": { - "sslmode": "none", - "ConnectionString": "Server=localhost;Database=steeltoe;Uid=steeltoe;Pwd=steeltoe;sslmode=none;" - // setting the connection string this way works fine with a single database - } - }, - "multipleMySqlDatabases": true, - // to add multiple databases of the same type, mimic the structure of how they will be configured on PCF - "vcap": { - "services": { - "local-mysql": [ - { - "name": "myMySqlService", - "credentials": { - "uri": "mysql://newuser0:password@localhost:3306/testdata" - } - }, - { - "name": "myOtherMySqlService", - "credentials": { - "uri": "mysql://newuser1:password@localhost:3306/moretestdata" - } - } - ] + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + }, + "mysql": { + "client": { + "ConnectionString": "Server=localhost;Database=steeltoe;Uid=steeltoe;Pwd=steeltoe;" + // setting the connection string this way works fine with a single database + } + }, + "multipleMySqlDatabases": false, + /* // to add multiple databases of the same type, mimic the structure of how they will be configured on Cloud Foundry + "vcap": { + "services": { + "local-mysql": [ + { + "name": "myMySqlService", + "credentials": { + "uri": "mysql://newuser0:password@localhost:3306/testdata" + } + }, + { + "name": "myOtherMySqlService", + "credentials": { + "uri": "mysql://newuser1:password@localhost:3306/moretestdata" + } } + ] } + }*/ } diff --git a/Connectors/src/AspDotNetCore/MySqlEFCore/appsettings.json b/Connectors/src/AspDotNetCore/MySqlEFCore/appsettings.json index 8982de7fe..c9d720233 100644 --- a/Connectors/src/AspDotNetCore/MySqlEFCore/appsettings.json +++ b/Connectors/src/AspDotNetCore/MySqlEFCore/appsettings.json @@ -5,11 +5,6 @@ "Default": "Warning" } }, - "mysql": { - "client": { - "sslmode": "none" - } - }, "management": { "endpoints": { "path": "/cloudfoundryapplication" diff --git a/Connectors/src/AspDotNetCore/MySqlEFCore/nuget.config b/Connectors/src/AspDotNetCore/MySqlEFCore/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Connectors/src/AspDotNetCore/MySqlEFCore/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Connectors/src/AspDotNetCore/OAuth/OAuth.csproj b/Connectors/src/AspDotNetCore/OAuth/OAuth.csproj index d44865a48..0efcf5daa 100644 --- a/Connectors/src/AspDotNetCore/OAuth/OAuth.csproj +++ b/Connectors/src/AspDotNetCore/OAuth/OAuth.csproj @@ -1,19 +1,11 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - + diff --git a/Connectors/src/AspDotNetCore/OAuth/Program.cs b/Connectors/src/AspDotNetCore/OAuth/Program.cs index 5cb3aaa5e..60f274434 100644 --- a/Connectors/src/AspDotNetCore/OAuth/Program.cs +++ b/Connectors/src/AspDotNetCore/OAuth/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; @@ -15,10 +16,10 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) { return WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .UseStartup() - .UseCloudFoundryHosting() + .UseCloudHosting() .Build(); } } diff --git a/Connectors/src/AspDotNetCore/OAuth/README.md b/Connectors/src/AspDotNetCore/OAuth/README.md index a6e2904e2..925282a6f 100644 --- a/Connectors/src/AspDotNetCore/OAuth/README.md +++ b/Connectors/src/AspDotNetCore/OAuth/README.md @@ -24,11 +24,11 @@ If you want to use the [Pivotal Single Signon](https://docs.pivotal.io/p-identit 1. `cd samples/Connectors/src/AspDotNetCore/OAuth` 1. `dotnet restore --configfile nuget.config` 1. Publish app to a local directory, specifying the framework and runtime (select ONE of these commands): - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f net461 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest (select ONE of these commands): - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest(s) will create an app named `oauth-connector` and attempt to bind the app to User Provided service `myOAuthService`. diff --git a/Connectors/src/AspDotNetCore/OAuth/Startup.cs b/Connectors/src/AspDotNetCore/OAuth/Startup.cs index 91ad0ccbd..5c0e4fa0b 100644 --- a/Connectors/src/AspDotNetCore/OAuth/Startup.cs +++ b/Connectors/src/AspDotNetCore/OAuth/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Steeltoe.CloudFoundry.Connector.OAuth; namespace OAuth @@ -22,15 +22,11 @@ public void ConfigureServices(IServiceCollection services) // Configure and Add IOptions to the container services.AddOAuthServiceOptions(Configuration); -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -43,7 +39,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -51,14 +46,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Connectors/src/AspDotNetCore/OAuth/nuget.config b/Connectors/src/AspDotNetCore/OAuth/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Connectors/src/AspDotNetCore/OAuth/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Connectors/src/AspDotNetCore/PostgreEFCore/PostgreEFCore.csproj b/Connectors/src/AspDotNetCore/PostgreEFCore/PostgreEFCore.csproj index 242c628f9..41c9853c5 100644 --- a/Connectors/src/AspDotNetCore/PostgreEFCore/PostgreEFCore.csproj +++ b/Connectors/src/AspDotNetCore/PostgreEFCore/PostgreEFCore.csproj @@ -1,24 +1,14 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - - + diff --git a/Connectors/src/AspDotNetCore/PostgreEFCore/PostgreEFCore.feature b/Connectors/src/AspDotNetCore/PostgreEFCore/PostgreEFCore.feature index d98098329..e13f02abb 100644 --- a/Connectors/src/AspDotNetCore/PostgreEFCore/PostgreEFCore.feature +++ b/Connectors/src/AspDotNetCore/PostgreEFCore/PostgreEFCore.feature @@ -14,30 +14,30 @@ Feature: PostgreEFCore Connector And you should see "2: Test Data 2 - EF Core TestContext" @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: PostgreEFCore Connector (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: PostgreEFCore Connector (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app postgresefcore-connector is started When you get https://postgresefcore-connector.x.y.z/Home/PostgresData Then you should see "1: Test Data 1 - EF Core TestContext" And you should see "2: Test Data 2 - EF Core TestContext" - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: PostgreEFCore Connector (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: PostgreEFCore Connector (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app postgresefcore-connector is started When you get https://postgresefcore-connector.x.y.z/Home/PostgresData Then you should see "1: Test Data 1 - EF Core TestContext" And you should see "2: Test Data 2 - EF Core TestContext" - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: PostgreEFCore Connector (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish + @net5.0 + @linux-x64 + Scenario: PostgreEFCore Connector (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app postgresefcore-connector is started When you get https://postgresefcore-connector.x.y.z/Home/PostgresData Then you should see "1: Test Data 1 - EF Core TestContext" diff --git a/Connectors/src/AspDotNetCore/PostgreEFCore/Program.cs b/Connectors/src/AspDotNetCore/PostgreEFCore/Program.cs index 92aa45d4d..3fe4369a2 100644 --- a/Connectors/src/AspDotNetCore/PostgreEFCore/Program.cs +++ b/Connectors/src/AspDotNetCore/PostgreEFCore/Program.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; using System; @@ -33,10 +34,10 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) { return WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .UseStartup() - .UseCloudFoundryHosting() + .UseCloudHosting() .Build(); } } diff --git a/Connectors/src/AspDotNetCore/PostgreEFCore/README.md b/Connectors/src/AspDotNetCore/PostgreEFCore/README.md index fbe20a72d..efd83edd0 100644 --- a/Connectors/src/AspDotNetCore/PostgreEFCore/README.md +++ b/Connectors/src/AspDotNetCore/PostgreEFCore/README.md @@ -36,11 +36,11 @@ Create an instance of the PostgreSQL database service in a org/space: 1. `cd samples/Connectors/src/AspDotNetCore/PostgreEFCore` 1. `dotnet restore --configfile nuget.config` 1. Publish app to a local directory, specifying the framework and runtime (select ONE of these commands): - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f net461 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest (select ONE of these commands): - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest(s) will create an app named `postgresefcore-connector` and attempt to bind the app to PostgreSql service `myPostgres`. diff --git a/Connectors/src/AspDotNetCore/PostgreEFCore/Startup.cs b/Connectors/src/AspDotNetCore/PostgreEFCore/Startup.cs index aced50bed..f01f9fa55 100644 --- a/Connectors/src/AspDotNetCore/PostgreEFCore/Startup.cs +++ b/Connectors/src/AspDotNetCore/PostgreEFCore/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Steeltoe.CloudFoundry.Connector.PostgreSql.EFCore; namespace PostgreEFCore @@ -22,15 +22,11 @@ public void ConfigureServices(IServiceCollection services) services.AddDbContext(options => options.UseNpgsql(Configuration)); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -43,7 +39,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -51,14 +46,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Connectors/src/AspDotNetCore/PostgreEFCore/appsettings.Development.json b/Connectors/src/AspDotNetCore/PostgreEFCore/appsettings.Development.json index e0ba5565a..9a3e766c4 100644 --- a/Connectors/src/AspDotNetCore/PostgreEFCore/appsettings.Development.json +++ b/Connectors/src/AspDotNetCore/PostgreEFCore/appsettings.Development.json @@ -9,7 +9,6 @@ }, "postgres": { "client": { - "sslmode": "none", "ConnectionString": "Server=localhost;Database=steeltoe;Uid=steeltoe;Pwd=steeltoe" } } diff --git a/Connectors/src/AspDotNetCore/PostgreEFCore/nuget.config b/Connectors/src/AspDotNetCore/PostgreEFCore/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Connectors/src/AspDotNetCore/PostgreEFCore/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Connectors/src/AspDotNetCore/PostgreSql/Model/SampleData.cs b/Connectors/src/AspDotNetCore/PostgreSql/Model/SampleData.cs index 34e357fbf..110e2c1cb 100644 --- a/Connectors/src/AspDotNetCore/PostgreSql/Model/SampleData.cs +++ b/Connectors/src/AspDotNetCore/PostgreSql/Model/SampleData.cs @@ -2,6 +2,7 @@ using System; using System.Threading.Tasks; using Npgsql; +using System.Data; namespace PostgreSql.Models { @@ -14,12 +15,16 @@ internal static async Task InitializePostgresData(IServiceProvider serviceProvid throw new ArgumentNullException("serviceProvider"); } - using (var service = serviceProvider.GetRequiredService()) + using (var scope = serviceProvider.CreateScope()) { - await service.OpenAsync(); - DropCreateTable(service); - InsertSampleData(service); - service.Close(); + + using (var service = (NpgsqlConnection)scope.ServiceProvider.GetRequiredService()) + { + await service.OpenAsync(); + DropCreateTable(service); + InsertSampleData(service); + service.Close(); + } } } diff --git a/Connectors/src/AspDotNetCore/PostgreSql/PostgreSql.csproj b/Connectors/src/AspDotNetCore/PostgreSql/PostgreSql.csproj index 4df528cfd..86929c1ae 100644 --- a/Connectors/src/AspDotNetCore/PostgreSql/PostgreSql.csproj +++ b/Connectors/src/AspDotNetCore/PostgreSql/PostgreSql.csproj @@ -1,24 +1,12 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - - - - + diff --git a/Connectors/src/AspDotNetCore/PostgreSql/PostgreSql.feature b/Connectors/src/AspDotNetCore/PostgreSql/PostgreSql.feature index 3c0b78971..fd69249a1 100644 --- a/Connectors/src/AspDotNetCore/PostgreSql/PostgreSql.feature +++ b/Connectors/src/AspDotNetCore/PostgreSql/PostgreSql.feature @@ -14,40 +14,30 @@ Feature: PostgreSql Connector And you should see "Key 2 = Row2 Text" @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: PostgreSql Connector (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: PostgreSql Connector (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app postgres-connector is started When you get https://postgres-connector.x.y.z/Home/PostgresData Then you should see "Key 1 = Row1 Text" And you should see "Key 2 = Row2 Text" - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: PostgreSql Connector (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: PostgreSql Connector (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app postgres-connector is started When you get https://postgres-connector.x.y.z/Home/PostgresData Then you should see "Key 1 = Row1 Text" And you should see "Key 2 = Row2 Text" - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: PostgreSql Connector (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish - And you wait until CloudFoundry app postgres-connector is started - When you get https://postgres-connector.x.y.z/Home/PostgresData - Then you should see "Key 1 = Row1 Text" - And you should see "Key 2 = Row2 Text" - - @net461 - @win10-x64 - Scenario: PostgreSql Connector (net461/win10-x64) - When you run: dotnet publish -f net461 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish + @net5.0 + @linux-x64 + Scenario: PostgreSql Connector (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app postgres-connector is started When you get https://postgres-connector.x.y.z/Home/PostgresData Then you should see "Key 1 = Row1 Text" diff --git a/Connectors/src/AspDotNetCore/PostgreSql/Program.cs b/Connectors/src/AspDotNetCore/PostgreSql/Program.cs index e87291ab7..ea4a0f413 100644 --- a/Connectors/src/AspDotNetCore/PostgreSql/Program.cs +++ b/Connectors/src/AspDotNetCore/PostgreSql/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; @@ -15,10 +16,10 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) { return WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .UseStartup() - .UseCloudFoundryHosting() + .UseCloudHosting() .Build(); } } diff --git a/Connectors/src/AspDotNetCore/PostgreSql/README.md b/Connectors/src/AspDotNetCore/PostgreSql/README.md index 7b743a42a..c1a98257b 100644 --- a/Connectors/src/AspDotNetCore/PostgreSql/README.md +++ b/Connectors/src/AspDotNetCore/PostgreSql/README.md @@ -36,11 +36,11 @@ cf create-service postgresql-10-odb standalone myPostgres -c '{\"db_name\":\"pos 1. `cd samples/Connectors/src/AspDotNetCore/PostgreSql` 1. `dotnet restore --configfile nuget.config` 1. Publish app to a local directory, specifying the framework and runtime (select ONE of these commands): - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f net461 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest (select ONE of these commands): - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest(s) will create an app named `postgres-connector` and attempt to bind the app to PostgreSQL service `myPostgres`. diff --git a/Connectors/src/AspDotNetCore/PostgreSql/Startup.cs b/Connectors/src/AspDotNetCore/PostgreSql/Startup.cs index 6a14f551f..eb2472c69 100644 --- a/Connectors/src/AspDotNetCore/PostgreSql/Startup.cs +++ b/Connectors/src/AspDotNetCore/PostgreSql/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using PostgreSql.Models; using Steeltoe.CloudFoundry.Connector.PostgreSql; @@ -22,15 +22,11 @@ public void ConfigureServices(IServiceCollection services) services.AddPostgresConnection(Configuration); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -43,20 +39,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif // Insert couple rows into table - SampleData.InitializePostgresData(app.ApplicationServices).Wait(); + SampleData.InitializePostgresData(app.ApplicationServices).GetAwaiter().GetResult(); } } } diff --git a/Connectors/src/AspDotNetCore/PostgreSql/appsettings.Development.json b/Connectors/src/AspDotNetCore/PostgreSql/appsettings.Development.json index e0ba5565a..9a3e766c4 100644 --- a/Connectors/src/AspDotNetCore/PostgreSql/appsettings.Development.json +++ b/Connectors/src/AspDotNetCore/PostgreSql/appsettings.Development.json @@ -9,7 +9,6 @@ }, "postgres": { "client": { - "sslmode": "none", "ConnectionString": "Server=localhost;Database=steeltoe;Uid=steeltoe;Pwd=steeltoe" } } diff --git a/Connectors/src/AspDotNetCore/PostgreSql/nuget.config b/Connectors/src/AspDotNetCore/PostgreSql/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Connectors/src/AspDotNetCore/PostgreSql/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Connectors/src/AspDotNetCore/RabbitMQ/Program.cs b/Connectors/src/AspDotNetCore/RabbitMQ/Program.cs index b08ae0392..f0b951d57 100644 --- a/Connectors/src/AspDotNetCore/RabbitMQ/Program.cs +++ b/Connectors/src/AspDotNetCore/RabbitMQ/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; @@ -10,10 +11,10 @@ public class Program public static void Main(string[] args) { var host = WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .UseStartup() - .UseCloudFoundryHosting() + .UseCloudHosting() .Build(); host.Run(); diff --git a/Connectors/src/AspDotNetCore/RabbitMQ/README.md b/Connectors/src/AspDotNetCore/RabbitMQ/README.md index 4e7c4f669..bdd3200cc 100644 --- a/Connectors/src/AspDotNetCore/RabbitMQ/README.md +++ b/Connectors/src/AspDotNetCore/RabbitMQ/README.md @@ -6,7 +6,7 @@ ASP.NET Core sample app illustrating how to use [Steeltoe RabbitMQ Connector](ht ## Pre-requisites - CloudFoundry -1. Installed Pivotal CloudFoundry 1.7+ +1. Installed CloudFoundry 1. (Optional) installed Windows support 1. Installed RabbitMQ CloudFoundry service 1. Installed .NET Core SDK @@ -24,11 +24,11 @@ You must first create an instance of the RabbitMQ service in a org/space. 1. `cd samples/Connectors/src/AspDotNetCore/RabbitMQ` 1. `dotnet restore --configfile nuget.config` 1. Publish app to a local directory, specifying the framework and runtime (select ONE of these commands): - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f net461 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest (select ONE of these commands): - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest will create an app named `rabbitmq-connector` and attempt to bind the app to RabbitMQ service `myRabbitMQService`. diff --git a/Connectors/src/AspDotNetCore/RabbitMQ/RabbitMQ.csproj b/Connectors/src/AspDotNetCore/RabbitMQ/RabbitMQ.csproj index 9743f82a0..04e877cd0 100644 --- a/Connectors/src/AspDotNetCore/RabbitMQ/RabbitMQ.csproj +++ b/Connectors/src/AspDotNetCore/RabbitMQ/RabbitMQ.csproj @@ -1,22 +1,12 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - - + diff --git a/Connectors/src/AspDotNetCore/RabbitMQ/RabbitMQ.feature b/Connectors/src/AspDotNetCore/RabbitMQ/RabbitMQ.feature index 3f16df9d5..25db0bfdb 100644 --- a/Connectors/src/AspDotNetCore/RabbitMQ/RabbitMQ.feature +++ b/Connectors/src/AspDotNetCore/RabbitMQ/RabbitMQ.feature @@ -14,40 +14,30 @@ Feature: RabbitMQ Connector Then you should see "Message=HEY THERE" @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: Rabbit Connector (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: Rabbit Connector (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app rabbitmq-connector is started When you post "Message=HEY THERE" to https://rabbitmq-connector.x.y.z/RabbitMQ/Send And you get https://rabbitmq-connector.x.y.z/RabbitMQ/Receive Then you should see "Message=HEY THERE" - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: Rabbit Connector (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: Rabbit Connector (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app rabbitmq-connector is started When you post "Message=HEY THERE" to https://rabbitmq-connector.x.y.z/RabbitMQ/Send And you get https://rabbitmq-connector.x.y.z/RabbitMQ/Receive Then you should see "Message=HEY THERE" - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: Rabbit Connector (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish - And you wait until CloudFoundry app rabbitmq-connector is started - When you post "Message=HEY THERE" to https://rabbitmq-connector.x.y.z/RabbitMQ/Send - And you get https://rabbitmq-connector.x.y.z/RabbitMQ/Receive - Then you should see "Message=HEY THERE" - - @net461 - @win10-x64 - Scenario: Rabbit Connector (net461/win10-x64) - When you run: dotnet publish -f net461 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish + @net5.0 + @linux-x64 + Scenario: Rabbit Connector (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app rabbitmq-connector is started When you post "Message=HEY THERE" to https://rabbitmq-connector.x.y.z/RabbitMQ/Send And you get https://rabbitmq-connector.x.y.z/RabbitMQ/Receive diff --git a/Connectors/src/AspDotNetCore/RabbitMQ/Startup.cs b/Connectors/src/AspDotNetCore/RabbitMQ/Startup.cs index f1669ee93..b03eaae41 100644 --- a/Connectors/src/AspDotNetCore/RabbitMQ/Startup.cs +++ b/Connectors/src/AspDotNetCore/RabbitMQ/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Steeltoe.CloudFoundry.Connector.RabbitMQ; using Steeltoe.Management.CloudFoundry; @@ -21,15 +21,11 @@ public void ConfigureServices(IServiceCollection services) { services.AddRabbitMQConnection(Configuration); -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -42,7 +38,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -50,14 +45,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=RabbitMQ}/{action=Send}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=RabbitMQ}/{action=Send}/{id?}"); - }); -#endif } } } diff --git a/Connectors/src/AspDotNetCore/RabbitMQ/nuget.config b/Connectors/src/AspDotNetCore/RabbitMQ/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Connectors/src/AspDotNetCore/RabbitMQ/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Connectors/src/AspDotNetCore/Redis/Program.cs b/Connectors/src/AspDotNetCore/Redis/Program.cs index 54e489cfa..7618562ff 100644 --- a/Connectors/src/AspDotNetCore/Redis/Program.cs +++ b/Connectors/src/AspDotNetCore/Redis/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; @@ -10,10 +11,10 @@ public class Program public static void Main(string[] args) { var host = WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .UseStartup() - .UseCloudFoundryHosting() + .UseCloudHosting() .Build(); host.Run(); diff --git a/Connectors/src/AspDotNetCore/Redis/README.md b/Connectors/src/AspDotNetCore/Redis/README.md index 768a892aa..083148b4d 100644 --- a/Connectors/src/AspDotNetCore/Redis/README.md +++ b/Connectors/src/AspDotNetCore/Redis/README.md @@ -26,11 +26,11 @@ You must first create an instance of the Redis service in a org/space. 1. `cd samples/Connectors/src/AspDotNetCore/Redis` 1. `dotnet restore --configfile nuget.config` 1. Publish app to a local directory, specifying the framework and runtime (select ONE of these commands): - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f net461 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest (select ONE of these commands): - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest will create an app named `redis-connector` and attempt to bind the app to Redis service `myRedisService`. diff --git a/Connectors/src/AspDotNetCore/Redis/Redis.csproj b/Connectors/src/AspDotNetCore/Redis/Redis.csproj index 4a29dde64..8e43f3b3f 100644 --- a/Connectors/src/AspDotNetCore/Redis/Redis.csproj +++ b/Connectors/src/AspDotNetCore/Redis/Redis.csproj @@ -1,25 +1,12 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - - - - - - + + diff --git a/Connectors/src/AspDotNetCore/Redis/Redis.feature b/Connectors/src/AspDotNetCore/Redis/Redis.feature index 73be5cbbf..3b31f9b59 100644 --- a/Connectors/src/AspDotNetCore/Redis/Redis.feature +++ b/Connectors/src/AspDotNetCore/Redis/Redis.feature @@ -14,40 +14,30 @@ Feature: Redis Connector And you should see "Key2=Key2Value" @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: Redis Connector (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: Redis Connector (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app redis-connector is started When you get https://redis-connector.x.y.z/Home/CacheData Then you should see "Key1=Key1Value" And you should see "Key2=Key2Value" - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: Redis Connector (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: Redis Connector (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app redis-connector is started When you get https://redis-connector.x.y.z/Home/CacheData Then you should see "Key1=Key1Value" And you should see "Key2=Key2Value" - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: Redis Connector (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish - And you wait until CloudFoundry app redis-connector is started - When you get https://redis-connector.x.y.z/Home/CacheData - Then you should see "Key1=Key1Value" - And you should see "Key2=Key2Value" - - @net461 - @win10-x64 - Scenario: Redis Connector (net461/win10-x64) - When you run: dotnet publish -f net461 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish + @net5.0 + @linux-x64 + Scenario: Redis Connector (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app redis-connector is started When you get https://redis-connector.x.y.z/Home/CacheData Then you should see "Key1=Key1Value" diff --git a/Connectors/src/AspDotNetCore/Redis/Startup.cs b/Connectors/src/AspDotNetCore/Redis/Startup.cs index c47a2de1e..f1cb3154c 100644 --- a/Connectors/src/AspDotNetCore/Redis/Startup.cs +++ b/Connectors/src/AspDotNetCore/Redis/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Redis.Models; using Steeltoe.CloudFoundry.Connector.Redis; @@ -31,15 +31,11 @@ public void ConfigureServices(IServiceCollection services) services.AddRedisConnectionMultiplexer(Configuration); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -52,17 +48,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif // Add some data to the Redis cache SampleData.InitializeCache(app.ApplicationServices).Wait(); diff --git a/Connectors/src/AspDotNetCore/Redis/nuget.config b/Connectors/src/AspDotNetCore/Redis/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Connectors/src/AspDotNetCore/Redis/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Connectors/src/AspDotNetCore/SqlServerEFCore/Program.cs b/Connectors/src/AspDotNetCore/SqlServerEFCore/Program.cs index 5901a7adb..a8d0199ba 100644 --- a/Connectors/src/AspDotNetCore/SqlServerEFCore/Program.cs +++ b/Connectors/src/AspDotNetCore/SqlServerEFCore/Program.cs @@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; using System; @@ -33,10 +34,10 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) { return WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .UseStartup() - .UseCloudFoundryHosting() + .UseCloudHosting() .Build(); } } diff --git a/Connectors/src/AspDotNetCore/SqlServerEFCore/README.md b/Connectors/src/AspDotNetCore/SqlServerEFCore/README.md index b2f7f97cb..d29f1f341 100644 --- a/Connectors/src/AspDotNetCore/SqlServerEFCore/README.md +++ b/Connectors/src/AspDotNetCore/SqlServerEFCore/README.md @@ -27,11 +27,11 @@ You must first create an instance of the SQL Server service in a org/space using 1. `cd samples/Connectors/src/AspDotNetCore/SqlServerEFCore` 1. `dotnet restore --configfile nuget.config` 1. Publish app to a local directory, specifying the framework and runtime (select ONE of these commands): - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f net461 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest (select ONE of these commands): - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest will create an app named `sqlserverefcore-connector` and attempt to bind the app to SQL Server service `mySqlServerService`. diff --git a/Connectors/src/AspDotNetCore/SqlServerEFCore/SqlServerEFCore.csproj b/Connectors/src/AspDotNetCore/SqlServerEFCore/SqlServerEFCore.csproj index 61268c31e..b4a5f7f90 100644 --- a/Connectors/src/AspDotNetCore/SqlServerEFCore/SqlServerEFCore.csproj +++ b/Connectors/src/AspDotNetCore/SqlServerEFCore/SqlServerEFCore.csproj @@ -1,21 +1,13 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - + diff --git a/Connectors/src/AspDotNetCore/SqlServerEFCore/Startup.cs b/Connectors/src/AspDotNetCore/SqlServerEFCore/Startup.cs index 2c44de167..d6e9606d9 100644 --- a/Connectors/src/AspDotNetCore/SqlServerEFCore/Startup.cs +++ b/Connectors/src/AspDotNetCore/SqlServerEFCore/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Steeltoe.CloudFoundry.Connector.SqlServer.EFCore; namespace SqlServerEFCore @@ -21,15 +21,11 @@ public void ConfigureServices(IServiceCollection services) // Add Context and use SqlServer as provider ... provider will be configured from VCAP_ info services.AddDbContext(options => options.UseSqlServer(Configuration)); -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -42,17 +38,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Discovery/src/AspDotNetAutofac/Fortune-Teller-OwinService4/App.config b/Discovery/src/AspDotNetAutofac/Fortune-Teller-OwinService4/App.config index a0d4bf3bf..cad48eec9 100644 --- a/Discovery/src/AspDotNetAutofac/Fortune-Teller-OwinService4/App.config +++ b/Discovery/src/AspDotNetAutofac/Fortune-Teller-OwinService4/App.config @@ -1,13 +1,12 @@  - - - + + - + @@ -23,67 +22,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -91,18 +90,74 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + - + \ No newline at end of file diff --git a/Discovery/src/AspDotNetAutofac/Fortune-Teller-OwinService4/Fortune-Teller-OwinService4.csproj b/Discovery/src/AspDotNetAutofac/Fortune-Teller-OwinService4/Fortune-Teller-OwinService4.csproj index ddb72d5c4..32d7db42a 100644 --- a/Discovery/src/AspDotNetAutofac/Fortune-Teller-OwinService4/Fortune-Teller-OwinService4.csproj +++ b/Discovery/src/AspDotNetAutofac/Fortune-Teller-OwinService4/Fortune-Teller-OwinService4.csproj @@ -1,5 +1,4 @@  - Debug @@ -19,6 +18,7 @@ false + true true @@ -39,159 +39,176 @@ 4 - - ..\packages\Autofac.4.8.1\lib\net45\Autofac.dll + + ..\packages\Autofac.8.0.0\lib\netstandard2.0\Autofac.dll - - ..\packages\Autofac.Owin.4.2.0\lib\net45\Autofac.Integration.Owin.dll + + ..\packages\Autofac.Owin.7.1.0\lib\net472\Autofac.Integration.Owin.dll - - ..\packages\Autofac.WebApi2.4.3.1\lib\net45\Autofac.Integration.WebApi.dll + + ..\packages\Autofac.WebApi2.6.1.1\lib\net472\Autofac.Integration.WebApi.dll - - ..\packages\Autofac.WebApi2.Owin.4.0.0\lib\net45\Autofac.Integration.WebApi.Owin.dll + + ..\packages\Autofac.WebApi2.Owin.6.2.1\lib\net472\Autofac.Integration.WebApi.Owin.dll - - ..\packages\Consul.0.7.2.6\lib\net45\Consul.dll + + ..\packages\Consul.1.7.14.3\lib\net461\Consul.dll - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll - - ..\packages\Microsoft.Extensions.Caching.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll + + ..\packages\Microsoft.Extensions.Caching.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Caching.Abstractions.dll + + + ..\packages\Microsoft.Extensions.Configuration.8.0.0\lib\net462\Microsoft.Extensions.Configuration.dll - - ..\packages\Microsoft.Extensions.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll + + ..\packages\Microsoft.Extensions.Configuration.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.Configuration.Abstractions.dll - - ..\packages\Microsoft.Extensions.Configuration.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll + + ..\packages\Microsoft.Extensions.Configuration.Binder.8.0.1\lib\net462\Microsoft.Extensions.Configuration.Binder.dll - - ..\packages\Microsoft.Extensions.Configuration.Binder.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll + + ..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.8.0.0\lib\net462\Microsoft.Extensions.Configuration.EnvironmentVariables.dll - - ..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.2.2.4\lib\netstandard2.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll + + ..\packages\Microsoft.Extensions.Configuration.FileExtensions.8.0.0\lib\net462\Microsoft.Extensions.Configuration.FileExtensions.dll - - ..\packages\Microsoft.Extensions.Configuration.FileExtensions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll + + ..\packages\Microsoft.Extensions.Configuration.Json.8.0.0\lib\net462\Microsoft.Extensions.Configuration.Json.dll - - ..\packages\Microsoft.Extensions.Configuration.Json.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll + + ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\packages\Microsoft.Extensions.FileProviders.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll + + ..\packages\Microsoft.Extensions.FileProviders.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.FileProviders.Abstractions.dll - - ..\packages\Microsoft.Extensions.FileProviders.Physical.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll + + ..\packages\Microsoft.Extensions.FileProviders.Physical.8.0.0\lib\net462\Microsoft.Extensions.FileProviders.Physical.dll - - ..\packages\Microsoft.Extensions.FileSystemGlobbing.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll + + ..\packages\Microsoft.Extensions.FileSystemGlobbing.8.0.0\lib\net462\Microsoft.Extensions.FileSystemGlobbing.dll - - ..\packages\Microsoft.Extensions.Http.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Http.dll + + ..\packages\Microsoft.Extensions.Http.8.0.0\lib\net462\Microsoft.Extensions.Http.dll - - ..\packages\Microsoft.Extensions.Logging.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll + + ..\packages\Microsoft.Extensions.Logging.8.0.0\lib\net462\Microsoft.Extensions.Logging.dll - - ..\packages\Microsoft.Extensions.Logging.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll + + ..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Extensions.Logging.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll + + ..\packages\Microsoft.Extensions.Logging.Configuration.8.0.0\lib\net462\Microsoft.Extensions.Logging.Configuration.dll - - ..\packages\Microsoft.Extensions.Logging.Console.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Console.dll + + ..\packages\Microsoft.Extensions.Logging.Console.8.0.0\lib\net462\Microsoft.Extensions.Logging.Console.dll - - ..\packages\Microsoft.Extensions.Options.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll + + ..\packages\Microsoft.Extensions.Options.8.0.2\lib\net462\Microsoft.Extensions.Options.dll - - ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll + + ..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.8.0.0\lib\net462\Microsoft.Extensions.Options.ConfigurationExtensions.dll - - ..\packages\Microsoft.Extensions.Primitives.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll + + ..\packages\Microsoft.Extensions.Primitives.8.0.0\lib\net462\Microsoft.Extensions.Primitives.dll - - ..\packages\Microsoft.Owin.4.0.1\lib\net45\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll - - ..\packages\Microsoft.Owin.Host.HttpListener.4.0.1\lib\net45\Microsoft.Owin.Host.HttpListener.dll + + ..\packages\Microsoft.Owin.Host.HttpListener.4.2.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll - - ..\packages\Microsoft.Owin.Hosting.4.0.1\lib\net45\Microsoft.Owin.Hosting.dll + + ..\packages\Microsoft.Owin.Hosting.4.2.2\lib\net45\Microsoft.Owin.Hosting.dll - - ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll ..\packages\Owin.1.0\lib\net40\Owin.dll - - ..\packages\Steeltoe.CloudFoundry.ConnectorBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.CloudFoundry.ConnectorBase.dll + + ..\packages\Steeltoe.CloudFoundry.ConnectorBase.2.5.5\lib\netstandard2.0\Steeltoe.CloudFoundry.ConnectorBase.dll - - ..\packages\Steeltoe.Common.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.dll + + ..\packages\Steeltoe.Common.2.5.5\lib\netstandard2.0\Steeltoe.Common.dll - - ..\packages\Steeltoe.Common.Autofac.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.Autofac.dll + + ..\packages\Steeltoe.Common.Autofac.2.5.5\lib\netstandard2.0\Steeltoe.Common.Autofac.dll - - ..\packages\Steeltoe.Common.Http.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Common.Http.dll + + ..\packages\Steeltoe.Common.Http.2.5.5\lib\netstandard2.0\Steeltoe.Common.Http.dll - - ..\packages\Steeltoe.Discovery.ClientAutofac.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Discovery.ClientAutofac.dll + + ..\packages\Steeltoe.Discovery.ClientAutofac.2.5.5\lib\netstandard2.0\Steeltoe.Discovery.ClientAutofac.dll - - ..\packages\Steeltoe.Discovery.ConsulBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Discovery.ConsulBase.dll + + ..\packages\Steeltoe.Discovery.ConsulBase.2.5.5\lib\netstandard2.0\Steeltoe.Discovery.ConsulBase.dll - - ..\packages\Steeltoe.Discovery.EurekaBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Discovery.EurekaBase.dll + + ..\packages\Steeltoe.Discovery.EurekaBase.2.5.5\lib\netstandard2.0\Steeltoe.Discovery.EurekaBase.dll - - ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.4.0-ci1177\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.5.5\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll - - ..\packages\System.Buffers.4.4.0\lib\netstandard2.0\System.Buffers.dll + + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - ..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll + ..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll - - ..\packages\System.Diagnostics.DiagnosticSource.4.4.1\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll ..\packages\System.IO.4.3.0\lib\net462\System.IO.dll True True - - ..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll + + ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll True True + + ..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll + - - ..\packages\System.Numerics.Vectors.4.4.0\lib\net46\System.Numerics.Vectors.dll + + + + + + + ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + + ..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll True True - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.5.1\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - ..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll True True @@ -205,19 +222,29 @@ True True - - ..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + + ..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll True True - - - - - + + ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.8.0.3\lib\net462\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + - - ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.7\lib\net45\System.Web.Http.Owin.dll + + ..\packages\Microsoft.AspNet.WebApi.Core.5.3.0\lib\net45\System.Web.Http.dll + + + ..\packages\Microsoft.AspNet.WebApi.Owin.5.3.0\lib\net45\System.Web.Http.Owin.dll @@ -225,14 +252,6 @@ - - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll - - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll - - @@ -253,13 +272,13 @@ - App.config App.config + @@ -272,11 +291,12 @@ + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + diff --git a/Discovery/src/AspDotNetAutofac/Fortune-Teller-Service4/appsettings.json b/Discovery/src/AspDotNetAutofac/Fortune-Teller-Service4/appsettings.json index ab8739aa6..250d2157e 100644 --- a/Discovery/src/AspDotNetAutofac/Fortune-Teller-Service4/appsettings.json +++ b/Discovery/src/AspDotNetAutofac/Fortune-Teller-Service4/appsettings.json @@ -6,7 +6,7 @@ }, "eureka": { "client": { - "serviceUrl": "http://localhost:8761/eureka/", + "serviceUrl": "http://172.26.240.1:8761/eureka/", "shouldFetchRegistry": false, "validate_certificates": false }, diff --git a/Discovery/src/AspDotNetAutofac/Fortune-Teller-Service4/packages.config b/Discovery/src/AspDotNetAutofac/Fortune-Teller-Service4/packages.config index f30417096..a945667d2 100644 --- a/Discovery/src/AspDotNetAutofac/Fortune-Teller-Service4/packages.config +++ b/Discovery/src/AspDotNetAutofac/Fortune-Teller-Service4/packages.config @@ -1,93 +1,105 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Discovery/src/AspDotNetAutofac/Fortune-Teller-UI4/Fortune-Teller-UI4.csproj b/Discovery/src/AspDotNetAutofac/Fortune-Teller-UI4/Fortune-Teller-UI4.csproj index 0bc635ab4..72d5e3da5 100644 --- a/Discovery/src/AspDotNetAutofac/Fortune-Teller-UI4/Fortune-Teller-UI4.csproj +++ b/Discovery/src/AspDotNetAutofac/Fortune-Teller-UI4/Fortune-Teller-UI4.csproj @@ -1,7 +1,5 @@  - - Debug @@ -15,7 +13,7 @@ Properties FortuneTellerUI4 FortuneTellerUI4 - v4.6.1 + v4.7.2 false true @@ -45,30 +43,6 @@ prompt 4 - - - - - - - - - - - - - - - - - - - - - - - - @@ -147,40 +121,28 @@ - 4.0.2 + 6.1.0 - 5.2.7 + 5.3.0 1.1.3 - - 2.4.0-ci1177 + + 4.1.0 - - 2.4.0-ci1177 + + 13.0.3 - 2.4.0-ci1177 + 2.5.5 - 2.4.0-ci1177 - - - 2.4.0-ci1177 - - - 2.4.0-ci1177 - - - 2.4.0-ci1177 - - - 2.4.0-ci1177 + 2.5.5 - 2.4.0-ci1177 + 2.5.5 @@ -215,8 +177,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + + - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + + - - + + - + @@ -254,12 +58,22 @@ - + - + - + + + + + + + + + + + diff --git a/Discovery/src/AspDotNetAutofac/Fortune-Teller-UI4/appsettings.json b/Discovery/src/AspDotNetAutofac/Fortune-Teller-UI4/appsettings.json index 03b711e6c..3b2820fd8 100644 --- a/Discovery/src/AspDotNetAutofac/Fortune-Teller-UI4/appsettings.json +++ b/Discovery/src/AspDotNetAutofac/Fortune-Teller-UI4/appsettings.json @@ -6,7 +6,7 @@ }, "eureka": { "client": { - "serviceUrl": "http://localhost:8761/eureka/", + "serviceUrl": "http://172.26.240.1:8761/eureka/", "shouldRegisterWithEureka": false, "validateCertificates": false } diff --git a/Discovery/src/AspDotNetAutofac/FortuneTellerWinService/FortuneTellerWinService.csproj b/Discovery/src/AspDotNetAutofac/FortuneTellerWinService/FortuneTellerWinService.csproj index ef3c66ceb..7725177b1 100644 --- a/Discovery/src/AspDotNetAutofac/FortuneTellerWinService/FortuneTellerWinService.csproj +++ b/Discovery/src/AspDotNetAutofac/FortuneTellerWinService/FortuneTellerWinService.csproj @@ -108,7 +108,10 @@ 2.2.0 - 2.4.0-ci1177 + 2.5.5 + + + 2.5.5 diff --git a/Discovery/src/AspDotNetAutofac/FortuneTellerWinService/appsettings.json b/Discovery/src/AspDotNetAutofac/FortuneTellerWinService/appsettings.json index e7f28c632..67fa547fe 100644 --- a/Discovery/src/AspDotNetAutofac/FortuneTellerWinService/appsettings.json +++ b/Discovery/src/AspDotNetAutofac/FortuneTellerWinService/appsettings.json @@ -6,7 +6,7 @@ }, "eureka": { "client": { - "serviceUrl": "http://localhost:8761/eureka/", + "serviceUrl": "http://172.26.240.1:8761/eureka/", "shouldFetchRegistry": false, "validate_certificates": false }, diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Fortune-Teller-Service.csproj b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Fortune-Teller-Service.csproj index ea44c2e00..a55c4bf88 100644 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Fortune-Teller-Service.csproj +++ b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Fortune-Teller-Service.csproj @@ -1,8 +1,7 @@  - netcoreapp3.1 - + netcoreapp3.1 @@ -15,19 +14,12 @@ - - - - - - - - - - + + + diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Program.cs b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Program.cs index 3b372d271..ed1e08e39 100644 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Program.cs +++ b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Program.cs @@ -16,7 +16,7 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - // .AddCloudFoundry() + // .AddCloudFoundryConfiguration() .AddPlaceholderResolver() .AddServiceDiscovery() .UseStartup() diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/README.md b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/README.md index 2c61dcd2b..aaa1118e0 100644 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/README.md +++ b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/README.md @@ -20,7 +20,7 @@ This sample assumes that there is a running Spring Cloud Eureka Server on your m 1. Clone this repo. (i.e. git clone ) 1. cd samples/Discovery/src/AspDotNetCore/Fortune-Teller-Service 1. dotnet restore --configfile nuget.config -1. dotnet run -f netcoreapp2.1 +1. dotnet run -f netcoreapp3.1 ## What to expect - Local @@ -28,7 +28,7 @@ After building and running the app, you should see something like the following: ```bash $ cd samples/Discovery/src/AspDotNetCore/Fortune-Teller-Service -$ dotnet run -f netcoreapp2.1 +$ dotnet run -f netcoreapp3.1 info: Microsoft.Data.Entity.Storage.Internal.InMemoryStore[1] Saved 50 entities to in-memory store. Hosting environment: Production @@ -57,9 +57,9 @@ You must first create an instance of the Service Registry service in a org/space 1. cf target -o myorg -s development 1. cd samples/Discovery/src/AspDotNetCore/Fortune-Teller-Service -1. dotnet restore --configfile nuget.config -1. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64`) -1. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish`) +1. dotnet restore +1. Publish app to a directory selecting the runtime you want to run on. (e.g. `dotnet publish -r linux-x64`) +1. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish`) > Note: If you are using self-signed certificates it is possible that you might run into SSL certificate validation issues when pushing this app. The simplest way to fix this: diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Startup.cs b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Startup.cs index 42590b35a..86ac5af27 100644 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Startup.cs +++ b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/Startup.cs @@ -5,7 +5,6 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Steeltoe.Discovery.Client; namespace FortuneTellerService @@ -29,30 +28,17 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); // Add framework services. -#if NETCOREAPP3_1 services.AddControllers(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app) { app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif SampleData.InitializeFortunesAsync(app.ApplicationServices).Wait(); } diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/nuget.config b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/versions.props b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/versions.props index a1c8b826b..2737d706f 100644 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-Service/versions.props +++ b/Discovery/src/AspDotNetCore/Fortune-Teller-Service/versions.props @@ -1,6 +1,6 @@ - 2.4.3 + 2.5.5 $(SteeltoeVersion) @@ -15,14 +15,6 @@ 11.0.3 5.1.0 - - 2.1.1 - 2.1.1 - - - 2.1.1 - 2.1.1 - 3.1.0 3.1.0 diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Fortune-Teller-UI.csproj b/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Fortune-Teller-UI.csproj index edf0e169f..732129e64 100644 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Fortune-Teller-UI.csproj +++ b/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Fortune-Teller-UI.csproj @@ -1,19 +1,13 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1 - - - - - - - - + + + diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Program.cs b/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Program.cs index f5affcb71..85dadd045 100644 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Program.cs +++ b/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Discovery.Client; using Steeltoe.Extensions.Configuration.CloudFoundry; @@ -14,10 +15,10 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddServiceDiscovery() .UseStartup() - .UseCloudFoundryHosting(5555) + .UseCloudHosting(5555) .Build(); } } diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/README.md b/Discovery/src/AspDotNetCore/Fortune-Teller-UI/README.md index b547fa3c5..18b2930f4 100644 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/README.md +++ b/Discovery/src/AspDotNetCore/Fortune-Teller-UI/README.md @@ -13,7 +13,7 @@ Refer to [common tasks](/CommonTasks.md#Spring-Cloud-Eureka-Server) for detailed 1. Clone this repository: `git clone https://github.com/SteeltoeOSS/Samples` 1. `cd samples/Discovery/src/AspDotNetCore/Fortune-Teller/Fortune-Teller-UI` 1. `dotnet restore` -1. `dotnet run -f netcoreapp3.1` - netcoreapp2.1 are also valid choices net461 +1. `dotnet run` ## What to expect - Local @@ -21,7 +21,7 @@ After building and running the app, you should see something like the following: ```bash $ cd samples/Discovery/src/AspDotNetCore/Fortune-Teller-UI -$ dotnet run -f netcoreapp2.1 +$ dotnet run Hosting environment: Production Now listening on: http://*:5555 Application started. Press Ctrl+C to shut down. @@ -39,10 +39,11 @@ Using the service instance name of `myDiscoveryService`, complete the [common ta 1. Login and target your desired space/org: `cf target -o myorg -s myspace` 1. `cd samples/Discovery/src/AspDotNetCore/Fortune-Teller/Fortune-Teller-Service` -1. Publish the app, selecting the framework and runtime you want to run on: - - `dotnet publish -f netcoreapp3.1 -r ubuntu.18.04-x64` +1. Publish the app, selecting the runtime you want to run on: + - `dotnet publish -r linux-x64` + - `dotnet publish -r win10-x64` 1. Push the app using the appropriate manifest: - - `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.18.04-x64/publish` + - `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` - `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` ## What to expect - CloudFoundry diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Startup.cs b/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Startup.cs index 955465ca0..b39c0eeb0 100644 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Startup.cs +++ b/Discovery/src/AspDotNetCore/Fortune-Teller-UI/Startup.cs @@ -1,9 +1,8 @@ using Fortune_Teller_UI.Services; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Hosting; using Steeltoe.Discovery.Client; using Steeltoe.Common.Http.Discovery; using System; @@ -30,15 +29,11 @@ public void ConfigureServices(IServiceCollection services) .AddTypedClient(); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -51,17 +46,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/nuget.config b/Discovery/src/AspDotNetCore/Fortune-Teller-UI/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Discovery/src/AspDotNetCore/Fortune-Teller-UI/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Discovery/src/AspDotNetCore/RunFortuneTeller.cmd b/Discovery/src/AspDotNetCore/RunFortuneTeller.cmd index 6c069e524..2d52bfc2f 100644 --- a/Discovery/src/AspDotNetCore/RunFortuneTeller.cmd +++ b/Discovery/src/AspDotNetCore/RunFortuneTeller.cmd @@ -5,5 +5,5 @@ start "Fortune Teller UI" dotnet run -p .\Fortune-Teller-UI\Fortune-Teller-UI.cs :usage echo USAGE: echo RunFortuneTeller [framework] -echo framework - target framework to publish (e.g. net461, netcoreapp2.1) +echo framework - target framework to publish (e.g. netcoreapp3.1) exit /b \ No newline at end of file diff --git a/Discovery/src/AspDotNetCoreDocker/Fortune-Teller-Service/Program.cs b/Discovery/src/AspDotNetCoreDocker/Fortune-Teller-Service/Program.cs index 56a928b65..0246e6bd7 100644 --- a/Discovery/src/AspDotNetCoreDocker/Fortune-Teller-Service/Program.cs +++ b/Discovery/src/AspDotNetCoreDocker/Fortune-Teller-Service/Program.cs @@ -14,8 +14,8 @@ public static void Main(string[] args) } public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseCloudFoundryHosting(5000) - .AddCloudFoundry() + .UseCloudHosting(5000) + .AddCloudFoundryConfiguration() .UseStartup() .Build(); diff --git a/Discovery/src/AspDotNetCoreDocker/Fortune-Teller-UI/Program.cs b/Discovery/src/AspDotNetCoreDocker/Fortune-Teller-UI/Program.cs index d4ef52703..2fe7bb5ae 100644 --- a/Discovery/src/AspDotNetCoreDocker/Fortune-Teller-UI/Program.cs +++ b/Discovery/src/AspDotNetCoreDocker/Fortune-Teller-UI/Program.cs @@ -12,8 +12,8 @@ public static void Main(string[] args) } public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseCloudFoundryHosting(5555) - .AddCloudFoundry() + .UseCloudHosting(5555) + .AddCloudFoundryConfiguration() .UseStartup() .Build(); } diff --git a/Discovery/src/Console/Fetch/Program.cs b/Discovery/src/Console/Fetch/Program.cs index a3fcf6edd..c52af1863 100644 --- a/Discovery/src/Console/Fetch/Program.cs +++ b/Discovery/src/Console/Fetch/Program.cs @@ -17,7 +17,7 @@ static void Main(string[] args) ConfigurationBuilder builder = new ConfigurationBuilder(); builder.SetBasePath(Environment.CurrentDirectory); builder.AddJsonFile("appsettings.json"); - builder.AddCloudFoundry(); + builder.AddCloudFoundryConfiguration(); var configuration = builder.Build(); // Setup logging diff --git a/Discovery/src/Console/Register/Program.cs b/Discovery/src/Console/Register/Program.cs index 5c4f122ea..143909c27 100644 --- a/Discovery/src/Console/Register/Program.cs +++ b/Discovery/src/Console/Register/Program.cs @@ -17,7 +17,7 @@ static void Main(string[] args) ConfigurationBuilder builder = new ConfigurationBuilder(); builder.SetBasePath(Environment.CurrentDirectory); builder.AddJsonFile("appsettings.json"); - builder.AddCloudFoundry(); + builder.AddCloudFoundryConfiguration(); var configuration = builder.Build(); diff --git a/FreddysBBQ/README.md b/FreddysBBQ/README.md index a39e08b18..42c469f6a 100644 --- a/FreddysBBQ/README.md +++ b/FreddysBBQ/README.md @@ -80,8 +80,8 @@ cf delete order-service -f dotnet publish -f netcoreapp2.1 -r win10-x64 cf push -f manifest-windows.yml -p bin\Debug\netcoreapp2.1\win10-x64\publish # OR for Linux -dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 -cf push -f manifest.yml -p bin\Debug\netcoreapp2.1\ubuntu.16.04-x64\publish +dotnet publish -f netcoreapp2.1 -r linux-x64 +cf push -f manifest.yml -p bin\Debug\netcoreapp2.1\linux-x64\publish cd ..\AdminPortal cf delete admin-portal -f @@ -89,8 +89,8 @@ cf delete admin-portal -f dotnet publish -f netcoreapp2.1 -r win10-x64 cf push -f manifest-windows.yml -p bin\Debug\netcoreapp2.1\win10-x64\publish # OR for Linux -dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 -cf push -f manifest.yml -p bin\Debug\netcoreapp2.1\ubuntu.16.04-x64\publish +dotnet publish -f netcoreapp2.1 -r linux-x64 +cf push -f manifest.yml -p bin\Debug\netcoreapp2.1\linux-x64\publish ``` At this point the app should continue to work as it did before. Any orders you might have had before, will be gone as you are now starting with a new clean order database. diff --git a/Management/README.md b/Management/README.md index cb80d61bb..f81f2171a 100644 --- a/Management/README.md +++ b/Management/README.md @@ -1,6 +1,6 @@ # Management Sample Applications -This repo tree contains sample apps illustrating how to use the Steeltoe Actuator Endpoints for managing and monitoring your ASP.NET Core and/or ASP.NET 4.x application. Steeltoe Actuator endpoints can be used to expose services for checking health, adjusting logging, etc. of your applications. The endpoints also seemlessly integrate with the Pivotal Applications Manager for Cloud Foundry providing more information on how your application is behaving. +This repo tree contains sample apps illustrating how to use the Steeltoe Actuator Endpoints for managing and monitoring your ASP.NET Core and/or ASP.NET 4.x application. Steeltoe Actuator endpoints can be used to expose services for checking health, adjusting logging, etc. of your applications. The endpoints also seamlessly integrate with the Pivotal Applications Manager for Cloud Foundry providing more information on how your application is behaving. * src/AspDotNetCore/CloudFoundry - ASP.NET Core sample app illustrating how to use all of the Actuator endpoints which are capable of integrating with the Pivotal Apps Manager console for Cloud Foundry. diff --git a/Management/src/AspDotNet4/CloudFoundryOwin/App_Start/LoggingConfig.cs b/Management/src/AspDotNet4/CloudFoundryOwin/App_Start/LoggingConfig.cs index ea3220a59..d82bd32cc 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwin/App_Start/LoggingConfig.cs +++ b/Management/src/AspDotNet4/CloudFoundryOwin/App_Start/LoggingConfig.cs @@ -8,14 +8,17 @@ namespace CloudFoundryOwin public static class LoggingConfig { public static ILoggerFactory LoggerFactory { get; set; } + public static ILoggerProvider LoggerProvider { get; set; } public static void Configure(IConfiguration configuration) { - IServiceCollection serviceCollection = new Microsoft.Extensions.DependencyInjection.ServiceCollection(); + IServiceCollection serviceCollection = new ServiceCollection(); serviceCollection.AddLogging(builder => builder.SetMinimumLevel(LogLevel.Trace)); - serviceCollection.AddLogging(builder => builder.AddDynamicConsole()); - LoggerFactory = serviceCollection.BuildServiceProvider().GetService(); + serviceCollection.AddLogging(builder => builder.AddDynamicConsole(true)); + var serviceProvider = serviceCollection.BuildServiceProvider(); + LoggerFactory = serviceProvider.GetService(); + LoggerProvider = serviceProvider.GetService(); } } } \ No newline at end of file diff --git a/Management/src/AspDotNet4/CloudFoundryOwin/CloudFoundryOwin.csproj b/Management/src/AspDotNet4/CloudFoundryOwin/CloudFoundryOwin.csproj index 99fdd9e81..b7a32105e 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwin/CloudFoundryOwin.csproj +++ b/Management/src/AspDotNet4/CloudFoundryOwin/CloudFoundryOwin.csproj @@ -1,7 +1,6 @@  + - - Debug @@ -46,8 +45,26 @@ 4 - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll + + + ..\packages\Google.Protobuf.3.11.4\lib\net45\Google.Protobuf.dll + + + ..\packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll + + + ..\packages\K4os.Compression.LZ4.Streams.1.1.11\lib\net46\K4os.Compression.LZ4.Streams.dll + + + ..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -92,8 +109,8 @@ ..\packages\Microsoft.Extensions.FileSystemGlobbing.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll - - ..\packages\Microsoft.Extensions.Hosting.2.1.0\lib\netstandard2.0\Microsoft.Extensions.Hosting.dll + + ..\packages\Microsoft.Extensions.Hosting.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Hosting.dll ..\packages\Microsoft.Extensions.Hosting.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Hosting.Abstractions.dll @@ -101,17 +118,17 @@ ..\packages\Microsoft.Extensions.Http.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Http.dll - - ..\packages\Microsoft.Extensions.Logging.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.dll + + ..\packages\Microsoft.Extensions.Logging.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll ..\packages\Microsoft.Extensions.Logging.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll - - ..\packages\Microsoft.Extensions.Logging.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll + + ..\packages\Microsoft.Extensions.Logging.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll - - ..\packages\Microsoft.Extensions.Logging.Console.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Console.dll + + ..\packages\Microsoft.Extensions.Logging.Console.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Console.dll ..\packages\Microsoft.Extensions.Options.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll @@ -122,14 +139,14 @@ ..\packages\Microsoft.Extensions.Primitives.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll - - ..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll + + ..\packages\Microsoft.Owin.4.2.0\lib\net45\Microsoft.Owin.dll ..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll - - ..\packages\MySql.Data.6.10.8\lib\net452\MySql.Data.dll + + ..\packages\MySql.Data.8.0.23\lib\net452\MySql.Data.dll ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll @@ -137,55 +154,58 @@ ..\packages\Owin.1.0\lib\net40\Owin.dll - - ..\packages\Steeltoe.CloudFoundry.ConnectorBase.2.4.0\lib\netstandard2.0\Steeltoe.CloudFoundry.ConnectorBase.dll + + ..\packages\SSH.NET.2020.0.0\lib\net40\Renci.SshNet.dll + + + ..\packages\Steeltoe.CloudFoundry.ConnectorBase.2.5.4\lib\netstandard2.0\Steeltoe.CloudFoundry.ConnectorBase.dll - - ..\packages\Steeltoe.Common.2.4.0\lib\netstandard2.0\Steeltoe.Common.dll + + ..\packages\Steeltoe.Common.2.5.4\lib\netstandard2.0\Steeltoe.Common.dll - - ..\packages\Steeltoe.Common.Http.2.4.0\lib\netstandard2.0\Steeltoe.Common.Http.dll + + ..\packages\Steeltoe.Common.Http.2.5.4\lib\netstandard2.0\Steeltoe.Common.Http.dll - - ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.4.0\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.5.4\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll - - ..\packages\Steeltoe.Extensions.Logging.DynamicLogger.2.4.0\lib\netstandard2.0\Steeltoe.Extensions.Logging.DynamicLogger.dll + + ..\packages\Steeltoe.Extensions.Logging.DynamicLogger.2.5.4\lib\netstandard2.0\Steeltoe.Extensions.Logging.DynamicLogger.dll - - ..\packages\Steeltoe.Management.Diagnostics.2.4.0\lib\netstandard2.0\Steeltoe.Management.Diagnostics.dll + + ..\packages\Steeltoe.Management.Diagnostics.2.5.4\lib\netstandard2.0\Steeltoe.Management.Diagnostics.dll - - ..\packages\Steeltoe.Management.EndpointBase.2.4.0\lib\netstandard2.0\Steeltoe.Management.EndpointBase.dll + + ..\packages\Steeltoe.Management.EndpointBase.2.5.4\lib\netstandard2.0\Steeltoe.Management.EndpointBase.dll - - ..\packages\Steeltoe.Management.EndpointOwin.2.4.0\lib\net461\Steeltoe.Management.EndpointOwin.dll + + ..\packages\Steeltoe.Management.EndpointOwin.2.5.4\lib\net461\Steeltoe.Management.EndpointOwin.dll - - ..\packages\Steeltoe.Management.ExporterBase.2.4.0\lib\netstandard2.0\Steeltoe.Management.ExporterBase.dll + + ..\packages\Steeltoe.Management.ExporterBase.2.5.4\lib\netstandard2.0\Steeltoe.Management.ExporterBase.dll - - ..\packages\Steeltoe.Management.OpenCensus.2.4.0\lib\net46\Steeltoe.Management.OpenCensus.dll + + ..\packages\Steeltoe.Management.OpenCensus.2.5.4\lib\net46\Steeltoe.Management.OpenCensus.dll - - ..\packages\Steeltoe.Management.OpenCensus.Abstractions.2.4.0\lib\net45\Steeltoe.Management.OpenCensus.Abstractions.dll + + ..\packages\Steeltoe.Management.OpenCensus.Abstractions.2.5.4\lib\net45\Steeltoe.Management.OpenCensus.Abstractions.dll - - ..\packages\Steeltoe.Management.OpenCensusBase.2.4.0\lib\netstandard2.0\Steeltoe.Management.OpenCensusBase.dll + + ..\packages\Steeltoe.Management.OpenCensusBase.2.5.4\lib\netstandard2.0\Steeltoe.Management.OpenCensusBase.dll - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - ..\packages\System.Collections.Immutable.1.7.0-preview1.19504.10\lib\netstandard2.0\System.Collections.Immutable.dll + ..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll - ..\packages\System.ComponentModel.Annotations.4.7.0-preview1.19504.10\lib\net461\System.ComponentModel.Annotations.dll + ..\packages\System.ComponentModel.Annotations.4.7.0\lib\net461\System.ComponentModel.Annotations.dll - - ..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -205,25 +225,25 @@ - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll - - ..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll + + ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll True True - - ..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll + + ..\packages\System.Reflection.Metadata.1.8.0\lib\netstandard2.0\System.Reflection.Metadata.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0-preview1.19504.10\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll @@ -245,7 +265,19 @@ True True + + ..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + @@ -256,31 +288,31 @@ - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.5.2.6\lib\net45\System.Web.Http.dll + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll ..\packages\Microsoft.AspNet.WebApi.Owin.5.2.6\lib\net45\System.Web.Http.Owin.dll - - ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.6\lib\net45\System.Web.Http.WebHost.dll + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.7\lib\net45\System.Web.Http.WebHost.dll - - ..\packages\Microsoft.AspNet.Mvc.5.2.6\lib\net45\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll - ..\packages\Microsoft.AspNet.Razor.3.2.6\lib\net45\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll - ..\packages\Microsoft.AspNet.WebPages.3.2.6\lib\net45\System.Web.WebPages.Razor.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Razor.dll @@ -289,6 +321,12 @@ + + ..\packages\MySql.Data.8.0.23\lib\net452\Ubiety.Dns.Core.dll + + + ..\packages\MySql.Data.8.0.23\lib\net452\Zstandard.Net.dll + @@ -393,9 +431,9 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see https://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + @@ -324,7 +324,7 @@ - + @@ -344,7 +344,7 @@ - + @@ -358,22 +358,10 @@ - - - - - - - - - - - - @@ -388,11 +376,11 @@ - + - + @@ -430,12 +418,32 @@ + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/Management/src/AspDotNet4/CloudFoundryOwinAutofac/appsettings.json b/Management/src/AspDotNet4/CloudFoundryOwinAutofac/appsettings.json index 72f2f9102..b20fd104e 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwinAutofac/appsettings.json +++ b/Management/src/AspDotNet4/CloudFoundryOwinAutofac/appsettings.json @@ -1,27 +1,18 @@ { + "$schema": "https://steeltoe.io/schema/v2/schema.json", "Logging": { "IncludeScopes": true, "LogLevel": { "Default": "Debug", "System": "Information", "Microsoft": "Information", - "Management": "Trace", - "Steeltoe": "Trace" + "CloudFoundryOwinAutofac": "Trace", + "Steeltoe": "Trace" } }, - "management": { - "endpoints": { - "path": "/cloudfoundryapplication", - "cloudfoundry": { - "validateCertificates": false - } - }, - "metrics": { - "exporter": { - "cloudfoundry": { - "validateCertificates": false - } - } + "Management": { + "Endpoints": { + "Path": "/cloudfoundryapplication" } }, "info": { @@ -29,5 +20,12 @@ "appsetting2": "appsetting2", "appsetting3": "appsetting3", "appsetting4": "appsetting4" + }, + "MySql": { + "Client": { + "Username": "steeltoe", + "Password": "steeltoe", + "Database": "steeltoe" + } } } \ No newline at end of file diff --git a/Management/src/AspDotNet4/CloudFoundryOwinAutofac/packages.config b/Management/src/AspDotNet4/CloudFoundryOwinAutofac/packages.config index 6236b79ce..9f59dede7 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwinAutofac/packages.config +++ b/Management/src/AspDotNet4/CloudFoundryOwinAutofac/packages.config @@ -5,17 +5,23 @@ + + - - - - - + + + + + + + + - - - + + + + @@ -40,44 +46,49 @@ - - + + - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + + + + + \ No newline at end of file diff --git a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/App.config b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/App.config index e17e002fb..dd9c6130d 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/App.config +++ b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/App.config @@ -1,138 +1,10 @@  - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/App_Start/ApplicationConfig.cs b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/App_Start/ApplicationConfig.cs index 63e47366b..205d29272 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/App_Start/ApplicationConfig.cs +++ b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/App_Start/ApplicationConfig.cs @@ -11,7 +11,9 @@ namespace CloudFoundryOwinSelfHost public class ApplicationConfig { public static IConfigurationRoot Configuration { get; set; } + public static ILoggerFactory LoggerFactory { get; set; } + public static ILoggerProvider LoggerProvider { get; set; } public static void Register(string environment) @@ -30,10 +32,12 @@ public static void Register(string environment) public static void ConfigureLogging() { - IServiceCollection serviceCollection = new Microsoft.Extensions.DependencyInjection.ServiceCollection(); + IServiceCollection serviceCollection = new ServiceCollection(); serviceCollection.AddLogging(builder => builder.SetMinimumLevel(LogLevel.Trace)); - serviceCollection.AddLogging(builder => builder.AddDynamicConsole()); - LoggerFactory = serviceCollection.BuildServiceProvider().GetService(); + serviceCollection.AddLogging(builder => builder.AddDynamicConsole(true)); + var serviceProvider = serviceCollection.BuildServiceProvider(); + LoggerFactory = serviceProvider.GetService(); + LoggerProvider = serviceProvider.GetService(); } public static string GetContentRoot() diff --git a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/CloudFoundryOwinSelfHost.csproj b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/CloudFoundryOwinSelfHost.csproj index fad513089..80427ef37 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/CloudFoundryOwinSelfHost.csproj +++ b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/CloudFoundryOwinSelfHost.csproj @@ -8,7 +8,7 @@ Exe CloudFoundryOwinSelfHost CloudFoundryOwinSelfHost - v4.6.2 + v4.7.2 512 true true @@ -31,6 +31,7 @@ false true true + AnyCPU @@ -68,6 +69,7 @@ + @@ -115,6 +117,23 @@ false + + + 4.1.1 + + + 8.0.23 + + + 2.5.4 + + + 2.5.4 + + + 4.3.4 + + diff --git a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/Controllers/ValuesController.cs b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/Controllers/ValuesController.cs index 06810b67c..2329fc564 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/Controllers/ValuesController.cs +++ b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/Controllers/ValuesController.cs @@ -1,13 +1,32 @@ -using System.Collections.Generic; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Diagnostics; using System.Web.Http; namespace CloudFoundryOwinSelfHost.Controllers { public class ValuesController : ApiController { + private ILogger _logger; + + public ValuesController() + { + _logger = ApplicationConfig.LoggerFactory.CreateLogger(); + } + // GET api/values public IEnumerable Get() { + var minlvl = GetMinLogLevel(_logger); + Console.WriteLine($"Minimum level set on _logger: {minlvl}"); + Debug.WriteLine($"Minimum level set on _logger: {minlvl}"); + _logger.LogTrace("This is a {LogLevel} log", LogLevel.Trace.ToString()); + _logger.LogDebug("This is a {LogLevel} log", LogLevel.Debug.ToString()); + _logger.LogInformation("This is a {LogLevel} log", LogLevel.Information.ToString()); + _logger.LogWarning("This is a {LogLevel} log", LogLevel.Warning.ToString()); + _logger.LogError("This is a {LogLevel} log", LogLevel.Error.ToString()); + _logger.LogCritical("This is a {LogLevel} log", LogLevel.Critical.ToString()); return new string[] { "value1", "value2" }; } @@ -17,19 +36,19 @@ public string Get(int id) return "value"; } - // POST api/values - public void Post([FromBody]string value) - { - } - // PUT api/values/5 - public void Put(int id, [FromBody]string value) + private LogLevel GetMinLogLevel(ILogger logger) { - } + for (var i = 0; i < 6; i++) + { + var level = (LogLevel)Enum.ToObject(typeof(LogLevel), i); + if (logger.IsEnabled(level)) + { + return level; + } + } - // DELETE api/values/5 - public void Delete(int id) - { + return LogLevel.None; } } } diff --git a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/Startup.cs b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/Startup.cs index e99b29860..fa8486ecb 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/Startup.cs +++ b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/Startup.cs @@ -6,22 +6,10 @@ using Steeltoe.CloudFoundry.Connector.Services; using Steeltoe.Common.Diagnostics; using Steeltoe.Common.HealthChecks; -//using Steeltoe.Management.Endpoint.Health; using Steeltoe.Management.Endpoint.Health.Contributor; using Steeltoe.Management.EndpointOwin; -//using Steeltoe.Management.EndpointOwin; -//using Steeltoe.Management.EndpointOwin.CloudFoundry; -//using Steeltoe.Management.EndpointOwin.Diagnostics; -//using Steeltoe.Management.EndpointOwin.Env; -//using Steeltoe.Management.EndpointOwin.Health; -//using Steeltoe.Management.EndpointOwin.HeapDump; -//using Steeltoe.Management.EndpointOwin.Info; -//using Steeltoe.Management.EndpointOwin.Loggers; -//using Steeltoe.Management.EndpointOwin.Mappings; -//using Steeltoe.Management.EndpointOwin.Metrics; -//using Steeltoe.Management.EndpointOwin.Refresh; -//using Steeltoe.Management.EndpointOwin.ThreadDump; -//using Steeltoe.Management.EndpointOwin.Trace; +using Steeltoe.Management.EndpointOwin.Metrics; +using Steeltoe.Management.EndpointOwin.Refresh; using System.Collections.Generic; namespace CloudFoundryOwinSelfHost @@ -41,20 +29,10 @@ public void Configuration(IAppBuilder app) DiagnosticsManager.Instance.Start(); - //app - // .UseDiagnosticSourceMiddleware(ApplicationConfig.LoggerFactory) - // .UseCloudFoundrySecurityMiddleware(ApplicationConfig.Configuration, ApplicationConfig.LoggerFactory) - // .UseCloudFoundryEndpointMiddleware(ApplicationConfig.Configuration, ApplicationConfig.LoggerFactory) + app + .UseMetricsActuator(ApplicationConfig.Configuration, ApplicationConfig.LoggerFactory) + .UseRefreshActuator(ApplicationConfig.Configuration, ApplicationConfig.LoggerFactory); // .UseEnvEndpointMiddleware(ApplicationConfig.Configuration, ApplicationConfig.LoggerFactory) - // .UseHealthEndpointMiddleware(new HealthOptions(ApplicationConfig.Configuration), new DefaultHealthAggregator(), GetHealthContributors(), ApplicationConfig.LoggerFactory) - // .UseHeapDumpEndpointMiddleware(ApplicationConfig.Configuration, ApplicationConfig.GetContentRoot(), ApplicationConfig.LoggerFactory) - // .UseInfoEndpointMiddleware(ApplicationConfig.Configuration, ApplicationConfig.LoggerFactory) - // .UseLoggersEndpointMiddleware(ApplicationConfig.Configuration, ApplicationConfig.LoggerProvider, ApplicationConfig.LoggerFactory) - // .UseMappingEndpointMiddleware(ApplicationConfig.Configuration, WebApiConfig.GetApiExplorer(), ApplicationConfig.LoggerFactory) - // .UseMetricsEndpointMiddleware(ApplicationConfig.Configuration, ApplicationConfig.LoggerFactory) - // .UseRefreshEndpointMiddleware(ApplicationConfig.Configuration, ApplicationConfig.LoggerFactory) - // .UseThreadDumpEndpointMiddleware(ApplicationConfig.Configuration, ApplicationConfig.LoggerFactory) - // .UseTraceEndpointMiddleware(ApplicationConfig.Configuration, null, ApplicationConfig.LoggerFactory); //DiagnosticsManager.Instance.Start(); } diff --git a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/appsettings.json b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/appsettings.json index 72f2f9102..19e73e829 100644 --- a/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/appsettings.json +++ b/Management/src/AspDotNet4/CloudFoundryOwinSelfHost/appsettings.json @@ -1,27 +1,18 @@ { + "$schema": "https://steeltoe.io/schema/v2/schema.json", "Logging": { "IncludeScopes": true, "LogLevel": { "Default": "Debug", "System": "Information", "Microsoft": "Information", - "Management": "Trace", - "Steeltoe": "Trace" + "CloudFoundryOwinSelfHost": "Trace", + "Steeltoe": "Trace" } }, - "management": { - "endpoints": { - "path": "/cloudfoundryapplication", - "cloudfoundry": { - "validateCertificates": false - } - }, - "metrics": { - "exporter": { - "cloudfoundry": { - "validateCertificates": false - } - } + "Management": { + "Endpoints": { + "Path": "/cloudfoundryapplication" } }, "info": { @@ -29,5 +20,12 @@ "appsetting2": "appsetting2", "appsetting3": "appsetting3", "appsetting4": "appsetting4" + }, + "MySql": { + "Client": { + "Username": "steeltoe", + "Password": "steeltoe", + "Database": "steeltoe" + } } } \ No newline at end of file diff --git a/Management/src/AspDotNet4/CloudFoundryWeb/App_Start/LoggingConfig.cs b/Management/src/AspDotNet4/CloudFoundryWeb/App_Start/LoggingConfig.cs index 016881214..e0a885e78 100644 --- a/Management/src/AspDotNet4/CloudFoundryWeb/App_Start/LoggingConfig.cs +++ b/Management/src/AspDotNet4/CloudFoundryWeb/App_Start/LoggingConfig.cs @@ -8,6 +8,7 @@ namespace CloudFoundryWeb public static class LoggingConfig { public static ILoggerFactory LoggerFactory { get; set; } + public static ILoggerProvider LoggerProvider { get; set; } public static void Configure(IConfiguration configuration) @@ -19,7 +20,9 @@ public static void Configure(IConfiguration configuration) .AddConfiguration(configuration) .AddDynamicConsole(); }); - LoggerFactory = serviceCollection.BuildServiceProvider().GetService(); + var serviceProvider = serviceCollection.BuildServiceProvider(); + LoggerFactory = serviceProvider.GetService(); + LoggerProvider = serviceProvider.GetService(); } } } \ No newline at end of file diff --git a/Management/src/AspDotNet4/CloudFoundryWeb/CloudFoundryWeb.csproj b/Management/src/AspDotNet4/CloudFoundryWeb/CloudFoundryWeb.csproj index 1d5b521fd..171871ea0 100644 --- a/Management/src/AspDotNet4/CloudFoundryWeb/CloudFoundryWeb.csproj +++ b/Management/src/AspDotNet4/CloudFoundryWeb/CloudFoundryWeb.csproj @@ -1,7 +1,6 @@  - - + @@ -29,6 +28,8 @@ 3.0 + true + true true @@ -52,8 +53,20 @@ ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - ..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll + + ..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll + + + ..\packages\Google.Protobuf.3.11.4\lib\net45\Google.Protobuf.dll + + + ..\packages\K4os.Compression.LZ4.1.1.11\lib\net46\K4os.Compression.LZ4.dll + + + ..\packages\K4os.Compression.LZ4.Streams.1.1.11\lib\net46\K4os.Compression.LZ4.Streams.dll + + + ..\packages\K4os.Hash.xxHash.1.0.6\lib\net46\K4os.Hash.xxHash.dll ..\packages\Microsoft.ApplicationInsights.Agent.Intercept.2.4.0\lib\net45\Microsoft.AI.Agent.Intercept.dll @@ -79,8 +92,11 @@ ..\packages\Microsoft.AspNet.TelemetryCorrelation.1.0.7\lib\net45\Microsoft.AspNet.TelemetryCorrelation.dll - - ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -158,54 +174,57 @@ ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\MySql.Data.6.10.8\lib\net452\MySql.Data.dll + + ..\packages\MySql.Data.8.0.23\lib\net452\MySql.Data.dll ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - ..\packages\Steeltoe.CloudFoundry.ConnectorBase.2.4.1\lib\netstandard2.0\Steeltoe.CloudFoundry.ConnectorBase.dll + + ..\packages\SSH.NET.2020.0.0\lib\net40\Renci.SshNet.dll + + + ..\packages\Steeltoe.CloudFoundry.ConnectorBase.2.5.4\lib\netstandard2.0\Steeltoe.CloudFoundry.ConnectorBase.dll - - ..\packages\Steeltoe.Common.2.4.1\lib\netstandard2.0\Steeltoe.Common.dll + + ..\packages\Steeltoe.Common.2.5.4\lib\netstandard2.0\Steeltoe.Common.dll - - ..\packages\Steeltoe.Common.Http.2.4.1\lib\netstandard2.0\Steeltoe.Common.Http.dll + + ..\packages\Steeltoe.Common.Http.2.5.4\lib\netstandard2.0\Steeltoe.Common.Http.dll - - ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.4.1\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll + + ..\packages\Steeltoe.Extensions.Configuration.CloudFoundryBase.2.5.4\lib\netstandard2.0\Steeltoe.Extensions.Configuration.CloudFoundryBase.dll - - ..\packages\Steeltoe.Extensions.Logging.DynamicLogger.2.4.1\lib\netstandard2.0\Steeltoe.Extensions.Logging.DynamicLogger.dll + + ..\packages\Steeltoe.Extensions.Logging.DynamicLogger.2.5.4\lib\netstandard2.0\Steeltoe.Extensions.Logging.DynamicLogger.dll - - ..\packages\Steeltoe.Management.Diagnostics.2.4.1\lib\netstandard2.0\Steeltoe.Management.Diagnostics.dll + + ..\packages\Steeltoe.Management.Diagnostics.2.5.4\lib\netstandard2.0\Steeltoe.Management.Diagnostics.dll - - ..\packages\Steeltoe.Management.EndpointBase.2.4.1\lib\netstandard2.0\Steeltoe.Management.EndpointBase.dll + + ..\packages\Steeltoe.Management.EndpointBase.2.5.4\lib\netstandard2.0\Steeltoe.Management.EndpointBase.dll - - ..\packages\Steeltoe.Management.EndpointWeb.2.4.1\lib\net461\Steeltoe.Management.EndpointWeb.dll + + ..\packages\Steeltoe.Management.EndpointWeb.2.5.4\lib\net461\Steeltoe.Management.EndpointWeb.dll - - ..\packages\Steeltoe.Management.ExporterBase.2.4.1\lib\netstandard2.0\Steeltoe.Management.ExporterBase.dll + + ..\packages\Steeltoe.Management.ExporterBase.2.5.4\lib\netstandard2.0\Steeltoe.Management.ExporterBase.dll - - ..\packages\Steeltoe.Management.OpenCensus.2.4.1\lib\net46\Steeltoe.Management.OpenCensus.dll + + ..\packages\Steeltoe.Management.OpenCensus.2.5.4\lib\net46\Steeltoe.Management.OpenCensus.dll - - ..\packages\Steeltoe.Management.OpenCensus.Abstractions.2.4.1\lib\net45\Steeltoe.Management.OpenCensus.Abstractions.dll + + ..\packages\Steeltoe.Management.OpenCensus.Abstractions.2.5.4\lib\net45\Steeltoe.Management.OpenCensus.Abstractions.dll - - ..\packages\Steeltoe.Management.OpenCensusBase.2.4.1\lib\netstandard2.0\Steeltoe.Management.OpenCensusBase.dll + + ..\packages\Steeltoe.Management.OpenCensusBase.2.5.4\lib\netstandard2.0\Steeltoe.Management.OpenCensusBase.dll - ..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll + ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - ..\packages\System.Collections.Immutable.1.7.0\lib\netstandard2.0\System.Collections.Immutable.dll + ..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll @@ -216,7 +235,7 @@ - ..\packages\System.Diagnostics.DiagnosticSource.4.7.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + ..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll @@ -240,9 +259,10 @@ True True + - ..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll + ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll ..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll @@ -265,9 +285,10 @@ True - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll True @@ -288,8 +309,20 @@ True True + + ..\packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll + + + ..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll + + + ..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + ..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + @@ -331,9 +364,15 @@ + + ..\packages\MySql.Data.8.0.23\lib\net452\Ubiety.Dns.Core.dll + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll + + ..\packages\MySql.Data.8.0.23\lib\net452\Zstandard.Net.dll + @@ -507,8 +546,8 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + @@ -517,4 +556,5 @@ + \ No newline at end of file diff --git a/Management/src/AspDotNet4/CloudFoundryWeb/Web.config b/Management/src/AspDotNet4/CloudFoundryWeb/Web.config index 0a1fbc29f..e209eee97 100644 --- a/Management/src/AspDotNet4/CloudFoundryWeb/Web.config +++ b/Management/src/AspDotNet4/CloudFoundryWeb/Web.config @@ -37,383 +37,137 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - + + + + - - + + + + - - + + + + + + + + - - + + + + - + + + - + + + - - + + + + - - + + + + - - + + + + - - + + + + - + + + - - + + + + + + - - - - - - - - - - - - - - + + + + - - + + + + - + + + - - + + - - + + \ No newline at end of file diff --git a/Management/src/AspDotNet4/CloudFoundryWeb/appsettings.json b/Management/src/AspDotNet4/CloudFoundryWeb/appsettings.json index 72f2f9102..c22859c05 100644 --- a/Management/src/AspDotNet4/CloudFoundryWeb/appsettings.json +++ b/Management/src/AspDotNet4/CloudFoundryWeb/appsettings.json @@ -1,27 +1,18 @@ { + "$schema": "https://steeltoe.io/schema/v2/schema.json", "Logging": { "IncludeScopes": true, "LogLevel": { "Default": "Debug", "System": "Information", "Microsoft": "Information", - "Management": "Trace", - "Steeltoe": "Trace" + "CloudFoundryWeb": "Trace", + "Steeltoe": "Trace" } }, "management": { "endpoints": { - "path": "/cloudfoundryapplication", - "cloudfoundry": { - "validateCertificates": false - } - }, - "metrics": { - "exporter": { - "cloudfoundry": { - "validateCertificates": false - } - } + "path": "/cloudfoundryapplication" } }, "info": { @@ -29,5 +20,12 @@ "appsetting2": "appsetting2", "appsetting3": "appsetting3", "appsetting4": "appsetting4" + }, + "MySql": { + "Client": { + "Username": "steeltoe", + "Password": "steeltoe", + "Database": "steeltoe" + } } } \ No newline at end of file diff --git a/Management/src/AspDotNet4/CloudFoundryWeb/packages.config b/Management/src/AspDotNet4/CloudFoundryWeb/packages.config index 1e21ba565..f6d5a92b7 100644 --- a/Management/src/AspDotNet4/CloudFoundryWeb/packages.config +++ b/Management/src/AspDotNet4/CloudFoundryWeb/packages.config @@ -2,9 +2,13 @@ + - + + + + @@ -22,7 +26,8 @@ - + + @@ -47,40 +52,45 @@ - + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + + + + + \ No newline at end of file diff --git a/Management/src/AspDotNetCore/CloudFoundry/CloudFoundry.feature b/Management/src/AspDotNetCore/CloudFoundry/CF.feature similarity index 55% rename from Management/src/AspDotNetCore/CloudFoundry/CloudFoundry.feature rename to Management/src/AspDotNetCore/CloudFoundry/CF.feature index 6811cf4dd..82b3d48a8 100644 --- a/Management/src/AspDotNetCore/CloudFoundry/CloudFoundry.feature +++ b/Management/src/AspDotNetCore/CloudFoundry/CF.feature @@ -12,33 +12,25 @@ Feature: Cloud Foundry Samples Then you should be able to access CloudFoundry app actuator management endpoints @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: CloudFoundry Management (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: CloudFoundry Management (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app actuator is started Then you should be able to access CloudFoundry app actuator management endpoints - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: CloudFoundry Management (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: CloudFoundry Management (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app actuator is started Then you should be able to access CloudFoundry app actuator management endpoints - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: CloudFoundry Management (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish - And you wait until CloudFoundry app actuator is started - Then you should be able to access CloudFoundry app actuator management endpoints - - @net461 - @win10-x64 - Scenario: CloudFoundry Management (net461/win10-x64) - When you run: dotnet publish -f net461 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish + @net5.0 + @linux-x64 + Scenario: CloudFoundry Management (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app actuator is started Then you should be able to access CloudFoundry app actuator management endpoints diff --git a/Management/src/AspDotNetCore/CloudFoundry/CloudFoundry.csproj b/Management/src/AspDotNetCore/CloudFoundry/CloudFoundry.csproj index 6f0c94867..8704144e8 100644 --- a/Management/src/AspDotNetCore/CloudFoundry/CloudFoundry.csproj +++ b/Management/src/AspDotNetCore/CloudFoundry/CloudFoundry.csproj @@ -1,33 +1,24 @@  - - netcoreapp3.1;netcoreapp2.1;net461; + netcoreapp3.1;net5.0 - - - - - - - - - all runtime; build; native; contentfiles; analyzers - - + + + diff --git a/Management/src/AspDotNetCore/CloudFoundry/Program.cs b/Management/src/AspDotNetCore/CloudFoundry/Program.cs index 147252a97..86ec712f0 100644 --- a/Management/src/AspDotNetCore/CloudFoundry/Program.cs +++ b/Management/src/AspDotNetCore/CloudFoundry/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Extensions.Logging.SerilogDynamicLogger; using Steeltoe.Management.CloudFoundry; @@ -12,8 +13,8 @@ public class Program public static void Main(string[] args) { var host = WebHost.CreateDefaultBuilder() - .AddCloudFoundry() // config - .UseCloudFoundryHosting() // listen on port defined in env var 'PORT' + .AddCloudFoundryConfiguration() // config + .UseCloudHosting() // listen on port defined in env var 'PORT' .ConfigureLogging((context, builder) => builder.AddSerilogDynamicConsole()) .AddCloudFoundryActuators() // add actuators - should come AFTER Serilog config or else DynamicConsoleLogger will be injected .UseStartup() diff --git a/Management/src/AspDotNetCore/CloudFoundry/README.md b/Management/src/AspDotNetCore/CloudFoundry/README.md index 339af409a..e7033e8dd 100644 --- a/Management/src/AspDotNetCore/CloudFoundry/README.md +++ b/Management/src/AspDotNetCore/CloudFoundry/README.md @@ -26,9 +26,9 @@ You must first create an instance of the MySql service in a org/space. 1. cf target -o myorg -s development 2. cd samples/Management/src/AspDotNetCore/CloudFoundry -3. dotnet restore --configfile nuget.config -4. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp2.2 -r ubuntu.16.04-x64`) -5. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp2.2/ubuntu.16.04-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.2/win10-x64/publish`) +3. dotnet restore +4. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp3.1 -r linux-x64`) +5. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish`) > Note: The provided manifest will create an app named `actuator` and attempt to bind to the the app to MySql service `myMySqlService`. diff --git a/Management/src/AspDotNetCore/CloudFoundry/Startup.cs b/Management/src/AspDotNetCore/CloudFoundry/Startup.cs index 2d7ca22cb..7a87bfabd 100644 --- a/Management/src/AspDotNetCore/CloudFoundry/Startup.cs +++ b/Management/src/AspDotNetCore/CloudFoundry/Startup.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Steeltoe.CloudFoundry.Connector.EFCore; using Steeltoe.CloudFoundry.Connector.MySql; using Steeltoe.CloudFoundry.Connector.MySql.EFCore; @@ -45,15 +45,11 @@ public void ConfigureServices(IServiceCollection services) // services.AddMetricsForwarderExporter(Configuration); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -69,17 +65,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) // Add metrics collection to the app // Remove comment below to enable // app.UseMetricsActuator(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif // Start up the metrics forwarder service added above // Remove comment below to enable // app.UseMetricsExporter(); diff --git a/Management/src/AspDotNetCore/CloudFoundry/nuget.config b/Management/src/AspDotNetCore/CloudFoundry/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Management/src/AspDotNetCore/CloudFoundry/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Management/src/AspDotNetCore/MicrosoftHealthChecks/MicrosoftHealthChecks.csproj b/Management/src/AspDotNetCore/MicrosoftHealthChecks/MicrosoftHealthChecks.csproj index 0491f9183..6f8893469 100644 --- a/Management/src/AspDotNetCore/MicrosoftHealthChecks/MicrosoftHealthChecks.csproj +++ b/Management/src/AspDotNetCore/MicrosoftHealthChecks/MicrosoftHealthChecks.csproj @@ -1,16 +1,9 @@  - - netcoreapp3.1;netcoreapp2.1;net461; + net5.0;netcoreapp3.1; - - - - - - @@ -20,9 +13,10 @@ runtime; build; native; contentfiles; analyzers - - - + + + + diff --git a/Management/src/AspDotNetCore/MicrosoftHealthChecks/Program.cs b/Management/src/AspDotNetCore/MicrosoftHealthChecks/Program.cs index 5d9fa3c13..9f7fe9b4f 100644 --- a/Management/src/AspDotNetCore/MicrosoftHealthChecks/Program.cs +++ b/Management/src/AspDotNetCore/MicrosoftHealthChecks/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; @@ -10,9 +11,9 @@ public class Program public static void Main(string[] args) { var host = WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() - .UseCloudFoundryHosting() + .UseCloudHosting() .UseStartup() .Build(); diff --git a/Management/src/AspDotNetCore/MicrosoftHealthChecks/Properties/launchSettings.json b/Management/src/AspDotNetCore/MicrosoftHealthChecks/Properties/launchSettings.json index bb0c4e4b7..e3468ec65 100644 --- a/Management/src/AspDotNetCore/MicrosoftHealthChecks/Properties/launchSettings.json +++ b/Management/src/AspDotNetCore/MicrosoftHealthChecks/Properties/launchSettings.json @@ -14,14 +14,6 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } - }, - "CloudFoundry": { - "commandName": "Project", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:58673" } } } diff --git a/Management/src/AspDotNetCore/MicrosoftHealthChecks/README.md b/Management/src/AspDotNetCore/MicrosoftHealthChecks/README.md index 761c6ef3f..3609e92c9 100644 --- a/Management/src/AspDotNetCore/MicrosoftHealthChecks/README.md +++ b/Management/src/AspDotNetCore/MicrosoftHealthChecks/README.md @@ -24,9 +24,9 @@ You must first create an instance of the MySql service in a org/space. 1. cf target -o myorg -s development 2. cd samples/Management/src/AspDotNetCore/CloudFoundry -3. dotnet restore --configfile nuget.config -4. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64`) -5. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish`) +3. dotnet restore +4. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp3.1 -r linux-x64`) +5. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish`) > Note: The provided manifest will create an app named `actuator` and attempt to bind to the the app to MySql service `myMySqlService`. diff --git a/Management/src/AspDotNetCore/MicrosoftHealthChecks/Startup.cs b/Management/src/AspDotNetCore/MicrosoftHealthChecks/Startup.cs index c2502ea19..90ae26c21 100644 --- a/Management/src/AspDotNetCore/MicrosoftHealthChecks/Startup.cs +++ b/Management/src/AspDotNetCore/MicrosoftHealthChecks/Startup.cs @@ -1,11 +1,9 @@ using HealthChecks.UI.Client; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Diagnostics.HealthChecks; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; using Steeltoe.CloudFoundry.Connector; using Steeltoe.CloudFoundry.Connector.MySql; @@ -29,26 +27,16 @@ public void ConfigureServices(IServiceCollection services) services.AddHealthChecks().AddMySql(connectionString); // Add in a MySql connection (this method also adds an IHealthContributor for it) - services.AddMySqlConnection(Configuration); //will use microsoft health check instead of steelto health check + services.AddMySqlConnection(Configuration); //will use microsoft health check instead of steeltoe health check services.AddHealthChecksUI(); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, -#if NETCOREAPP3_1 - IWebHostEnvironment env, -#else - Microsoft.AspNetCore.Hosting.IHostingEnvironment env, -#endif - ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -71,17 +59,8 @@ public void Configure(IApplicationBuilder app, //Optionally use health checks ui at /healthchecks-ui app.UseHealthChecksUI(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Management/src/AspDotNetCore/MicrosoftHealthChecks/appsettings.Development.json b/Management/src/AspDotNetCore/MicrosoftHealthChecks/appsettings.Development.json index 5710081c2..529051f5b 100644 --- a/Management/src/AspDotNetCore/MicrosoftHealthChecks/appsettings.Development.json +++ b/Management/src/AspDotNetCore/MicrosoftHealthChecks/appsettings.Development.json @@ -1,4 +1,5 @@ { + "$schema": "https://steeltoe.io/schema/latest/schema.json", "Logging": { "IncludeScopes": false, "LogLevel": { @@ -8,5 +9,12 @@ "Pivotal": "Debug", "Steeltoe": "Debug" } + }, + "MySql": { + "Client": { + "Database": "steeltoe", + "Username": "root", + "Password": "steeltoe" + } } } diff --git a/Management/src/AspDotNetCore/MicrosoftHealthChecks/appsettings.json b/Management/src/AspDotNetCore/MicrosoftHealthChecks/appsettings.json index 038387ffa..5a379d3d4 100644 --- a/Management/src/AspDotNetCore/MicrosoftHealthChecks/appsettings.json +++ b/Management/src/AspDotNetCore/MicrosoftHealthChecks/appsettings.json @@ -33,7 +33,7 @@ }, "mysql": { "client": { - "sslmode": "none" + "sslmode": "required" } }, "HealthChecks-UI": { diff --git a/Management/src/AspDotNetCore/MicrosoftHealthChecks/healthchecksdb b/Management/src/AspDotNetCore/MicrosoftHealthChecks/healthchecksdb index 27c20bb4b..20a44891c 100644 Binary files a/Management/src/AspDotNetCore/MicrosoftHealthChecks/healthchecksdb and b/Management/src/AspDotNetCore/MicrosoftHealthChecks/healthchecksdb differ diff --git a/Management/src/AspDotNetCore/MicrosoftHealthChecks/nuget.config b/Management/src/AspDotNetCore/MicrosoftHealthChecks/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Management/src/AspDotNetCore/MicrosoftHealthChecks/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Fortune-Teller-Service.csproj b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Fortune-Teller-Service.csproj index 152cd1a6a..ad98376b2 100644 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Fortune-Teller-Service.csproj +++ b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Fortune-Teller-Service.csproj @@ -1,8 +1,7 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 @@ -14,20 +13,15 @@ PreserveNewest - - - - - - - - - - - + + + + + + diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Program.cs b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Program.cs index ee74debbe..f2d39c380 100644 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Program.cs +++ b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Discovery.Client; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Management.CloudFoundry; @@ -15,10 +16,10 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .AddServiceDiscovery() - .UseCloudFoundryHosting(5000) + .UseCloudHosting(5000) .UseStartup() .Build(); } diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/README.md b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/README.md index a00f59c49..5c12b2a93 100644 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/README.md +++ b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/README.md @@ -40,7 +40,7 @@ If you have a running docker environment installed on your system, then you shou 1. Clone this repository. (i.e. git clone ) 1. cd samples/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service -1. dotnet run -f netcoreapp2.1 +1. dotnet run -f netcoreapp3.1 ## What to expect - Locally @@ -48,7 +48,7 @@ After building and running the app, you should see something like the following: ```bash $ cd samples/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service -$ dotnet run -f netcoreapp2.1 +$ dotnet run -f netcoreapp3.1 info: Microsoft.Data.Entity.Storage.Internal.InMemoryStore[1] Saved 50 entities to in-memory store. Hosting environment: Production @@ -87,8 +87,8 @@ You must first create an instance of the Service Registry service in a org/space 1. cf target -o myorg -s development 1. cd samples/Discovery/src/AspDotNetCore/Fortune-Teller-Service -1. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64`) -1. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish`) +1. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp3.1 -r linux-x64`) +1. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish`) ## What to expect - CloudFoundry diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Startup.cs b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Startup.cs index ab0d8fb0d..8083a55e1 100644 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Startup.cs +++ b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/Startup.cs @@ -32,11 +32,7 @@ public void ConfigureServices(IServiceCollection services) services.AddZipkinExporter(Configuration); // Add framework services. -#if NETCOREAPP3_1 services.AddControllers(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -44,12 +40,8 @@ public void Configure(IApplicationBuilder app) { app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(); -#endif // Start up trace exporter app.UseTracingExporter(); diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/nuget.config b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-Service/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Fortune-Teller-UI.csproj b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Fortune-Teller-UI.csproj index 8e1871972..88486caee 100644 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Fortune-Teller-UI.csproj +++ b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Fortune-Teller-UI.csproj @@ -1,19 +1,14 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - - + + + + + + diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Program.cs b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Program.cs index 18c07f431..3c4095cc9 100644 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Program.cs +++ b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Program.cs @@ -3,6 +3,7 @@ using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Discovery.Client; using Steeltoe.Management.CloudFoundry; +using Steeltoe.Common.Hosting; namespace Fortune_Teller_UI { @@ -15,11 +16,11 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .AddCloudFoundry() + .AddCloudFoundryConfiguration() .AddCloudFoundryActuators() .AddServiceDiscovery() .UseStartup() - .UseCloudFoundryHosting(5555) + .UseCloudHosting(5555) .Build(); } } diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/README.md b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/README.md index 012330047..476def052 100644 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/README.md +++ b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/README.md @@ -14,7 +14,7 @@ Note: You can run all of this either locally or on CloudFoundry. 1. Clone this repository. (i.e. git clone ) 1. cd samples/Discovery/src/AspDotNetCore/Fortune-Teller-UI -1. dotnet run -f netcoreapp2.1 +1. dotnet run -f netcoreapp3.1 ## What to expect - Locally @@ -22,7 +22,7 @@ After building and running the app, you should see something like the following: ```bash $ cd samples/Discovery/src/AspDotNetCore/Fortune-Teller-UI -$ dotnet run -f netcoreapp2.1 +$ dotnet run -f netcoreapp3.1 Hosting environment: Production Now listening on: http://*:5555 Application started. Press Ctrl+C to shut down. @@ -46,8 +46,8 @@ Before proceeding with the steps below, make sure you have completed the steps t 1. cf target -o myorg -s development 1. cd samples/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI -1. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64`) -1. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish`) +1. Publish app to a directory selecting the framework and runtime you want to run on. (e.g. `dotnet publish -f netcoreapp3.1 -r linux-x64`) +1. Push the app using the appropriate manifest. (e.g. `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` or `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish`) ## What to expect - CloudFoundry diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Startup.cs b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Startup.cs index c8ed3e38c..e5bcbc954 100644 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Startup.cs +++ b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/Startup.cs @@ -1,9 +1,8 @@ using Fortune_Teller_UI.Services; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Hosting; using Steeltoe.Common.Http.Discovery; using Steeltoe.Management.Exporter.Tracing; using Steeltoe.Management.Tracing; @@ -37,15 +36,11 @@ public void ConfigureServices(IServiceCollection services) services.AddZipkinExporter(Configuration); // Add framework services. -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -58,12 +53,8 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF app.UseStaticFiles(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => endpoints.MapDefaultControllerRoute()); -#else - app.UseMvc(); -#endif // Start up trace exporter app.UseTracingExporter(); diff --git a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/nuget.config b/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/nuget.config deleted file mode 100644 index 25727cdf8..000000000 --- a/Management/src/AspDotNetCore/Tracing/Fortune-Teller-UI/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Management/src/AspDotNetCore/Tracing/RunTracing.cmd b/Management/src/AspDotNetCore/Tracing/RunTracing.cmd index 6c069e524..2d52bfc2f 100644 --- a/Management/src/AspDotNetCore/Tracing/RunTracing.cmd +++ b/Management/src/AspDotNetCore/Tracing/RunTracing.cmd @@ -5,5 +5,5 @@ start "Fortune Teller UI" dotnet run -p .\Fortune-Teller-UI\Fortune-Teller-UI.cs :usage echo USAGE: echo RunFortuneTeller [framework] -echo framework - target framework to publish (e.g. net461, netcoreapp2.1) +echo framework - target framework to publish (e.g. netcoreapp3.1) exit /b \ No newline at end of file diff --git a/Management/src/AspDotNetCore/Tracing/RunTracing.sh b/Management/src/AspDotNetCore/Tracing/RunTracing.sh index d0d5959ce..3758ed40b 100644 --- a/Management/src/AspDotNetCore/Tracing/RunTracing.sh +++ b/Management/src/AspDotNetCore/Tracing/RunTracing.sh @@ -3,7 +3,7 @@ function printUsage() { echo "USAGE:" echo "RunFortuneTeller [framework]" - echo "framework - target framework to publish (e.g. netcoreapp2.1)" + echo "framework - target framework to publish (e.g. netcoreapp3.1)" exit } # diff --git a/Management/src/AspDotNetCore/Tracing/Tracing.sln b/Management/src/AspDotNetCore/Tracing/Tracing.sln index 0ee7ba2ae..55573e02f 100644 --- a/Management/src/AspDotNetCore/Tracing/Tracing.sln +++ b/Management/src/AspDotNetCore/Tracing/Tracing.sln @@ -1,12 +1,19 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2000 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30803.129 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fortune-Teller-Service", "Fortune-Teller-Service\Fortune-Teller-Service.csproj", "{C56DF1BF-8504-4832-9DED-8E346DAB1EDE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fortune-Teller-UI", "Fortune-Teller-UI\Fortune-Teller-UI.csproj", "{6024C864-1F30-4911-864F-D291EF6E9D7D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E6E6C0B6-7225-49B5-8A4C-B53610BF36E9}" + ProjectSection(SolutionItems) = preProject + RunTracing.cmd = RunTracing.cmd + RunTracing.ps1 = RunTracing.ps1 + RunTracing.sh = RunTracing.sh + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/MusicStore/README.md b/MusicStore/README.md index b54299460..b7c84e3da 100644 --- a/MusicStore/README.md +++ b/MusicStore/README.md @@ -117,7 +117,7 @@ No changes are required to the application configuration files before pushing th Once the services have been created and ready on CloudFoundry (i.e. check via `cf services`) then you can use the provided `push*.cmd or push*.sh` commands to startup the individual application services on CloudFoundry. For example to start the ShoppingCart service: 1. `cd Samples/MusicStore` -1. `pushShoppingCartService.cmd win10-x64 netcoreapp2.1` or `./pushShoppingCartService.sh ubuntu.16.04-x64 netcoreapp2.1` +1. `pushShoppingCartService.cmd win10-x64 netcoreapp2.1` or `./pushShoppingCartService.sh linux-x64 netcoreapp2.1` Note: If you wish to use the Redis cache for storing Session state, you will have to set ENVIRONMENT variable `DefineConstants=USE_REDIS_CACHE` before building and pushing the MusicUI application. diff --git a/MusicStore/docker-compose.yml b/MusicStore/docker-compose.yml index b9d376186..b94d874f4 100644 --- a/MusicStore/docker-compose.yml +++ b/MusicStore/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.2' services: config: - image: "steeltoeoss/configserver:1.3.2" + image: "steeltoeoss/config-server" command: --spring.profiles.active=native --spring.cloud.config.server.native.searchLocations=/config volumes: - type: bind @@ -10,7 +10,7 @@ services: ports: - "8888:8888" eureka: - image: "steeltoeoss/eurekaserver:1.4.4" + image: "steeltoeoss/eurekaserver" ports: - "8761:8761" mysql: diff --git a/MusicStore/pushMusicStoreService.cmd b/MusicStore/pushMusicStoreService.cmd index 2983f7bb1..f39820080 100644 --- a/MusicStore/pushMusicStoreService.cmd +++ b/MusicStore/pushMusicStoreService.cmd @@ -12,6 +12,6 @@ exit /b :usage echo USAGE: echo pushMusicStoreService [runtime] [framework] -echo runtime - target runtime to publish (e.g. win10-x64, ubuntu.16.04-x64) +echo runtime - target runtime to publish (e.g. win10-x64, linux-x64) echo framework - target framework to publish (e.g. net461, netcoreapp2.1) exit /b \ No newline at end of file diff --git a/MusicStore/pushMusicStoreService.sh b/MusicStore/pushMusicStoreService.sh index a4ca12488..3061449ab 100644 --- a/MusicStore/pushMusicStoreService.sh +++ b/MusicStore/pushMusicStoreService.sh @@ -3,7 +3,7 @@ function printUsage() { echo "USAGE:" echo "pushMusicStoreService [runtime] [framework]" -echo "runtime - target runtime to publish (e.g. win10-x64, ubuntu.16.04-x64)" +echo "runtime - target runtime to publish (e.g. win10-x64, linux-x64)" echo "framework - target framework to publish (e.g. net461, netcoreapp2.1)" exit } diff --git a/MusicStore/pushMusicStoreUI.cmd b/MusicStore/pushMusicStoreUI.cmd index 29b8b6a34..0db4af3c1 100644 --- a/MusicStore/pushMusicStoreUI.cmd +++ b/MusicStore/pushMusicStoreUI.cmd @@ -17,6 +17,6 @@ exit /b :usage echo USAGE: echo pushMusicStoreUI [runtime] [framework] -echo runtime - target runtime to publish (e.g. win10-x64, ubuntu.16.04-x64) +echo runtime - target runtime to publish (e.g. win10-x64, linux-x64) echo framework - target framework to publish (e.g. net461, netcoreapp2.1) exit /b \ No newline at end of file diff --git a/MusicStore/pushMusicStoreUI.sh b/MusicStore/pushMusicStoreUI.sh index 1e6f2bdf0..992b53c35 100644 --- a/MusicStore/pushMusicStoreUI.sh +++ b/MusicStore/pushMusicStoreUI.sh @@ -3,7 +3,7 @@ function printUsage() { echo "USAGE:" echo "pushMusicStoreUI [runtime] [framework]" -echo "runtime - target runtime to publish (e.g. win10-x64, ubuntu.16.04-x64)" +echo "runtime - target runtime to publish (e.g. win10-x64, linux-x64)" echo "framework - target framework to publish (e.g. net461, netcoreapp2.1)" exit } diff --git a/MusicStore/pushOrderService.cmd b/MusicStore/pushOrderService.cmd index f37a6fc79..8f4871b1e 100644 --- a/MusicStore/pushOrderService.cmd +++ b/MusicStore/pushOrderService.cmd @@ -12,6 +12,6 @@ exit /b :usage echo USAGE: echo pushOrderService [runtime] [framework] -echo runtime - target runtime to publish (e.g. win10-x64, ubuntu.16.04-x64) +echo runtime - target runtime to publish (e.g. win10-x64, linux-x64) echo framework - target framework to publish (e.g. net461, netcoreapp2.1) exit /b \ No newline at end of file diff --git a/MusicStore/pushOrderService.sh b/MusicStore/pushOrderService.sh index dfdec3742..3a7a2d5aa 100644 --- a/MusicStore/pushOrderService.sh +++ b/MusicStore/pushOrderService.sh @@ -3,7 +3,7 @@ function printUsage() { echo "USAGE:" echo "pushOrderService [runtime] [framework]" -echo "runtime - target runtime to publish (e.g. win10-x64, ubuntu.16.04-x64)" +echo "runtime - target runtime to publish (e.g. win10-x64, linux-x64)" echo "framework - target framework to publish (e.g. net461, netcoreapp2.1)" exit } diff --git a/MusicStore/pushShoppingCartService.cmd b/MusicStore/pushShoppingCartService.cmd index 70b172bb4..1dd88fe18 100644 --- a/MusicStore/pushShoppingCartService.cmd +++ b/MusicStore/pushShoppingCartService.cmd @@ -12,6 +12,6 @@ exit /b :usage echo USAGE: echo pushShoppingCartService [runtime] [framework] -echo runtime - target runtime to publish (e.g. win10-x64, ubuntu.16.04-x64) +echo runtime - target runtime to publish (e.g. win10-x64, linux-x64) echo framework - target framework to publish (e.g. net461, netcoreapp2.1) exit /b \ No newline at end of file diff --git a/MusicStore/pushShoppingCartService.sh b/MusicStore/pushShoppingCartService.sh index 64024f158..71f7d836d 100644 --- a/MusicStore/pushShoppingCartService.sh +++ b/MusicStore/pushShoppingCartService.sh @@ -3,7 +3,7 @@ function printUsage() { echo "USAGE:" echo "pushShoppingCartService [runtime] [framework]" -echo "runtime - target runtime to publish (e.g. win10-x64, ubuntu.16.04-x64)" +echo "runtime - target runtime to publish (e.g. win10-x64, linux-x64)" echo "framework - target framework to publish (e.g. net461, netcoreapp2.1)" exit } diff --git a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/CloudFoundryJwtAuthentication.csproj b/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/CloudFoundryJwtAuthentication.csproj index 5297ba42d..d1420c888 100644 --- a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/CloudFoundryJwtAuthentication.csproj +++ b/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/CloudFoundryJwtAuthentication.csproj @@ -1,22 +1,15 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - + + + diff --git a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/Program.cs b/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/Program.cs index ae0796aa2..3f520cd4c 100644 --- a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/Program.cs +++ b/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; namespace CloudFoundryJwtAuthentication @@ -13,8 +14,8 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseCloudFoundryHosting(63807) - .AddCloudFoundry() + .UseCloudHosting(63807) + .AddCloudFoundryConfiguration() .UseStartup() .Build(); } diff --git a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/README.md b/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/README.md index fdda5f5f2..193a2134f 100644 --- a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/README.md +++ b/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/README.md @@ -14,13 +14,13 @@ This sample illustrates how you can secure your web api endpoints using JWT Bear 1. cf target -o myorg -s development 1. cd samples/Security/src/CloudFoundryJwtAuthentication -1. dotnet restore --configfile nuget.config +1. dotnet restore 1. Publish app to a directory selecting the framework and runtime you want to run on. - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f netcoreapp2.1 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest. - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish`) + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish`) The provided manifest(s) will create an app named `jwtauth` and attempt to bind it to `myOAuthService`. diff --git a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/Startup.cs b/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/Startup.cs index 520835213..40bd42184 100644 --- a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/Startup.cs +++ b/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/Startup.cs @@ -1,11 +1,9 @@ - +using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Hosting; using Steeltoe.Security.Authentication.CloudFoundry; -using Microsoft.AspNetCore.Authentication.JwtBearer; namespace CloudFoundryJwtAuthentication { @@ -32,19 +30,12 @@ public void ConfigureServices(IServiceCollection services) options.AddPolicy("testgroup1", policy => policy.RequireClaim("scope", "testgroup1")); }); -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { - - -#if NETCOREAPP3_1 app.UseRouting(); app.UseAuthentication(); app.UseAuthorization(); @@ -54,15 +45,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseAuthentication(); - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/nuget.config b/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/nuget.config deleted file mode 100644 index a26441404..000000000 --- a/Security/src/AspDotNetCore/CloudFoundryJwtAuthentication/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/CloudFoundrySingleSignon.csproj b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/CloudFoundrySingleSignon.csproj index 51f33eaa6..cbf5798f1 100644 --- a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/CloudFoundrySingleSignon.csproj +++ b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/CloudFoundrySingleSignon.csproj @@ -1,22 +1,12 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - - - - + + + diff --git a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/CloudFoundrySingleSignon.feature b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/CloudFoundrySingleSignon.feature index 06048609c..c27ebbebc 100644 --- a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/CloudFoundrySingleSignon.feature +++ b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/CloudFoundrySingleSignon.feature @@ -19,10 +19,10 @@ Feature: CloudFoundry Single SignOn And you should see "Your About page." @netcoreapp3.1 - @ubuntu.16.04-x64 - Scenario: CloudFoundry Single SignOn (netcoreapp3.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp3.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/ubuntu.16.04-x64/publish + @linux-x64 + Scenario: CloudFoundry Single SignOn (netcoreapp3.1/linux-x64) + When you run: dotnet publish -f netcoreapp3.1 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish And you wait until CloudFoundry app single-signon is started When you get https://single-signon.x.y.z/Home/About Then you should be at https://uaa.x.y.z/login @@ -33,11 +33,11 @@ Feature: CloudFoundry Single SignOn Then you should be at https://single-signon.x.y.z/Home/About And you should see "Your About page." - @netcoreapp2.1 + @net5.0 @win10-x64 - Scenario: CloudFoundry Single SignOn (netcoreapp2.1/win10-x64) - When you run: dotnet publish -f netcoreapp2.1 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish + Scenario: CloudFoundry Single SignOn (net5.0/win10-x64) + When you run: dotnet publish -f net5.0 -r win10-x64 + And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net5.0/win10-x64/publish And you wait until CloudFoundry app single-signon is started When you get https://single-signon.x.y.z/Home/About Then you should be at https://uaa.x.y.z/login @@ -48,26 +48,11 @@ Feature: CloudFoundry Single SignOn Then you should be at https://single-signon.x.y.z/Home/About And you should see "Your About page." - @netcoreapp2.1 - @ubuntu.16.04-x64 - Scenario: CloudFoundry Single SignOn (netcoreapp2.1/ubuntu.16.04-x64) - When you run: dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64 - And you run in the background: cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish - And you wait until CloudFoundry app single-signon is started - When you get https://single-signon.x.y.z/Home/About - Then you should be at https://uaa.x.y.z/login - When you login with "baduser"/"badpass" - Then you should be at https://uaa.x.y.z/login - And you should see "Unable to verify email or password. Please try again." - When you login with "testuser"/"Password1!" - Then you should be at https://single-signon.x.y.z/Home/About - And you should see "Your About page." - - @net461 - @win10-x64 - Scenario: CloudFoundry Single SignOn (net461/win10-x64) - When you run: dotnet publish -f net461 -r win10-x64 - And you run in the background: cf push -f manifest-windows.yml -p bin/Debug/net461/win10-x64/publish + @net5.0 + @linux-x64 + Scenario: CloudFoundry Single SignOn (net5.0/linux-x64) + When you run: dotnet publish -f net5.0 -r linux-x64 + And you run in the background: cf push -f manifest.yml -p bin/Debug/net5.0/linux-x64/publish And you wait until CloudFoundry app single-signon is started When you get https://single-signon.x.y.z/Home/About Then you should be at https://uaa.x.y.z/login diff --git a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/Program.cs b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/Program.cs index 0d792b808..967279a45 100644 --- a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/Program.cs +++ b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; namespace CloudFoundrySingleSignon @@ -13,8 +14,8 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseCloudFoundryHosting() - .AddCloudFoundry() + .UseCloudHosting() + .AddCloudFoundryConfiguration() .UseStartup() .Build(); } diff --git a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/README-SSO.md b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/README-SSO.md index 3b953f74a..71004937a 100644 --- a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/README-SSO.md +++ b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/README-SSO.md @@ -30,11 +30,11 @@ Next, locate the sso-setup script you'd like to execute (.cmd/.sh) from the scri 1. cd samples/Security/src/CloudFoundrySingleSignon 1. dotnet restore --configfile nuget.config 1. Publish app to a directory, specifying the desired framework and runtime: - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f netcoreapp2.1 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest: - * `cf push -f manifest-sso.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows-sso.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish` + * `cf push -f manifest-sso.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows-sso.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest(s) will create an app named `single-signon` and attempt to bind it to the SSO service `mySSOService`. diff --git a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/README.md b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/README.md index 031d4420a..bd34b4b30 100644 --- a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/README.md +++ b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/README.md @@ -58,13 +58,13 @@ cf cups myOAuthService -p "{\"client_id\": \"myTestApp\",\"client_secret\": \"my 1. cf target -o myorg -s development 1. cd samples/Security/src/CloudFoundrySingleSignon -1. dotnet restore --configfile nuget.config +1. dotnet restore 1. Publish app to a directory selecting the framework and runtime you want to run on. - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f netcoreapp2.1 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest. - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest(s) will create an app named `single-signon` and attempt to bind it to the user-provided service `myOAuthService`. diff --git a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/Startup.cs b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/Startup.cs index b31aac225..3cee4919a 100644 --- a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/Startup.cs +++ b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/Startup.cs @@ -1,12 +1,11 @@ using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; // using Microsoft.AspNetCore.DataProtection; -using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.HttpOverrides; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Hosting; // using Steeltoe.CloudFoundry.Connector.Redis; using Steeltoe.Security.Authentication.CloudFoundry; // using Steeltoe.Security.DataProtection; @@ -56,15 +55,11 @@ public void ConfigureServices(IServiceCollection services) // services.AddDistributedRedisCache(Configuration); // services.AddSession(); -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -82,7 +77,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) ForwardedHeaders = ForwardedHeaders.XForwardedProto }); -#if NETCOREAPP3_1 app.UseRouting(); app.UseAuthentication(); app.UseAuthorization(); @@ -92,15 +86,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseAuthentication(); - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/nuget.config b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/nuget.config deleted file mode 100644 index a26441404..000000000 --- a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/scaffold/cloudfoundry.py b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/scaffold/cloudfoundry.py index a11ca72d7..8fd0f55c6 100644 --- a/Security/src/AspDotNetCore/CloudFoundrySingleSignon/scaffold/cloudfoundry.py +++ b/Security/src/AspDotNetCore/CloudFoundrySingleSignon/scaffold/cloudfoundry.py @@ -1,5 +1,6 @@ import os import shutil +import stat from pysteel import cloudfoundry, dns from pysteel.command import Command @@ -12,7 +13,7 @@ def setup(context): cf = cloudfoundry.CloudFoundry(context) # remove previous apps cf.delete_app('single-signon') - cf.delete_app('uaa') + #cf.delete_app('uaa') # create UAA service and app if not cf.service_exists('myOAuthService'): credentials = '\'{{"client_id":"myTestApp", "client_secret":"myTestApp", "uri":"{}"}}\''.format( @@ -23,7 +24,10 @@ def setup(context): domainname = dns.resolve_domainname(context, 'x.y.z') uaa_repo = os.path.join(context.project_dir, 'uaa') if os.path.exists(uaa_repo): - shutil.rmtree(uaa_repo) + def remove_readonly(func, path, excinfo): + os.chmod(path, stat.S_IWRITE) + func(path) + shutil.rmtree(uaa_repo, onerror=remove_readonly) for cmd_s in [ 'git clone https://github.com/cloudfoundry/uaa.git', 'git -C uaa checkout 4.7.1', diff --git a/Security/src/AspDotNetCore/CredHubDemo/CredHubDemo.csproj b/Security/src/AspDotNetCore/CredHubDemo/CredHubDemo.csproj index ec812a76d..0c255f281 100644 --- a/Security/src/AspDotNetCore/CredHubDemo/CredHubDemo.csproj +++ b/Security/src/AspDotNetCore/CredHubDemo/CredHubDemo.csproj @@ -1,20 +1,13 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - - + + + + diff --git a/Security/src/AspDotNetCore/CredHubDemo/Program.cs b/Security/src/AspDotNetCore/CredHubDemo/Program.cs index 839549965..a80e1c9b6 100644 --- a/Security/src/AspDotNetCore/CredHubDemo/Program.cs +++ b/Security/src/AspDotNetCore/CredHubDemo/Program.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; using Steeltoe.Extensions.Logging; using Steeltoe.Security.DataProtection.CredHubCore; @@ -45,7 +46,7 @@ public static void Main(string[] args) var host = new WebHostBuilder() .UseKestrel() - .UseCloudFoundryHosting() + .UseCloudHosting() .UseContentRoot(Directory.GetCurrentDirectory()) .UseIISIntegration() .UseStartup() @@ -71,12 +72,7 @@ public static void Main(string[] args) public static ILoggerFactory GetLoggerFactory() { IServiceCollection serviceCollection = new ServiceCollection(); - serviceCollection.AddLogging(builder => builder.SetMinimumLevel(LogLevel.Trace)); - serviceCollection.AddLogging(builder => builder.AddConsole((opts) => - { - opts.DisableColors = true; - })); - serviceCollection.AddLogging(builder => builder.AddDebug()); + serviceCollection.AddLogging(builder => builder.SetMinimumLevel(LogLevel.Trace).AddConsole().AddDebug()); return serviceCollection.BuildServiceProvider().GetService(); } } diff --git a/Security/src/AspDotNetCore/CredHubDemo/README.md b/Security/src/AspDotNetCore/CredHubDemo/README.md index 6cf38e574..64ade1bb3 100644 --- a/Security/src/AspDotNetCore/CredHubDemo/README.md +++ b/Security/src/AspDotNetCore/CredHubDemo/README.md @@ -23,12 +23,12 @@ We will need to use the UAA command line tool to establish some security credent 1. cd samples/Security/src/CredHubDemo 1. dotnet restore 1. Publish app to a directory selecting the framework and runtime you want to run on. - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f netcoreapp2.1 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` * `dotnet publish -f net461 -r win10-x64` 1. Push the app using the appropriate manifest. - * `cf push -f manifest-nix.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-win-core.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish` + * `cf push -f manifest-nix.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-win-core.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` * `cf push -f manifest-win.yml -p bin/Debug/net461/win10-x64/publish` > Note: The provided manifest will create an app named `CredHubDemo-nix`, `CredHubDemo-win` or `CredHubDemo-wincore`. diff --git a/Security/src/AspDotNetCore/CredHubDemo/Startup.cs b/Security/src/AspDotNetCore/CredHubDemo/Startup.cs index 5edcc923e..92a17c533 100644 --- a/Security/src/AspDotNetCore/CredHubDemo/Startup.cs +++ b/Security/src/AspDotNetCore/CredHubDemo/Startup.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; using Steeltoe.Management.CloudFoundry; using Steeltoe.Security.DataProtection.CredHub; @@ -27,15 +27,11 @@ public void ConfigureServices(IServiceCollection services) services.AddCloudFoundryActuators(Configuration); services.Configure(Configuration.GetSection("CredHubClient")); services.AddCredHubClient(Configuration, logFactory); -#if NETCOREAPP3_1 services.AddControllersWithViews(); -#else - services.AddMvc(); -#endif } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) + public void Configure(IApplicationBuilder app, IHostEnvironment env) { if (env.IsDevelopment()) { @@ -49,7 +45,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); app.UseCloudFoundryActuators(); -#if NETCOREAPP3_1 app.UseRouting(); app.UseEndpoints(endpoints => { @@ -57,14 +52,6 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) name: "default", pattern: "{controller=Home}/{action=Index}/{id?}"); }); -#else - app.UseMvc(routes => - { - routes.MapRoute( - name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); - }); -#endif } } } diff --git a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/Program.cs b/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/Program.cs index 6f8e773cc..7fa41f829 100644 --- a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/Program.cs +++ b/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/Program.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; +using Steeltoe.Common.Hosting; using Steeltoe.Extensions.Configuration.CloudFoundry; namespace RedisDataProtectionKeyStore @@ -13,8 +14,8 @@ public static void Main(string[] args) public static IWebHost BuildWebHost(string[] args) => WebHost.CreateDefaultBuilder(args) - .UseCloudFoundryHosting() - .AddCloudFoundry() + .UseCloudHosting() + .AddCloudFoundryConfiguration() .UseStartup() .Build(); } diff --git a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/README.md b/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/README.md index b3104b14f..5ee6e54e9 100644 --- a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/README.md +++ b/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/README.md @@ -20,13 +20,13 @@ You must first create an instance of the Redis service in a org/space. 1. cf target -o myorg -s development 1. cd samples/Security/src/RedisDataProtectionKeyStore -1. dotnet restore --configfile nuget.config +1. dotnet restore 1. Publish app to a directory, specifying the desired framework and runtime: - * `dotnet publish -f netcoreapp2.1 -r ubuntu.16.04-x64` - * `dotnet publish -f netcoreapp2.1 -r win10-x64` + * `dotnet publish -f netcoreapp3.1 -r linux-x64` + * `dotnet publish -f netcoreapp3.1 -r win10-x64` 1. Push the app using the appropriate manifest: - * `cf push -f manifest.yml -p bin/Debug/netcoreapp2.1/ubuntu.16.04-x64/publish` - * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp2.1/win10-x64/publish` + * `cf push -f manifest.yml -p bin/Debug/netcoreapp3.1/linux-x64/publish` + * `cf push -f manifest-windows.yml -p bin/Debug/netcoreapp3.1/win10-x64/publish` > Note: The provided manifest will create an app named `keystore` and attempt to bind to the Redis service `myRedisService`. diff --git a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/RedisDataProtectionKeyStore.csproj b/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/RedisDataProtectionKeyStore.csproj index a62ed54f5..df8d7a6aa 100644 --- a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/RedisDataProtectionKeyStore.csproj +++ b/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/RedisDataProtectionKeyStore.csproj @@ -1,24 +1,14 @@  - - netcoreapp3.1;netcoreapp2.1;net461 + netcoreapp3.1;net5.0 - - - - - - - - - - - - - - + + + + + diff --git a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/Startup.cs b/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/Startup.cs index a69a1be58..5cd36b666 100644 --- a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/Startup.cs +++ b/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/Startup.cs @@ -1,13 +1,11 @@ - -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.DataProtection; +using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Steeltoe.Security.DataProtection; +using Microsoft.Extensions.Hosting; using Steeltoe.CloudFoundry.Connector.Redis; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.DataProtection; +using Steeltoe.Security.DataProtection; namespace RedisDataProtectionKeyStore { @@ -36,7 +34,7 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); // Add framework services. -#if NETCOREAPP3_1 +#if NETCOREAPP3_1 || NET5_0 services.AddControllersWithViews(); #else services.AddMvc(); @@ -44,7 +42,11 @@ public void ConfigureServices(IServiceCollection services) } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. +#if NETCOREAPP3_1 || NET5_0 + public void Configure(IApplicationBuilder app, IHostEnvironment env) +#else public void Configure(IApplicationBuilder app, IHostingEnvironment env) +#endif { app.UseSession(); @@ -59,7 +61,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env) app.UseStaticFiles(); -#if NETCOREAPP3_1 +#if NETCOREAPP3_1 || NET5_0 app.UseRouting(); app.UseEndpoints(endpoints => { diff --git a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/nuget.config b/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/nuget.config deleted file mode 100644 index a26441404..000000000 --- a/Security/src/AspDotNetCore/RedisDataProtectionKeyStore/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/TESTS.md b/TESTS.md index 22d855dcc..ab8f2a1c2 100644 --- a/TESTS.md +++ b/TESTS.md @@ -37,7 +37,7 @@ C:> .\behave.ps1 Connectors\src\AspDotNetCore\RabbitMQ To run only a specific framework/runtime combination, use the `--tags` or `-t` parameter: ```dos -C:> .\behave.ps1 Connectors\src\AspDotNetCore\RabbitMQ -t netcoreapp2.1 -t ubuntu.16.04-x64 +C:> .\behave.ps1 Connectors\src\AspDotNetCore\RabbitMQ -t netcoreapp3.1 -t linux-x64 ``` ## Configuring diff --git a/ci/templates/cloud-foundry-job.yaml b/ci/templates/cloud-foundry-job.yaml index 0caacc20c..ced99a7fb 100644 --- a/ci/templates/cloud-foundry-job.yaml +++ b/ci/templates/cloud-foundry-job.yaml @@ -48,7 +48,7 @@ jobs: - bash: ./behave.sh ${{parameters.feature}}/src/AspDotNetCore/${{parameters.sample}} ${{parameters.behave_args}} --tags ~@net461 displayName: 'Sample -> ${{parameters.feature}}: ${{parameters.sample}}' env: - PYTHON: C:\hostedtoolcache\windows\Python\3.7.8\x64\python.exe + PYTHON: python - template: publish-results-steps.yaml parameters: feature: ${{parameters.feature}} diff --git a/ci/templates/cloud-foundry-uaac-job.yaml b/ci/templates/cloud-foundry-uaac-job.yaml index fae90cce9..910dc8a6e 100644 --- a/ci/templates/cloud-foundry-uaac-job.yaml +++ b/ci/templates/cloud-foundry-uaac-job.yaml @@ -6,7 +6,7 @@ jobs: - job: ${{parameters.feature}}_${{parameters.sample}}_Linux displayName: '${{parameters.feature}}: ${{parameters.sample}} (Linux)' pool: - vmImage: Ubuntu-16.04 + vmImage: Ubuntu-latest steps: - template: setup-cloud-foundry-linux-steps.yaml - template: setup-cloud-foundry-uaac-steps.yaml @@ -38,14 +38,14 @@ jobs: - job: ${{parameters.feature}}_${{parameters.sample}}_Windows displayName: '${{parameters.feature}}: ${{parameters.sample}} (Windows)' pool: - vmImage: Windows-2019 + vmImage: Windows-latest steps: - template: setup-cloud-foundry-windows-steps.yaml - template: setup-cloud-foundry-uaac-steps.yaml - bash: ./behave.sh ${{parameters.feature}}/src/AspDotNetCore/${{parameters.sample}} ${{parameters.behave_args}} --tags ~@net461 displayName: 'Sample -> ${{parameters.feature}}: ${{parameters.sample}}' env: - PYTHON: C:\hostedtoolcache\windows\Python\3.7.8\x64\python.exe + PYTHON: python - template: publish-results-steps.yaml parameters: feature: ${{parameters.feature}} diff --git a/ci/templates/setup-cloud-foundry-linux-steps.yaml b/ci/templates/setup-cloud-foundry-linux-steps.yaml index bc164cf7e..8d41087d0 100644 --- a/ci/templates/setup-cloud-foundry-linux-steps.yaml +++ b/ci/templates/setup-cloud-foundry-linux-steps.yaml @@ -7,3 +7,5 @@ steps: sudo apt-get install cf-cli displayName: 'Setup Cloud Foundry CLI' - template: configure-cloud-foundry-steps.yaml +- script: | + echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_8_X64)" diff --git a/ci/templates/setup-tools-steps.yaml b/ci/templates/setup-tools-steps.yaml index 44cbf550c..256949c93 100644 --- a/ci/templates/setup-tools-steps.yaml +++ b/ci/templates/setup-tools-steps.yaml @@ -1,6 +1,6 @@ parameters: dotnet3Version: 3.1.x - dotnet2Version: 2.1.x + dotnet5Version: 5.0.x steps: - task: UseDotNet@2 displayName: 'Setup DotNet3' @@ -8,15 +8,15 @@ steps: packageType: sdk version: ${{parameters.dotnet3Version}} - task: UseDotNet@2 - displayName: 'Setup DotNet2' + displayName: 'Setup DotNet5' inputs: packageType: sdk - version: ${{parameters.dotnet2Version}} + version: ${{parameters.dotnet5Version}} - task: UsePythonVersion@0 displayName: 'Setup Python' inputs: - versionSpec: 3.7.8 + versionSpec: 3.7.x - task: UseRubyVersion@0 displayName: 'Setup Ruby' inputs: - versionSpec: 2.4.x + versionSpec: 2.6.x diff --git a/config/targetframework.props b/config/targetframework.props index 64aacddcf..58dba9e3d 100644 --- a/config/targetframework.props +++ b/config/targetframework.props @@ -1,10 +1,6 @@ - - $(NuGetPackageRoot)microsoft.targetingpack.netframework.v4.6.1/1.0.1/lib/net461/ - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json - - + diff --git a/config/versions.props b/config/versions.props index d8a8df8a2..5bb4c21e7 100644 --- a/config/versions.props +++ b/config/versions.props @@ -1,6 +1,6 @@ - 2.4.4 + 2.5.5 $(SteeltoeVersion) @@ -15,16 +15,16 @@ 11.0.3 5.1.0 - - 2.1.1 - 2.1.1 - - + 2.1.1 2.1.1 - 3.1.0 - 3.1.0 - - + 3.1.0 + 3.1.0 + + + 5.0.0 + 5.0.0 + + diff --git a/environment.py b/environment.py index 989317605..6881c8685 100644 --- a/environment.py +++ b/environment.py @@ -7,6 +7,29 @@ from pysteel import fs, tooling +class LogObscurer(object): + + def __init__(self, context, logger) -> None: + self._context = context + self._logger = logger + + def info(self, message): + self._logger.info(self._obscure_message(message)) + + def _obscure_message(self, message, attr=None): + if attr: + if hasattr(self._context, 'options'): + if hasattr(self._context.options, 'cf'): + try: + message = message.replace(getattr(self._context.options.cf, attr), '***') + except AttributeError: + pass + return message + else: + message = self._obscure_message(message, 'username') + message = self._obscure_message(message, 'password') + return message + # # hooks @@ -20,7 +43,7 @@ def before_all(context): tooling.init() context.samples_dir = os.getcwd() context.config.setup_logging(configfile=os.path.join(context.samples_dir, 'logging.ini')) - context.log = logging.getLogger('pivotal') + context.log = LogObscurer(context, logging.getLogger('pivotal')) context.log.info("Steeltoe Samples test suite") context.log.info("samples directory: {}".format(context.samples_dir)) setup_options(context) @@ -174,7 +197,7 @@ def setup_options(context): context.options.cf.username = context.config.userdata.get('cf_username') context.log.info("option: CloudFoundry username -> {}".format(context.options.cf.username)) context.options.cf.password = context.config.userdata.get('cf_password') - context.log.info("option: CloudFoundry password -> {}".format('*' if context.options.cf.password else None)) + context.log.info("option: CloudFoundry password -> {}".format(context.options.cf.password)) context.options.cf.org = context.config.userdata.get('cf_org') context.log.info("option: CloudFoundry org -> {}".format(context.options.cf.org)) context.options.cf.domain = context.config.userdata.get('cf_domain') diff --git a/nuget.config b/nuget.config index cdf0827c0..dc9f2e2a2 100644 --- a/nuget.config +++ b/nuget.config @@ -1,8 +1,8 @@  - + - + diff --git a/pysteel/cloudfoundry.py b/pysteel/cloudfoundry.py index 75644c717..4b1becb2a 100644 --- a/pysteel/cloudfoundry.py +++ b/pysteel/cloudfoundry.py @@ -83,7 +83,7 @@ def create_service(self, service, plan, service_instance, args=None): else: self._context.log.info("attempt {}".format(attempts)) status = self.get_service_status(service_instance) - if status == 'create succeeded': + if (status == 'create succeeded') or (status == 'update succeeded'): break if status is None: self._context.log.info('service instance "{}" status not yet available'.format(service_instance))