From 4e4bd16d52bdb13489b01835885583e992dfa40e Mon Sep 17 00:00:00 2001 From: Geeksltd Date: Wed, 30 Sep 2020 15:31:57 +0100 Subject: [PATCH] no message --- BuildAll.bat | 87 -------------- Olive.ApiClient/ApiClient.Retries.cs | 8 +- Olive.ApiClient/Olive.ApiClient.csproj | 12 +- .../Olive.Audit.DatabaseLogger.csproj | 8 +- Olive.Audit/Olive.Audit.csproj | 10 +- Olive.Aws.EventBus/Olive.Aws.EventBus.csproj | 13 ++- ...Olive.Aws.Ses.AutoFetch.TestConsole.csproj | 7 +- .../Olive.Aws.Ses.AutoFetch.csproj | 20 ++-- Olive.Aws.Ses/Olive.Aws.Ses.csproj | 25 ++-- Olive.Aws/Olive.Aws.csproj | 18 +-- Olive.Blob.Aws/Olive.BlobAws.csproj | 32 +++--- Olive.Blob.Azure/Olive.Blob.Azure.csproj | 15 +-- Olive.Compression/Olive.Compression.csproj | 8 +- Olive.Console/Olive.Console.csproj | 22 ++-- Olive.Csv/CsvReader.cs | 4 +- Olive.Csv/Olive.Csv.csproj | 6 +- Olive.Drawing/Olive.Drawing.csproj | 8 +- Olive.Email.Imap/Olive.Email.Imap.csproj | 31 +++-- Olive.Email/Olive.Email.csproj | 33 ++---- Olive.Encryption/Olive.Encryption.csproj | 8 +- .../Olive.Entities.Cache.Redis.csproj | 6 +- .../Olive.Entities.Data.MySql.csproj | 6 +- .../Olive.Entities.Data.PostgreSQL.csproj | 6 +- .../Olive.Entities.Data.Replication.csproj | 10 +- .../Olive.Entities.Data.SQLite.csproj | 6 +- .../Olive.Entities.Data.SqlServer.csproj | 6 +- .../Olive.Entities.Data.csproj | 6 +- Olive.Entities/Olive.Entities.csproj | 15 +-- ...ies.Data.Replication.Mvc.Extensions.csproj | 10 +- Olive.EventBus/Olive.EventBus.csproj | 9 +- Olive.Export/Olive.Export.csproj | 4 +- Olive.GeoLocation/Olive.GeoLocation.csproj | 7 +- .../Olive.Globalization.csproj | 8 +- .../Olive.Hangfire.MySql.csproj | 29 +++-- Olive.Hangfire/Olive.Hangfire.csproj | 26 ++--- Olive.Log.EventBus/Olive.Log.EventBus.csproj | 10 +- .../Olive.Microservices.csproj | 6 +- .../Olive.Mvc.CKEditorFileManager.csproj | 19 ++- Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj | 22 ++-- .../Olive.Mvc.Microservices.csproj | 29 ++--- Olive.Mvc.Microservices/Startup.cs | 2 +- Olive.Mvc.Paging/Olive.Mvc.Paging.csproj | 24 ++-- .../Olive.Mvc.Recaptcha.csproj | 55 ++++----- .../Olive.Security.Auth0.csproj | 65 ++++++----- Olive.Mvc.Testing/Olive.Mvc.Testing.csproj | 28 ++--- Olive.Mvc/ActionResults/JsonNetResult.cs | 4 +- ...OliveValidationAttributeAdapterProvider.cs | 67 +++++++++-- Olive.Mvc/Binding/OliveBinderProvider.cs | 3 +- Olive.Mvc/Binding/OliveModelBinder.cs | 3 +- Olive.Mvc/JavaScript/Controller.cs | 3 +- Olive.Mvc/Olive.Mvc.csproj | 33 ++---- Olive.Mvc/Properties/launchSettings.json | 27 +++++ Olive.Mvc/Utilities/Controller.File.cs | 2 +- ...erencesMetadataReferenceFeatureProvider.cs | 108 +++++++++--------- Olive.Mvc/Utilities/Startup.cs | 29 +++-- Olive.PDF/Olive.PDF.csproj | 5 +- .../Olive.PassiveBackgroundTasks.csproj | 20 ++-- .../Olive.PushNotification.csproj | 11 +- Olive.SMS/Olive.SMS.csproj | 8 +- Olive.Security.Aws/Olive.Security.Aws.csproj | 22 ++-- .../Olive.Security.Impersonation.csproj | 26 ++--- Olive.Security/Olive.Mvc.Security.csproj | 25 ++-- Olive.Security/OliveSecurityExtensions.cs | 4 +- Olive.Web/Olive.Web.csproj | 20 ++-- Olive.sln | 66 +++++++++++ Olive/Olive.csproj | 12 +- .../Olive.Email.Tests.csproj | 6 +- .../Olive.Entities.Data.MySql.Tests.csproj | 6 +- .../Olive.Entities.Tests.csproj | 8 +- .../Olive.GeoLocation.Tests.csproj | 8 +- .../Olive.PushNotification.Tests.csproj | 8 +- Tests/Olive.Tests/Olive.Tests.csproj | 18 +-- 72 files changed, 653 insertions(+), 688 deletions(-) create mode 100644 Olive.Mvc/Properties/launchSettings.json diff --git a/BuildAll.bat b/BuildAll.bat index 2fbb6aeac..786b8a2fd 100644 --- a/BuildAll.bat +++ b/BuildAll.bat @@ -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) diff --git a/Olive.ApiClient/ApiClient.Retries.cs b/Olive.ApiClient/ApiClient.Retries.cs index 3121dc381..77df551ca 100644 --- a/Olive.ApiClient/ApiClient.Retries.cs +++ b/Olive.ApiClient/ApiClient.Retries.cs @@ -9,8 +9,8 @@ namespace Olive { partial class ApiClient { - static readonly Dictionary CircuitBreakerPolicies - = new Dictionary(); + static readonly Dictionary CircuitBreakerPolicies + = new Dictionary(); int retries, ExceptionsBeforeBreakingCircuit; TimeSpan CircuitBreakDuration, RetryPauseDuration; @@ -53,7 +53,7 @@ Task SendAsync(HttpClient client, HttpRequestMessage reques return CreateExecutionPolicy(request).ExecuteAsync(() => client.SendAsync(request)); } - Policy CreateExecutionPolicy(HttpRequestMessage request) + AsyncPolicy CreateExecutionPolicy(HttpRequestMessage request) { var retryPolicy = Policy.Handle() .WaitAndRetryAsync(retries, attempt => RetryPauseDuration); @@ -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; diff --git a/Olive.ApiClient/Olive.ApiClient.csproj b/Olive.ApiClient/Olive.ApiClient.csproj index cbbf993ac..1a2168b59 100644 --- a/Olive.ApiClient/Olive.ApiClient.csproj +++ b/Olive.ApiClient/Olive.ApiClient.csproj @@ -3,7 +3,7 @@ netstandard2.0 Olive.ApiClient - 2.2.104 + 2.2.105 2.2.0.0 2.2.0.0 Olive ClientApi @@ -20,11 +20,11 @@ - - - - - + + + + + diff --git a/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj b/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj index bfbfa43a3..848b9e9b7 100644 --- a/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj +++ b/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj @@ -2,7 +2,7 @@ netstandard2.0 - Olive.Audit.DatabaseLogger + Olive.Audit.DatabaseLogger 2.1.0.0 2.1.0.0 Olive Audit @@ -14,12 +14,12 @@ ..\bin ..\bin\netstandard2.0\Olive.Audit.DatabaseLogger.xml 1701;1702;1705;1591;NU1701 - 2.1.102 + 2.1.103 - - + + diff --git a/Olive.Audit/Olive.Audit.csproj b/Olive.Audit/Olive.Audit.csproj index 4136a13b4..d517f9e99 100644 --- a/Olive.Audit/Olive.Audit.csproj +++ b/Olive.Audit/Olive.Audit.csproj @@ -2,16 +2,16 @@ netstandard2.0 - Olive.Audit + Olive.Audit Olive Audit Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. - Olive Framework + Olive Framework 2.1.0.0 2.1.0.0 - 2.1.102 + 2.1.105 ..\bin @@ -20,8 +20,8 @@ - - + + diff --git a/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj b/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj index 04ee525ef..8d478826d 100644 --- a/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj +++ b/Olive.Aws.EventBus/Olive.Aws.EventBus.csproj @@ -14,14 +14,15 @@ ..\bin ..\bin\netstandard2.0\Olive.EventBus.xml 1701;1702;1705;1591;1573;NU1701 - 2.1.131 + 2.1.136 - - - - - + + + + + + ..\bin\netstandard2.0\Olive.dll diff --git a/Olive.Aws.Ses.AutoFetch.TestConsole/Olive.Aws.Ses.AutoFetch.TestConsole.csproj b/Olive.Aws.Ses.AutoFetch.TestConsole/Olive.Aws.Ses.AutoFetch.TestConsole.csproj index 928f0d4e5..c3a12223e 100644 --- a/Olive.Aws.Ses.AutoFetch.TestConsole/Olive.Aws.Ses.AutoFetch.TestConsole.csproj +++ b/Olive.Aws.Ses.AutoFetch.TestConsole/Olive.Aws.Ses.AutoFetch.TestConsole.csproj @@ -6,12 +6,13 @@ - - - + + + + diff --git a/Olive.Aws.Ses.AutoFetch/Olive.Aws.Ses.AutoFetch.csproj b/Olive.Aws.Ses.AutoFetch/Olive.Aws.Ses.AutoFetch.csproj index be7df9064..6b588b403 100644 --- a/Olive.Aws.Ses.AutoFetch/Olive.Aws.Ses.AutoFetch.csproj +++ b/Olive.Aws.Ses.AutoFetch/Olive.Aws.Ses.AutoFetch.csproj @@ -3,7 +3,7 @@ netstandard2.0 Olive.Aws.Ses.AutoFetch - 1.0.0.3 + 1.0.4.3 1.0.0.3 1.0.0.3 Olive AWS SES Autofetch @@ -13,16 +13,17 @@ Copyright ©2020 Geeks Ltd - All rights reserved. A plugin for Olive Framework ..\bin - ..\bin\netcoreapp2.1\Olive.Aws.Ses.xml + ..\bin\netcoreapp3.1\Olive.Aws.Ses.xml 1701;1702;1705;1591;1573;NU1701 - - - - - - + + + + + + + @@ -40,9 +41,6 @@ ..\bin\netstandard2.0\Olive.Aws.dll - - ..\bin\netcoreapp2.1\Olive.Email.dll - ..\bin\netstandard2.0\Olive.Entities.Data.dll diff --git a/Olive.Aws.Ses/Olive.Aws.Ses.csproj b/Olive.Aws.Ses/Olive.Aws.Ses.csproj index 72f70823e..9dd945290 100644 --- a/Olive.Aws.Ses/Olive.Aws.Ses.csproj +++ b/Olive.Aws.Ses/Olive.Aws.Ses.csproj @@ -1,11 +1,11 @@  - netcoreapp2.1 + netcoreapp3.1 Olive.Aws.Ses - 2.1.103 - 2.1.0.0 - 2.1.0.0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 Olive AWS SES Geeks Ltd https://github.com/Geeksltd/Olive @@ -13,14 +13,18 @@ Copyright ©2020 Geeks Ltd - All rights reserved. A plugin for Olive Framework ..\bin - ..\bin\netcoreapp2.1\Olive.Aws.Ses.xml + ..\bin\netcoreapp3.1\Olive.Aws.Ses.xml 1701;1702;1705;1591;1573;NU1701 + 3.1.101 - - - - + + + + + + + @@ -32,9 +36,6 @@ ..\bin\netstandard2.0\Olive.Aws.dll - - ..\bin\netcoreapp2.1\Olive.Email.dll - diff --git a/Olive.Aws/Olive.Aws.csproj b/Olive.Aws/Olive.Aws.csproj index 58612a180..774a20118 100644 --- a/Olive.Aws/Olive.Aws.csproj +++ b/Olive.Aws/Olive.Aws.csproj @@ -3,7 +3,7 @@ netstandard2.0 Olive.Aws - 2.2.114 + 2.2.119 2.2.114 2.2.114 Olive AWS General Provider @@ -19,15 +19,15 @@ ..\bin\netstandard2.0\Olive.Aws.xml - - - + + + - - - - - + + + + + diff --git a/Olive.Blob.Aws/Olive.BlobAws.csproj b/Olive.Blob.Aws/Olive.BlobAws.csproj index 4a83bcf28..933089633 100644 --- a/Olive.Blob.Aws/Olive.BlobAws.csproj +++ b/Olive.Blob.Aws/Olive.BlobAws.csproj @@ -1,17 +1,18 @@ - + - netcoreapp2.1 + netcoreapp3.1 Olive.BlobAws - 2.1.120 - 2.1.120.0 - 2.1.120.0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 Olive Blob AWS (S3) Storage Provider Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. A plugin for Olive Framework + 3.1.101 1701;1702;1705;1591;1573;NU1701 @@ -19,13 +20,15 @@ ..\bin\netstandard2.0\Olive.BlobAws.xml - + - - - - - + + + + + + + @@ -39,12 +42,9 @@ ..\bin\netstandard2.0\Olive.Entities.Data.dll - - - ..\bin\netcoreapp2.1\Olive.Mvc.dll - + - + \ No newline at end of file diff --git a/Olive.Blob.Azure/Olive.Blob.Azure.csproj b/Olive.Blob.Azure/Olive.Blob.Azure.csproj index 4445a8bf0..55a6351b0 100644 --- a/Olive.Blob.Azure/Olive.Blob.Azure.csproj +++ b/Olive.Blob.Azure/Olive.Blob.Azure.csproj @@ -1,22 +1,23 @@ + - - netcoreapp2.1 + netcoreapp3.1 Geeks Ltd A plugin for Olive Framework Copyright ©2020 Geeks Ltd - All rights reserved. https://github.com/Geeksltd/Olive Olive.Blob.Azure + 3.1.0.0 + 3.1.0.1 + 3.1.100 + 3.1.101 - - + - - - + \ No newline at end of file diff --git a/Olive.Compression/Olive.Compression.csproj b/Olive.Compression/Olive.Compression.csproj index 6c66bb793..a9a67afd9 100644 --- a/Olive.Compression/Olive.Compression.csproj +++ b/Olive.Compression/Olive.Compression.csproj @@ -4,7 +4,7 @@ netstandard2.0 Olive.Compression Olive.Compression - Olive.Compression + Olive.Compression 2.1.0.0 2.1.0.0 Olive Compression (Service) @@ -13,7 +13,7 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.1.102 + 2.1.105 ..\bin\ @@ -22,8 +22,8 @@ - - + + diff --git a/Olive.Console/Olive.Console.csproj b/Olive.Console/Olive.Console.csproj index f10e685e2..d8e6ea07b 100644 --- a/Olive.Console/Olive.Console.csproj +++ b/Olive.Console/Olive.Console.csproj @@ -14,7 +14,7 @@ Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework 2.1.104 - 2.1.108 + 2.1.109 ..\bin\ @@ -22,16 +22,16 @@ 1701;1702;1705;1591;1573;NU1701 - - - - - - - - - - + + + + + + + + + + diff --git a/Olive.Csv/CsvReader.cs b/Olive.Csv/CsvReader.cs index d05ee1ba5..75ae25328 100644 --- a/Olive.Csv/CsvReader.cs +++ b/Olive.Csv/CsvReader.cs @@ -32,7 +32,7 @@ public static DataTable Read(string csvContent, bool isFirstRowHeaders, int mini var output = new DataTable(); using (var textReaderContent = new StringReader(csvContent)) - using (var csvResult = new CsvHelper.CsvReader(textReaderContent)) + using (var csvResult = new CsvHelper.CsvReader(textReaderContent, System.Globalization.CultureInfo.CurrentCulture)) { csvResult.Read(); csvResult.ReadHeader(); @@ -84,7 +84,7 @@ public static async Task GetColumnsAsync(FileInfo file) public static string[] GetColumns(string csvContent) { using (var textReaderContent = new StringReader(csvContent)) - using (var csvResult = new CsvHelper.CsvReader(textReaderContent)) + using (var csvResult = new CsvHelper.CsvReader(textReaderContent, System.Globalization.CultureInfo.CurrentCulture)) { csvResult.Read(); csvResult.ReadHeader(); diff --git a/Olive.Csv/Olive.Csv.csproj b/Olive.Csv/Olive.Csv.csproj index 9cbd77d92..6829ee04b 100644 --- a/Olive.Csv/Olive.Csv.csproj +++ b/Olive.Csv/Olive.Csv.csproj @@ -13,7 +13,7 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.1.103 + 2.1.105 ..\bin\ @@ -21,9 +21,9 @@ 1701;1702;1705;1591;1573;NU1701 - + - + diff --git a/Olive.Drawing/Olive.Drawing.csproj b/Olive.Drawing/Olive.Drawing.csproj index 3b8bde737..57d3cd249 100644 --- a/Olive.Drawing/Olive.Drawing.csproj +++ b/Olive.Drawing/Olive.Drawing.csproj @@ -13,7 +13,7 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.1.103 + 2.1.105 true @@ -23,9 +23,9 @@ - - - + + + diff --git a/Olive.Email.Imap/Olive.Email.Imap.csproj b/Olive.Email.Imap/Olive.Email.Imap.csproj index afcb49fa3..a483b95c7 100644 --- a/Olive.Email.Imap/Olive.Email.Imap.csproj +++ b/Olive.Email.Imap/Olive.Email.Imap.csproj @@ -1,38 +1,38 @@ + - - netcoreapp2.1 + netcoreapp3.1 Olive.Email Olive.Email.Imap Olive.Email.Imap - 2.0.0.0 - 2.0.0.0 Olive Email Imap (Service) Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.0.0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 + 3.1.102 - ..\bin\ 1701;1702;1705;1591;1573;NU1701 - - - - - - + + + + + + + - ..\bin\netstandard2.0\Olive.dll @@ -40,8 +40,5 @@ ..\bin\netstandard2.0\Olive.Entities.dll - - ..\bin\netcoreapp2.1\Olive.Email.dll - - + \ No newline at end of file diff --git a/Olive.Email/Olive.Email.csproj b/Olive.Email/Olive.Email.csproj index 14cb801c6..3c76f7675 100644 --- a/Olive.Email/Olive.Email.csproj +++ b/Olive.Email/Olive.Email.csproj @@ -1,44 +1,27 @@  - netcoreapp2.1 + netcoreapp3.1 Olive.Email Olive.Email Olive.Email - 2.1.0.0 - 2.1.0.0 Olive Email (Service) Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.1.110 - - + 3.1.0.0 + 3.1.0.1 + 3.1.100 + 3.1.102 ..\bin\ - ..\bin\netcoreapp2.1\Olive.Email.xml + ..\bin\netcoreapp3.1\Olive.Email.xml 1701;1702;1705;1591;1573;NU1701 - - - - - - - - - - ..\bin\netstandard2.0\Olive.dll - - - ..\bin\netstandard2.0\Olive.Entities.dll - - - ..\bin\netcoreapp2.1\Olive.Web.dll - - + + diff --git a/Olive.Encryption/Olive.Encryption.csproj b/Olive.Encryption/Olive.Encryption.csproj index 316ccf422..d7d547c86 100644 --- a/Olive.Encryption/Olive.Encryption.csproj +++ b/Olive.Encryption/Olive.Encryption.csproj @@ -8,20 +8,20 @@ 1701;1702;1705;1591;1573;NU1701 Olive.Encryption Olive.Encryption - Olive.Encryption + Olive.Encryption Olive Encryption Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. - Olive Framework + Olive Framework 2.2.0.0 2.2.0.0 - 2.2.102 + 2.2.104 - + diff --git a/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj b/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj index bbde36c66..735594d4f 100644 --- a/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj +++ b/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj b/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj index cfe7ce3bb..f4d55f06c 100644 --- a/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj +++ b/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj @@ -13,7 +13,7 @@ 2.1.0.0 2.1.0.0 - 2.1.105 + 2.1.113 ..\bin\ @@ -25,8 +25,8 @@ - - + + diff --git a/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj b/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj index 82330e893..3b8a866e6 100644 --- a/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj +++ b/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj @@ -3,7 +3,7 @@ netstandard2.0 Olive.Entities.Data.PostgreSQL - 2.1.104 + 2.1.108 2.1.0.0 2.1.0.0 Olive Entities Data PostgreSQL @@ -20,8 +20,8 @@ - - + + diff --git a/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj b/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj index 3229379fe..21ab3381e 100644 --- a/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj +++ b/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj @@ -6,7 +6,7 @@ ..\bin\netstandard2.0\Olive.Entities.Data.Replication.xml 1701;1702;1705;1591;1573;NU1701 Olive.Entities.Data.Replication - 2.1.148 + 2.1.149 2.1.147 2.1.147 Olive Entities Data Replication @@ -18,11 +18,11 @@ Olive.Entities - - + + - - + + diff --git a/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj b/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj index 6b1ad572c..c74b27b21 100644 --- a/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj +++ b/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj @@ -3,7 +3,7 @@ netstandard2.0 Olive.Entities.Data.SQLite - 2.1.108 + 2.1.110 2.1.0.0 2.1.0.0 Olive Entities Data Sqlite provider @@ -20,8 +20,8 @@ - - + + diff --git a/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj b/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj index 6cb813c7d..5cd5a7e58 100644 --- a/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj +++ b/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj @@ -8,7 +8,7 @@ ..\bin ..\bin\netstandard2.0\Olive.Entities.Data.SqlServer.xml Olive.Entities.Data.SqlServer - 2.1.109 + 2.1.111 2.1.0.0 2.1.0.0 Olive Entities Data SqlServer @@ -20,8 +20,8 @@ - - + + diff --git a/Olive.Entities.Data/Olive.Entities.Data.csproj b/Olive.Entities.Data/Olive.Entities.Data.csproj index 46c2e1ba1..8490a3a18 100644 --- a/Olive.Entities.Data/Olive.Entities.Data.csproj +++ b/Olive.Entities.Data/Olive.Entities.Data.csproj @@ -14,13 +14,13 @@ Olive Framework 2.1.0.0 2.1.0.0 - 2.1.157 + 2.1.162 - - + + diff --git a/Olive.Entities/Olive.Entities.csproj b/Olive.Entities/Olive.Entities.csproj index 4102778a7..704f065c8 100644 --- a/Olive.Entities/Olive.Entities.csproj +++ b/Olive.Entities/Olive.Entities.csproj @@ -16,7 +16,7 @@ Olive Framework 2.1.0.0 2.1.0.0 - 2.1.141 + 2.1.148 @@ -24,19 +24,14 @@ - - - - - + + - - ..\bin\netstandard2.0\Olive.dll - + - + diff --git a/Olive.EventBus.Mvc.Extensions/Olive.Entities.Data.Replication.Mvc.Extensions.csproj b/Olive.EventBus.Mvc.Extensions/Olive.Entities.Data.Replication.Mvc.Extensions.csproj index e5c7b63de..a13cb3915 100644 --- a/Olive.EventBus.Mvc.Extensions/Olive.Entities.Data.Replication.Mvc.Extensions.csproj +++ b/Olive.EventBus.Mvc.Extensions/Olive.Entities.Data.Replication.Mvc.Extensions.csproj @@ -10,14 +10,14 @@ https://raw.githubusercontent.com/Geeksltd/Olive/master/Olive/Nuget.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 1.0.13 - 1.0.13 - 1.0.13 + 2.0.0 + 2.0.0 + 1.0.14 - - + + diff --git a/Olive.EventBus/Olive.EventBus.csproj b/Olive.EventBus/Olive.EventBus.csproj index 8481d42aa..1f4a39be2 100644 --- a/Olive.EventBus/Olive.EventBus.csproj +++ b/Olive.EventBus/Olive.EventBus.csproj @@ -14,12 +14,13 @@ ..\bin ..\bin\netstandard2.0\Olive.EventBus.xml 1701;1702;1705;1591;1573;NU1701 - 2.1.120 + 2.1.121 - - - + + + + ..\bin\netstandard2.0\Olive.dll diff --git a/Olive.Export/Olive.Export.csproj b/Olive.Export/Olive.Export.csproj index ff3e2bae9..2b5b1c454 100644 --- a/Olive.Export/Olive.Export.csproj +++ b/Olive.Export/Olive.Export.csproj @@ -13,7 +13,7 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Enables exporting tabular data to Csv or Excel. - 2.1.103 + 2.1.105 ..\bin\ @@ -22,7 +22,7 @@ - + diff --git a/Olive.GeoLocation/Olive.GeoLocation.csproj b/Olive.GeoLocation/Olive.GeoLocation.csproj index 67e055717..b05e2e9e1 100644 --- a/Olive.GeoLocation/Olive.GeoLocation.csproj +++ b/Olive.GeoLocation/Olive.GeoLocation.csproj @@ -7,7 +7,6 @@ ..\bin\netstandard2.0\Olive.GeoLocation.xml 1701;1702;1705;1591;1573;NU1701 Olive.GeoLocation - 2.1.0.0 2.1.0.0 Olive GeoLocation (Service) @@ -16,12 +15,12 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.1.102 + 2.1.104 - - + + diff --git a/Olive.Globalization/Olive.Globalization.csproj b/Olive.Globalization/Olive.Globalization.csproj index eda607eac..33c95b234 100644 --- a/Olive.Globalization/Olive.Globalization.csproj +++ b/Olive.Globalization/Olive.Globalization.csproj @@ -4,7 +4,7 @@ netstandard2.0 Olive.Globalization Olive.Globalization - 2.1.106 + 2.1.108 2.1.0.0 2.1.0.0 Olive Globalization (Service) @@ -14,13 +14,13 @@ Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework ..\bin\ - ..\bin\netcoreapp2.1\Olive.Globalization.xml + ..\bin\netstandard2.0\Olive.Globalization.xml 1701;1702;1705;1591;1573;NU1701 - - + + diff --git a/Olive.Hangfire.MySql/Olive.Hangfire.MySql.csproj b/Olive.Hangfire.MySql/Olive.Hangfire.MySql.csproj index 8351451a2..528fc5d0d 100644 --- a/Olive.Hangfire.MySql/Olive.Hangfire.MySql.csproj +++ b/Olive.Hangfire.MySql/Olive.Hangfire.MySql.csproj @@ -1,12 +1,10 @@ - - + + - netcoreapp2.1 + netcoreapp3.1 ..\bin\ ..\bin\Olive.Hangfire.MySql.xml Olive.Hangfire.MySql - 2.1.0.0 - 2.1.0.0 Olive Hangfire (Service) With MySQL Geeks Ltd https://github.com/Geeksltd/Olive @@ -14,16 +12,19 @@ Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework 1701;1702;1705;1591;NU1701 - 2.1.100 + 3.1.0.0 + 3.1.0.1 + 3.1.100 + 3.1.102 - - + - - + + + + - ..\bin\netstandard2.0\Olive.dll @@ -31,12 +32,8 @@ ..\bin\netstandard2.0\Olive.Entities.Data.dll - - ..\bin\netcoreapp2.1\Olive.Hangfire.dll - - - + \ No newline at end of file diff --git a/Olive.Hangfire/Olive.Hangfire.csproj b/Olive.Hangfire/Olive.Hangfire.csproj index 9a5031858..cee04af93 100644 --- a/Olive.Hangfire/Olive.Hangfire.csproj +++ b/Olive.Hangfire/Olive.Hangfire.csproj @@ -1,12 +1,10 @@  - netcoreapp2.1 + netcoreapp3.1 ..\bin\ - ..\bin\netstandard2.0\Olive.Hangfire.xml + ..\bin\netcoreapp3.1\Olive.Hangfire.xml Olive.Hangfire - 2.1.0.0 - 2.1.0.0 Olive Hangfire (Service) Geeks Ltd https://github.com/Geeksltd/Olive @@ -14,13 +12,18 @@ Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework 1701;1702;1705;1591;NU1701 - 2.1.109 + 3.1.0.0 + 3.1.0.1 + 3.1.100 + 3.1.102 - - - + + + + + @@ -30,13 +33,6 @@ ..\bin\netstandard2.0\Olive.Entities.Data.dll - - ..\bin\netcoreapp2.1\Olive.Mvc.dll - - - ..\bin\netcoreapp2.1\Olive.Web.dll - false - diff --git a/Olive.Log.EventBus/Olive.Log.EventBus.csproj b/Olive.Log.EventBus/Olive.Log.EventBus.csproj index 63f2328a3..b336790ed 100644 --- a/Olive.Log.EventBus/Olive.Log.EventBus.csproj +++ b/Olive.Log.EventBus/Olive.Log.EventBus.csproj @@ -17,13 +17,13 @@ ..\bin ..\bin\netstandard2.0\Olive.Log.EventBus.xml 1701;1702;1591 - 2.1.111 + 2.1.112 - - - - + + + + ..\bin\netstandard2.0\Olive.dll false diff --git a/Olive.Microservices/Olive.Microservices.csproj b/Olive.Microservices/Olive.Microservices.csproj index 1866e1a09..79e436e9f 100644 --- a/Olive.Microservices/Olive.Microservices.csproj +++ b/Olive.Microservices/Olive.Microservices.csproj @@ -15,12 +15,12 @@ ..\bin\ ..\bin\netstandard2.0\Olive.Microservices.xml 1701;1702;1705;1591;NU1701 - 2.1.103 + 2.1.104 - - + + diff --git a/Olive.Mvc.CKEditorFileManager/Olive.Mvc.CKEditorFileManager.csproj b/Olive.Mvc.CKEditorFileManager/Olive.Mvc.CKEditorFileManager.csproj index 689ea225a..0564790da 100644 --- a/Olive.Mvc.CKEditorFileManager/Olive.Mvc.CKEditorFileManager.csproj +++ b/Olive.Mvc.CKEditorFileManager/Olive.Mvc.CKEditorFileManager.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1 + netcoreapp3.1 ..\bin\ Olive.Mvc.CKEditorFileManager Olive CKEditor FileManager @@ -10,13 +10,18 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. CKEditor filermanager for Olive - 2.1.0.0 - 2.1.0.0 - 2.1.3 + 3.1.0.0 + 3.1.0.1 + 3.1.100 + 3.1.102 + + + + ..\bin\netstandard2.0\Olive.dll @@ -24,12 +29,6 @@ ..\bin\netstandard2.0\Olive.Entities.dll - - ..\bin\netcoreapp2.1\Olive.Mvc.dll - - - ..\bin\netcoreapp2.1\Olive.Web.dll - diff --git a/Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj b/Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj index 6e77689f4..86a1823af 100644 --- a/Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj +++ b/Olive.Mvc.IpFilter/Olive.Mvc.IpFilter.csproj @@ -1,11 +1,9 @@  - netcoreapp2.1 + netcoreapp3.1 Olive.Mvc - Olive.IpFilter - 2.1.0.0 - 2.1.0.0 + Olive.IpFilter Olive Ip Filter (Service) Geeks Ltd https://github.com/Geeksltd/Olive @@ -13,14 +11,20 @@ Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework ..\bin\ - ..\bin\netcoreapp2.1\Olive.Mvc.IpFilter.xml + ..\bin\netcoreapp3.1\Olive.Mvc.IpFilter.xml 1701;1702;1705;1591;1573;NU1701 - 2.1.102 + 3.1.0.0 + 3.1.0.1 + 3.1.100 + 3.1.102 - + + + + @@ -35,10 +39,6 @@ ..\bin\netstandard2.0\Olive.Entities.dll false - - ..\bin\netcoreapp2.1\Olive.Web.dll - false - diff --git a/Olive.Mvc.Microservices/Olive.Mvc.Microservices.csproj b/Olive.Mvc.Microservices/Olive.Mvc.Microservices.csproj index f13888e14..9488a76bf 100644 --- a/Olive.Mvc.Microservices/Olive.Mvc.Microservices.csproj +++ b/Olive.Mvc.Microservices/Olive.Mvc.Microservices.csproj @@ -1,9 +1,9 @@  - netcoreapp2.1 + netcoreapp3.1 ..\bin\ - ..\bin\netcoreapp2.1\Olive.Mvc.Microservices.xml + ..\bin\netcoreapp3.1\Olive.Mvc.Microservices.xml 1701;1702;1705;1591;1573;NU1701 Olive.Mvc.Microservices Olive MVC Microservices @@ -12,14 +12,13 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Mvc Utilities for Olive - 2.1.0.0 - 2.1.0.0 - 2.1.106 + 3.1.0.0 + 3.1.0.1 + 3.1.100 + 3.1.102 - - - + @@ -43,20 +42,6 @@ ..\bin\netstandard2.0\Olive.Microservices.dll - - ..\bin\netcoreapp2.1\Olive.Mvc.Security.dll - false - - - ..\bin\netcoreapp2.1\Olive.Web.dll - false - false - - - ..\bin\netcoreapp2.1\Olive.Mvc.dll - false - false - ..\bin\netstandard2.0\Olive.Encryption.dll false diff --git a/Olive.Mvc.Microservices/Startup.cs b/Olive.Mvc.Microservices/Startup.cs index 5e3dd9f19..9e35e00cc 100644 --- a/Olive.Mvc.Microservices/Startup.cs +++ b/Olive.Mvc.Microservices/Startup.cs @@ -11,7 +11,7 @@ public abstract class Startup : Olive.Mvc.Startup { const string HubDevUrl = "http://localhost:9011"; - protected Startup(IHostingEnvironment env, IConfiguration config, ILoggerFactory factory) + protected Startup(IWebHostEnvironment env, IConfiguration config, ILoggerFactory factory) : base(env, config, factory) { } public override void ConfigureServices(IServiceCollection services) diff --git a/Olive.Mvc.Paging/Olive.Mvc.Paging.csproj b/Olive.Mvc.Paging/Olive.Mvc.Paging.csproj index 4eb6cb704..438a4fdcb 100644 --- a/Olive.Mvc.Paging/Olive.Mvc.Paging.csproj +++ b/Olive.Mvc.Paging/Olive.Mvc.Paging.csproj @@ -1,25 +1,22 @@  - netcoreapp2.1 + netcoreapp3.1 ..\bin\ - ..\bin\netcoreapp2.1\Olive.Mvc.Paging.xml + ..\bin\netcoreapp3.1\Olive.Mvc.Paging.xml 1701;1702;1705;1591;1573;NU1701 Olive.Mvc.Paging - 2.1.102 - 2.1.0.0 - 2.1.0.0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 Olive MVC Paging Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Pagination Utilities for Olive + 3.1.102 - - - - ..\bin\netstandard2.0\Olive.dll @@ -33,14 +30,7 @@ ..\bin\netstandard2.0\Olive.Entities.Data.dll false - - ..\bin\netcoreapp2.1\Olive.Web.dll - false - - - ..\bin\netcoreapp2.1\Olive.Mvc.dll - false - + diff --git a/Olive.Mvc.Recaptcha/Olive.Mvc.Recaptcha.csproj b/Olive.Mvc.Recaptcha/Olive.Mvc.Recaptcha.csproj index b91c28e52..92b8a0a4c 100644 --- a/Olive.Mvc.Recaptcha/Olive.Mvc.Recaptcha.csproj +++ b/Olive.Mvc.Recaptcha/Olive.Mvc.Recaptcha.csproj @@ -1,31 +1,26 @@ + - - - netcoreapp2.1 - Geeks Ltd - Google reCaptcha for Olive - Copyright ©2020 Geeks Ltd - All rights reserved. - https://github.com/Geeksltd/Olive - 2.1.0.0 - 2.1.0.0 - 2.1.0 - Olive.Mvc.Recaptcha - - - - - - - - - - - ..\bin\netcoreapp2.1\Olive.dll - - - - - - - - + + netcoreapp3.1 + Geeks Ltd + Google reCaptcha for Olive + Copyright ©2020 Geeks Ltd - All rights reserved. + https://github.com/Geeksltd/Olive + 3.1.0.0 + 3.1.0.1 + 3.1.100 + Olive.Mvc.Recaptcha + 3.1.102 + + + + + + + + + + + + + \ No newline at end of file diff --git a/Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj b/Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj index a7b0644cc..0ba2900d4 100644 --- a/Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj +++ b/Olive.Mvc.Security.Auth0/Olive.Security.Auth0.csproj @@ -1,36 +1,35 @@  - - netcoreapp2.1 - Olive.Security - Olive.Security.Auth0 - 2.1.0.0 - 2.1.0.0 - Olive Security Auth0 - Geeks Ltd - https://github.com/Geeksltd/Olive - http://licensing.msharp.co.uk/Images/OliveComponent.png - Copyright ©2020 Geeks Ltd - All rights reserved. - Olive Framework - 2.1.102 - - - ..\bin\ - ..\bin\netcoreapp2.1\Olive.Security.Auth0.xml - 1701;1702;1705;1591;NU1701 - - - - - - - - - ..\bin\netstandard2.0\Olive.dll - false - - - - - + + netcoreapp3.1 + Olive.Security + Olive.Security.Auth0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 + Olive Security Auth0 + Geeks Ltd + https://github.com/Geeksltd/Olive + http://licensing.msharp.co.uk/Images/OliveComponent.png + Copyright ©2020 Geeks Ltd - All rights reserved. + Olive Framework + 3.1.101 + ..\bin\ + ..\bin\netcoreapp3.1\Olive.Security.Auth0.xml + 1701;1702;1705;1591;NU1701 + + + + + + + + + ..\bin\netstandard2.0\Olive.dll + false + + + + + \ No newline at end of file diff --git a/Olive.Mvc.Testing/Olive.Mvc.Testing.csproj b/Olive.Mvc.Testing/Olive.Mvc.Testing.csproj index 353594158..1bf8e42f2 100644 --- a/Olive.Mvc.Testing/Olive.Mvc.Testing.csproj +++ b/Olive.Mvc.Testing/Olive.Mvc.Testing.csproj @@ -1,10 +1,11 @@  - netcoreapp2.1 + netcoreapp3.1 Olive.Testing - 2.1.0.0 - 2.1.0.0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 Olive Testing (Service) Geeks Ltd https://github.com/Geeksltd/Olive @@ -12,16 +13,10 @@ Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework ..\bin\ - ..\bin\netcoreapp2.1\Olive.Mvc.Testing.xml + ..\bin\netcoreapp3.1\Olive.Mvc.Testing.xml 1701;1702;1705;1591;1573;NU1701 - 2.1.117 + 3.1.102 - - - - - - ..\bin\netstandard2.0\Olive.dll @@ -41,18 +36,13 @@ ..\bin\netstandard2.0\Olive.Export.dll - - ..\bin\netcoreapp2.1\Olive.Mvc.dll - false - - - ..\bin\netcoreapp2.1\Olive.Web.dll - false - + + + diff --git a/Olive.Mvc/ActionResults/JsonNetResult.cs b/Olive.Mvc/ActionResults/JsonNetResult.cs index abff1a9ce..1eca461e1 100644 --- a/Olive.Mvc/ActionResults/JsonNetResult.cs +++ b/Olive.Mvc/ActionResults/JsonNetResult.cs @@ -18,7 +18,7 @@ public JsonNetResult(object value) : base(value) }; } - public JsonNetResult(object value, JsonSerializerSettings serializerSettings) : base(value, serializerSettings) + public JsonNetResult(object value, object serializerSettings) : base(value, serializerSettings) { Settings = new JsonSerializerSettings { @@ -34,7 +34,7 @@ public override async Task ExecuteResultAsync(ActionContext context) if (context == null) throw new ArgumentNullException(nameof(context)); var response = context.HttpContext.Response; - response.ContentType = string.IsNullOrEmpty(ContentType) ? "application/json" : ContentType; + response.ContentType = ContentType.Or("application/json"); if (Value == null) return; diff --git a/Olive.Mvc/Attributes/ConditionalValidators/OliveValidationAttributeAdapterProvider.cs b/Olive.Mvc/Attributes/ConditionalValidators/OliveValidationAttributeAdapterProvider.cs index b5e8e0067..3df09aee3 100644 --- a/Olive.Mvc/Attributes/ConditionalValidators/OliveValidationAttributeAdapterProvider.cs +++ b/Olive.Mvc/Attributes/ConditionalValidators/OliveValidationAttributeAdapterProvider.cs @@ -1,11 +1,9 @@ -using Microsoft.AspNetCore.Mvc.DataAnnotations; -using Microsoft.AspNetCore.Mvc.DataAnnotations.Internal; -using Microsoft.Extensions.Localization; -using Olive; -using System; -using System.Collections.Generic; +using System; using System.ComponentModel.DataAnnotations; -using System.Text; +using System.Globalization; +using Microsoft.AspNetCore.Mvc.DataAnnotations; +using Microsoft.AspNetCore.Mvc.ModelBinding.Validation; +using Microsoft.Extensions.Localization; namespace Olive.Mvc { @@ -33,4 +31,59 @@ public IAttributeAdapter GetAttributeAdapter(ValidationAttribute attribute, else return baseProvider.GetAttributeAdapter(attribute, stringLocalizer); } } + + internal class RangeAttributeAdapter : AttributeAdapterBase + { + readonly string _max, _min; + + public RangeAttributeAdapter(RangeAttribute attribute, IStringLocalizer stringLocalizer) : base(attribute, stringLocalizer) + { + attribute.IsValid(3); + + _max = Convert.ToString(Attribute.Maximum, CultureInfo.InvariantCulture); + _min = Convert.ToString(Attribute.Minimum, CultureInfo.InvariantCulture); + } + + public override void AddValidation(ClientModelValidationContext context) + { + MergeAttribute(context.Attributes, "data-val", "true"); + MergeAttribute(context.Attributes, "data-val-range", GetErrorMessage(context)); + MergeAttribute(context.Attributes, "data-val-range-max", _max); + MergeAttribute(context.Attributes, "data-val-range-min", _min); + } + + public override string GetErrorMessage(ModelValidationContextBase validationContext) + { + return GetErrorMessage(validationContext.ModelMetadata, validationContext.ModelMetadata.GetDisplayName(), Attribute.Minimum, Attribute.Maximum); + } + } + + internal class StringLengthAttributeAdapter : AttributeAdapterBase + { + readonly string _max, _min; + + public StringLengthAttributeAdapter(StringLengthAttribute attribute, IStringLocalizer stringLocalizer) + : base(attribute, stringLocalizer) + { + _max = Attribute.MaximumLength.ToString(CultureInfo.InvariantCulture); + _min = Attribute.MinimumLength.ToString(CultureInfo.InvariantCulture); + } + + public override void AddValidation(ClientModelValidationContext context) + { + MergeAttribute(context.Attributes, "data-val", "true"); + MergeAttribute(context.Attributes, "data-val-length", GetErrorMessage(context)); + + if (Attribute.MaximumLength != int.MaxValue) + MergeAttribute(context.Attributes, "data-val-length-max", _max); + + if (Attribute.MinimumLength != 0) + MergeAttribute(context.Attributes, "data-val-length-min", _min); + } + + public override string GetErrorMessage(ModelValidationContextBase ctx) + { + return GetErrorMessage(ctx.ModelMetadata, ctx.ModelMetadata.GetDisplayName(), Attribute.MaximumLength, Attribute.MinimumLength); + } + } } diff --git a/Olive.Mvc/Binding/OliveBinderProvider.cs b/Olive.Mvc/Binding/OliveBinderProvider.cs index a5a36d352..a46134a09 100644 --- a/Olive.Mvc/Binding/OliveBinderProvider.cs +++ b/Olive.Mvc/Binding/OliveBinderProvider.cs @@ -1,6 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata; +using Microsoft.Extensions.Logging; using Olive.Entities; using System; using System.Collections.Concurrent; @@ -26,7 +27,7 @@ IModelBinder IModelBinderProvider.GetBinder(ModelBinderProviderContext context) var propertyBinders = GetProperties(context.Metadata) .ToDictionary(property => property, context.CreateBinder); - return new OliveModelBinder(propertyBinders); + return new OliveModelBinder(propertyBinders, Context.Current.GetService()); } if (modelType.IsA()) return new ListSortExpressionBinder(); diff --git a/Olive.Mvc/Binding/OliveModelBinder.cs b/Olive.Mvc/Binding/OliveModelBinder.cs index 9dc84862a..8b79a48d3 100644 --- a/Olive.Mvc/Binding/OliveModelBinder.cs +++ b/Olive.Mvc/Binding/OliveModelBinder.cs @@ -1,5 +1,6 @@ using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.ModelBinding.Binders; +using Microsoft.Extensions.Logging; using System; using System.Collections; using System.Collections.Generic; @@ -12,7 +13,7 @@ public class OliveModelBinder : ComplexTypeModelBinder { readonly IDictionary PropertyBinders; - public OliveModelBinder(IDictionary propertyBinders) : base(propertyBinders) => + public OliveModelBinder(IDictionary propertyBinders, ILoggerFactory loggerFactory) : base(propertyBinders, loggerFactory) => PropertyBinders = propertyBinders; protected override Task BindProperty(ModelBindingContext bindingContext) diff --git a/Olive.Mvc/JavaScript/Controller.cs b/Olive.Mvc/JavaScript/Controller.cs index ad26015a0..e4a52b3a5 100644 --- a/Olive.Mvc/JavaScript/Controller.cs +++ b/Olive.Mvc/JavaScript/Controller.cs @@ -1,6 +1,5 @@ -using Microsoft.AspNetCore.Http; +using System; using Microsoft.AspNetCore.Mvc; -using System; namespace Olive.Mvc { diff --git a/Olive.Mvc/Olive.Mvc.csproj b/Olive.Mvc/Olive.Mvc.csproj index 448b03a95..ada5db4cc 100644 --- a/Olive.Mvc/Olive.Mvc.csproj +++ b/Olive.Mvc/Olive.Mvc.csproj @@ -1,9 +1,9 @@  - netcoreapp2.1 + netcoreapp3.1 ..\bin\ - ..\bin\netcoreapp2.1\Olive.Mvc.xml + ..\bin\netcoreapp3.1\Olive.Mvc.xml 1701;1702;1705;1591;1573;NU1701 Olive.Mvc Olive MVC @@ -12,21 +12,19 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Mvc Utilities for Olive - 2.1.0.0 - 2.1.0.0 - 2.1.170 + 3.1.0.0 + 3.1.0.0 + Library + 3.1.102 + 3.1.103 - - - + + + + - - ..\bin\netstandard2.0\Olive.dll - false - false - ..\bin\netstandard2.0\Olive.Audit.dll @@ -40,15 +38,6 @@ false false - - ..\bin\netcoreapp2.1\Olive.Mvc.Security.dll - false - - - ..\bin\netcoreapp2.1\Olive.Web.dll - false - false - diff --git a/Olive.Mvc/Properties/launchSettings.json b/Olive.Mvc/Properties/launchSettings.json new file mode 100644 index 000000000..1facfe5cd --- /dev/null +++ b/Olive.Mvc/Properties/launchSettings.json @@ -0,0 +1,27 @@ +{ + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:27188/", + "sslPort": 44368 + } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Olive.Mvc": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:5001;http://localhost:5000" + } + } +} \ No newline at end of file diff --git a/Olive.Mvc/Utilities/Controller.File.cs b/Olive.Mvc/Utilities/Controller.File.cs index 361825b2b..947045a86 100644 --- a/Olive.Mvc/Utilities/Controller.File.cs +++ b/Olive.Mvc/Utilities/Controller.File.cs @@ -6,7 +6,7 @@ namespace Olive.Mvc { - partial class Controller : Microsoft.AspNetCore.Mvc.Controller + partial class Controller { /// /// Gets a FilePathResult based on the file's path. It sets the mime type based on the file's extension. diff --git a/Olive.Mvc/Utilities/ReferencesMetadataReferenceFeatureProvider.cs b/Olive.Mvc/Utilities/ReferencesMetadataReferenceFeatureProvider.cs index ef12f9d61..074a7178b 100644 --- a/Olive.Mvc/Utilities/ReferencesMetadataReferenceFeatureProvider.cs +++ b/Olive.Mvc/Utilities/ReferencesMetadataReferenceFeatureProvider.cs @@ -1,58 +1,58 @@ -using Microsoft.AspNetCore.Mvc.ApplicationParts; -using Microsoft.AspNetCore.Mvc.Razor.Compilation; -using Microsoft.CodeAnalysis; -using Microsoft.Extensions.DependencyModel; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection.PortableExecutable; +//using Microsoft.AspNetCore.Mvc.ApplicationParts; +//using Microsoft.AspNetCore.Mvc.Razor.Compilation; +//using Microsoft.CodeAnalysis; +//using Microsoft.Extensions.DependencyModel; +//using System; +//using System.Collections.Generic; +//using System.IO; +//using System.Linq; +//using System.Reflection.PortableExecutable; -namespace Olive.Mvc -{ - public class ReferencesMetadataReferenceFeatureProvider : IApplicationFeatureProvider - { - public void PopulateFeature(IEnumerable parts, MetadataReferenceFeature feature) - { - var libraryPaths = new HashSet(StringComparer.OrdinalIgnoreCase); - foreach (var assemblyPart in parts.OfType()) - { - var dependencyContext = DependencyContext.Load(assemblyPart.Assembly); - if (dependencyContext != null) - { - foreach (var library in dependencyContext.CompileLibraries) - { - if (string.Equals("reference", library.Type, StringComparison.OrdinalIgnoreCase)) - { - foreach (var libraryAssembly in library.Assemblies) - libraryPaths.Add(AppDomain.CurrentDomain.GetBaseDirectory().GetFile(libraryAssembly).FullName); - } - else - { - foreach (var path in library.ResolveReferencePaths()) - libraryPaths.Add(path); - } - } - } - else - { - libraryPaths.Add(assemblyPart.Assembly.Location); - } - } +//namespace Olive.Mvc +//{ +// public class ReferencesMetadataReferenceFeatureProvider : IApplicationFeatureProvider +// { +// public void PopulateFeature(IEnumerable parts, MetadataReferenceFeature feature) +// { +// var libraryPaths = new HashSet(StringComparer.OrdinalIgnoreCase); +// foreach (var assemblyPart in parts.OfType()) +// { +// var dependencyContext = DependencyContext.Load(assemblyPart.Assembly); +// if (dependencyContext != null) +// { +// foreach (var library in dependencyContext.CompileLibraries) +// { +// if (string.Equals("reference", library.Type, StringComparison.OrdinalIgnoreCase)) +// { +// foreach (var libraryAssembly in library.Assemblies) +// libraryPaths.Add(AppDomain.CurrentDomain.GetBaseDirectory().GetFile(libraryAssembly).FullName); +// } +// else +// { +// foreach (var path in library.ResolveReferencePaths()) +// libraryPaths.Add(path); +// } +// } +// } +// else +// { +// libraryPaths.Add(assemblyPart.Assembly.Location); +// } +// } - foreach (var path in libraryPaths) - feature.MetadataReferences.Add(CreateMetadataReference(path)); - } +// foreach (var path in libraryPaths) +// feature.MetadataReferences.Add(CreateMetadataReference(path)); +// } - static MetadataReference CreateMetadataReference(string path) - { - using (var stream = File.OpenRead(path)) - { - var moduleMetadata = ModuleMetadata.CreateFromStream(stream, PEStreamOptions.PrefetchMetadata); - var assemblyMetadata = AssemblyMetadata.Create(moduleMetadata); +// static MetadataReference CreateMetadataReference(string path) +// { +// using (var stream = File.OpenRead(path)) +// { +// var moduleMetadata = ModuleMetadata.CreateFromStream(stream, PEStreamOptions.PrefetchMetadata); +// var assemblyMetadata = AssemblyMetadata.Create(moduleMetadata); - return assemblyMetadata.GetReference(filePath: path); - } - } - } -} +// return assemblyMetadata.GetReference(filePath: path); +// } +// } +// } +//} diff --git a/Olive.Mvc/Utilities/Startup.cs b/Olive.Mvc/Utilities/Startup.cs index d7d91ac99..b66ed83cf 100644 --- a/Olive.Mvc/Utilities/Startup.cs +++ b/Olive.Mvc/Utilities/Startup.cs @@ -1,4 +1,8 @@ -using Microsoft.AspNetCore.Authentication; +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -7,20 +11,15 @@ using Microsoft.AspNetCore.Mvc.Infrastructure; using Microsoft.AspNetCore.Mvc.ModelBinding; using Microsoft.AspNetCore.Mvc.Razor; -using Microsoft.AspNetCore.Mvc.Razor.Compilation; using Microsoft.AspNetCore.Routing; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; +using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Logging; -using Newtonsoft.Json.Serialization; using Olive.Entities; using Olive.Entities.Data; using Olive.Security; -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Threading.Tasks; namespace Olive.Mvc { @@ -28,11 +27,11 @@ public abstract class Startup { const int DEFAULT_SESSION_TIMEOUT = 20; - protected readonly IHostingEnvironment Environment; + protected readonly IWebHostEnvironment Environment; protected readonly IConfiguration Configuration; protected IServiceCollection Services { get; private set; } - protected Startup(IHostingEnvironment env, IConfiguration config, ILoggerFactory loggerFactory) + protected Startup(IWebHostEnvironment env, IConfiguration config, ILoggerFactory loggerFactory) { Environment = env; Configuration = config; @@ -79,13 +78,13 @@ protected virtual void ConfigureMvc(IMvcBuilder mvc) { mvc.AddMvcOptions(x => x.ModelBinderProviders.Insert(0, new OliveBinderProvider())); - mvc.AddJsonOptions(o => o.SerializerSettings.ContractResolver = new DefaultContractResolver()); + // mvc.AddJsonOptions(o => o.SerializerSettings.ContractResolver = new DefaultContractResolver()); - mvc.ConfigureApplicationPartManager(manager => - { - manager.FeatureProviders.RemoveWhere(x => x is MetadataReferenceFeatureProvider); - manager.FeatureProviders.Add(new ReferencesMetadataReferenceFeatureProvider()); - }); + //mvc.ConfigureApplicationPartManager(manager => + //{ + // manager.FeatureProviders.RemoveWhere(x => x is MetadataReferenceFeatureProvider); + // manager.FeatureProviders.Add(new ReferencesMetadataReferenceFeatureProvider()); + //}); mvc.AddMvcOptions(options => { diff --git a/Olive.PDF/Olive.PDF.csproj b/Olive.PDF/Olive.PDF.csproj index a6cbb11bf..4a3c637a8 100644 --- a/Olive.PDF/Olive.PDF.csproj +++ b/Olive.PDF/Olive.PDF.csproj @@ -4,7 +4,6 @@ netstandard2.0 Olive.PDF Olive.PDF - 2.1.0.0 2.1.0.0 Olive PDF (Service) @@ -13,7 +12,7 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.1.102 + 2.1.106 ..\bin\ @@ -22,7 +21,7 @@ - + diff --git a/Olive.PassiveBackgroundTasks/Olive.PassiveBackgroundTasks.csproj b/Olive.PassiveBackgroundTasks/Olive.PassiveBackgroundTasks.csproj index 750700964..1bb41489b 100644 --- a/Olive.PassiveBackgroundTasks/Olive.PassiveBackgroundTasks.csproj +++ b/Olive.PassiveBackgroundTasks/Olive.PassiveBackgroundTasks.csproj @@ -1,5 +1,5 @@ - - + + netstandard2.0 ..\bin\ @@ -12,16 +12,17 @@ Olive Framework 1.0.0.13 1.0.0.13 - 1.0.13 + 1.0.14 - - + - - + + + + + - ..\bin\netstandard2.0\Olive.dll @@ -33,5 +34,4 @@ ..\bin\netstandard2.0\Olive.Entities.Data.dll - - + \ No newline at end of file diff --git a/Olive.PushNotification/Olive.PushNotification.csproj b/Olive.PushNotification/Olive.PushNotification.csproj index ddabb2326..472f4f412 100644 --- a/Olive.PushNotification/Olive.PushNotification.csproj +++ b/Olive.PushNotification/Olive.PushNotification.csproj @@ -5,7 +5,6 @@ ..\bin\ ..\bin\netstandard2.0\Olive.PushNotification.xml Olive.PushNotification - 2.1.0.0 2.1.0.0 Olive PushNotification (Service) @@ -14,17 +13,17 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.1.102 + 2.1.103 1701;1702;1705;1591;1573;NU1701 - - - - + + + + diff --git a/Olive.SMS/Olive.SMS.csproj b/Olive.SMS/Olive.SMS.csproj index c592aadca..bd32f18d1 100644 --- a/Olive.SMS/Olive.SMS.csproj +++ b/Olive.SMS/Olive.SMS.csproj @@ -12,7 +12,7 @@ http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.1.103 + 2.1.106 ..\bin\ @@ -21,9 +21,9 @@ - - - + + + diff --git a/Olive.Security.Aws/Olive.Security.Aws.csproj b/Olive.Security.Aws/Olive.Security.Aws.csproj index 0b72186e2..63e56210f 100644 --- a/Olive.Security.Aws/Olive.Security.Aws.csproj +++ b/Olive.Security.Aws/Olive.Security.Aws.csproj @@ -1,29 +1,33 @@  - netcoreapp2.1 + netcoreapp3.1 Olive.Security Olive.Security.Aws - 2.2.103 - 2.2.0.0 - 2.2.0.0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 Olive Security Aws Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework + 3.1.102 ..\bin\ - ..\bin\netcoreapp2.1\Olive.Security.Aws.xml + ..\bin\netcoreapp3.1\Olive.Security.Aws.xml 1701;1702;1705;1591;NU1701 - + - + + + + @@ -34,10 +38,6 @@ ..\bin\netstandard2.0\Olive.Aws.dll false - - ..\bin\netcoreapp2.1\Olive.Mvc.Security.dll - false - diff --git a/Olive.Security.Impersonation/Olive.Security.Impersonation.csproj b/Olive.Security.Impersonation/Olive.Security.Impersonation.csproj index c059a460e..9a8290971 100644 --- a/Olive.Security.Impersonation/Olive.Security.Impersonation.csproj +++ b/Olive.Security.Impersonation/Olive.Security.Impersonation.csproj @@ -1,29 +1,31 @@  - netcoreapp2.1 + netcoreapp3.1 Olive.Security.Impersonation Olive.Security.Impersonation - - 2.1.0.0 - 2.1.0.0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 Olive Security Impersonation Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.1.102 - - ..\bin\ - ..\bin\netcoreapp2.1\Olive.Security.Impersonation.xml + ..\bin\netcoreapp3.1\Olive.Security.Impersonation.xml 1701;1702;1705;1591;1573;NU1701 + 3.1.102 + + + + ..\bin\netstandard2.0\Olive.dll @@ -37,14 +39,6 @@ ..\bin\netstandard2.0\Olive.Entities.Data.dll false - - ..\bin\netcoreapp2.1\Olive.Mvc.Security.dll - false - - - ..\bin\netcoreapp2.1\Olive.Web.dll - false - diff --git a/Olive.Security/Olive.Mvc.Security.csproj b/Olive.Security/Olive.Mvc.Security.csproj index 5f4b66ca3..bd148865d 100644 --- a/Olive.Security/Olive.Mvc.Security.csproj +++ b/Olive.Security/Olive.Mvc.Security.csproj @@ -1,33 +1,34 @@  - netcoreapp2.1 + netcoreapp3.1 ..\bin - ..\bin\netcoreapp2.1\Olive.Mvc.Security.xml + ..\bin\netcoreapp3.1\Olive.Mvc.Security.xml NU1605 1701;1702;1705;1591;NU1701 Olive.Security Olive.Mvc.Security Olive.Mvc.Security - 2.2.0.0 - 2.2.0.0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 Olive Mvc Security Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.2.106 + 3.1.102 - + + + + + - - ..\bin\netstandard2.0\Olive.dll - false - ..\bin\netstandard2.0\Olive.Encryption.dll false @@ -36,10 +37,6 @@ ..\bin\netstandard2.0\Olive.Entities.dll false - - ..\bin\netcoreapp2.1\Olive.Web.dll - false - diff --git a/Olive.Security/OliveSecurityExtensions.cs b/Olive.Security/OliveSecurityExtensions.cs index 69252cd95..2454cf874 100644 --- a/Olive.Security/OliveSecurityExtensions.cs +++ b/Olive.Security/OliveSecurityExtensions.cs @@ -1,12 +1,12 @@ using Microsoft.AspNetCore.Authentication; -using Microsoft.IdentityModel.Tokens; using Olive.Security; using System; using System.Collections.Generic; -using System.IdentityModel.Tokens.Jwt; using System.Security.Claims; using System.Threading.Tasks; using System.Linq; +using Microsoft.IdentityModel.Tokens; +using System.IdentityModel.Tokens.Jwt; namespace Olive { diff --git a/Olive.Web/Olive.Web.csproj b/Olive.Web/Olive.Web.csproj index 36f93b1c9..9848efdba 100644 --- a/Olive.Web/Olive.Web.csproj +++ b/Olive.Web/Olive.Web.csproj @@ -1,32 +1,32 @@  - netcoreapp2.1 + netcoreapp3.1 Olive.Web Olive.Web ..\bin\ - ..\bin\netcoreapp2.1\Olive.Web.xml + ..\bin\netcoreapp3.1\Olive.Web.xml 1701;1702;1705;1591;1573;NU1701 Olive.Web - 2.2.0.0 - 2.2.0.0 + 3.1.0.0 + 3.1.0.1 + 3.1.100 Olive Web Geeks Ltd https://github.com/Geeksltd/Olive http://licensing.msharp.co.uk/Images/OliveComponent.png Copyright ©2020 Geeks Ltd - All rights reserved. Olive Framework - 2.2.106 + 3.1.101 - + + + + - - ..\bin\netstandard2.0\Olive.dll - false - ..\bin\netstandard2.0\Olive.ApiClient.dll false diff --git a/Olive.sln b/Olive.sln index c5a491754..26be3561d 100644 --- a/Olive.sln +++ b/Olive.sln @@ -158,6 +158,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Mvc.Recaptcha", "Oliv EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Olive.Blob.Azure", "Olive.Blob.Azure\Olive.Blob.Azure.csproj", "{5F0FEF65-84C0-4DA5-A859-E67FC401778C}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetStandard", "NetStandard", "{50102A6B-6A9D-47FE-B21B-1968F24A4CCF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NetCore", "NetCore", "{B08CEA40-4865-41AF-94CA-AC59E2513A11}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AWS", "AWS", "{6A937A37-1CEC-4347-9594-C471645B43DA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Entities", "Entities", "{4F5D9D95-8E6C-40CE-84EE-3D2157EB8928}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Distributed", "Distributed", "{F9E4B82C-F72E-4D58-A31B-1E971182A29A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Services", "Services", "{BC185AF9-EC42-4926-B45D-2261E63FF0F0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -424,8 +436,43 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {EF844D85-7C45-4725-B033-DBC6111C5F7F} = {50102A6B-6A9D-47FE-B21B-1968F24A4CCF} + {81D870C8-EA2A-46DA-A936-0D4D520B2C32} = {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} + {35B19C59-D221-47AF-AAC6-F9CEB0953FFB} = {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} + {EA922ABB-FF72-4C92-B5BE-C4FEAF5AC168} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {AB221943-A14F-4817-BAA6-A6829841EA51} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {50ABA031-EAD6-4554-AC73-8BCA56C637B2} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {253531A7-A460-4D61-9A85-A3E29B33AA94} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {5EE54E7F-07C7-4966-9EFA-5E2252206B77} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {5B7D4B8F-66B2-4A74-A42F-37298CF1878F} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {2CCA47DA-038F-4C63-8E7F-9F4A9296BB44} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {55390C42-F8DE-4089-B079-74E18714236D} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {816FFC81-38E0-442C-8236-742551AC8AFC} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {E66479DB-792B-4A2F-AA03-DEAAB128CE94} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {4C446033-19E3-4D88-B4A2-AE2D5190AF41} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {08ADF968-0FFF-4E3C-88EC-E04E2FA94D13} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} {D6CB3117-1CB6-4263-AE89-37483A0379B9} = {E51A8EF6-624C-45C9-AC5C-6DE92BF1825D} + {8BE6BB58-FFF0-4057-9027-94CF7B96A0E3} = {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} + {8614E659-EA39-4D64-B014-A4ED525EE045} = {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} + {33375385-4384-4BBF-9955-B2927FB1AA74} = {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} + {52AF0D90-E65E-450C-877B-95B831B35694} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {EE70F844-B284-42D1-8565-45B153727A1B} = {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} + {7FF67EEC-A5F7-46C3-BE96-0CF1A76706B6} = {F9E4B82C-F72E-4D58-A31B-1E971182A29A} + {2A273AE2-5D6A-491A-809B-71764F35281E} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {0019E42E-F830-439C-9911-DF36142BACB0} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {3CFA0862-652F-493B-B06F-6873A0B52271} = {F9E4B82C-F72E-4D58-A31B-1E971182A29A} + {77A2DD2F-8249-4140-B9D4-7F80FECAB405} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {6D544D10-9E8B-47E8-AB51-D6F504B1F5EF} = {F9E4B82C-F72E-4D58-A31B-1E971182A29A} + {6C81363C-E71F-4999-80A4-AF42FAF69D04} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} {4E848AF4-85B4-4B47-82FB-C78C337573C9} = {E51A8EF6-624C-45C9-AC5C-6DE92BF1825D} + {4F36784E-BBBB-4CE4-A491-8BB1BD0CCB35} = {50102A6B-6A9D-47FE-B21B-1968F24A4CCF} + {CA96897D-00EA-4554-8EE1-06F42939ECA3} = {50102A6B-6A9D-47FE-B21B-1968F24A4CCF} + {A504705A-BAAA-447D-A15F-C99BEFF296F7} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {012CB6E2-AA00-4BEB-93A4-B6BBF5770341} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {64B3426B-0ECF-4478-AD84-F29E5030AF15} = {6A937A37-1CEC-4347-9594-C471645B43DA} + {AC924CEE-42AD-4E5C-BDEA-D100DDBF9341} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {AA08CBC6-3923-491D-A9E3-22BA46E56DA1} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {C001382C-3FB6-4CAA-8A28-D469D867B7ED} = {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} {B67F7B8C-3B04-45AC-8D5A-442EC14C68FC} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} {CF8E08B3-684E-4A1A-8141-5FDE29B2FA11} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} {E613709B-D776-41D5-BDBF-5386B6DB186B} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} @@ -435,7 +482,26 @@ Global {A0B60121-F4AB-4D29-8863-C3DE2DCABEE1} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} {641E5318-DADD-48AE-9DBD-0BF74883D577} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} {126292EE-733D-4C27-8343-E38A310B72F1} = {E51A8EF6-624C-45C9-AC5C-6DE92BF1825D} + {CE18C25B-E11F-429F-A3B3-F23C30B00731} = {F9E4B82C-F72E-4D58-A31B-1E971182A29A} + {0E4F7C8B-D7C4-4EFF-9163-0DD377E7CAF1} = {6A937A37-1CEC-4347-9594-C471645B43DA} + {BFDA766C-CEA4-4318-86B4-F3E094B7B502} = {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} + {E107920A-21F0-43C4-93BE-47CE0F2797C7} = {F9E4B82C-F72E-4D58-A31B-1E971182A29A} + {AD1AE4FD-141B-4F0A-8A8D-6D92E843F817} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {692A994A-178E-474F-989E-C6B1196ABD04} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {C366BDD1-CEA8-4D62-8473-8F04B8AF0F86} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {C4C25FC8-80AE-4292-BC28-2E91B7F3DBBB} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {F5475043-F394-4B67-BF3F-AE192179F7A9} = {BC185AF9-EC42-4926-B45D-2261E63FF0F0} + {0AD86AF8-5F92-43FB-91DF-84E9C1DB7F38} = {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} + {D9DCB1FC-5367-40EB-BD0C-0CE0AF14972F} = {50102A6B-6A9D-47FE-B21B-1968F24A4CCF} + {E235C02C-0BAA-4E69-BAD2-3C7D7AE5BA2A} = {6A937A37-1CEC-4347-9594-C471645B43DA} {A03434B4-E606-4928-B798-A9EB34DC3ADC} = {7104C604-DB4B-4766-A61D-17FA1A57EFDD} + {2C67A6F3-778A-48F6-BE78-14963E457629} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {6EECDDF0-6E2E-4063-AB0F-EEFAAEE544A8} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {5F0FEF65-84C0-4DA5-A859-E67FC401778C} = {B08CEA40-4865-41AF-94CA-AC59E2513A11} + {6A937A37-1CEC-4347-9594-C471645B43DA} = {50102A6B-6A9D-47FE-B21B-1968F24A4CCF} + {4F5D9D95-8E6C-40CE-84EE-3D2157EB8928} = {50102A6B-6A9D-47FE-B21B-1968F24A4CCF} + {F9E4B82C-F72E-4D58-A31B-1E971182A29A} = {50102A6B-6A9D-47FE-B21B-1968F24A4CCF} + {BC185AF9-EC42-4926-B45D-2261E63FF0F0} = {50102A6B-6A9D-47FE-B21B-1968F24A4CCF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B8459027-6FAF-42E6-B8A8-4887D7730704} diff --git a/Olive/Olive.csproj b/Olive/Olive.csproj index 1894ee294..3c1b16d24 100644 --- a/Olive/Olive.csproj +++ b/Olive/Olive.csproj @@ -14,7 +14,7 @@ Olive Framework 2.1.0.0 2.1.0.0 - 2.1.194 + 2.1.196 Auto @@ -28,11 +28,11 @@ - - - - - + + + + + diff --git a/Tests/Olive.Email.Tests/Olive.Email.Tests.csproj b/Tests/Olive.Email.Tests/Olive.Email.Tests.csproj index 0374051b3..4a1f7b08c 100644 --- a/Tests/Olive.Email.Tests/Olive.Email.Tests.csproj +++ b/Tests/Olive.Email.Tests/Olive.Email.Tests.csproj @@ -22,9 +22,9 @@ - - - + + + diff --git a/Tests/Olive.Entities.Data.MySql.Tests/Olive.Entities.Data.MySql.Tests.csproj b/Tests/Olive.Entities.Data.MySql.Tests/Olive.Entities.Data.MySql.Tests.csproj index f7cfe2b7e..86e205306 100644 --- a/Tests/Olive.Entities.Data.MySql.Tests/Olive.Entities.Data.MySql.Tests.csproj +++ b/Tests/Olive.Entities.Data.MySql.Tests/Olive.Entities.Data.MySql.Tests.csproj @@ -22,9 +22,9 @@ - - - + + + diff --git a/Tests/Olive.Entities.Tests/Olive.Entities.Tests.csproj b/Tests/Olive.Entities.Tests/Olive.Entities.Tests.csproj index cd89d6fa0..6f9b6edc3 100644 --- a/Tests/Olive.Entities.Tests/Olive.Entities.Tests.csproj +++ b/Tests/Olive.Entities.Tests/Olive.Entities.Tests.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/Tests/Olive.GeoLocation.Tests/Olive.GeoLocation.Tests.csproj b/Tests/Olive.GeoLocation.Tests/Olive.GeoLocation.Tests.csproj index a07fd8d21..0f838397a 100644 --- a/Tests/Olive.GeoLocation.Tests/Olive.GeoLocation.Tests.csproj +++ b/Tests/Olive.GeoLocation.Tests/Olive.GeoLocation.Tests.csproj @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/Tests/Olive.PushNotification.Tests/Olive.PushNotification.Tests.csproj b/Tests/Olive.PushNotification.Tests/Olive.PushNotification.Tests.csproj index 63e20335d..e64d7be18 100644 --- a/Tests/Olive.PushNotification.Tests/Olive.PushNotification.Tests.csproj +++ b/Tests/Olive.PushNotification.Tests/Olive.PushNotification.Tests.csproj @@ -22,10 +22,10 @@ - - - - + + + + diff --git a/Tests/Olive.Tests/Olive.Tests.csproj b/Tests/Olive.Tests/Olive.Tests.csproj index 9b32744ce..e36ec0889 100644 --- a/Tests/Olive.Tests/Olive.Tests.csproj +++ b/Tests/Olive.Tests/Olive.Tests.csproj @@ -11,15 +11,15 @@ - - - - - - - - - + + + + + + + + +