yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/move-tests

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/Default.cshtml
This commit is contained in:
Bjarke Berg
2020-08-19 11:39:06 +02:00
parent 577a9ae365 0a2ebcd1f1
commit 5f1cfc514e
11 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/NuSpecs/UmbracoCms.nuspec
View File

@@ -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>
<!--

2
build/templates/UmbracoSolution/.template.config/template.json
View File

@@ -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"
},

5
src/Umbraco.Configuration/Models/ConnectionStrings.cs
View File

@@ -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));

4
src/Umbraco.Core/Composing/DefaultUmbracoAssemblyProvider.cs
View File

@@ -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)

2
src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
View File

@@ -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))
{

2
src/Umbraco.Web.BackOffice/Controllers/LogViewerController.cs
View File

@@ -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);

6
src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
View File

@@ -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);

4
src/Umbraco.Web.UI.NetCore/Startup.cs
View File

@@ -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.

0
src/Umbraco.Web.UI.NetCore/Umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml → src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/AuthorizeUpgrade.cshtml
View File

3
src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
View File

@@ -17,10 +17,9 @@
@{
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);
}
<!DOCTYPE html>

4
src/Umbraco.Web/UmbracoApplication.cs
View File

@@ -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);