From 2da7e3c54fd837394db5f1ea780a4f2500481516 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 17 Aug 2020 14:02:55 +0200
Subject: [PATCH 01/10] Updated template default version to alpha001

---
 build/templates/UmbracoSolution/.template.config/template.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/templates/UmbracoSolution/.template.config/template.json b/build/templates/UmbracoSolution/.template.config/template.json
index 7d0a22ee25..c222161245 100644
--- a/build/templates/UmbracoSolution/.template.config/template.json
+++ b/build/templates/UmbracoSolution/.template.config/template.json
@@ -15,7 +15,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.0.0",
+            "defaultValue": "0.5.0-alpha001",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },

From eed6c879780af555b2ce5b0306d0cdc2d37e4fb2 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 17 Aug 2020 14:06:17 +0200
Subject: [PATCH 02/10] fix issue with nuget version requested

---
 build/NuSpecs/UmbracoCms.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec
index 5db3a439d9..fbcff62bb6 100644
--- a/build/NuSpecs/UmbracoCms.nuspec
+++ b/build/NuSpecs/UmbracoCms.nuspec
@@ -17,7 +17,7 @@
         <repository type="git" url="https://github.com/umbraco/umbraco-cms" />
         <dependencies>
             <group targetFramework="netcoreapp3.1">
-                <dependency id="UmbracoCms.Web" version="9.0.0" />
+                <dependency id="UmbracoCms.Web" version="[$version$]" />
             </group>
         </dependencies>
         <!--

From 20c8ae1fa74ebc0350a7ed8d3786845212654c90 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 18 Aug 2020 10:22:01 +0200
Subject: [PATCH 03/10] Change linux check to check windows instead

---
 src/Umbraco.Web/UmbracoApplication.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/UmbracoApplication.cs b/src/Umbraco.Web/UmbracoApplication.cs
index 41a4833ff4..6334f96d4b 100644
--- a/src/Umbraco.Web/UmbracoApplication.cs
+++ b/src/Umbraco.Web/UmbracoApplication.cs
@@ -35,8 +35,8 @@ namespace Umbraco.Web
             // Determine if we should use the sql main dom or the default
             var appSettingMainDomLock = globalSettings.MainDomLock;
 
-            var isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
-            var mainDomLock = appSettingMainDomLock == "SqlMainDomLock" || isLinux == true
+            var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+            var mainDomLock = appSettingMainDomLock == "SqlMainDomLock" || isWindows == false
                 ? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connectionStrings, dbProviderFactoryCreator, hostingEnvironment)
                 : new MainDomSemaphoreLock(logger, hostingEnvironment);
 

From 5f6de61391237b421fee3c5c74f8d06e0c7b7b53 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 18 Aug 2020 11:36:45 +0200
Subject: [PATCH 04/10] Fix iss issue

---
 src/Umbraco.Web.UI.NetCore/Startup.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Umbraco.Web.UI.NetCore/Startup.cs b/src/Umbraco.Web.UI.NetCore/Startup.cs
index deba559ed1..21faae22f2 100644
--- a/src/Umbraco.Web.UI.NetCore/Startup.cs
+++ b/src/Umbraco.Web.UI.NetCore/Startup.cs
@@ -63,6 +63,10 @@ namespace Umbraco.Web.UI.NetCore
                 options.AllowSynchronousIO = true;
             });
 
+            services.Configure<IISServerOptions>(options =>
+            {
+                options.AllowSynchronousIO = true;
+            });
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.

From 1f206766ab7f86f3a55b287e7ae85873d695fbb0 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Tue, 18 Aug 2020 11:07:59 +0100
Subject: [PATCH 05/10] Fixed log viewer level filter by correcting binding for
 provided array of selected values to filter by.

---
 src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
index 258c3817aa..a25d0aaa52 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
@@ -80,7 +80,7 @@ namespace Umbraco.Web.BackOffice.Controllers
         }
 
         [HttpGet]
-        public PagedResult<LogMessage> GetLogs(string orderDirection = "Descending", int pageNumber = 1, string filterExpression = null, [FromQuery]string[] logLevels = null, [FromQuery] DateTime? startDate = null,[FromQuery] DateTime? endDate = null)
+        public PagedResult<LogMessage> GetLogs(string orderDirection = "Descending", int pageNumber = 1, string filterExpression = null, [FromQuery(Name = "logLevels[]")]string[] logLevels = null, [FromQuery]DateTime? startDate = null, [FromQuery]DateTime? endDate = null)
         {
             var logTimePeriod = GetTimePeriod(startDate, endDate);
 

From a2a850e1b211a50ee19e7b372a6ec01cf0fec4f6 Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Tue, 18 Aug 2020 11:47:53 +0100
Subject: [PATCH 06/10] Applied fix to query parameter binding for saving
 public access configuration on a content item.

---
 src/Umbraco.Web.BackOffice/Controllers/ContentController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
index 9166f69700..f554f39aa6 100644
--- a/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
+++ b/src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
@@ -2441,7 +2441,7 @@ namespace Umbraco.Web.Editors
         // set up public access using role based access
         [EnsureUserPermissionForContent("contentId", ActionProtect.ActionLetter)]
         [HttpPost]
-        public IActionResult PostPublicAccess(int contentId, [FromQuery]string[] groups, [FromQuery]string[] usernames, int loginPageId, int errorPageId)
+        public IActionResult PostPublicAccess(int contentId, [FromQuery(Name = "groups[]")]string[] groups, [FromQuery(Name = "usernames[]")]string[] usernames, int loginPageId, int errorPageId)
         {
             if ((groups == null || groups.Any() == false) && (usernames == null || usernames.Any() == false))
             {

From 3dd59c6b83260632f8d45cf5585e33b734019460 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 18 Aug 2020 13:49:15 +0200
Subject: [PATCH 07/10] Support for parsing provider from azure connection
 strings

---
 src/Umbraco.Configuration/Models/ConnectionStrings.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Umbraco.Configuration/Models/ConnectionStrings.cs b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
index 0e6ca846aa..586765714c 100644
--- a/src/Umbraco.Configuration/Models/ConnectionStrings.cs
+++ b/src/Umbraco.Configuration/Models/ConnectionStrings.cs
@@ -56,6 +56,11 @@ namespace Umbraco.Configuration.Models
                 {
                     return Constants.DbProviderNames.SqlServer;
                 }
+
+                if (builder.TryGetValue("Initial Catalog", out var i) && i is string initialCatalog && !string.IsNullOrEmpty(initialCatalog))
+                {
+                    return Constants.DbProviderNames.SqlServer;
+                }
             }
 
             throw new ArgumentException("Cannot determine provider name from connection string", nameof(connectionString));

From 9049469f70089f325da6618a78fbd327441e87b1 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 19 Aug 2020 08:42:45 +0200
Subject: [PATCH 08/10] Bugfix cannot parse StringValues as bool. Use ToString
 first.

---
 .../Umbraco/UmbracoBackOffice/Default.cshtml                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml b/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml
index d399817502..55959c27a8 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml
@@ -17,7 +17,7 @@
 
 @{
     var isDebug = false;
-    var qryDebug = Context.Request.Query["umbDebug"].TryConvertTo<bool>();
+    var qryDebug = Context.Request.Query["umbDebug"].ToString().TryConvertTo<bool>();
     isDebug = qryDebug.Success && qryDebug.Result;
     var backOfficePath = globalSettings.GetBackOfficePath(hostingEnvironment);
 }

From 023ec53a9a10dcba062aa0adef65c14376b0e639 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 19 Aug 2020 08:43:24 +0200
Subject: [PATCH 09/10] Dont try to load assemblies that is not used yet

---
 src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
index d242ea1eaf..c5d87abf91 100644
--- a/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
+++ b/src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
@@ -17,15 +17,13 @@ namespace Umbraco.Core.Composing
         private static readonly string[] UmbracoCoreAssemblyNames = new[]
             {
                 "Umbraco.Core",
-                "Umbraco.Web",
                 "Umbraco.Infrastructure",
                 "Umbraco.PublishedCache.NuCache",
-                "Umbraco.ModelsBuilder.Embedded",
+              //  "Umbraco.ModelsBuilder.Embedded", TODO reintroduce when ModelsBuilder is migrated
                 "Umbraco.Examine.Lucene",
                 "Umbraco.Web.Common",
                 "Umbraco.Web.BackOffice",
                 "Umbraco.Web.Website",
-                "Umbraco.Web.NetCore"
             };
 
         public DefaultUmbracoAssemblyProvider(Assembly entryPointAssembly)

From 0a2ebcd1f14597764d544851aa89817b5ee702d5 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Wed, 19 Aug 2020 09:39:11 +0200
Subject: [PATCH 10/10] Use SqlMainDomLock if not windows

---
 .../Extensions/UmbracoCoreServiceCollectionExtensions.cs    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
index c739f5fbbb..d18275ca7f 100644
--- a/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
@@ -156,7 +156,7 @@ namespace Umbraco.Extensions
                 out factory);
 
             return services;
-        }   
+        }
 
         /// <summary>
         /// Adds the Umbraco Back Core requirements
@@ -252,8 +252,8 @@ namespace Umbraco.Extensions
             var connStrings = configs.ConnectionStrings();
             var appSettingMainDomLock = globalSettings.MainDomLock;
 
-            var isLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
-            var mainDomLock = appSettingMainDomLock == "SqlMainDomLock" || isLinux == true
+            var isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+            var mainDomLock = appSettingMainDomLock == "SqlMainDomLock" || isWindows == false
                 ? (IMainDomLock)new SqlMainDomLock(logger, globalSettings, connStrings, dbProviderFactoryCreator, hostingEnvironment)
                 : new MainDomSemaphoreLock(logger, hostingEnvironment);