From 77f3a031c5837aa399d055431780e52650d7c1a0 Mon Sep 17 00:00:00 2001 From: Lombiq Date: Thu, 28 Apr 2016 01:55:36 +0200 Subject: [PATCH 1/5] Fixing that stylesheets having a protocol-relative URL caused exception when building shape alternate names --- .../ResourceBindingStrategy/StylesheetBindingStrategy.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs b/src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs index d027e900d..ececdd071 100644 --- a/src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs +++ b/src/Orchard/DisplayManagement/Descriptors/ResourceBindingStrategy/StylesheetBindingStrategy.cs @@ -43,6 +43,9 @@ namespace Orchard.DisplayManagement.Descriptors.ResourceBindingStrategy { if (Uri.IsWellFormedUriString(fileName, UriKind.Absolute) || (fileName.StartsWith("//", StringComparison.InvariantCulture) && Uri.IsWellFormedUriString("http:" + fileName, UriKind.Absolute))) { + if (fileName.StartsWith("//", StringComparison.InvariantCulture)) { + fileName = "http:" + fileName; + } var uri = new Uri(fileName); shapeName = uri.Authority + "$" + uri.AbsolutePath + "$" + uri.Query; } From 6ec23919aa3ca091d2f68e94ff034fe07a9c7098 Mon Sep 17 00:00:00 2001 From: Sergio Navarro Date: Thu, 28 Apr 2016 21:04:29 +0200 Subject: [PATCH 2/5] Element Bindings breaks after adding field to content type Fixes #6842 --- .../Views/EditorTemplates/FormBindings.cshtml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml index 6fc93195b..66b68d91e 100644 --- a/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml +++ b/src/Orchard.Web/Modules/Orchard.DynamicForms/Views/EditorTemplates/FormBindings.cshtml @@ -22,8 +22,8 @@ @if (partDescriptor.BindingContexts.Any()) { foreach (var partBinding in partDescriptor.BindingContexts.SelectMany(x => x.Bindings)) { - var partBindingId = String.Format("binding-{0}-{1}", partDescriptor.Part.PartDefinition.Name.HtmlClassify(), partBinding.Name.HtmlClassify()); - var partBindingState = partState.Bindings.ElementAtOrDefault(partBindingIndex) ?? new BindingSettings(); + var partBindingId = String.Format("binding-{0}-{1}", partDescriptor.Part.PartDefinition.Name.HtmlClassify(), partBinding.Name.HtmlClassify()); + var partBindingState = partState.Bindings.FirstOrDefault(f => f.Name == partBinding.Name) ?? new BindingSettings(); @@ -36,7 +36,7 @@ } @foreach (var fieldDescriptor in partDescriptor.FieldBindings) { var fieldBindingIndex = 0; - var fieldState = partState.Fields.ElementAtOrDefault(fieldIndex) ?? new FieldBindingSettings(); + var fieldState = partState.Fields.FirstOrDefault(f=>f.Name == fieldDescriptor.Field.Name) ?? new FieldBindingSettings(); if (fieldDescriptor.BindingContexts.Any()) { foreach (var fieldBinding in fieldDescriptor.BindingContexts.SelectMany(x => x.Bindings)) { var fieldBindingId = String.Format("binding-{0}-{1}-{2}", partDescriptor.Part.PartDefinition.Name.HtmlClassify(), fieldDescriptor.Field.Name.HtmlClassify(), fieldBinding.Name.HtmlClassify()); From 951962f6d9cc6f1c03f42dd9a8ba2d37e9d84c44 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 5 May 2016 12:39:39 -0700 Subject: [PATCH 3/5] Fixing dynamic compilation issues Fixes #6858 --- src/Orchard.Web/Web.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Web/Web.config b/src/Orchard.Web/Web.config index cc10d9dab..13876a268 100644 --- a/src/Orchard.Web/Web.config +++ b/src/Orchard.Web/Web.config @@ -59,6 +59,10 @@ + + + + @@ -75,7 +79,6 @@ - From 06778eb584c59737992a8cccc7a4a7d3bd3bbfc6 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 5 May 2016 12:46:48 -0700 Subject: [PATCH 4/5] Setting correct nuget path for Kudu Fixes #6810 --- deploy.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.cmd b/deploy.cmd index 53142d03e..8a04b0067 100644 --- a/deploy.cmd +++ b/deploy.cmd @@ -69,7 +69,7 @@ echo Handling .NET Web Application deployment. :: 1. Restore NuGet packages IF /I "" NEQ "" ( - call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\" + call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\src\Orchard.sln" IF !ERRORLEVEL! NEQ 0 goto error ) From d21538eb54ab59961f9df8ffc1054a19f3bc3ef7 Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Thu, 5 May 2016 13:05:35 -0700 Subject: [PATCH 5/5] Forcing Nuget restore on Kudu --- deploy.cmd | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/deploy.cmd b/deploy.cmd index 8a04b0067..151965c59 100644 --- a/deploy.cmd +++ b/deploy.cmd @@ -68,10 +68,8 @@ IF NOT DEFINED MSBUILD_PATH ( echo Handling .NET Web Application deployment. :: 1. Restore NuGet packages -IF /I "" NEQ "" ( - call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\src\Orchard.sln" - IF !ERRORLEVEL! NEQ 0 goto error -) +call :ExecuteCmd nuget restore "%DEPLOYMENT_SOURCE%\src\Orchard.sln" +IF !ERRORLEVEL! NEQ 0 goto error :: 2. Build to the temporary path call :ExecuteCmd "%MSBUILD_PATH%" "%DEPLOYMENT_SOURCE%\Orchard.proj" /t:Precompiled /v:m