Skip to content

Commit

Permalink
no message
Browse files Browse the repository at this point in the history
  • Loading branch information
Geeksltd committed Sep 30, 2020
1 parent e42ab12 commit 4e4bd16
Show file tree
Hide file tree
Showing 72 changed files with 653 additions and 688 deletions.
87 changes: 0 additions & 87 deletions BuildAll.bat
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,4 @@
@echo off

dotnet build Olive
if ERRORLEVEL 1 (goto error)

dotnet build Olive.EventBus
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Log.EventBus
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Entities
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Audit
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Audit.DatabaseLogger
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Encryption
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Globalization
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Entities.Data
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Entities.Data.Replication
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Entities.Data.MySql
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Entities.Data.PostgreSQL
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Entities.Data.SQLite
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Entities.Data.SqlServer
if ERRORLEVEL 1 (goto error)

REM dotnet build Olive.Entities.Cache.Redis
REM if ERRORLEVEL 1 (goto error)

dotnet build Olive.Aws
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Aws.EventBus
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Compression
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Csv
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Drawing
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Export
if ERRORLEVEL 1 (goto error)

dotnet build Olive.GeoLocation
if ERRORLEVEL 1 (goto error)

dotnet build Olive.PDF
if ERRORLEVEL 1 (goto error)

dotnet build Olive.PushNotification
if ERRORLEVEL 1 (goto error)

dotnet build Olive.SMS
if ERRORLEVEL 1 (goto error)

dotnet build Olive.ApiClient
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Microservices
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Web
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Security
if ERRORLEVEL 1 (goto error)

dotnet build Olive.Security.Aws
if ERRORLEVEL 1 (goto error)
Expand Down
8 changes: 4 additions & 4 deletions Olive.ApiClient/ApiClient.Retries.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ namespace Olive
{
partial class ApiClient
{
static readonly Dictionary<string, CircuitBreakerPolicy> CircuitBreakerPolicies
= new Dictionary<string, CircuitBreakerPolicy>();
static readonly Dictionary<string, AsyncCircuitBreakerPolicy> CircuitBreakerPolicies
= new Dictionary<string, AsyncCircuitBreakerPolicy>();

int retries, ExceptionsBeforeBreakingCircuit;
TimeSpan CircuitBreakDuration, RetryPauseDuration;
Expand Down Expand Up @@ -53,7 +53,7 @@ Task<HttpResponseMessage> SendAsync(HttpClient client, HttpRequestMessage reques
return CreateExecutionPolicy(request).ExecuteAsync(() => client.SendAsync(request));
}

Policy CreateExecutionPolicy(HttpRequestMessage request)
AsyncPolicy CreateExecutionPolicy(HttpRequestMessage request)
{
var retryPolicy = Policy.Handle<HttpRequestException>()
.WaitAndRetryAsync(retries, attempt => RetryPauseDuration);
Expand All @@ -65,7 +65,7 @@ Policy CreateExecutionPolicy(HttpRequestMessage request)
return retryPolicy.WrapAsync(GetOrCreateCircuitBreakerPolicy(policyKey));
}

CircuitBreakerPolicy GetOrCreateCircuitBreakerPolicy(string policyKey)
AsyncCircuitBreakerPolicy GetOrCreateCircuitBreakerPolicy(string policyKey)
{
if (CircuitBreakerPolicies.TryGetValue(policyKey, out var policy))
return policy;
Expand Down
12 changes: 6 additions & 6 deletions Olive.ApiClient/Olive.ApiClient.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Olive.ApiClient</PackageId>
<PackageVersion>2.2.104</PackageVersion>
<PackageVersion>2.2.105</PackageVersion>
<AssemblyVersion>2.2.0.0</AssemblyVersion>
<FileVersion>2.2.0.0</FileVersion>
<Title>Olive ClientApi</Title>
Expand All @@ -20,11 +20,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GCop.All.Geeks" Version="2.6.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
<ItemGroup>
<Reference Include="Olive">
Expand Down
8 changes: 4 additions & 4 deletions Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Olive.Audit.DatabaseLogger</PackageId>
<PackageId>Olive.Audit.DatabaseLogger</PackageId>
<AssemblyVersion>2.1.0.0</AssemblyVersion>
<FileVersion>2.1.0.0</FileVersion>
<Title>Olive Audit</Title>
Expand All @@ -14,12 +14,12 @@
<OutputPath>..\bin</OutputPath>
<DocumentationFile>..\bin\netstandard2.0\Olive.Audit.DatabaseLogger.xml</DocumentationFile>
<NoWarn>1701;1702;1705;1591;NU1701</NoWarn>
<PackageVersion>2.1.102</PackageVersion>
<PackageVersion>2.1.103</PackageVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GCop.All.Geeks" Version="2.6.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" />
</ItemGroup>
<ItemGroup>
<Reference Include="Olive">
Expand Down
10 changes: 5 additions & 5 deletions Olive.Audit/Olive.Audit.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Olive.Audit</PackageId>
<PackageId>Olive.Audit</PackageId>
<Title>Olive Audit</Title>
<Authors>Geeks Ltd</Authors>
<PackageProjectUrl>https://github.com/Geeksltd/Olive</PackageProjectUrl>
<PackageIconUrl>http://licensing.msharp.co.uk/Images/OliveComponent.png</PackageIconUrl>
<Copyright>Copyright ©2020 Geeks Ltd - All rights reserved.</Copyright>
<Description>Olive Framework</Description>
<Description>Olive Framework</Description>
<AssemblyVersion>2.1.0.0</AssemblyVersion>
<FileVersion>2.1.0.0</FileVersion>
<PackageVersion>2.1.102</PackageVersion>
<PackageVersion>2.1.105</PackageVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\bin</OutputPath>
Expand All @@ -20,8 +20,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GCop.All.Geeks" Version="2.6.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
</ItemGroup>
<ItemGroup>
<Reference Include="Olive">
Expand Down
13 changes: 7 additions & 6 deletions Olive.Aws.EventBus/Olive.Aws.EventBus.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@
<OutputPath>..\bin</OutputPath>
<DocumentationFile>..\bin\netstandard2.0\Olive.EventBus.xml</DocumentationFile>
<NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
<PackageVersion>2.1.131</PackageVersion>
<PackageVersion>2.1.136</PackageVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.SQS" Version="3.3.3.38" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
<PackageReference Include="AWSSDK.SQS" Version="3.5.0.20" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<Reference Include="Olive">
<HintPath>..\bin\netstandard2.0\Olive.dll</HintPath>
</Reference>
Expand Down
7 changes: 4 additions & 3 deletions Olive.Aws.Ses.AutoFetch.TestConsole/Olive.Aws.Ses.AutoFetch.TestConsole.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Olive.Audit\Olive.Audit.csproj" />
<ProjectReference Include="..\Olive.Aws.Ses.AutoFetch\Olive.Aws.Ses.AutoFetch.csproj" />
</ItemGroup>

Expand Down
20 changes: 9 additions & 11 deletions Olive.Aws.Ses.AutoFetch/Olive.Aws.Ses.AutoFetch.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Olive.Aws.Ses.AutoFetch</PackageId>
<PackageVersion>1.0.0.3</PackageVersion>
<PackageVersion>1.0.4.3</PackageVersion>
<AssemblyVersion>1.0.0.3</AssemblyVersion>
<FileVersion>1.0.0.3</FileVersion>
<Title>Olive AWS SES Autofetch</Title>
Expand All @@ -13,16 +13,17 @@
<Copyright>Copyright ©2020 Geeks Ltd - All rights reserved.</Copyright>
<Description>A plugin for Olive Framework</Description>
<OutputPath>..\bin</OutputPath>
<DocumentationFile>..\bin\netcoreapp2.1\Olive.Aws.Ses.xml</DocumentationFile>
<DocumentationFile>..\bin\netcoreapp3.1\Olive.Aws.Ses.xml</DocumentationFile>
<NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.S3" Version="3.3.110.49" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageReference Include="MimeKit" Version="2.6.0" />
<PackageReference Include="AWSSDK.S3" Version="3.5.1.10" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
<PackageReference Include="MimeKit" Version="2.9.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
<ItemGroup>
<None Include="readme.txt" pack="true" PackagePath="." />
Expand All @@ -40,9 +41,6 @@
<Reference Include="Olive.Aws">
<HintPath>..\bin\netstandard2.0\Olive.Aws.dll</HintPath>
</Reference>
<Reference Include="Olive.Email">
<HintPath>..\bin\netcoreapp2.1\Olive.Email.dll</HintPath>
</Reference>
<Reference Include="Olive.Entities.Data">
<HintPath>..\bin\netstandard2.0\Olive.Entities.Data.dll</HintPath>
</Reference>
Expand Down
25 changes: 13 additions & 12 deletions Olive.Aws.Ses/Olive.Aws.Ses.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<PackageId>Olive.Aws.Ses</PackageId>
<PackageVersion>2.1.103</PackageVersion>
<AssemblyVersion>2.1.0.0</AssemblyVersion>
<FileVersion>2.1.0.0</FileVersion>
<FileVersion>3.1.0.0</FileVersion>
<AssemblyVersion>3.1.0.1</AssemblyVersion>
<Version>3.1.100</Version>
<Title>Olive AWS SES</Title>
<Authors>Geeks Ltd</Authors>
<PackageProjectUrl>https://github.com/Geeksltd/Olive</PackageProjectUrl>
<PackageIconUrl>http://licensing.msharp.co.uk/Images/OliveComponent.png</PackageIconUrl>
<Copyright>Copyright ©2020 Geeks Ltd - All rights reserved.</Copyright>
<Description>A plugin for Olive Framework</Description>
<OutputPath>..\bin</OutputPath>
<DocumentationFile>..\bin\netcoreapp2.1\Olive.Aws.Ses.xml</DocumentationFile>
<DocumentationFile>..\bin\netcoreapp3.1\Olive.Aws.Ses.xml</DocumentationFile>
<NoWarn>1701;1702;1705;1591;1573;NU1701</NoWarn>
<PackageVersion>3.1.101</PackageVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.SimpleEmail" Version="3.3.6.20" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageReference Include="AWSSDK.SimpleEmail" Version="3.5.0.20" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.6" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Olive.Email\Olive.Email.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="Olive">
Expand All @@ -32,9 +36,6 @@
<Reference Include="Olive.Aws">
<HintPath>..\bin\netstandard2.0\Olive.Aws.dll</HintPath>
</Reference>
<Reference Include="Olive.Email">
<HintPath>..\bin\netcoreapp2.1\Olive.Email.dll</HintPath>
</Reference>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="update-local-nuget-cache $(ProjectPath) $(TargetPath) $(TargetName)" />
Expand Down
18 changes: 9 additions & 9 deletions Olive.Aws/Olive.Aws.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<PackageId>Olive.Aws</PackageId>
<PackageVersion>2.2.114</PackageVersion>
<PackageVersion>2.2.119</PackageVersion>
<AssemblyVersion>2.2.114</AssemblyVersion>
<FileVersion>2.2.114</FileVersion>
<Title>Olive AWS General Provider</Title>
Expand All @@ -19,15 +19,15 @@
<DocumentationFile>..\bin\netstandard2.0\Olive.Aws.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.SecretsManager" Version="3.3.2.6" />
<PackageReference Include="AWSSDK.SecurityToken" Version="3.3.4.15" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.3.127.6" />
<PackageReference Include="AWSSDK.SecretsManager" Version="3.5.0.20" />
<PackageReference Include="AWSSDK.SecurityToken" Version="3.5.1" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.5.1.19" />
<PackageReference Include="GCop.All.Geeks" Version="2.6.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.1.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.8" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>
<ItemGroup>
<Reference Include="Olive">
Expand Down
Loading

0 comments on commit 4e4bd16

Please sign in to comment.