Charles Lowell
7 years ago
607 changed files with 19001 additions and 72301 deletions
Split View
Diff Options
-
+3 -2.gitignore
-
+12 -9README.md
-
+29 -0_docker/rabbitmq/Dockerfile.nanowin
-
+1 -0_docker/rabbitmq/enabled_plugins
-
+1 -0_docker/rabbitmq/rabbitmq.config
-
+30 -0_docker/redis/Dockerfile.nanowin
-
+2 -1cli-linux/build-bits-linux.sh
-
+1 -0cli-mac/build-bits.sh
-
+0 -160cli-windows/build-bits-expanded.ps1
-
+2 -1cli-windows/build-bits.ps1
-
+5 -0docker-compose-external.yml
-
+79 -0docker-compose-windows.override.yml
-
+80 -0docker-compose-windows.prod.yml
-
+80 -0docker-compose-windows.yml
-
+20 -2docker-compose.override.yml
-
+20 -2docker-compose.prod.yml
-
+15 -0docker-compose.vs.debug.yml
-
+10 -0docker-compose.vs.release.yml
-
+13 -0docker-compose.yml
-
BINdocs/Enterprise-Application-Patterns-using-XamarinForms.pdf
-
BINdocs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf
-
+435 -1eShopOnContainers-ServicesAndWebApps.sln
-
+485 -10eShopOnContainers.sln
-
BINimg/eShopOnContainers_Architecture_Diagram.png
-
BINimg/eShopOnContainers_Architecture_Diagram_old.png
-
BINimg/eShopOnContainers_Types_Of_Microservices.png
-
BINimg/xamarin-enterprise-patterns-ebook-cover-small.png
-
+14 -0src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
-
+18 -0src/BuildingBlocks/EventBus/EventBus/Abstractions/IIntegrationEventHandler.cs
-
+17 -0src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
-
+18 -0src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEvent.cs
-
+171 -0src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
-
+19 -0src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj
-
+13 -0src/BuildingBlocks/EventBus/IntegrationEventLogEF/EventStateEnum.cs
-
+48 -0src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogContext.cs
-
+27 -0src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
-
+28 -0src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEntry.cs
-
+15 -0src/BuildingBlocks/EventBus/IntegrationEventLogEF/Services/IIntegrationEventLogService.cs
-
+53 -0src/BuildingBlocks/EventBus/IntegrationEventLogEF/Services/IntegrationEventLogService.cs
-
+37 -0src/BuildingBlocks/EventBus/IntegrationEventLogEF/Utilities/ResilientTransaction.cs
-
+68 -0src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckMiddleware.cs
-
+38 -0src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckStartupFilter.cs
-
+36 -0src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckWebHostBuilderExtension.cs
-
+38 -0src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckWebHostExtensions.cs
-
+16 -0src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj
-
+45 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/HealthCheckBuilderDataExtensions.cs
-
+19 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/Microsoft.Extensions.HealthChecks.Data.csproj
-
+13 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CheckStatus.cs
-
+110 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/AddCheck.cs
-
+55 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/NumericChecks.cs
-
+21 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/SystemChecks.cs
-
+109 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/UrlChecks.cs
-
+83 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CompositeHealthCheckResult.cs
-
+76 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheck.cs
-
+40 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckBuilder.cs
-
+18 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckExtensions.cs
-
+54 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckResult.cs
-
+12 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckResults.cs
-
+54 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckService.cs
-
+22 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceCollectionExtensions.cs
-
+38 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceExtensions.cs
-
+16 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheck.cs
-
+14 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheckResult.cs
-
+13 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheckService.cs
-
+92 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Internal/UrlChecker.cs
-
+20 -0src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj
-
+45 -0src/BuildingBlocks/HealthChecks/src/common/Guard.cs
-
+16 -0src/BuildingBlocks/Resilience/Resilience.Http/IHttpClient.cs
-
+14 -0src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj
-
+10 -0src/BuildingBlocks/Resilience/Resilience.Http/ResiliencePolicy.cs
-
+64 -0src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs
-
+33 -0src/BuildingBlocks/Resilience/Resilience.Http/StandardHttpClient.cs
-
+19 -8src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml
-
+4 -4src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs
-
+19 -25src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/LineColorBehavior.cs
-
+22 -0src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/FirstValidationErrorConverter.cs
-
+23 -0src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/WebNavigatedEventArgsConverter.cs
-
+11 -0src/Mobile/eShopOnContainers/eShopOnContainers.Core/Effects/EntryLineColorEffect.cs
-
+0 -18src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/AnimationExtension.cs
-
+1 -1src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
-
+3 -3src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs
-
+2 -2src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs
-
+10 -0src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs
-
+3 -0src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/Order.cs
-
+1 -8src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/INavigationService.cs
-
+33 -90src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs
-
+16 -13src/Mobile/eShopOnContainers/eShopOnContainers.Core/Validations/ValidatableObject.cs
-
+1 -1src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ExtendedBindableObject.cs
-
+1 -1src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessageKeys.cs
-
+4 -5src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelBase.cs
-
+83 -81src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs
-
+14 -14src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/BasketViewModel.cs
-
+8 -19src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CatalogViewModel.cs
-
+5 -4src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/CheckoutViewModel.cs
-
+24 -12src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/LoginViewModel.cs
-
+2 -3src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/MainViewModel.cs
-
+2 -9src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/OrderDetailViewModel.cs
-
+1 -1src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/ProfileViewModel.cs
-
+2 -2src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/SettingsViewModel.cs
-
+4 -2src/Mobile/eShopOnContainers/eShopOnContainers.Core/Views/BasketView.xaml
+ 3
- 2
.gitignore
View File
+ 12
- 9
README.md
View File
+ 29
- 0
_docker/rabbitmq/Dockerfile.nanowin
View File
| @ -0,0 +1,29 @@ | |||
| #https://github.com/spring2/dockerfiles/tree/master/rabbitmq | |||
| FROM microsoft/windowsservercore | |||
| SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] | |||
| ENV chocolateyUseWindowsCompression false | |||
| RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); \ | |||
| choco install -y curl; | |||
| RUN choco install -y erlang | |||
| ENV ERLANG_SERVICE_MANAGER_PATH="C:\Program Files\erl8.2\erts-8.2\bin" | |||
| RUN choco install -y rabbitmq | |||
| ENV RABBITMQ_SERVER="C:\Program Files\RabbitMQ Server\rabbitmq_server-3.6.5" | |||
| ENV RABBITMQ_CONFIG_FILE="c:\rabbitmq" | |||
| COPY rabbitmq.config C:/ | |||
| COPY rabbitmq.config C:/Users/ContainerAdministrator/AppData/Roaming/RabbitMQ/ | |||
| COPY enabled_plugins C:/Users/ContainerAdministrator/AppData/Roaming/RabbitMQ/ | |||
| EXPOSE 4369 | |||
| EXPOSE 5672 | |||
| EXPOSE 5671 | |||
| EXPOSE 15672 | |||
| WORKDIR C:/Program\ Files/RabbitMQ\ Server/rabbitmq_server-3.6.5/sbin | |||
| CMD .\rabbitmq-server.bat | |||
+ 1
- 0
_docker/rabbitmq/enabled_plugins
View File
| @ -0,0 +1 @@ | |||
| [rabbitmq_amqp1_0,rabbitmq_management]. | |||
+ 1
- 0
_docker/rabbitmq/rabbitmq.config
View File
| @ -0,0 +1 @@ | |||
| [{rabbit, [{loopback_users, []}]}]. | |||
+ 30
- 0
_docker/redis/Dockerfile.nanowin
View File
| @ -0,0 +1,30 @@ | |||
| # The MSI installs a service which is hard to override, so let's use a zip file. | |||
| FROM microsoft/windowsservercore | |||
| MAINTAINER alexellis2@gmail.com | |||
| SHELL ["powershell"] | |||
| RUN $ErrorActionPreference = 'Stop'; \ | |||
| wget https://github.com/MSOpenTech/redis/releases/download/win-3.2.100/Redis-x64-3.2.100.zip -OutFile Redis-x64-3.2.100.zip ; \ | |||
| Expand-Archive Redis-x64-3.2.100.zip -dest 'C:\\Program Files\\Redis\\' ; \ | |||
| Remove-Item Redis-x64-3.2.100.zip -Force | |||
| RUN setx PATH '%PATH%;C:\\Program Files\\Redis\\' | |||
| WORKDIR 'C:\\Program Files\\Redis\\' | |||
| RUN Get-Content redis.windows.conf | Where { $_ -notmatch 'bind 127.0.0.1' } | Set-Content redis.openport.conf ; \ | |||
| Get-Content redis.openport.conf | Where { $_ -notmatch 'protected-mode yes' } | Set-Content redis.unprotected.conf ; \ | |||
| Add-Content redis.unprotected.conf 'protected-mode no' ; \ | |||
| Add-Content redis.unprotected.conf 'bind 0.0.0.0' ; \ | |||
| Get-Content redis.unprotected.conf | |||
| EXPOSE 6379 | |||
| RUN set-itemproperty -path 'HKLM:\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters' -Name ServerPriorityTimeLimit -Value 0 -Type DWord | |||
| # Define our command to be run when launching the container | |||
| CMD .\\redis-server.exe .\\redis.unprotected.conf --port 6379 ; \ | |||
| Write-Host Redis Started... ; \ | |||
| while ($true) { Start-Sleep -Seconds 3600 } | |||
+ 2
- 1
cli-linux/build-bits-linux.sh
View File
+ 1
- 0
cli-mac/build-bits.sh
View File
+ 0
- 160
cli-windows/build-bits-expanded.ps1
View File
| @ -1,160 +0,0 @@ | |||
| ######################################################################################################### | |||
| # This "expanded Script" can be used when debugging issues when building the .NET Core bits | |||
| # as it is easier to follow and debug than when using a loop (like in the optimized build-bits.ps1) | |||
| ######################################################################################################### | |||
| Param([string] $rootPath) | |||
| $scriptPath = Split-Path $script:MyInvocation.MyCommand.Path | |||
| Write-Host "Current script directory is $scriptPath" -ForegroundColor Yellow | |||
| if ([string]::IsNullOrEmpty($rootPath)) { | |||
| $rootPath = "$scriptPath\.." | |||
| } | |||
| Write-Host "Root path used is $rootPath" -ForegroundColor Yellow | |||
| # *** WebMVC paths *** | |||
| $webMVCPath = $rootPath + "\src\Web\WebMVC" | |||
| $webMVCPathToProject = $webMVCPath + "\WebMVC.csproj" | |||
| Write-Host "webMVCPathToProject is $webMVCPathToProject" -ForegroundColor Yellow | |||
| $webMVCPathToPub = $webMVCPath + "\obj\Docker\publish" | |||
| Write-Host "webMVCPathToPub is $webMVCPathToPub" -ForegroundColor Yellow | |||
| # *** WebSPA paths *** | |||
| $webSPAPath = $rootPath + "\src\Web\WebSPA" | |||
| $webSPAPathToProject = $webSPAPath + "\WebSPA.csproj" | |||
| Write-Host "webSPAPathToProject is $webSPAPathToProject" -ForegroundColor Yellow | |||
| $webSPAPathToPub = $webSPAPath + "\obj\Docker\publish" | |||
| Write-Host "webSPAPathToPub is $webSPAPathToPub" -ForegroundColor Yellow | |||
| # *** IdentitySvc paths *** | |||
| $identitySvcPath = $rootPath + "\src\Services\Identity\Identity.API" | |||
| $identitySvcToProject = $identitySvcPath + "\Identity.API.csproj" | |||
| Write-Host "identitySvcToProject is $identitySvcToProject" -ForegroundColor Yellow | |||
| $identitySvcPathToPub = $identitySvcPath + "\obj\Docker\publish" | |||
| Write-Host "identitySvcPathToPub is $identitySvcPathToPub" -ForegroundColor Yellow | |||
| # *** Catalog paths *** | |||
| $catalogPath = $rootPath + "\src\Services\Catalog\Catalog.API" | |||
| $catalogPathToProject = $catalogPath + "\Catalog.API.csproj" | |||
| Write-Host "catalogPathToProject is $catalogPathToProject" -ForegroundColor Yellow | |||
| $catalogPathToPub = $catalogPath + "\obj\Docker\publish" | |||
| Write-Host "catalogPathToPub is $catalogPathToPub" -ForegroundColor Yellow | |||
| # *** Ordering paths *** | |||
| $orderingPath = $rootPath + "\src\Services\Ordering\Ordering.API" | |||
| $orderingPathToProject = $orderingPath + "\Ordering.API.csproj" | |||
| Write-Host "orderingPathToProject is $orderingPathToProject" -ForegroundColor Yellow | |||
| $orderingPathToPub = $orderingPath + "\obj\Docker\publish" | |||
| Write-Host "orderingPathToPub is $orderingPathToPub" -ForegroundColor Yellow | |||
| # *** Basket paths *** | |||
| $basketPath = $rootPath + "\src\Services\Basket\Basket.API" | |||
| $basketPathToProject = $basketPath + "\Basket.API.csproj" | |||
| Write-Host "basketPathToProject is $basketPathToProject" -ForegroundColor Yellow | |||
| $basketPathToPub = $basketPath + "\obj\Docker\publish" | |||
| Write-Host "basketPathToPub is $basketPathToPub" -ForegroundColor Yellow | |||
| ######################################################################################## | |||
| # Delete old eShop dotnet publish bits | |||
| ######################################################################################## | |||
| # Write-Host "Deleting previous dotnet publish bits from all projects" -ForegroundColor Blue | |||
| remove-item -path $WebMVCPathToPub -Force -Recurse -ErrorAction SilentlyContinue | |||
| remove-item -path $webSPAPathToPub -Force -Recurse -ErrorAction SilentlyContinue | |||
| remove-item -path $identitySvcPathToPub -Force -Recurse -ErrorAction SilentlyContinue | |||
| remove-item -path $catalogPathToPub -Force -Recurse -ErrorAction SilentlyContinue | |||
| remove-item -path $orderingPathToPub -Force -Recurse -ErrorAction SilentlyContinue | |||
| remove-item -path $basketPathToPub -Force -Recurse -ErrorAction SilentlyContinue | |||
| ######################################################################################## | |||
| # Building DotNet bits | |||
| ######################################################################################## | |||
| # WebMVC: Build dotnet bits | |||
| Write-Host "WebMVC: Restore Dependencies, dotnet build and dotnet publish" -ForegroundColor Blue | |||
| dotnet restore $WebMVCPathToProject | |||
| dotnet build $WebMVCPathToProject | |||
| dotnet publish $WebMVCPathToProject -o $WebMVCPathToPub | |||
| # WebSPA: Build dotnet bits | |||
| Write-Host "WebSPA: Installing npm dependencies" | |||
| #TEMP COMMENT--- Start-Process -WorkingDirectory $webSPAPath -NoNewWindow -Wait npm i | |||
| Write-Host "WebSPA: Restore Dependencies, dotnet build and dotnet publish" -ForegroundColor Blue | |||
| dotnet restore $webSPAPathToProject | |||
| dotnet build $webSPAPathToProject | |||
| dotnet publish $webSPAPathToProject -o $webSPAPathToPub | |||
| # Identity Service: Build dotnet bits | |||
| Write-Host "Identity Service: Restore Dependencies, dotnet build and dotnet publish" -ForegroundColor Blue | |||
| dotnet restore $identitySvcToProject | |||
| dotnet build $identitySvcToProject | |||
| dotnet publish $identitySvcToProject -o $identitySvcPathToPub | |||
| # Catalog Service: Build dotnet bits | |||
| Write-Host "Catalog Service: Restore Dependencies, dotnet build and dotnet publish" -ForegroundColor Blue | |||
| dotnet restore $catalogPathToProject | |||
| dotnet build $catalogPathToProject | |||
| dotnet publish $catalogPathToProject -o $catalogPathToPub | |||
| # Ordering Service: Build dotnet bits | |||
| Write-Host "Ordering Service: Restore Dependencies, dotnet build and dotnet publish" -ForegroundColor Blue | |||
| dotnet restore $orderingPathToProject | |||
| dotnet build $orderingPathToProject | |||
| dotnet publish $orderingPathToProject -o $orderingPathToPub | |||
| # Basket Service: Build dotnet bits | |||
| Write-Host "Basket Service: Restore Dependencies, dotnet build and dotnet publish" -ForegroundColor Blue | |||
| dotnet restore $basketPathToProject | |||
| dotnet build $basketPathToProject | |||
| dotnet publish $basketPathToProject -o $basketPathToPub | |||
| ######################################################################################## | |||
| # Delete old eShop Docker images | |||
| ######################################################################################## | |||
| $imagesToDelete = docker images --filter=reference="eshop/*" -q | |||
| If (-Not $imagesToDelete) {Write-Host "Not deleting eShop images as there are no eShop images in the current local Docker repo."} | |||
| Else | |||
| { | |||
| # Delete all containers | |||
| Write-Host "Deleting all containers in local Docker Host" | |||
| docker rm $(docker ps -a -q) -f | |||
| # Delete all eshop images | |||
| Write-Host "Deleting eShop images in local Docker repo" | |||
| Write-Host $imagesToDelete | |||
| docker rmi $(docker images --filter=reference="eshop/*" -q) -f | |||
| } | |||
| ######################################################################################## | |||
| # Build new eShop images | |||
| ######################################################################################## | |||
| # WE DON'T NEED DOCKER BUILD AS WE CAN RUN "DOCKER-COMPOSE BUILD" OR "DOCKER-COMPOSE UP" AND IT WILL BUILD ALL THE IMAGES IN THE .YML FOR US | |||
| #*** build docker images *** | |||
| # docker build -t eshop/web $webPathToPub | |||
| # docker build -t eshop/catalog.api $catalogPathToPub | |||
| # docker build -t eshop/ordering.api $orderingApiPathToPub | |||
| # docker build -t eshop/basket.api $basketPathToPub | |||
| # docker build -t eshop/webspa $webSPAPathToPub | |||
| # docker build -t eshop/identity $identitySvcPathToPub | |||
+ 2
- 1
cli-windows/build-bits.ps1
View File
+ 5
- 0
docker-compose-external.yml
View File
+ 79
- 0
docker-compose-windows.override.yml
View File
| @ -0,0 +1,79 @@ | |||
| version: '2.1' | |||
| # The default docker-compose.override file can use the "localhost" as the external name for testing web apps within the same dev machine. | |||
| # The ESHOP_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: | |||
| # ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost | |||
| # but values present in the environment vars at runtime will always override those defined inside the .env file | |||
| # An external IP or DNS name has to be used (instead localhost and the 10.0.75.1 IP) when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance. | |||
| services: | |||
| basket.api: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Development | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5103 | |||
| - ConnectionString=basket.data | |||
| - identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. | |||
| - EventBusConnection=rabbitmq | |||
| ports: | |||
| - "5103:5103" | |||
| catalog.api: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Development | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5101 | |||
| - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word | |||
| - ExternalCatalogBaseUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. | |||
| - EventBusConnection=rabbitmq | |||
| ports: | |||
| - "5101:5101" | |||
| identity.api: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Development | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5105 | |||
| - SpaClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5104 | |||
| - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word | |||
| - MvcClient=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your local dev-machine firewall at range 5100-5105. | |||
| ports: | |||
| - "5105:5105" | |||
| ordering.api: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Development | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5102 | |||
| - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word | |||
| - identityUrl=http://identity.api:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. | |||
| - EventBusConnection=rabbitmq | |||
| ports: | |||
| - "5102:5102" | |||
| webspa: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Development | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5104 | |||
| - CatalogUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5101 | |||
| - OrderingUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5102 | |||
| - IdentityUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your local dev-machine firewall at range 5100-5105. at range 5100-5105. | |||
| - BasketUrl=http://${ESHOP_EXTERNAL_DNS_NAME_OR_IP}:5103 | |||
| ports: | |||
| - "5104:5104" | |||
| webmvc: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Development | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5100 | |||
| - CatalogUrl=http://catalog.api:5101 | |||
| - OrderingUrl=http://ordering.api:5102 | |||
| - BasketUrl=http://basket.api:5103 | |||
| - IdentityUrl=http://10.0.75.1:5105 #Local: Use 10.0.75.1 in a "Docker for Windows" environment, if using "localhost" from browser. | |||
| #Remote: Use ${ESHOP_EXTERNAL_DNS_NAME_OR_IP} if using external IP or DNS name from browser. | |||
| ports: | |||
| - "5100:5100" | |||
| sql.data: | |||
| environment: | |||
| - SA_PASSWORD=Pass@word | |||
| - ACCEPT_EULA=Y | |||
| ports: | |||
| - "5433:1433" | |||
+ 80
- 0
docker-compose-windows.prod.yml
View File
| @ -0,0 +1,80 @@ | |||
| version: '2.1' | |||
| # The Production docker-compose file has to have the external/real IPs or DNS names for the services | |||
| # The ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP environment variable is taken, by default, from the ".env" file defined like: | |||
| # ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP=192.168.88.248 | |||
| # but values present in the environment vars at runtime will always override those defined inside the .env file | |||
| # An external IP or DNS name has to be used when testing the Web apps and the Xamarin apps from remote machines/devices using the same WiFi, for instance. | |||
| # | |||
| # Set ASPNETCORE_ENVIRONMENT=Development to get errors while testing. | |||
| # | |||
| # You need to start it with the following CLI command: | |||
| # docker-compose -f docker-compose-windows.yml -f docker-compose-windows.prod.yml up -d | |||
| services: | |||
| basket.api: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Production | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5103 | |||
| - ConnectionString=basket.data | |||
| - identityUrl=http://identity.api:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105. | |||
| ports: | |||
| - "5103:5103" | |||
| catalog.api: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Production | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5101 | |||
| - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=sa;Password=Pass@word | |||
| - ExternalCatalogBaseUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105. | |||
| ports: | |||
| - "5101:5101" | |||
| identity.api: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Production | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5105 | |||
| - SpaClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5104 | |||
| - ConnectionStrings__DefaultConnection=Server=sql.data;Database=Microsoft.eShopOnContainers.Service.IdentityDb;User Id=sa;Password=Pass@word | |||
| - MvcClient=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5100 #Local: You need to open your host's firewall at range 5100-5105. | |||
| ports: | |||
| - "5105:5105" | |||
| ordering.api: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Production | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5102 | |||
| - ConnectionString=Server=sql.data;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word | |||
| - identityUrl=http://identity.api:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105. | |||
| ports: | |||
| - "5102:5102" | |||
| webspa: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Production | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5104 | |||
| - CatalogUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5101 | |||
| - OrderingUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5102 | |||
| - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: You need to open your host's firewall at range 5100-5105. at range 5100-5105. | |||
| - BasketUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5103 | |||
| ports: | |||
| - "5104:5104" | |||
| webmvc: | |||
| environment: | |||
| - ASPNETCORE_ENVIRONMENT=Production | |||
| - ASPNETCORE_URLS=http://0.0.0.0:5100 | |||
| - CatalogUrl=http://catalog.api:5101 | |||
| - OrderingUrl=http://ordering.api:5102 | |||
| - IdentityUrl=http://${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}:5105 #Local: Use ${ESHOP_PROD_EXTERNAL_DNS_NAME_OR_IP}, if using external IP or DNS name from browser. | |||
| - BasketUrl=http://basket.api:5103 | |||
| ports: | |||
| - "5100:5100" | |||
| sql.data: | |||
| environment: | |||
| - SA_PASSWORD=Pass@word | |||
| - ACCEPT_EULA=Y | |||
| ports: | |||
| - "5433:1433" | |||
+ 80
- 0
docker-compose-windows.yml
View File
| @ -0,0 +1,80 @@ | |||
| version: '2.1' | |||
| services: | |||
| basket.api: | |||
| image: eshop/basket.api | |||
| build: | |||
| context: ./src/Services/Basket/Basket.API | |||
| dockerfile: Dockerfile.nanowin | |||
| depends_on: | |||
| - basket.data | |||
| - identity.api | |||
| catalog.api: | |||
| image: eshop/catalog.api | |||
| build: | |||
| context: ./src/Services/Catalog/Catalog.API | |||
| dockerfile: Dockerfile.nanowin | |||
| depends_on: | |||
| - sql.data | |||
| identity.api: | |||
| image: eshop/identity.api | |||
| build: | |||
| context: ./src/Services/Identity/Identity.API | |||
| dockerfile: Dockerfile.nanowin | |||
| depends_on: | |||
| - sql.data | |||
| ordering.api: | |||
| image: eshop/ordering.api | |||
| build: | |||
| context: ./src/Services/Ordering/Ordering.API | |||
| dockerfile: Dockerfile.nanowin | |||
| depends_on: | |||
| - sql.data | |||
| webspa: | |||
| image: eshop/webspa | |||
| build: | |||
| context: ./src/Web/WebSPA | |||
| dockerfile: Dockerfile.nanowin | |||
| depends_on: | |||
| - identity.api | |||
| - basket.api | |||
| webmvc: | |||
| image: eshop/webmvc | |||
| build: | |||
| context: ./src/Web/WebMVC | |||
| dockerfile: Dockerfile.nanowin | |||
| depends_on: | |||
| - catalog.api | |||
| - ordering.api | |||
| - identity.api | |||
| - basket.api | |||
| sql.data: | |||
| image: microsoft/mssql-server-windows | |||
| basket.data: | |||
| image: redis | |||
| build: | |||
| context: ./_docker/redis | |||
| dockerfile: Dockerfile.nanowin | |||
| ports: | |||
| - "6379:6379" | |||
| rabbitmq: | |||
| image: rabbitmq | |||
| build: | |||
| context: ./_docker/rabbitmq | |||
| dockerfile: Dockerfile.nanowin | |||
| ports: | |||
| - "5672:5672" | |||
| networks: | |||
| default: | |||
| external: | |||
| name: nat | |||
+ 20
- 2
docker-compose.override.yml
View File
+ 20
- 2
docker-compose.prod.yml
View File
+ 15
- 0
docker-compose.vs.debug.yml
View File
+ 10
- 0
docker-compose.vs.release.yml
View File
+ 13
- 0
docker-compose.yml
View File
BIN
docs/Enterprise-Application-Patterns-using-XamarinForms.pdf
View File
BIN
docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf
View File
+ 435
- 1
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 485
- 10
eShopOnContainers.sln
View File
BIN
img/eShopOnContainers_Architecture_Diagram.png
View File
| Before | After |
|---|---|
|
|
| Width: 2034 | Height: 1078 | Size: 427 KiB | Width: 1830 | Height: 1078 | Size: 405 KiB |
BIN
img/eShopOnContainers_Architecture_Diagram_old.png
View File
| Before | After |
|---|---|
|
|
| Width: 2034 | Height: 1078 | Size: 427 KiB |
BIN
img/eShopOnContainers_Types_Of_Microservices.png
View File
| Before | After |
|---|---|
|
|
| Width: 1249 | Height: 581 | Size: 156 KiB |
BIN
img/xamarin-enterprise-patterns-ebook-cover-small.png
View File
| Before | After |
|---|---|
|
|
| Width: 260 | Height: 336 | Size: 28 KiB |
+ 14
- 0
src/BuildingBlocks/EventBus/EventBus/Abstractions/IEventBus.cs
View File
| @ -0,0 +1,14 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions | |||
| { | |||
| public interface IEventBus | |||
| { | |||
| void Subscribe<T>(IIntegrationEventHandler<T> handler) where T: IntegrationEvent; | |||
| void Unsubscribe<T>(IIntegrationEventHandler<T> handler) where T : IntegrationEvent; | |||
| void Publish(IntegrationEvent @event); | |||
| } | |||
| } | |||
+ 18
- 0
src/BuildingBlocks/EventBus/EventBus/Abstractions/IIntegrationEventHandler.cs
View File
| @ -0,0 +1,18 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions | |||
| { | |||
| public interface IIntegrationEventHandler<in TIntegrationEvent> : IIntegrationEventHandler | |||
| where TIntegrationEvent: IntegrationEvent | |||
| { | |||
| Task Handle(TIntegrationEvent @event); | |||
| } | |||
| public interface IIntegrationEventHandler | |||
| { | |||
| } | |||
| } | |||
+ 17
- 0
src/BuildingBlocks/EventBus/EventBus/EventBus.csproj
View File
| @ -0,0 +1,17 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp1.1</TargetFramework> | |||
| <RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion> | |||
| <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBus</RootNamespace> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <Folder Include="Abstractions\" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Newtonsoft.Json" Version="9.0.1" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 18
- 0
src/BuildingBlocks/EventBus/EventBus/Events/IntegrationEvent.cs
View File
| @ -0,0 +1,18 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events | |||
| { | |||
| public class IntegrationEvent | |||
| { | |||
| public IntegrationEvent() | |||
| { | |||
| Id = Guid.NewGuid(); | |||
| CreationDate = DateTime.UtcNow; | |||
| } | |||
| public Guid Id { get; } | |||
| public DateTime CreationDate { get; } | |||
| } | |||
| } | |||
+ 171
- 0
src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
View File
| @ -0,0 +1,171 @@ | |||
| | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using Newtonsoft.Json; | |||
| using RabbitMQ.Client; | |||
| using RabbitMQ.Client.Events; | |||
| using System; | |||
| using System.Collections; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Reflection; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ | |||
| { | |||
| public class EventBusRabbitMQ : IEventBus, IDisposable | |||
| { | |||
| private readonly string _brokerName = "eshop_event_bus"; | |||
| private readonly string _connectionString; | |||
| private readonly Dictionary<string, List<IIntegrationEventHandler>> _handlers; | |||
| private readonly List<Type> _eventTypes; | |||
| private IModel _model; | |||
| private IConnection _connection; | |||
| private string _queueName; | |||
| public EventBusRabbitMQ(string connectionString) | |||
| { | |||
| _connectionString = connectionString; | |||
| _handlers = new Dictionary<string, List<IIntegrationEventHandler>>(); | |||
| _eventTypes = new List<Type>(); | |||
| } | |||
| public void Publish(IntegrationEvent @event) | |||
| { | |||
| var eventName = @event.GetType().Name; | |||
| var factory = new ConnectionFactory() { HostName = _connectionString }; | |||
| using (var connection = factory.CreateConnection()) | |||
| using (var channel = connection.CreateModel()) | |||
| { | |||
| channel.ExchangeDeclare(exchange: _brokerName, | |||
| type: "direct"); | |||
| string message = JsonConvert.SerializeObject(@event); | |||
| var body = Encoding.UTF8.GetBytes(message); | |||
| channel.BasicPublish(exchange: _brokerName, | |||
| routingKey: eventName, | |||
| basicProperties: null, | |||
| body: body); | |||
| } | |||
| } | |||
| public void Subscribe<T>(IIntegrationEventHandler<T> handler) where T : IntegrationEvent | |||
| { | |||
| var eventName = typeof(T).Name; | |||
| if (_handlers.ContainsKey(eventName)) | |||
| { | |||
| _handlers[eventName].Add(handler); | |||
| } | |||
| else | |||
| { | |||
| var channel = GetChannel(); | |||
| channel.QueueBind(queue: _queueName, | |||
| exchange: _brokerName, | |||
| routingKey: eventName); | |||
| _handlers.Add(eventName, new List<IIntegrationEventHandler>()); | |||
| _handlers[eventName].Add(handler); | |||
| _eventTypes.Add(typeof(T)); | |||
| } | |||
| } | |||
| public void Unsubscribe<T>(IIntegrationEventHandler<T> handler) where T : IntegrationEvent | |||
| { | |||
| var eventName = typeof(T).Name; | |||
| if (_handlers.ContainsKey(eventName) && _handlers[eventName].Contains(handler)) | |||
| { | |||
| _handlers[eventName].Remove(handler); | |||
| if (_handlers[eventName].Count == 0) | |||
| { | |||
| _handlers.Remove(eventName); | |||
| var eventType = _eventTypes.Single(e => e.Name == eventName); | |||
| _eventTypes.Remove(eventType); | |||
| _model.QueueUnbind(queue: _queueName, | |||
| exchange: _brokerName, | |||
| routingKey: eventName); | |||
| if (_handlers.Keys.Count == 0) | |||
| { | |||
| _queueName = string.Empty; | |||
| _model.Dispose(); | |||
| _connection.Dispose(); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| public void Dispose() | |||
| { | |||
| _handlers.Clear(); | |||
| _model?.Dispose(); | |||
| _connection?.Dispose(); | |||
| } | |||
| private IModel GetChannel() | |||
| { | |||
| if (_model != null) | |||
| { | |||
| return _model; | |||
| } | |||
| else | |||
| { | |||
| (_model, _connection) = CreateConnection(); | |||
| return _model; | |||
| } | |||
| } | |||
| private (IModel model, IConnection connection) CreateConnection() | |||
| { | |||
| var factory = new ConnectionFactory() { HostName = _connectionString }; | |||
| var con = factory.CreateConnection(); | |||
| var channel = con.CreateModel(); | |||
| channel.ExchangeDeclare(exchange: _brokerName, | |||
| type: "direct"); | |||
| if (string.IsNullOrEmpty(_queueName)) | |||
| { | |||
| _queueName = channel.QueueDeclare().QueueName; | |||
| } | |||
| var consumer = new EventingBasicConsumer(channel); | |||
| consumer.Received += async (model, ea) => | |||
| { | |||
| var eventName = ea.RoutingKey; | |||
| var message = Encoding.UTF8.GetString(ea.Body); | |||
| await ProcessEvent(eventName, message); | |||
| }; | |||
| channel.BasicConsume(queue: _queueName, | |||
| noAck: true, | |||
| consumer: consumer); | |||
| return (channel, con); | |||
| } | |||
| private async Task ProcessEvent(string eventName, string message) | |||
| { | |||
| if (_handlers.ContainsKey(eventName)) | |||
| { | |||
| Type eventType = _eventTypes.Single(t => t.Name == eventName); | |||
| var integrationEvent = JsonConvert.DeserializeObject(message, eventType); | |||
| var concreteType = typeof(IIntegrationEventHandler<>).MakeGenericType(eventType); | |||
| var handlers = _handlers[eventName]; | |||
| foreach (var handler in handlers) | |||
| { | |||
| await (Task)concreteType.GetMethod("Handle").Invoke(handler, new object[] { integrationEvent }); | |||
| } | |||
| } | |||
| } | |||
| } | |||
| } | |||
+ 19
- 0
src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.csproj
View File
| @ -0,0 +1,19 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp1.1</TargetFramework> | |||
| <RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion> | |||
| <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ</RootNamespace> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Newtonsoft.Json" Version="9.0.1" /> | |||
| <PackageReference Include="RabbitMQ.Client" Version="4.1.1" /> | |||
| <PackageReference Include="System.ValueTuple" Version="4.3.0" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\EventBus\EventBus.csproj" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 13
- 0
src/BuildingBlocks/EventBus/IntegrationEventLogEF/EventStateEnum.cs
View File
| @ -0,0 +1,13 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF | |||
| { | |||
| public enum EventStateEnum | |||
| { | |||
| NotPublished = 0, | |||
| Published = 1, | |||
| PublishedFailed = 2 | |||
| } | |||
| } | |||
+ 48
- 0
src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogContext.cs
View File
| @ -0,0 +1,48 @@ | |||
| using Microsoft.EntityFrameworkCore; | |||
| using Microsoft.EntityFrameworkCore.Metadata.Builders; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF | |||
| { | |||
| public class IntegrationEventLogContext : DbContext | |||
| { | |||
| public IntegrationEventLogContext(DbContextOptions<IntegrationEventLogContext> options) : base(options) | |||
| { | |||
| } | |||
| public DbSet<IntegrationEventLogEntry> IntegrationEventLogs { get; set; } | |||
| protected override void OnModelCreating(ModelBuilder builder) | |||
| { | |||
| builder.Entity<IntegrationEventLogEntry>(ConfigureIntegrationEventLogEntry); | |||
| } | |||
| void ConfigureIntegrationEventLogEntry(EntityTypeBuilder<IntegrationEventLogEntry> builder) | |||
| { | |||
| builder.ToTable("IntegrationEventLog"); | |||
| builder.HasKey(e => e.EventId); | |||
| builder.Property(e => e.EventId) | |||
| .IsRequired(); | |||
| builder.Property(e => e.Content) | |||
| .IsRequired(); | |||
| builder.Property(e => e.CreationTime) | |||
| .IsRequired(); | |||
| builder.Property(e => e.State) | |||
| .IsRequired(); | |||
| builder.Property(e => e.TimesSent) | |||
| .IsRequired(); | |||
| builder.Property(e => e.EventTypeName) | |||
| .IsRequired(); | |||
| } | |||
| } | |||
| } | |||
+ 27
- 0
src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEF.csproj
View File
| @ -0,0 +1,27 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp1.1</TargetFramework> | |||
| <RuntimeFrameworkVersion>1.1.0</RuntimeFrameworkVersion> | |||
| <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF</RootNamespace> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="1.1.0" /> | |||
| <PackageReference Include="Newtonsoft.Json" Version="9.0.1" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\EventBus\EventBus.csproj" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 28
- 0
src/BuildingBlocks/EventBus/IntegrationEventLogEF/IntegrationEventLogEntry.cs
View File
| @ -0,0 +1,28 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using Newtonsoft.Json; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF | |||
| { | |||
| public class IntegrationEventLogEntry | |||
| { | |||
| private IntegrationEventLogEntry() { } | |||
| public IntegrationEventLogEntry(IntegrationEvent @event) | |||
| { | |||
| EventId = @event.Id; | |||
| CreationTime = @event.CreationDate; | |||
| EventTypeName = @event.GetType().FullName; | |||
| Content = JsonConvert.SerializeObject(@event); | |||
| State = EventStateEnum.NotPublished; | |||
| TimesSent = 0; | |||
| } | |||
| public Guid EventId { get; private set; } | |||
| public string EventTypeName { get; private set; } | |||
| public EventStateEnum State { get; set; } | |||
| public int TimesSent { get; set; } | |||
| public DateTime CreationTime { get; private set; } | |||
| public string Content { get; private set; } | |||
| } | |||
| } | |||
+ 15
- 0
src/BuildingBlocks/EventBus/IntegrationEventLogEF/Services/IIntegrationEventLogService.cs
View File
| @ -0,0 +1,15 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Data.Common; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services | |||
| { | |||
| public interface IIntegrationEventLogService | |||
| { | |||
| Task SaveEventAsync(IntegrationEvent @event, DbTransaction transaction); | |||
| Task MarkEventAsPublishedAsync(IntegrationEvent @event); | |||
| } | |||
| } | |||
+ 53
- 0
src/BuildingBlocks/EventBus/IntegrationEventLogEF/Services/IntegrationEventLogService.cs
View File
| @ -0,0 +1,53 @@ | |||
| using Microsoft.EntityFrameworkCore; | |||
| using Microsoft.EntityFrameworkCore.Infrastructure; | |||
| using Microsoft.EntityFrameworkCore.Storage; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System.Data.Common; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| using System; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services | |||
| { | |||
| public class IntegrationEventLogService : IIntegrationEventLogService | |||
| { | |||
| private readonly IntegrationEventLogContext _integrationEventLogContext; | |||
| private readonly DbConnection _dbConnection; | |||
| public IntegrationEventLogService(DbConnection dbConnection) | |||
| { | |||
| _dbConnection = dbConnection?? throw new ArgumentNullException("dbConnection"); | |||
| _integrationEventLogContext = new IntegrationEventLogContext( | |||
| new DbContextOptionsBuilder<IntegrationEventLogContext>() | |||
| .UseSqlServer(_dbConnection) | |||
| .ConfigureWarnings(warnings => warnings.Throw(RelationalEventId.QueryClientEvaluationWarning)) | |||
| .Options); | |||
| } | |||
| public Task SaveEventAsync(IntegrationEvent @event, DbTransaction transaction) | |||
| { | |||
| if(transaction == null) | |||
| { | |||
| throw new ArgumentNullException("transaction", $"A {typeof(DbTransaction).FullName} is required as a pre-requisite to save the event."); | |||
| } | |||
| var eventLogEntry = new IntegrationEventLogEntry(@event); | |||
| _integrationEventLogContext.Database.UseTransaction(transaction); | |||
| _integrationEventLogContext.IntegrationEventLogs.Add(eventLogEntry); | |||
| return _integrationEventLogContext.SaveChangesAsync(); | |||
| } | |||
| public Task MarkEventAsPublishedAsync(IntegrationEvent @event) | |||
| { | |||
| var eventLogEntry = _integrationEventLogContext.IntegrationEventLogs.Single(ie => ie.EventId == @event.Id); | |||
| eventLogEntry.TimesSent++; | |||
| eventLogEntry.State = EventStateEnum.Published; | |||
| _integrationEventLogContext.IntegrationEventLogs.Update(eventLogEntry); | |||
| return _integrationEventLogContext.SaveChangesAsync(); | |||
| } | |||
| } | |||
| } | |||
+ 37
- 0
src/BuildingBlocks/EventBus/IntegrationEventLogEF/Utilities/ResilientTransaction.cs
View File
| @ -0,0 +1,37 @@ | |||
| using Microsoft.EntityFrameworkCore; | |||
| using Microsoft.EntityFrameworkCore.Storage; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Data.Common; | |||
| using System.Text; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Utilities | |||
| { | |||
| public class ResilientTransaction | |||
| { | |||
| private DbContext _context; | |||
| private ResilientTransaction(DbContext context) => | |||
| _context = context ?? throw new ArgumentNullException(nameof(context)); | |||
| public static ResilientTransaction New (DbContext context) => | |||
| new ResilientTransaction(context); | |||
| public async Task ExecuteAsync(Func<Task> action) | |||
| { | |||
| //Use of an EF Core resiliency strategy when using multiple DbContexts within an explicit BeginTransaction(): | |||
| //See: https://docs.microsoft.com/en-us/ef/core/miscellaneous/connection-resiliency | |||
| var strategy = _context.Database.CreateExecutionStrategy(); | |||
| await strategy.ExecuteAsync(async () => | |||
| { | |||
| using (var transaction = _context.Database.BeginTransaction()) | |||
| { | |||
| await action(); | |||
| transaction.Commit(); | |||
| } | |||
| }); | |||
| } | |||
| } | |||
| } | |||
+ 68
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckMiddleware.cs
View File
| @ -0,0 +1,68 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Threading.Tasks; | |||
| using Microsoft.AspNetCore.Http; | |||
| using Microsoft.AspNetCore.Http.Features; | |||
| using Microsoft.Extensions.HealthChecks; | |||
| using Newtonsoft.Json; | |||
| namespace Microsoft.AspNetCore.HealthChecks | |||
| { | |||
| public class HealthCheckMiddleware | |||
| { | |||
| private RequestDelegate _next; | |||
| private string _path; | |||
| private int? _port; | |||
| private IHealthCheckService _service; | |||
| public HealthCheckMiddleware(RequestDelegate next, IHealthCheckService service, int port) | |||
| { | |||
| _port = port; | |||
| _service = service; | |||
| _next = next; | |||
| } | |||
| public HealthCheckMiddleware(RequestDelegate next, IHealthCheckService service, string path) | |||
| { | |||
| _path = path; | |||
| _service = service; | |||
| _next = next; | |||
| } | |||
| public async Task Invoke(HttpContext context) | |||
| { | |||
| if (IsHealthCheckRequest(context)) | |||
| { | |||
| var result = await _service.CheckHealthAsync(); | |||
| var status = result.CheckStatus; | |||
| if (status != CheckStatus.Healthy) | |||
| context.Response.StatusCode = 503; | |||
| context.Response.Headers.Add("content-type", "application/json"); | |||
| await context.Response.WriteAsync(JsonConvert.SerializeObject(new { status = status.ToString() })); | |||
| return; | |||
| } | |||
| else | |||
| { | |||
| await _next.Invoke(context); | |||
| } | |||
| } | |||
| private bool IsHealthCheckRequest(HttpContext context) | |||
| { | |||
| if (_port.HasValue) | |||
| { | |||
| var connInfo = context.Features.Get<IHttpConnectionFeature>(); | |||
| if (connInfo.LocalPort == _port) | |||
| return true; | |||
| } | |||
| if (context.Request.Path == _path) | |||
| return true; | |||
| return false; | |||
| } | |||
| } | |||
| } | |||
+ 38
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckStartupFilter.cs
View File
| @ -0,0 +1,38 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using Microsoft.AspNetCore.Builder; | |||
| using Microsoft.AspNetCore.Hosting; | |||
| namespace Microsoft.AspNetCore.HealthChecks | |||
| { | |||
| public class HealthCheckStartupFilter : IStartupFilter | |||
| { | |||
| private string _path; | |||
| private int? _port; | |||
| public HealthCheckStartupFilter(int port) | |||
| { | |||
| _port = port; | |||
| } | |||
| public HealthCheckStartupFilter(string path) | |||
| { | |||
| _path = path; | |||
| } | |||
| public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next) | |||
| { | |||
| return app => | |||
| { | |||
| if (_port.HasValue) | |||
| app.UseMiddleware<HealthCheckMiddleware>(_port); | |||
| else | |||
| app.UseMiddleware<HealthCheckMiddleware>(_path); | |||
| next(app); | |||
| }; | |||
| } | |||
| } | |||
| } | |||
+ 36
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckWebHostBuilderExtension.cs
View File
| @ -0,0 +1,36 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using Microsoft.AspNetCore.HealthChecks; | |||
| using Microsoft.Extensions.DependencyInjection; | |||
| namespace Microsoft.AspNetCore.Hosting | |||
| { | |||
| public static class HealthCheckWebHostBuilderExtension | |||
| { | |||
| public static IWebHostBuilder UseHealthChecks(this IWebHostBuilder builder, int port) | |||
| { | |||
| Guard.ArgumentValid(port > 0 && port < 65536, nameof(port), "Port must be a value between 1 and 65535"); | |||
| builder.ConfigureServices(services => | |||
| { | |||
| var existingUrl = builder.GetSetting(WebHostDefaults.ServerUrlsKey); | |||
| builder.UseSetting(WebHostDefaults.ServerUrlsKey, $"{existingUrl};http://localhost:{port}"); | |||
| services.AddSingleton<IStartupFilter>(new HealthCheckStartupFilter(port)); | |||
| }); | |||
| return builder; | |||
| } | |||
| public static IWebHostBuilder UseHealthChecks(this IWebHostBuilder builder, string path) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(path), path); | |||
| // REVIEW: Is there a better URL path validator somewhere? | |||
| Guard.ArgumentValid(!path.Contains("?"), nameof(path), "Path cannot contain query string values"); | |||
| Guard.ArgumentValid(path.StartsWith("/"), nameof(path), "Path should start with /"); | |||
| builder.ConfigureServices(services => services.AddSingleton<IStartupFilter>(new HealthCheckStartupFilter(path))); | |||
| return builder; | |||
| } | |||
| } | |||
| } | |||
+ 38
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/HealthCheckWebHostExtensions.cs
View File
| @ -0,0 +1,38 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using Microsoft.Extensions.HealthChecks; | |||
| namespace Microsoft.AspNetCore.Hosting | |||
| { | |||
| public static class HealthCheckWebHostExtensions | |||
| { | |||
| private const int DEFAULT_TIMEOUT_SECONDS = 300; | |||
| public static void RunWhenHealthy(this IWebHost webHost) | |||
| { | |||
| webHost.RunWhenHealthy(TimeSpan.FromSeconds(DEFAULT_TIMEOUT_SECONDS)); | |||
| } | |||
| public static void RunWhenHealthy(this IWebHost webHost, TimeSpan timeout) | |||
| { | |||
| var healthChecks = webHost.Services.GetService(typeof(IHealthCheckService)) as IHealthCheckService; | |||
| var loops = 0; | |||
| do | |||
| { | |||
| var checkResult = healthChecks.CheckHealthAsync().Result; | |||
| if (checkResult.CheckStatus == CheckStatus.Healthy) | |||
| { | |||
| webHost.Run(); | |||
| break; | |||
| } | |||
| System.Threading.Thread.Sleep(1000); | |||
| loops++; | |||
| } while (loops < timeout.TotalSeconds); | |||
| } | |||
| } | |||
| } | |||
+ 16
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj
View File
| @ -0,0 +1,16 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp1.0</TargetFramework> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <Compile Include="..\common\Guard.cs" Link="Internal\Guard.cs" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" /> | |||
| <ProjectReference Include="..\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 45
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/HealthCheckBuilderDataExtensions.cs
View File
| @ -0,0 +1,45 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Data; | |||
| using System.Data.SqlClient; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static class HealthCheckBuilderDataExtensions | |||
| { | |||
| public static HealthCheckBuilder AddSqlCheck(this HealthCheckBuilder builder, string name, string connectionString) | |||
| { | |||
| builder.AddCheck($"SqlCheck({name})", async () => | |||
| { | |||
| try | |||
| { | |||
| //TODO: There is probably a much better way to do this. | |||
| using (var connection = new SqlConnection(connectionString)) | |||
| { | |||
| connection.Open(); | |||
| using (var command = connection.CreateCommand()) | |||
| { | |||
| command.CommandType = CommandType.Text; | |||
| command.CommandText = "SELECT 1"; | |||
| var result = (int)await command.ExecuteScalarAsync().ConfigureAwait(false); | |||
| if (result == 1) | |||
| { | |||
| return HealthCheckResult.Healthy($"SqlCheck({name}): Healthy"); | |||
| } | |||
| return HealthCheckResult.Unhealthy($"SqlCheck({name}): Unhealthy"); | |||
| } | |||
| } | |||
| } | |||
| catch(Exception ex) | |||
| { | |||
| return HealthCheckResult.Unhealthy($"SqlCheck({name}): Exception during check: {ex.GetType().FullName}"); | |||
| } | |||
| }); | |||
| return builder; | |||
| } | |||
| } | |||
| } | |||
+ 19
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.Data/Microsoft.Extensions.HealthChecks.Data.csproj
View File
| @ -0,0 +1,19 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netstandard1.3</TargetFramework> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <Compile Include="..\common\Guard.cs" Link="Internal\Guard.cs" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="System.Data.SqlClient" Version="4.3.0" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 13
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CheckStatus.cs
View File
| @ -0,0 +1,13 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public enum CheckStatus | |||
| { | |||
| Unknown, | |||
| Unhealthy, | |||
| Healthy, | |||
| Warning | |||
| } | |||
| } | |||
+ 110
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/AddCheck.cs
View File
| @ -0,0 +1,110 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static partial class HealthCheckBuilderExtensions | |||
| { | |||
| // Lambda versions of AddCheck for Func/Func<Task>/Func<ValueTask> | |||
| public static HealthCheckBuilder AddCheck(this HealthCheckBuilder builder, string name, Func<IHealthCheckResult> check) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromCheck(check, builder.DefaultCacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddCheck(this HealthCheckBuilder builder, string name, Func<CancellationToken, IHealthCheckResult> check) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromCheck(check, builder.DefaultCacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddCheck(this HealthCheckBuilder builder, string name, Func<IHealthCheckResult> check, TimeSpan cacheDuration) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromCheck(check, cacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddCheck(this HealthCheckBuilder builder, string name, Func<CancellationToken, IHealthCheckResult> check, TimeSpan cacheDuration) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromCheck(check, cacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddCheck(this HealthCheckBuilder builder, string name, Func<Task<IHealthCheckResult>> check) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromTaskCheck(check, builder.DefaultCacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddCheck(this HealthCheckBuilder builder, string name, Func<CancellationToken, Task<IHealthCheckResult>> check) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromTaskCheck(check, builder.DefaultCacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddCheck(this HealthCheckBuilder builder, string name, Func<Task<IHealthCheckResult>> check, TimeSpan cacheDuration) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromTaskCheck(check, cacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddCheck(this HealthCheckBuilder builder, string name, Func<CancellationToken, Task<IHealthCheckResult>> check, TimeSpan cacheDuration) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromTaskCheck(check, cacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddValueTaskCheck(this HealthCheckBuilder builder, string name, Func<ValueTask<IHealthCheckResult>> check) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromValueTaskCheck(check, builder.DefaultCacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddValueTaskCheck(this HealthCheckBuilder builder, string name, Func<CancellationToken, ValueTask<IHealthCheckResult>> check) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromValueTaskCheck(check, builder.DefaultCacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddValueTaskCheck(this HealthCheckBuilder builder, string name, Func<ValueTask<IHealthCheckResult>> check, TimeSpan cacheDuration) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromValueTaskCheck(check, cacheDuration)); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddValueTaskCheck(this HealthCheckBuilder builder, string name, Func<CancellationToken, ValueTask<IHealthCheckResult>> check, TimeSpan cacheDuration) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| builder.AddCheck(name, HealthCheck.FromValueTaskCheck(check, cacheDuration)); | |||
| return builder; | |||
| } | |||
| } | |||
| } | |||
+ 55
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/NumericChecks.cs
View File
| @ -0,0 +1,55 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Collections.Generic; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static partial class HealthCheckBuilderExtensions | |||
| { | |||
| // Numeric checks | |||
| public static HealthCheckBuilder AddMinValueCheck<T>(this HealthCheckBuilder builder, string name, T minValue, Func<T> currentValueFunc) | |||
| where T : IComparable<T> | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| Guard.ArgumentNotNullOrWhitespace(nameof(name), name); | |||
| Guard.ArgumentNotNull(nameof(currentValueFunc), currentValueFunc); | |||
| builder.AddCheck(name, () => | |||
| { | |||
| var currentValue = currentValueFunc(); | |||
| var status = currentValue.CompareTo(minValue) >= 0 ? CheckStatus.Healthy : CheckStatus.Unhealthy; | |||
| return HealthCheckResult.FromStatus( | |||
| status, | |||
| $"{name}: min={minValue}, current={currentValue}", | |||
| new Dictionary<string, object> { { "min", minValue }, { "current", currentValue } } | |||
| ); | |||
| }); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddMaxValueCheck<T>(this HealthCheckBuilder builder, string name, T maxValue, Func<T> currentValueFunc) | |||
| where T : IComparable<T> | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| Guard.ArgumentNotNullOrWhitespace(nameof(name), name); | |||
| Guard.ArgumentNotNull(nameof(currentValueFunc), currentValueFunc); | |||
| builder.AddCheck($"{name}", () => | |||
| { | |||
| var currentValue = currentValueFunc(); | |||
| var status = currentValue.CompareTo(maxValue) <= 0 ? CheckStatus.Healthy : CheckStatus.Unhealthy; | |||
| return HealthCheckResult.FromStatus( | |||
| status, | |||
| $"{name}: max={maxValue}, current={currentValue}", | |||
| new Dictionary<string, object> { { "max", maxValue }, { "current", currentValue } } | |||
| ); | |||
| }); | |||
| return builder; | |||
| } | |||
| } | |||
| } | |||
+ 21
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/SystemChecks.cs
View File
| @ -0,0 +1,21 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Diagnostics; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static partial class HealthCheckBuilderExtensions | |||
| { | |||
| // System checks | |||
| public static HealthCheckBuilder AddPrivateMemorySizeCheck(this HealthCheckBuilder builder, long maxSize) | |||
| => AddMaxValueCheck(builder, $"PrivateMemorySize({maxSize})", maxSize, () => Process.GetCurrentProcess().PrivateMemorySize64); | |||
| public static HealthCheckBuilder AddVirtualMemorySizeCheck(this HealthCheckBuilder builder, long maxSize) | |||
| => AddMaxValueCheck(builder, $"VirtualMemorySize({maxSize})", maxSize, () => Process.GetCurrentProcess().VirtualMemorySize64); | |||
| public static HealthCheckBuilder AddWorkingSetCheck(this HealthCheckBuilder builder, long maxSize) | |||
| => AddMaxValueCheck(builder, $"WorkingSet({maxSize})", maxSize, () => Process.GetCurrentProcess().WorkingSet64); | |||
| } | |||
| } | |||
+ 109
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Checks/UrlChecks.cs
View File
| @ -0,0 +1,109 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Net.Http; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.Extensions.HealthChecks.Internal; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static partial class HealthCheckBuilderExtensions | |||
| { | |||
| // URL checks | |||
| public static HealthCheckBuilder AddUrlCheck(this HealthCheckBuilder builder, string url) | |||
| => AddUrlCheck(builder, url, response => UrlChecker.DefaultUrlCheck(response)); | |||
| public static HealthCheckBuilder AddUrlCheck(this HealthCheckBuilder builder, string url, | |||
| Func<HttpResponseMessage, IHealthCheckResult> checkFunc) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(checkFunc), checkFunc); | |||
| return AddUrlCheck(builder, url, response => new ValueTask<IHealthCheckResult>(checkFunc(response))); | |||
| } | |||
| public static HealthCheckBuilder AddUrlCheck(this HealthCheckBuilder builder, string url, | |||
| Func<HttpResponseMessage, Task<IHealthCheckResult>> checkFunc) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(checkFunc), checkFunc); | |||
| return AddUrlCheck(builder, url, response => new ValueTask<IHealthCheckResult>(checkFunc(response))); | |||
| } | |||
| public static HealthCheckBuilder AddUrlCheck(this HealthCheckBuilder builder, string url, | |||
| Func<HttpResponseMessage, ValueTask<IHealthCheckResult>> checkFunc) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| Guard.ArgumentNotNullOrWhitespace(nameof(url), url); | |||
| Guard.ArgumentNotNull(nameof(checkFunc), checkFunc); | |||
| var urlCheck = new UrlChecker(checkFunc, url); | |||
| builder.AddCheck($"UrlCheck({url})", () => urlCheck.CheckAsync()); | |||
| return builder; | |||
| } | |||
| public static HealthCheckBuilder AddUrlChecks(this HealthCheckBuilder builder, IEnumerable<string> urlItems, string groupName) | |||
| => AddUrlChecks(builder, urlItems, groupName, CheckStatus.Warning, response => UrlChecker.DefaultUrlCheck(response)); | |||
| public static HealthCheckBuilder AddUrlChecks(this HealthCheckBuilder builder, IEnumerable<string> urlItems, string groupName, | |||
| Func<HttpResponseMessage, IHealthCheckResult> checkFunc) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(checkFunc), checkFunc); | |||
| return AddUrlChecks(builder, urlItems, groupName, CheckStatus.Warning, response => new ValueTask<IHealthCheckResult>(checkFunc(response))); | |||
| } | |||
| public static HealthCheckBuilder AddUrlChecks(this HealthCheckBuilder builder, IEnumerable<string> urlItems, string groupName, | |||
| Func<HttpResponseMessage, Task<IHealthCheckResult>> checkFunc) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(checkFunc), checkFunc); | |||
| return AddUrlChecks(builder, urlItems, groupName, CheckStatus.Warning, response => new ValueTask<IHealthCheckResult>(checkFunc(response))); | |||
| } | |||
| public static HealthCheckBuilder AddUrlChecks(this HealthCheckBuilder builder, IEnumerable<string> urlItems, string groupName, | |||
| Func<HttpResponseMessage, ValueTask<IHealthCheckResult>> checkFunc) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(checkFunc), checkFunc); | |||
| return AddUrlChecks(builder, urlItems, groupName, CheckStatus.Warning, response => checkFunc(response)); | |||
| } | |||
| public static HealthCheckBuilder AddUrlChecks(this HealthCheckBuilder builder, IEnumerable<string> urlItems, string groupName, | |||
| CheckStatus partialSuccessStatus) | |||
| => AddUrlChecks(builder, urlItems, groupName, partialSuccessStatus, response => UrlChecker.DefaultUrlCheck(response)); | |||
| public static HealthCheckBuilder AddUrlChecks(this HealthCheckBuilder builder, IEnumerable<string> urlItems, string groupName, | |||
| CheckStatus partialSuccessStatus, Func<HttpResponseMessage, IHealthCheckResult> checkFunc) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(checkFunc), checkFunc); | |||
| return AddUrlChecks(builder, urlItems, groupName, partialSuccessStatus, response => new ValueTask<IHealthCheckResult>(checkFunc(response))); | |||
| } | |||
| public static HealthCheckBuilder AddUrlChecks(this HealthCheckBuilder builder, IEnumerable<string> urlItems, string groupName, | |||
| CheckStatus partialSuccessStatus, Func<HttpResponseMessage, Task<IHealthCheckResult>> checkFunc) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(checkFunc), checkFunc); | |||
| return AddUrlChecks(builder, urlItems, groupName, partialSuccessStatus, response => new ValueTask<IHealthCheckResult>(checkFunc(response))); | |||
| } | |||
| public static HealthCheckBuilder AddUrlChecks(this HealthCheckBuilder builder, IEnumerable<string> urlItems, string groupName, | |||
| CheckStatus partialSuccessStatus, Func<HttpResponseMessage, ValueTask<IHealthCheckResult>> checkFunc) | |||
| { | |||
| var urls = urlItems?.ToArray(); | |||
| Guard.ArgumentNotNull(nameof(builder), builder); | |||
| Guard.ArgumentNotNullOrEmpty(nameof(urlItems), urls); | |||
| Guard.ArgumentNotNullOrWhitespace(nameof(groupName), groupName); | |||
| var urlChecker = new UrlChecker(checkFunc, urls) { PartiallyHealthyStatus = partialSuccessStatus }; | |||
| builder.AddCheck($"UrlChecks({groupName})", () => urlChecker.CheckAsync()); | |||
| return builder; | |||
| } | |||
| } | |||
| } | |||
+ 83
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/CompositeHealthCheckResult.cs
View File
| @ -0,0 +1,83 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| // REVIEW: Does this need to be thread safe? | |||
| /// <summary> | |||
| /// Represents a composite health check result built from several results. | |||
| /// </summary> | |||
| public class CompositeHealthCheckResult : IHealthCheckResult | |||
| { | |||
| private static readonly IReadOnlyDictionary<string, object> _emptyData = new Dictionary<string, object>(); | |||
| private readonly CheckStatus _initialStatus; | |||
| private readonly CheckStatus _partiallyHealthyStatus; | |||
| private readonly Dictionary<string, IHealthCheckResult> _results = new Dictionary<string, IHealthCheckResult>(StringComparer.OrdinalIgnoreCase); | |||
| public CompositeHealthCheckResult(CheckStatus partiallyHealthyStatus = CheckStatus.Warning, | |||
| CheckStatus initialStatus = CheckStatus.Unknown) | |||
| { | |||
| _partiallyHealthyStatus = partiallyHealthyStatus; | |||
| _initialStatus = initialStatus; | |||
| } | |||
| public CheckStatus CheckStatus | |||
| { | |||
| get | |||
| { | |||
| var checkStatuses = new HashSet<CheckStatus>(_results.Select(x => x.Value.CheckStatus)); | |||
| if (checkStatuses.Count == 0) | |||
| return _initialStatus; | |||
| if (checkStatuses.Count == 1) | |||
| return checkStatuses.First(); | |||
| if (checkStatuses.Contains(CheckStatus.Healthy)) | |||
| return _partiallyHealthyStatus; | |||
| return CheckStatus.Unhealthy; | |||
| } | |||
| } | |||
| public string Description => string.Join(Environment.NewLine, _results.Select(r => r.Value.Description)); | |||
| public IReadOnlyDictionary<string, object> Data | |||
| { | |||
| get | |||
| { | |||
| var result = new Dictionary<string, object>(); | |||
| foreach (var kvp in _results) | |||
| result.Add(kvp.Key, kvp.Value.Data); | |||
| return result; | |||
| } | |||
| } | |||
| public IReadOnlyDictionary<string, IHealthCheckResult> Results => _results; | |||
| // REVIEW: Should description be required? Seems redundant for success checks. | |||
| public void Add(string name, CheckStatus status, string description) | |||
| => Add(name, status, description, null); | |||
| public void Add(string name, CheckStatus status, string description, Dictionary<string, object> data) | |||
| { | |||
| Guard.ArgumentNotNullOrWhitespace(nameof(name), name); | |||
| Guard.ArgumentValid(status != CheckStatus.Unknown, nameof(status), "Cannot add unknown status to composite health check result"); | |||
| Guard.ArgumentNotNullOrWhitespace(nameof(description), description); | |||
| _results.Add(name, HealthCheckResult.FromStatus(status, description, data)); | |||
| } | |||
| public void Add(string name, IHealthCheckResult checkResult) | |||
| { | |||
| Guard.ArgumentNotNullOrWhitespace(nameof(name), name); | |||
| Guard.ArgumentNotNull(nameof(checkResult), checkResult); | |||
| _results.Add(name, checkResult); | |||
| } | |||
| } | |||
| } | |||
+ 76
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheck.cs
View File
| @ -0,0 +1,76 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public class HealthCheck : IHealthCheck | |||
| { | |||
| private DateTimeOffset _cacheExpiration; | |||
| private IHealthCheckResult _cachedResult; | |||
| private volatile int _writerCount; | |||
| protected HealthCheck(Func<CancellationToken, ValueTask<IHealthCheckResult>> check, TimeSpan cacheDuration) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(check), check); | |||
| Guard.ArgumentValid(cacheDuration >= TimeSpan.Zero, nameof(cacheDuration), "Cache duration must either be zero (disabled) or a positive value"); | |||
| Check = check; | |||
| CacheDuration = cacheDuration; | |||
| } | |||
| public TimeSpan CacheDuration { get; } | |||
| protected Func<CancellationToken, ValueTask<IHealthCheckResult>> Check { get; } | |||
| protected virtual DateTimeOffset UtcNow => DateTimeOffset.UtcNow; | |||
| public async ValueTask<IHealthCheckResult> CheckAsync(CancellationToken cancellationToken) | |||
| { | |||
| while (_cacheExpiration <= UtcNow) | |||
| { | |||
| // Can't use a standard lock here because of async, so we'll use this flag to determine when we should write a value, | |||
| // and the waiters who aren't allowed to write will just spin wait for the new value. | |||
| if (Interlocked.Exchange(ref _writerCount, 1) != 0) | |||
| { | |||
| await Task.Delay(5, cancellationToken).ConfigureAwait(false); | |||
| continue; | |||
| } | |||
| try | |||
| { | |||
| _cachedResult = await Check(cancellationToken).ConfigureAwait(false); | |||
| _cacheExpiration = UtcNow + CacheDuration; | |||
| break; | |||
| } | |||
| finally | |||
| { | |||
| _writerCount = 0; | |||
| } | |||
| } | |||
| return _cachedResult; | |||
| } | |||
| public static HealthCheck FromCheck(Func<IHealthCheckResult> check, TimeSpan cacheDuration) | |||
| => new HealthCheck(token => new ValueTask<IHealthCheckResult>(check()), cacheDuration); | |||
| public static HealthCheck FromCheck(Func<CancellationToken, IHealthCheckResult> check, TimeSpan cacheDuration) | |||
| => new HealthCheck(token => new ValueTask<IHealthCheckResult>(check(token)), cacheDuration); | |||
| public static HealthCheck FromTaskCheck(Func<Task<IHealthCheckResult>> check, TimeSpan cacheDuration) | |||
| => new HealthCheck(token => new ValueTask<IHealthCheckResult>(check()), cacheDuration); | |||
| public static HealthCheck FromTaskCheck(Func<CancellationToken, Task<IHealthCheckResult>> check, TimeSpan cacheDuration) | |||
| => new HealthCheck(token => new ValueTask<IHealthCheckResult>(check(token)), cacheDuration); | |||
| public static HealthCheck FromValueTaskCheck(Func<ValueTask<IHealthCheckResult>> check, TimeSpan cacheDuration) | |||
| => new HealthCheck(token => check(), cacheDuration); | |||
| public static HealthCheck FromValueTaskCheck(Func<CancellationToken, ValueTask<IHealthCheckResult>> check, TimeSpan cacheDuration) | |||
| => new HealthCheck(check, cacheDuration); | |||
| } | |||
| } | |||
+ 40
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckBuilder.cs
View File
| @ -0,0 +1,40 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Collections.Generic; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public class HealthCheckBuilder | |||
| { | |||
| private readonly Dictionary<string, IHealthCheck> _checks; | |||
| public HealthCheckBuilder() | |||
| { | |||
| _checks = new Dictionary<string, IHealthCheck>(StringComparer.OrdinalIgnoreCase); | |||
| DefaultCacheDuration = TimeSpan.FromMinutes(5); | |||
| } | |||
| public IReadOnlyDictionary<string, IHealthCheck> Checks => _checks; | |||
| public TimeSpan DefaultCacheDuration { get; private set; } | |||
| public HealthCheckBuilder AddCheck(string name, IHealthCheck check) | |||
| { | |||
| Guard.ArgumentNotNullOrWhitespace(nameof(name), name); | |||
| Guard.ArgumentNotNull(nameof(check), check); | |||
| _checks.Add(name, check); | |||
| return this; | |||
| } | |||
| public HealthCheckBuilder WithDefaultCacheDuration(TimeSpan duration) | |||
| { | |||
| Guard.ArgumentValid(duration >= TimeSpan.Zero, nameof(duration), "Duration must be zero (disabled) or a positive duration"); | |||
| DefaultCacheDuration = duration; | |||
| return this; | |||
| } | |||
| } | |||
| } | |||
+ 18
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckExtensions.cs
View File
| @ -0,0 +1,18 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static class HealthCheckExtensions | |||
| { | |||
| public static ValueTask<IHealthCheckResult> CheckAsync(this IHealthCheck healthCheck) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(healthCheck), healthCheck); | |||
| return healthCheck.CheckAsync(CancellationToken.None); | |||
| } | |||
| } | |||
| } | |||
+ 54
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckResult.cs
View File
| @ -0,0 +1,54 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public class HealthCheckResult : IHealthCheckResult | |||
| { | |||
| private static readonly IReadOnlyDictionary<string, object> _emptyData = new Dictionary<string, object>(); | |||
| public CheckStatus CheckStatus { get; } | |||
| public IReadOnlyDictionary<string, object> Data { get; } | |||
| public string Description { get; } | |||
| private HealthCheckResult(CheckStatus checkStatus, string description, IReadOnlyDictionary<string, object> data) | |||
| { | |||
| CheckStatus = checkStatus; | |||
| Description = description; | |||
| Data = data ?? _emptyData; | |||
| } | |||
| public static HealthCheckResult Unhealthy(string description) | |||
| => new HealthCheckResult(CheckStatus.Unhealthy, description, null); | |||
| public static HealthCheckResult Unhealthy(string description, IReadOnlyDictionary<string, object> data) | |||
| => new HealthCheckResult(CheckStatus.Unhealthy, description, data); | |||
| public static HealthCheckResult Healthy(string description) | |||
| => new HealthCheckResult(CheckStatus.Healthy, description, null); | |||
| public static HealthCheckResult Healthy(string description, IReadOnlyDictionary<string, object> data) | |||
| => new HealthCheckResult(CheckStatus.Healthy, description, data); | |||
| public static HealthCheckResult Warning(string description) | |||
| => new HealthCheckResult(CheckStatus.Warning, description, null); | |||
| public static HealthCheckResult Warning(string description, IReadOnlyDictionary<string, object> data) | |||
| => new HealthCheckResult(CheckStatus.Warning, description, data); | |||
| public static HealthCheckResult Unknown(string description) | |||
| => new HealthCheckResult(CheckStatus.Unknown, description, null); | |||
| public static HealthCheckResult Unknown(string description, IReadOnlyDictionary<string, object> data) | |||
| => new HealthCheckResult(CheckStatus.Unknown, description, data); | |||
| public static HealthCheckResult FromStatus(CheckStatus status, string description) | |||
| => new HealthCheckResult(status, description, null); | |||
| public static HealthCheckResult FromStatus(CheckStatus status, string description, IReadOnlyDictionary<string, object> data) | |||
| => new HealthCheckResult(status, description, data); | |||
| } | |||
| } | |||
+ 12
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckResults.cs
View File
| @ -0,0 +1,12 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Collections.Generic; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public class HealthCheckResults | |||
| { | |||
| public IList<IHealthCheckResult> CheckResults { get; } = new List<IHealthCheckResult>(); | |||
| } | |||
| } | |||
+ 54
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckService.cs
View File
| @ -0,0 +1,54 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.Extensions.Logging; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public class HealthCheckService : IHealthCheckService | |||
| { | |||
| public IReadOnlyDictionary<string, IHealthCheck> _checks; | |||
| private ILogger<HealthCheckService> _logger; | |||
| public HealthCheckService(HealthCheckBuilder builder, ILogger<HealthCheckService> logger) | |||
| { | |||
| _checks = builder.Checks; | |||
| _logger = logger; | |||
| } | |||
| public async Task<CompositeHealthCheckResult> CheckHealthAsync(CheckStatus partiallyHealthyStatus, CancellationToken cancellationToken) | |||
| { | |||
| var logMessage = new StringBuilder(); | |||
| var result = new CompositeHealthCheckResult(partiallyHealthyStatus); | |||
| foreach (var check in _checks) | |||
| { | |||
| try | |||
| { | |||
| var healthCheckResult = await check.Value.CheckAsync().ConfigureAwait(false); | |||
| logMessage.AppendLine($"HealthCheck: {check.Key} : {healthCheckResult.CheckStatus}"); | |||
| result.Add(check.Key, healthCheckResult); | |||
| } | |||
| catch (Exception ex) | |||
| { | |||
| logMessage.AppendLine($"HealthCheck: {check.Key} : Exception {ex.GetType().FullName} thrown"); | |||
| result.Add(check.Key, CheckStatus.Unhealthy, $"Exception during check: {ex.GetType().FullName}"); | |||
| } | |||
| } | |||
| if (logMessage.Length == 0) | |||
| logMessage.AppendLine("HealthCheck: No checks have been registered"); | |||
| _logger.Log((result.CheckStatus == CheckStatus.Healthy ? LogLevel.Information : LogLevel.Error), 0, logMessage.ToString(), null, MessageFormatter); | |||
| return result; | |||
| } | |||
| private static string MessageFormatter(string state, Exception error) => state; | |||
| } | |||
| } | |||
+ 22
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceCollectionExtensions.cs
View File
| @ -0,0 +1,22 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using Microsoft.Extensions.HealthChecks; | |||
| namespace Microsoft.Extensions.DependencyInjection | |||
| { | |||
| public static class HealthCheckServiceCollectionExtensions | |||
| { | |||
| public static IServiceCollection AddHealthChecks(this IServiceCollection services, Action<HealthCheckBuilder> checkupAction) | |||
| { | |||
| var checkupBuilder = new HealthCheckBuilder(); | |||
| checkupAction.Invoke(checkupBuilder); | |||
| services.AddSingleton(checkupBuilder); | |||
| services.AddSingleton<IHealthCheckService, HealthCheckService>(); | |||
| return services; | |||
| } | |||
| } | |||
| } | |||
+ 38
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/HealthCheckServiceExtensions.cs
View File
| @ -0,0 +1,38 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public static class HealthCheckServiceExtensions | |||
| { | |||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(service), service); | |||
| return service.CheckHealthAsync(CheckStatus.Unhealthy, CancellationToken.None); | |||
| } | |||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service, CheckStatus partiallyHealthyStatus) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(service), service); | |||
| return service.CheckHealthAsync(partiallyHealthyStatus, CancellationToken.None); | |||
| } | |||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service, CancellationToken cancellationToken) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(service), service); | |||
| return service.CheckHealthAsync(CheckStatus.Unhealthy, cancellationToken); | |||
| } | |||
| public static Task<CompositeHealthCheckResult> CheckHealthAsync(this IHealthCheckService service, CheckStatus partiallyHealthyStatus, CancellationToken cancellationToken) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(service), service); | |||
| return service.CheckHealthAsync(partiallyHealthyStatus, cancellationToken); | |||
| } | |||
| } | |||
| } | |||
+ 16
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheck.cs
View File
| @ -0,0 +1,16 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public interface IHealthCheck | |||
| { | |||
| TimeSpan CacheDuration { get; } | |||
| ValueTask<IHealthCheckResult> CheckAsync(CancellationToken cancellationToken); | |||
| } | |||
| } | |||
+ 14
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheckResult.cs
View File
| @ -0,0 +1,14 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Collections.Generic; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public interface IHealthCheckResult | |||
| { | |||
| CheckStatus CheckStatus { get; } | |||
| string Description { get; } | |||
| IReadOnlyDictionary<string, object> Data { get; } | |||
| } | |||
| } | |||
+ 13
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/IHealthCheckService.cs
View File
| @ -0,0 +1,13 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks | |||
| { | |||
| public interface IHealthCheckService | |||
| { | |||
| Task<CompositeHealthCheckResult> CheckHealthAsync(CheckStatus partiallyHealthyStatus, CancellationToken cancellationToken); | |||
| } | |||
| } | |||
+ 92
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Internal/UrlChecker.cs
View File
| @ -0,0 +1,92 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Net; | |||
| using System.Net.Http; | |||
| using System.Net.Http.Headers; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.Extensions.HealthChecks.Internal | |||
| { | |||
| public class UrlChecker | |||
| { | |||
| private readonly Func<HttpResponseMessage, ValueTask<IHealthCheckResult>> _checkFunc; | |||
| private readonly string[] _urls; | |||
| // REVIEW: Cache timeout here? | |||
| public UrlChecker(Func<HttpResponseMessage, ValueTask<IHealthCheckResult>> checkFunc, params string[] urls) | |||
| { | |||
| Guard.ArgumentNotNull(nameof(checkFunc), checkFunc); | |||
| Guard.ArgumentNotNullOrEmpty(nameof(urls), urls); | |||
| _checkFunc = checkFunc; | |||
| _urls = urls; | |||
| } | |||
| public CheckStatus PartiallyHealthyStatus { get; set; } = CheckStatus.Warning; | |||
| public Task<IHealthCheckResult> CheckAsync() | |||
| => _urls.Length == 1 ? CheckSingleAsync() : CheckMultiAsync(); | |||
| public async Task<IHealthCheckResult> CheckSingleAsync() | |||
| { | |||
| var httpClient = CreateHttpClient(); | |||
| var result = default(IHealthCheckResult); | |||
| await CheckUrlAsync(httpClient, _urls[0], (_, checkResult) => result = checkResult).ConfigureAwait(false); | |||
| return result; | |||
| } | |||
| public async Task<IHealthCheckResult> CheckMultiAsync() | |||
| { | |||
| var composite = new CompositeHealthCheckResult(PartiallyHealthyStatus); | |||
| var httpClient = CreateHttpClient(); | |||
| // REVIEW: Should these be done in parallel? | |||
| foreach (var url in _urls) | |||
| await CheckUrlAsync(httpClient, url, (name, checkResult) => composite.Add(name, checkResult)).ConfigureAwait(false); | |||
| return composite; | |||
| } | |||
| private async Task CheckUrlAsync(HttpClient httpClient, string url, Action<string, IHealthCheckResult> adder) | |||
| { | |||
| var name = $"UrlCheck({url})"; | |||
| try | |||
| { | |||
| var response = await httpClient.GetAsync(url).ConfigureAwait(false); | |||
| var result = await _checkFunc(response); | |||
| adder(name, result); | |||
| } | |||
| catch (Exception ex) | |||
| { | |||
| adder(name, HealthCheckResult.Unhealthy($"Exception during check: {ex.GetType().FullName}")); | |||
| } | |||
| } | |||
| private HttpClient CreateHttpClient() | |||
| { | |||
| var httpClient = GetHttpClient(); | |||
| httpClient.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue { NoCache = true }; | |||
| return httpClient; | |||
| } | |||
| public static async ValueTask<IHealthCheckResult> DefaultUrlCheck(HttpResponseMessage response) | |||
| { | |||
| // REVIEW: Should this be an explicit 200 check, or just an "is success" check? | |||
| var status = response.StatusCode == HttpStatusCode.OK ? CheckStatus.Healthy : CheckStatus.Unhealthy; | |||
| var data = new Dictionary<string, object> | |||
| { | |||
| { "url", response.RequestMessage.RequestUri.ToString() }, | |||
| { "status", (int)response.StatusCode }, | |||
| { "reason", response.ReasonPhrase }, | |||
| { "body", await response.Content?.ReadAsStringAsync() } | |||
| }; | |||
| return HealthCheckResult.FromStatus(status, $"UrlCheck({response.RequestMessage.RequestUri}): status code {response.StatusCode} ({(int)response.StatusCode})", data); | |||
| } | |||
| protected virtual HttpClient GetHttpClient() | |||
| => new HttpClient(); | |||
| } | |||
| } | |||
+ 20
- 0
src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj
View File
| @ -0,0 +1,20 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netstandard1.3</TargetFramework> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <Compile Include="..\common\Guard.cs" Link="Internal\Guard.cs" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" /> | |||
| <PackageReference Include="Newtonsoft.Json" Version="9.0.1" /> | |||
| <PackageReference Include="System.Diagnostics.Process" Version="4.3.0" /> | |||
| <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" /> | |||
| <PackageReference Include="System.Threading.Thread" Version="4.3.0" /> | |||
| <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 45
- 0
src/BuildingBlocks/HealthChecks/src/common/Guard.cs
View File
| @ -0,0 +1,45 @@ | |||
| // Copyright (c) .NET Foundation. All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| using System; | |||
| using System.Collections.Generic; | |||
| static class Guard | |||
| { | |||
| public static void ArgumentNotNull(string argumentName, object value) | |||
| { | |||
| if (value == null) | |||
| throw new ArgumentNullException(argumentName); | |||
| } | |||
| public static void ArgumentNotNullOrEmpty<T>(string argumentName, string value) | |||
| { | |||
| if (value == null) | |||
| throw new ArgumentNullException(argumentName); | |||
| if (string.IsNullOrEmpty(value)) | |||
| throw new ArgumentException("Value cannot be an empty string", argumentName); | |||
| } | |||
| // Use IReadOnlyCollection<T> instead of IEnumerable<T> to discourage double enumeration | |||
| public static void ArgumentNotNullOrEmpty<T>(string argumentName, IReadOnlyCollection<T> items) | |||
| { | |||
| if (items == null) | |||
| throw new ArgumentNullException(argumentName); | |||
| if (items.Count == 0) | |||
| throw new ArgumentException("Collection must contain at least one item", argumentName); | |||
| } | |||
| public static void ArgumentNotNullOrWhitespace(string argumentName, string value) | |||
| { | |||
| if (value == null) | |||
| throw new ArgumentNullException(argumentName); | |||
| if (string.IsNullOrWhiteSpace(value)) | |||
| throw new ArgumentException("Value must contain a non-whitespace value", argumentName); | |||
| } | |||
| public static void ArgumentValid(bool valid, string argumentName, string exceptionMessage) | |||
| { | |||
| if (!valid) | |||
| throw new ArgumentException(exceptionMessage, argumentName); | |||
| } | |||
| } | |||
+ 16
- 0
src/BuildingBlocks/Resilience/Resilience.Http/IHttpClient.cs
View File
| @ -0,0 +1,16 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Net.Http; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http | |||
| { | |||
| public interface IHttpClient | |||
| { | |||
| HttpClient Inst { get; } | |||
| Task<string> GetStringAsync(string uri); | |||
| Task<HttpResponseMessage> PostAsync<T>(string uri, T item); | |||
| Task<HttpResponseMessage> DeleteAsync(string uri); | |||
| } | |||
| } | |||
+ 14
- 0
src/BuildingBlocks/Resilience/Resilience.Http/Resilience.Http.csproj
View File
| @ -0,0 +1,14 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netstandard1.4</TargetFramework> | |||
| <RootNamespace>Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http</RootNamespace> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.0" /> | |||
| <PackageReference Include="Newtonsoft.Json" Version="9.0.1" /> | |||
| <PackageReference Include="Polly" Version="5.0.6" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 10
- 0
src/BuildingBlocks/Resilience/Resilience.Http/ResiliencePolicy.cs
View File
| @ -0,0 +1,10 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Text; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http | |||
| { | |||
| public class ResiliencePolicy | |||
| { | |||
| } | |||
| } | |||
+ 64
- 0
src/BuildingBlocks/Resilience/Resilience.Http/ResilientHttpClient.cs
View File
| @ -0,0 +1,64 @@ | |||
| using Microsoft.Extensions.Logging; | |||
| using Newtonsoft.Json; | |||
| using Polly; | |||
| using Polly.Wrap; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Net; | |||
| using System.Net.Http; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http | |||
| { | |||
| /// <summary> | |||
| /// HttpClient wrapper that integrates Retry and Circuit | |||
| /// breaker policies when invoking HTTP services. | |||
| /// Based on Polly library: https://github.com/App-vNext/Polly | |||
| /// </summary> | |||
| public class ResilientHttpClient : IHttpClient | |||
| { | |||
| private HttpClient _client; | |||
| private PolicyWrap _policyWrapper; | |||
| private ILogger<ResilientHttpClient> _logger; | |||
| public HttpClient Inst => _client; | |||
| public ResilientHttpClient(Policy[] policies, ILogger<ResilientHttpClient> logger) | |||
| { | |||
| _client = new HttpClient(); | |||
| _logger = logger; | |||
| // Add Policies to be applied | |||
| _policyWrapper = Policy.WrapAsync(policies); | |||
| } | |||
| public Task<string> GetStringAsync(string uri) => | |||
| HttpInvoker(() => | |||
| _client.GetStringAsync(uri)); | |||
| public Task<HttpResponseMessage> PostAsync<T>(string uri, T item) => | |||
| // a new StringContent must be created for each retry | |||
| // as it is disposed after each call | |||
| HttpInvoker(() => | |||
| { | |||
| var response = _client.PostAsync(uri, new StringContent(JsonConvert.SerializeObject(item), System.Text.Encoding.UTF8, "application/json")); | |||
| // raise exception if HttpResponseCode 500 | |||
| // needed for circuit breaker to track fails | |||
| if (response.Result.StatusCode == HttpStatusCode.InternalServerError) | |||
| { | |||
| throw new HttpRequestException(); | |||
| } | |||
| return response; | |||
| }); | |||
| public Task<HttpResponseMessage> DeleteAsync(string uri) => | |||
| HttpInvoker(() => _client.DeleteAsync(uri)); | |||
| private Task<T> HttpInvoker<T>(Func<Task<T>> action) => | |||
| // Executes the action applying all | |||
| // the policies defined in the wrapper | |||
| _policyWrapper.ExecuteAsync(() => action()); | |||
| } | |||
| } | |||
+ 33
- 0
src/BuildingBlocks/Resilience/Resilience.Http/StandardHttpClient.cs
View File
| @ -0,0 +1,33 @@ | |||
| using Microsoft.Extensions.Logging; | |||
| using Newtonsoft.Json; | |||
| using System; | |||
| using System.Net.Http; | |||
| using System.Threading.Tasks; | |||
| namespace Microsoft.eShopOnContainers.BuildingBlocks.Resilience.Http | |||
| { | |||
| public class StandardHttpClient : IHttpClient | |||
| { | |||
| private HttpClient _client; | |||
| private ILogger<StandardHttpClient> _logger; | |||
| public HttpClient Inst => _client; | |||
| public StandardHttpClient(ILogger<StandardHttpClient> logger) | |||
| { | |||
| _client = new HttpClient(); | |||
| _logger = logger; | |||
| } | |||
| public Task<string> GetStringAsync(string uri) => | |||
| _client.GetStringAsync(uri); | |||
| public Task<HttpResponseMessage> PostAsync<T>(string uri, T item) | |||
| { | |||
| var contentString = new StringContent(JsonConvert.SerializeObject(item), System.Text.Encoding.UTF8, "application/json"); | |||
| return _client.PostAsync(uri, contentString); | |||
| } | |||
| public Task<HttpResponseMessage> DeleteAsync(string uri) => | |||
| _client.DeleteAsync(uri); | |||
| } | |||
| } | |||
+ 19
- 8
src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml
View File
+ 4
- 4
src/Mobile/eShopOnContainers/eShopOnContainers.Core/App.xaml.cs
View File
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Effects/LineColorEffect.cs → src/Mobile/eShopOnContainers/eShopOnContainers.Core/Behaviors/LineColorBehavior.cs
View File
+ 22
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/FirstValidationErrorConverter.cs
View File
| @ -0,0 +1,22 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Globalization; | |||
| using System.Linq; | |||
| using Xamarin.Forms; | |||
| namespace eShopOnContainers.Core.Converters | |||
| { | |||
| public class FirstValidationErrorConverter : IValueConverter | |||
| { | |||
| public object Convert(object value, Type targetType, object parameter, CultureInfo culture) | |||
| { | |||
| ICollection<string> errors = value as ICollection<string>; | |||
| return errors != null && errors.Count > 0 ? errors.ElementAt(0) : null; | |||
| } | |||
| public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) | |||
| { | |||
| throw new NotImplementedException(); | |||
| } | |||
| } | |||
| } | |||
+ 23
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Converters/WebNavigatedEventArgsConverter.cs
View File
| @ -0,0 +1,23 @@ | |||
| using System; | |||
| using System.Globalization; | |||
| using Xamarin.Forms; | |||
| namespace eShopOnContainers.Core.Converters | |||
| { | |||
| public class WebNavigatedEventArgsConverter : IValueConverter | |||
| { | |||
| public object Convert(object value, Type targetType, object parameter, CultureInfo culture) | |||
| { | |||
| var eventArgs = value as WebNavigatedEventArgs; | |||
| if (eventArgs == null) | |||
| throw new ArgumentException("Expected WebNavigatedEventArgs as value", "value"); | |||
| return eventArgs.Url; | |||
| } | |||
| public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) | |||
| { | |||
| throw new NotImplementedException(); | |||
| } | |||
| } | |||
| } | |||
+ 11
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Effects/EntryLineColorEffect.cs
View File
| @ -0,0 +1,11 @@ | |||
| using Xamarin.Forms; | |||
| namespace eShopOnContainers.Core.Effects | |||
| { | |||
| public class EntryLineColorEffect : RoutingEffect | |||
| { | |||
| public EntryLineColorEffect() : base("eShopOnContainers.EntryLineColorEffect") | |||
| { | |||
| } | |||
| } | |||
| } | |||
+ 0
- 18
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/AnimationExtension.cs
View File
| @ -1,18 +0,0 @@ | |||
| using eShopOnContainers.Core.Animations.Base; | |||
| using System; | |||
| using Xamarin.Forms; | |||
| namespace eShopOnContainers.Core.Extensions | |||
| { | |||
| public static class AnimationExtension | |||
| { | |||
| public static async void Animate(this VisualElement visualElement, AnimationBase animation, Action onFinishedCallback = null) | |||
| { | |||
| animation.Target = visualElement; | |||
| await animation.Begin(); | |||
| onFinishedCallback?.Invoke(); | |||
| } | |||
| } | |||
| } | |||
+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs
View File
+ 3
- 3
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/ServicesHelper.cs
View File
+ 2
- 2
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Helpers/Settings.cs
View File
+ 10
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Basket/BasketItem.cs
View File
+ 3
- 0
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/Order.cs
View File
+ 1
- 8
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/INavigationService.cs
View File
+ 33
- 90
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Navigation/NavigationService.cs
View File
+ 16
- 13
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Validations/ValidatableObject.cs
View File
+ 1
- 1
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ExtendedBindableObject.cs
View File
src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessengerKeys.cs → src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/MessageKeys.cs
View File
| @ -1,6 +1,6 @@ | |||
| namespace eShopOnContainers.Core.ViewModels.Base | |||
| { | |||
| public class MessengerKeys | |||
| public class MessageKeys | |||
| { | |||
| // Add product to basket | |||
| public const string AddProduct = "AddProduct"; | |||