Merge remote-tracking branch 'netcore/dev' into netcore/netcore

2020-08-26 08:05:15 +02:00
parent c561b256bf
commit 3d55dcd3c4
966 changed files with 9352 additions and 4199 deletions
--- a/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
+++ b/src/Umbraco.Infrastructure/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
@@ -32,6 +32,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            V2014 = 6,
            V2016 = 7,
            V2017 = 8,
+            V2019 = 9,
            Other = 99
        }

@@ -40,7 +41,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            Unknown = 0,
            Desktop = 1,
            Standard = 2,
-            Enterprise = 3,
+            Enterprise = 3,// Also developer edition
            Express = 4,
            Azure = 5
        }
@@ -81,6 +82,8 @@ namespace Umbraco.Core.Persistence.SqlSyntax
            {
                case "??":
                    return VersionName.Invalid;
+                case "15":
+                    return VersionName.V2019;
                case "14":
                    return VersionName.V2017;
                case "13":