Merge pull request #23 from cloudscribe/netcore31

JimKerslake · web-flow · commit 1647b72384e4 · 2020-08-14T17:09:43.000+01:00
merge Netcore31 upgrade branch
diff --git a/src/cloudscribe.Kvp.Models/cloudscribe.Kvp.Models.csproj b/src/cloudscribe.Kvp.Models/cloudscribe.Kvp.Models.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>model classes for key/value storage</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard1.6</TargetFrameworks>
     <PackageTags>cloudscribe;kvp</PackageTags>
diff --git a/src/cloudscribe.Kvp.Storage.EFCore.Common/cloudscribe.Kvp.Storage.EFCore.Common.csproj b/src/cloudscribe.Kvp.Storage.EFCore.Common/cloudscribe.Kvp.Storage.EFCore.Common.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
    <Description>Entity Framework Core common classes for cloudscribe.Kvp</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -22,9 +22,9 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/cloudscribe.Kvp.Storage.EFCore.MSSQL/StartupExtensions.cs b/src/cloudscribe.Kvp.Storage.EFCore.MSSQL/StartupExtensions.cs
@@ -34,12 +34,10 @@ public static IServiceCollection AddCloudscribeKvpEFStorageMSSQL(
                                     maxRetryDelay: TimeSpan.FromSeconds(maxConnectionRetryDelaySeconds),
                                     errorNumbersToAdd: transientSqlErrorNumbersToAdd);
                             }
-
-                            if (useSql2008Compatibility)
-                            {
-                                sqlOptions.UseRowNumberForPaging();
-                            }
-
+                            //if (useSql2008Compatibility)
+                            //{
+                            //    sqlOptions.UseRowNumberForPaging();
+                            //}
                         }),
                         optionsLifetime: ServiceLifetime.Singleton
                         );
@@ -48,7 +46,6 @@ public static IServiceCollection AddCloudscribeKvpEFStorageMSSQL(
             services.AddSingleton<IKvpDbContextFactory, KvpDbContextFactory>();
             services.AddScoped<IVersionProvider, VersionProvider>();
 
-
             return services;
         }
     }
diff --git a/src/cloudscribe.Kvp.Storage.EFCore.MSSQL/cloudscribe.Kvp.Storage.EFCore.MSSQL.csproj b/src/cloudscribe.Kvp.Storage.EFCore.MSSQL/cloudscribe.Kvp.Storage.EFCore.MSSQL.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
   <Description>Entity Framework Core common classes for cloudscribe.Kvp</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 	  <PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -24,11 +24,11 @@
   
   <ItemGroup>
     <PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
   </ItemGroup>
  
 
diff --git a/src/cloudscribe.Kvp.Storage.EFCore.MySql/cloudscribe.Kvp.Storage.EFCore.MySql.csproj b/src/cloudscribe.Kvp.Storage.EFCore.MySql/cloudscribe.Kvp.Storage.EFCore.MySql.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <Description>MySql Entity Framework Core storage for cloudscribe.Kvp</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackageTags>cloudscribe;kvp;commands;queries;ef</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -25,12 +25,12 @@
   
   <ItemGroup>
     <PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.0.0-*" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/cloudscribe.Kvp.Storage.EFCore.PostgreSql/cloudscribe.Kvp.Storage.EFCore.PostgreSql.csproj b/src/cloudscribe.Kvp.Storage.EFCore.PostgreSql/cloudscribe.Kvp.Storage.EFCore.PostgreSql.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <Description>Entity Framework Core postgresql storage for cloudscribe.Kvp</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackageTags>cloudscribe;kvp;commands;ef</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -26,13 +26,13 @@
 
   <ItemGroup>
     <PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.0" />
-    <PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="3.0.2" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.0" />
+    <PackageReference Include="cloudscribe.EFCore.PostgreSql.Conventions" Version="4.1.0" />	
 
   </ItemGroup>
 
diff --git a/src/cloudscribe.Kvp.Storage.EFCore.SQLite/cloudscribe.Kvp.Storage.EFCore.SQLite.csproj b/src/cloudscribe.Kvp.Storage.EFCore.SQLite/cloudscribe.Kvp.Storage.EFCore.SQLite.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <Description>Entity Framework Core SQLite storage for cloudscribe.Kvp</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackageTags>cloudscribe;kvp;ef</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -24,15 +24,13 @@
 
   <ItemGroup>
     <PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.0" />
 
   </ItemGroup>
 
-  
-
 </Project>
diff --git a/src/cloudscribe.Kvp.Storage.EFCore.pgsql/cloudscribe.Kvp.Storage.EFCore.pgsql.csproj b/src/cloudscribe.Kvp.Storage.EFCore.pgsql/cloudscribe.Kvp.Storage.EFCore.pgsql.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <Description>Entity Framework Core postgresql storage for cloudscribe.Kvp</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 	  <PackageTags>cloudscribe;kvp;commands;ef</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -26,12 +26,12 @@
   
    <ItemGroup>
     <PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.0" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.0" />
      
   </ItemGroup>
 
diff --git a/src/cloudscribe.Kvp.Storage.NoDb/cloudscribe.Kvp.Storage.NoDb.csproj b/src/cloudscribe.Kvp.Storage.NoDb/cloudscribe.Kvp.Storage.NoDb.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>NoDb storage for cloudscribe key/value models. NoDb storage is only recommended for small sites.</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageTags>cloudscribe;kvp;nodb</PackageTags>
diff --git a/src/cloudscribe.UserProperties.Kvp/cloudscribe.UserProperties.Kvp.csproj b/src/cloudscribe.UserProperties.Kvp/cloudscribe.UserProperties.Kvp.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <Description>Configurable custom user properties for cloudscribe core using per tenant or global configuration based custom proprties with key/value storage</Description>
-    <Version>4.0.1</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <PackageTags>cloudscribe;userprofile;customization</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -22,9 +22,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Core.Models" Version="4.0.0" />
-    <PackageReference Include="cloudscribe.Core.Identity" Version="4.0.0" />
-    <PackageReference Include="cloudscribe.Core.Web" Version="4.0.6" />
+    <PackageReference Include="cloudscribe.Core.Models" Version="4.1.0" />
+    <PackageReference Include="cloudscribe.Core.Identity" Version="4.1.0" />
+    <PackageReference Include="cloudscribe.Core.Web" Version="4.1.0" />
     <PackageReference Include="cloudscribe.Versioning" Version="1.0.0" />
 
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0" />
diff --git a/src/cloudscribe.UserProperties/cloudscribe.UserProperties.csproj b/src/cloudscribe.UserProperties/cloudscribe.UserProperties.csproj
@@ -2,9 +2,9 @@
 
   <PropertyGroup>
     <Description>Models for custom user properties that can be configured per tenant for cloudscribe core customization</Description>
-    <Version>4.0.0</Version>
+    <Version>4.1.0</Version>
     <Authors>Joe Audette</Authors>
-    <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <PackageTags>cloudscribe;userprofile;customization</PackageTags>
     <PackageIcon>icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/cloudscribe/cloudscribe.UserProperties.Kvp</PackageProjectUrl>
@@ -22,15 +22,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="cloudscribe.Core.Models" Version="4.0.0" />
-    <PackageReference Include="cloudscribe.Web.Common" Version="4.0.1" />
+    <PackageReference Include="cloudscribe.Core.Models" Version="4.1.0" />
+    <PackageReference Include="cloudscribe.Web.Common" Version="4.1.0" />
 
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Localization" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />
-   
   </ItemGroup>
   
 </Project>
diff --git a/src/sourceDev.WebApp/Properties/launchSettings.json b/src/sourceDev.WebApp/Properties/launchSettings.json
@@ -3,8 +3,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:5000/",
-      "sslPort": 5001
+        "applicationUrl": "http://localhost:43174/",
+        "sslPort": 44366
     }
   },
   "profiles": {
@@ -25,20 +25,18 @@
     "sourceDev.WebApp - Development": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      }
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
     },
     "sourceDev.WebApp - Production": {
       "commandName": "Project",
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Production"
-      }
+      },
+      "applicationUrl": "https://localhost:5001;http://localhost:5000"
     }
-
-
   }
-}
+}
diff --git a/src/sourceDev.WebApp/appsettings.json b/src/sourceDev.WebApp/appsettings.json
diff --git a/src/sourceDev.WebApp/sourceDev.WebApp.csproj b/src/sourceDev.WebApp/sourceDev.WebApp.csproj
