From dbad75c66a7eeac34d928379c12982c1ed827f0d Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 6 Jul 2021 09:54:55 +0200 Subject: [PATCH 01/10] Updated version number --- src/Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a1220f9b3f..431bd07fd3 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -2,7 +2,7 @@ 9.0.0 9.0.0 - 9.0.0-beta004 + 9.0.0-rc001.pre001 9.0.0 9.0 en-US From 1307188edeb4a0db94514729d7911e9893489b99 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 6 Jul 2021 10:50:05 +0200 Subject: [PATCH 02/10] output variable --- build/azure-pipelines.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 1a6ca02fd2..d405a56e6c 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -25,7 +25,8 @@ stages: vmImage: windows-latest steps: - task: PowerShell@1 - displayName: Set $isRelease variable + name: setVariable + displayName: Set isRelease variable inputs: scriptType: inlineScript inlineScript: > @@ -33,9 +34,9 @@ stages: if ($isRelease.Count -gt 0){ Write-Host "##vso[build.addbuildtag]Release build" - Write-Host "##vso[task.setvariable variable=isRelease]true" + Write-Host "##vso[task.setvariable variable=isRelease;isOutput=true]true" }else{ - Write-Host "##vso[task.setvariable variable=isRelease]false" + Write-Host "##vso[task.setvariable variable=isRelease;isOutput=true]false" } - stage: Unit_Tests displayName: Unit Tests @@ -476,7 +477,7 @@ stages: - stage: Artifacts_Docs displayName: 'Static Code Documentation' dependsOn: [Determine_build_type] - condition: 'eq(variables.IsRelease, true)' + condition: 'eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setVariable.IsRelease'], true)' jobs: - job: Generate_Docs_CSharp timeoutInMinutes: 60 From f8180f0009f8f8cd37ca417367acc42c77d3333f Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 6 Jul 2021 10:51:43 +0200 Subject: [PATCH 03/10] casing --- build/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index d405a56e6c..bde563fe25 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -25,7 +25,7 @@ stages: vmImage: windows-latest steps: - task: PowerShell@1 - name: setVariable + name: setReleaseVariable displayName: Set isRelease variable inputs: scriptType: inlineScript @@ -477,7 +477,7 @@ stages: - stage: Artifacts_Docs displayName: 'Static Code Documentation' dependsOn: [Determine_build_type] - condition: 'eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setVariable.IsRelease'], true)' + condition: 'eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], true)' jobs: - job: Generate_Docs_CSharp timeoutInMinutes: 60 From a4846b1d4ad6c7a59e2aeb26d40e3b4e76e24be0 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 6 Jul 2021 10:55:33 +0200 Subject: [PATCH 04/10] fix quotes --- build/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index bde563fe25..2f30ff3b8a 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -477,7 +477,7 @@ stages: - stage: Artifacts_Docs displayName: 'Static Code Documentation' dependsOn: [Determine_build_type] - condition: 'eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], true)' + condition: eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], true) jobs: - job: Generate_Docs_CSharp timeoutInMinutes: 60 From a755cac410f0909aba0e2cb01c2b0f2d0d21cde8 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 6 Jul 2021 10:59:30 +0200 Subject: [PATCH 05/10] make bool value as string --- build/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 2f30ff3b8a..5582a8dfb9 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -477,7 +477,7 @@ stages: - stage: Artifacts_Docs displayName: 'Static Code Documentation' dependsOn: [Determine_build_type] - condition: eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], true) + condition: eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], 'true') jobs: - job: Generate_Docs_CSharp timeoutInMinutes: 60 From 21528ff60b47c37804053dd6258b50fd0d764b39 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 6 Jul 2021 11:51:12 +0200 Subject: [PATCH 06/10] Move condition to job from stage --- build/azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index 5582a8dfb9..afb3d3f618 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -477,11 +477,11 @@ stages: - stage: Artifacts_Docs displayName: 'Static Code Documentation' dependsOn: [Determine_build_type] - condition: eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], 'true') jobs: - job: Generate_Docs_CSharp timeoutInMinutes: 60 displayName: Generate C# Docs + condition: eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], 'true') pool: vmImage: windows-latest steps: @@ -522,10 +522,10 @@ stages: targetPath: $(Build.ArtifactStagingDirectory)\docs\csharp-docs.zip artifact: docs-cs publishLocation: pipeline - - job: Generate_Docs_JS timeoutInMinutes: 60 displayName: Generate JS Docs + condition: eq(stageDependencies.Determine_build_type.Set_build_variables.outputs['setReleaseVariable.isRelease'], 'true') pool: vmImage: windows-latest steps: From 65c654231d9c068668da0872b7f341a51ab636d4 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 6 Jul 2021 14:03:00 +0200 Subject: [PATCH 07/10] paths and stuff for linux development --- .../Umbraco.Web.UI.NetCore.csproj | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj index 0b345753d0..743d024fc0 100644 --- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj +++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj @@ -5,63 +5,63 @@ Umbraco.Cms.Web.UI.NetCore - bin\Release\Umbraco.Web.UI.NetCore.xml + bin/Release/Umbraco.Web.UI.NetCore.xml true - - - - - + + + + + - + - - - - - + + + + + - - - - + + + + - - - - - + + + + + - + true Always - + true Always - - - - - + + + + + @@ -83,8 +83,8 @@ - $(ProjectDir)wwwroot\umbraco - $(ProjectDir)umbraco\config\appsettings-schema.json + $(ProjectDir)wwwroot/umbraco + $(ProjectDir)umbraco/config/appsettings-schema.json @@ -103,10 +103,10 @@ - + - + From 3a9c3f4f3bc8ec5f76b958dac05b6ff532393796 Mon Sep 17 00:00:00 2001 From: berg Date: Tue, 6 Jul 2021 14:21:04 +0200 Subject: [PATCH 08/10] Fix build (preconditions) on linux --- src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj index 743d024fc0..fc273da363 100644 --- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj +++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj @@ -21,7 +21,6 @@ - @@ -103,10 +102,10 @@ - + - + From 27d5aefc2d1c08c6c5263c8d58724ec0a68746b9 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 6 Jul 2021 15:04:48 +0200 Subject: [PATCH 09/10] add missing variable in azure pipeline script and removed the auto generation of files until we figure out how to support both windows and linux for those. --- build/azure-pipelines.yml | 1 + src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml index afb3d3f618..d95949d865 100644 --- a/build/azure-pipelines.yml +++ b/build/azure-pipelines.yml @@ -357,6 +357,7 @@ stages: $version = $ubuild.GetUmbracoVersion() + $isRelease = [regex]::matches($env:BUILD_SOURCEBRANCH,"v\d+\/\d+.\d+.*") if ($isRelease.Count -gt 0){ $continuous = $version.Semver diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj index fc273da363..9ebbc7b562 100644 --- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj +++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj @@ -102,10 +102,10 @@ - + - + From d10ea08f0d2ad1d3362de10fcfd5f1c1aacec970 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 6 Jul 2021 18:28:01 +0200 Subject: [PATCH 10/10] Fixed issue from merge - MediaPickerWithCropsValueConverter was not update to inject _publishedValueFallback --- .../ValueConverters/MediaPickerWithCropsValueConverter.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs index 0aa6fca5a9..51bf3c477c 100644 --- a/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs +++ b/src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MediaPickerWithCropsValueConverter.cs @@ -15,15 +15,18 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters { private readonly IPublishedSnapshotAccessor _publishedSnapshotAccessor; private readonly IPublishedUrlProvider _publishedUrlProvider; + private readonly IPublishedValueFallback _publishedValueFallback; private readonly IJsonSerializer _jsonSerializer; public MediaPickerWithCropsValueConverter( IPublishedSnapshotAccessor publishedSnapshotAccessor, IPublishedUrlProvider publishedUrlProvider, + IPublishedValueFallback publishedValueFallback, IJsonSerializer jsonSerializer) { _publishedSnapshotAccessor = publishedSnapshotAccessor ?? throw new ArgumentNullException(nameof(publishedSnapshotAccessor)); _publishedUrlProvider = publishedUrlProvider; + _publishedValueFallback = publishedValueFallback; _jsonSerializer = jsonSerializer; } @@ -77,7 +80,7 @@ namespace Umbraco.Cms.Core.PropertyEditors.ValueConverters // TODO: This should be optimized/cached, as calling Activator.CreateInstance is slow var mediaWithCropsType = typeof(MediaWithCrops<>).MakeGenericType(mediaItem.GetType()); - var mediaWithCrops = (MediaWithCrops)Activator.CreateInstance(mediaWithCropsType, mediaItem, localCrops); + var mediaWithCrops = (MediaWithCrops)Activator.CreateInstance(mediaWithCropsType, mediaItem, _publishedValueFallback, localCrops); mediaItems.Add(mediaWithCrops);