Skip to content

Commit c4f8944

Browse files
nikolajlauridsennikolajlauridsen
committed
Merge branch 'v9/contrib' into temp-11381
2 parents 3c1e52f + cd022af commit c4f8944

File tree

598 files changed

+24673
-47584
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

598 files changed

+24673
-47584
lines changed

‎.github/ISSUE_TEMPLATE/01_bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: input
77
id: "version"
88
attributes:
9-
label: "Which *exact* Umbraco version are you using? For example: 8.13.1 - don't just write v8"
9+
label: "Which *exact* Umbraco version are you using? For example: 9.0.1 - don't just write v9"
1010
description: "Use the help icon in the Umbraco backoffice to find the version you're using"
1111
validations:
1212
required: true

‎.github/workflows/codeql-config.yml renamed to ‎.github/config/codeql-config.yml

File renamed without changes.

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Perform CodeQL Analysis
5757
uses: github/codeql-action/analyze@v1
5858
with:
59-
config-file: ./.github/workflows/codeql-config.yml
59+
config-file: ./.github/config/codeql-config.yml
6060

6161
# This job is to prevent the workflow status from showing as failed when all other jobs are skipped - See https://github.community/t/workflow-is-failing-if-no-job-can-be-ran-due-to-condition/16873
6262
always_job:

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/js/*
8484
src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/lib/*
8585
src/Umbraco.Web.UI/wwwroot/[Uu]mbraco/views/*
8686
src/Umbraco.Web.UI/wwwroot/Media/*
87+
src/Umbraco.Web.UI/Smidge/
8788

8889
# Tests
8990
cypress.env.json

‎NuGet.Config

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎build/NuSpecs/buildTransitive/Umbraco.Cms.StaticAssets.targets

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@
66
<UmbracoWwwrootName Condition="'$(UmbracoWwwrootName)' == ''">umbraco</UmbracoWwwrootName>
77
</PropertyGroup>
88

9+
<PropertyGroup>
10+
<DefaultItemExcludes>$(DefaultItemExcludes);App_Plugins\**;</DefaultItemExcludes>
11+
12+
<DefaultItemExcludes>$(DefaultItemExcludes);umbraco\Data\**;</DefaultItemExcludes>
13+
<DefaultItemExcludes>$(DefaultItemExcludes);umbraco\Logs\**;</DefaultItemExcludes>
14+
<DefaultItemExcludes>$(DefaultItemExcludes);umbraco\mediacache\**;</DefaultItemExcludes>
15+
16+
<DefaultItemExcludes>$(DefaultItemExcludes);wwwroot\media\**;</DefaultItemExcludes>
17+
</PropertyGroup>
18+
919
<Target Name="CopyUmbracoAssets" BeforeTargets="BeforeBuild">
1020
<ItemGroup>
1121
<ContentFiles Include="$(ContentFilesPath)" />
@@ -21,9 +31,47 @@
2131
SourceFiles="@(ContentWwwrootFiles)"
2232
DestinationFiles="@(ContentWwwrootFiles->'$(MSBuildProjectDirectory)\wwwroot\$(UmbracoWwwrootName)\%(RecursiveDir)%(Filename)%(Extension)')"
2333
SkipUnchangedFiles="true" />
34+
</Target>
35+
36+
<Target Name="IncludeAppPluginsContent" BeforeTargets="GetCopyToOutputDirectoryItems;GetCopyToPublishDirectoryItems;">
37+
<ItemGroup>
38+
<_AppPluginsFiles Include="App_Plugins\**" />
39+
40+
<ContentWithTargetPath
41+
Include="@(_AppPluginsFiles)"
42+
TargetPath="%(Identity)"
43+
CopyToOutputDirectory="PreserveNewest"
44+
CopyToPublishDirectory="PreserveNewest"/>
45+
</ItemGroup>
46+
</Target>
47+
48+
<!--
49+
The set of files to publish is generated really early and doesn't currently account for files added by targets e.g. BeforeBuild.
50+
A fix was put in place in Web SDK to update for wwwwroot in case someone runs npm build etc in a target, we're borrowing their trick.
51+
https://github.com/dotnet/sdk/blob/e2b2b1a4ac56c955b84d62fe71cda3b6f258b42b/src/WebSdk/Publish/Targets/ComputeTargets/Microsoft.NET.Sdk.Publish.ComputeFiles.targets
52+
-->
53+
<Target Name="IncludeUmbracoFolderContent" BeforeTargets="GetCopyToOutputDirectoryItems;GetCopyToPublishDirectoryItems;">
54+
<ItemGroup>
55+
<_UmbracoFolderFiles Include="umbraco\config\**" />
56+
<_UmbracoFolderFiles Include="umbraco\PartialViewMacros\**" />
57+
<_UmbracoFolderFiles Include="umbraco\UmbracoBackOffice\**" />
58+
<_UmbracoFolderFiles Include="umbraco\UmbracoInstall\**" />
59+
<_UmbracoFolderFiles Include="umbraco\UmbracoWebsite\**" />
60+
<_UmbracoFolderFiles Include="umbraco\UmbracoWebsite\**" />
61+
<_UmbracoFolderFiles Include="umbraco\Licenses\**" />
2462

63+
<!-- This could be handled in deploy if it's not already -->
64+
<_UmbracoFolderFiles Include="umbraco\Deploy\**" />
65+
66+
<ContentWithTargetPath
67+
Include="@(_UmbracoFolderFiles)"
68+
TargetPath="%(Identity)"
69+
CopyToOutputDirectory="PreserveNewest"
70+
CopyToPublishDirectory="PreserveNewest"/>
71+
</ItemGroup>
2572
</Target>
2673

74+
2775
<Target Name="ClearUmbracoAssets" BeforeTargets="Clean">
2876
<ItemGroup>
2977
<UmbracoConfigPackageDir Include="$(MSBuildProjectDirectory)\umbraco\config\" />
@@ -42,4 +90,10 @@
4290
<RemoveDir Directories="@(WwwrootUmbracoPackageDir)" />
4391
</Target>
4492

93+
<Target Name="IncludeUmbracoRazorFiles" BeforeTargets="ResolveRazorGenerateInputs">
94+
<ItemGroup>
95+
<Content Include="$(MSBuildProjectDirectory)\umbraco\**\*.cshtml" />
96+
</ItemGroup>
97+
</Target>
98+
4599
</Project>

‎build/azure-pipelines.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -226,14 +226,14 @@ stages:
226226
inputs:
227227
command: ci
228228
workingDir: 'tests\Umbraco.Tests.AcceptanceTest'
229-
- task: Npm@1
229+
- task: PowerShell@2
230230
displayName: Run Cypress (Desktop)
231231
condition: always()
232232
continueOnError: true
233233
inputs:
234-
workingDir: tests\Umbraco.Tests.AcceptanceTest
235-
command: 'custom'
236-
customCommand: 'run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"'
234+
targetType: inline
235+
workingDirectory: tests\Umbraco.Tests.AcceptanceTest
236+
script: 'npm run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"'
237237

238238
- task: PublishTestResults@2
239239
condition: always()
@@ -259,7 +259,6 @@ stages:
259259
# customCommand: 'run test -- --config="viewportHeight=812,viewportWidth=375,screenshotsFolder=cypress/artifacts/mobile/screenshots,videosFolder=cypress/artifacts/mobile/videos,videoUploadOnPasses=false"'
260260
- task: PublishPipelineArtifact@1
261261
displayName: "Publish test artifacts"
262-
condition: failed()
263262
inputs:
264263
targetPath: '$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/cypress/artifacts'
265264
artifact: 'Test artifacts - Windows'
@@ -329,14 +328,14 @@ stages:
329328
inputs:
330329
command: ci
331330
workingDir: 'tests/Umbraco.Tests.AcceptanceTest'
332-
- task: Npm@1
331+
- task: Bash@3
333332
displayName: Run Cypress (Desktop)
334333
condition: always()
335334
continueOnError: true
336335
inputs:
337-
workingDir: tests/Umbraco.Tests.AcceptanceTest
338-
command: 'custom'
339-
customCommand: 'run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"'
336+
targetType: inline
337+
workingDirectory: tests/Umbraco.Tests.AcceptanceTest
338+
script: 'npm run test -- --reporter junit --reporter-options "mochaFile=results/test-output-D-[hash].xml,toConsole=true" --config="viewportHeight=1600,viewportWidth=2560,screenshotsFolder=cypress/artifacts/desktop/screenshots,videosFolder=cypress/artifacts/desktop/videos,videoUploadOnPasses=false"'
340339
- task: PublishTestResults@2
341340
condition: always()
342341
inputs:
@@ -361,13 +360,11 @@ stages:
361360
# customCommand: 'run test -- --config="viewportHeight=812,viewportWidth=375,screenshotsFolder=cypress/artifacts/mobile/screenshots,videosFolder=cypress/artifacts/mobile/videos,videoUploadOnPasses=false"'
362361
- task: PublishPipelineArtifact@1
363362
displayName: "Publish test artifacts"
364-
condition: failed()
365363
inputs:
366364
targetPath: '$(Build.SourcesDirectory)/tests/Umbraco.Tests.AcceptanceTest/cypress/artifacts'
367365
artifact: 'Test artifacts - Linux'
368366
- task: PublishPipelineArtifact@1
369367
displayName: "Publish run log"
370-
condition: failed()
371368
inputs:
372369
targetPath: '$(Build.ArtifactStagingDirectory)/dotnet_run_log_linux.txt'
373370
artifact: Test Run logs - Linux
@@ -541,7 +538,7 @@ stages:
541538
inputs:
542539
targetType: inline
543540
script: |
544-
choco install docfx -y
541+
choco install docfx --version=2.58.5 -y
545542
if ($lastexitcode -ne 0){
546543
throw ("Error installing DocFX")
547544
}

‎build/build.ps1

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -449,12 +449,6 @@
449449
if ($this.OnError()) { return }
450450
})
451451

452-
$ubuild.DefineMethod("PrepareAzureGallery",
453-
{
454-
Write-Host "Prepare Azure Gallery"
455-
$this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
456-
})
457-
458452
$ubuild.DefineMethod("PrepareCSharpDocs",
459453
{
460454
Write-Host "Prepare C# Documentation"
@@ -528,8 +522,6 @@
528522
if ($this.OnError()) { return }
529523
$this.PackageNuGet()
530524
if ($this.OnError()) { return }
531-
$this.PrepareAzureGallery()
532-
if ($this.OnError()) { return }
533525
$this.PostPackageHook()
534526
if ($this.OnError()) { return }
535527

‎build/templates/UmbracoPackage/.template.config/template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"version": {
2525
"type": "parameter",
2626
"datatype": "string",
27-
"defaultValue": "9.1.0",
27+
"defaultValue": "9.2.0-rc",
2828
"description": "The version of Umbraco to load using NuGet",
2929
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
3030
},

‎build/templates/UmbracoProject/.template.config/template.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
"version": {
5858
"type": "parameter",
5959
"datatype": "string",
60-
"defaultValue": "9.1.0",
60+
"defaultValue": "9.2.0-rc",
6161
"description": "The version of Umbraco to load using NuGet",
6262
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
6363
},

0 commit comments

Comments
 (0)