Solve Conflicts

Geeksltd · Aug 15, 2023 · f79b930 · f79b930
2 parents d88a771 + 8e99192
commit f79b930
Show file tree

Hide file tree

Showing 46 changed files with 1,170 additions and 388 deletions.
diff --git a/.github/workflows/publish_Olive.yml b/.github/workflows/publish_Olive.yml
@@ -250,6 +250,12 @@ jobs:
         PROJECT_FILE_PATH: Olive.Hangfire/Olive.Hangfire.csproj
         NUGET_KEY: ${{secrets.NUGET_API_KEY}}
 
+    - name: Publish Olive Hangfire Cron NuGet Package
+      uses: Geeksltd/publish-nuget@v2
+      with:
+        PROJECT_FILE_PATH: Olive.Hangfire.Cron/Olive.Hangfire.Cron.csproj
+        NUGET_KEY: ${{secrets.NUGET_API_KEY}}
+
     - name: Publish Olive Hangfire MySql NuGet Package
       uses: Geeksltd/publish-nuget@v2
       with:

diff --git a/Olive.ApiClient/Olive.ApiClient.csproj b/Olive.ApiClient/Olive.ApiClient.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.2.111</Version>
+    <Version>2.2.112</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj b/Olive.Audit.DatabaseLogger/Olive.Audit.DatabaseLogger.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.110</Version>
+    <Version>2.1.112</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Audit/Olive.Audit.csproj b/Olive.Audit/Olive.Audit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.119</Version>
+    <Version>2.1.121</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Azure.EventBus/Olive.Azure.EventBus.csproj b/Olive.Azure.EventBus/Olive.Azure.EventBus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.0.8</Version>
+    <Version>1.0.9</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Azure/Olive.Azure.csproj b/Olive.Azure/Olive.Azure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.0.10</Version>
+    <Version>1.0.11</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.AzureSearch/Olive.AzureSearch.csproj b/Olive.AzureSearch/Olive.AzureSearch.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.CSV/Olive.Csv.csproj b/Olive.CSV/Olive.Csv.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.114</Version>
+    <Version>2.1.115</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Cloud/Olive.Cloud.csproj b/Olive.Cloud/Olive.Cloud.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.0.6</Version>
+    <Version>1.0.8</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Compression/Olive.Compression.csproj b/Olive.Compression/Olive.Compression.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.112</Version>
+    <Version>2.1.113</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Console/Olive.Console.csproj b/Olive.Console/Olive.Console.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.117</Version>
+    <Version>2.1.119</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Drawing/Olive.Drawing.csproj b/Olive.Drawing/Olive.Drawing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.112</Version>
+    <Version>2.1.113</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/Olive.Email/Olive.Email.csproj b/Olive.Email/Olive.Email.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Version>3.1.115</Version>
+    <Version>3.1.116</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Encryption/Olive.Encryption.csproj b/Olive.Encryption/Olive.Encryption.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.2.112</Version>
+    <Version>2.2.113</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj b/Olive.Entities.Cache.Redis/Olive.Entities.Cache.Redis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.107</Version>
+    <Version>2.1.108</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Entities.Data.DynamoDB/Olive.Entities.Data.DynamoDB.csproj b/Olive.Entities.Data.DynamoDB/Olive.Entities.Data.DynamoDB.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.0.19</Version>
+    <Version>1.0.20</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj b/Olive.Entities.Data.MySql/Olive.Entities.Data.MySql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.121</Version>
+    <Version>2.1.122</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj b/Olive.Entities.Data.PostgreSQL/Olive.Entities.Data.PostgreSQL.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.116</Version>
+    <Version>2.1.117</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ies.Data.Replication.Mvc.Extensions/Olive.Entities.Data.Replication.Mvc.Extensions.csproj b/...ies.Data.Replication.Mvc.Extensions/Olive.Entities.Data.Replication.Mvc.Extensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.187</Version>
+    <Version>2.1.188</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...Data.Replication.QueueUrlProvider/Olive.Entities.Data.Replication.QueueUrlProvider.csproj b/...Data.Replication.QueueUrlProvider/Olive.Entities.Data.Replication.QueueUrlProvider.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.0.3</Version>
+    <Version>1.0.4</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj b/Olive.Entities.Data.Replication/Olive.Entities.Data.Replication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.195</Version>
+    <Version>2.1.196</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj b/Olive.Entities.Data.SQLite/Olive.Entities.Data.SQLite.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.116</Version>
+    <Version>2.1.117</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj b/Olive.Entities.Data.SqlServer/Olive.Entities.Data.SqlServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.121</Version>
+    <Version>2.1.122</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Entities.Data/Olive.Entities.Data.csproj b/Olive.Entities.Data/Olive.Entities.Data.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.195</Version>
+    <Version>2.1.196</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Entities/Olive.Entities.csproj b/Olive.Entities/Olive.Entities.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.187</Version>
+    <Version>2.1.189</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.EventBus/Olive.EventBus.csproj b/Olive.EventBus/Olive.EventBus.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.137</Version>
+    <Version>2.1.138</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Export/Olive.Export.csproj b/Olive.Export/Olive.Export.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.112</Version>
+    <Version>2.1.113</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.GeoLocation/Olive.GeoLocation.csproj b/Olive.GeoLocation/Olive.GeoLocation.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>2.1.113</Version>
+		<Version>2.1.114</Version>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/Olive.Globalization/Olive.Globalization.csproj b/Olive.Globalization/Olive.Globalization.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>2.1.113</Version>
+    <Version>2.1.114</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Olive.Gpt/Olive.Gpt.csproj b/Olive.Gpt/Olive.Gpt.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>1.0.100</Version>
+    <Version>1.0.102</Version>
   </PropertyGroup>
 
   <ItemGroup>