Skip to content

Commit ec0ecfd

Browse files
elit0451elit0451
committed
Merge remote-tracking branch 'origin/v9/dev' into v9/feature/language-keys-cleanup
2 parents 062116a + 35cfcfc commit ec0ecfd

File tree

467 files changed

+11762
-3647
lines changed

Some content is hidden

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

467 files changed

+11762
-3647
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ jobs:
5656
- name: Perform CodeQL Analysis
5757
uses: github/codeql-action/analyze@v1
5858
with:
59-
config-file: ./.github/codeql-config.yml
60-
59+
config-file: ./.github/workflows/codeql-config.yml
60+
61+
# 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
62+
always_job:
63+
name: Always run job
64+
runs-on: ubuntu-latest
65+
steps:
66+
- name: Always run
67+
run: echo "This job is to prevent the workflow status from showing as failed when all other jobs are skipped"
6168

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

33
<PropertyGroup>
4-
<ContentFilesPath>$(MSBuildThisFileDirectory)..\content\**\*.*</ContentFilesPath>
4+
<ContentFilesPath>$(MSBuildThisFileDirectory)..\content\umbraco\**\*.*</ContentFilesPath>
5+
<ContentWwwrootFilesPath>$(MSBuildThisFileDirectory)..\content\wwwroot\umbraco\**\*.*</ContentWwwrootFilesPath>
6+
<UmbracoWwwrootName Condition="'$(UmbracoWwwrootName)' == ''">umbraco</UmbracoWwwrootName>
57
</PropertyGroup>
68

79
<Target Name="CopyUmbracoAssets" BeforeTargets="Build">
810
<ItemGroup>
911

1012
<ContentFiles Include="$(ContentFilesPath)" />
13+
<ContentWwwrootFiles Include="$(ContentWwwrootFilesPath)" />
1114
</ItemGroup>
1215
<Message Text="Copying Umbraco content files: $(ContentFilesPath) - #@(ContentFiles->Count()) files" Importance="high" />
16+
<Message Text="Copying Umbraco wwwroot content files: $(ContentWwwrootFilesPath) - #@(ContentWwwrootFiles->Count()) files" Importance="high" />
1317
<Copy
1418
SourceFiles="@(ContentFiles)"
15-
DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\%(RecursiveDir)%(Filename)%(Extension)')"
19+
DestinationFiles="@(ContentFiles->'$(MSBuildProjectDirectory)\umbraco\%(RecursiveDir)%(Filename)%(Extension)')"
20+
SkipUnchangedFiles="true" />
21+
<Copy
22+
SourceFiles="@(ContentWwwrootFiles)"
23+
DestinationFiles="@(ContentWwwrootFiles->'$(MSBuildProjectDirectory)\wwwroot\$(UmbracoWwwrootName)\%(RecursiveDir)%(Filename)%(Extension)')"
1624
SkipUnchangedFiles="true" />
1725

1826
</Target>
@@ -24,7 +32,7 @@
2432
<UmbracoUmbracoBackOfficeMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoBackOffice\" />
2533
<UmbracoUmbracoInstallDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoInstall\" />
2634
<UmbracoUmbracoWebsiteMacrosDir Include="$(MSBuildProjectDirectory)\umbraco\UmbracoWebsite\" />
27-
<WwwrootUmbracoPackageDir Include="$(MSBuildProjectDirectory)\wwwroot\umbraco\" />
35+
<WwwrootUmbracoPackageDir Include="$(MSBuildProjectDirectory)\wwwroot\$(UmbracoWwwrootName)\" />
2836
</ItemGroup>
2937
<Message Text="Clear old umbraco data" Importance="high" />
3038
<RemoveDir Directories="@(UmbracoConfigPackageDir)" />

‎build/build.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@
428428
&$this.BuildEnv.NuGet Pack "$templates\Umbraco.Templates.nuspec" `
429429
-Properties BuildTmp="$($this.BuildTemp)" `
430430
-Version "$($this.Version.Semver.ToString())" `
431+
-NoDefaultExcludes `
431432
-Verbosity detailed -outputDirectory "$($this.BuildOutput)" > "$($this.BuildTemp)\nupack.templates.log"
432433
if (-not $?) { throw "Failed to pack NuGet Umbraco.Templates." }
433434

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

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,59 @@
2424
"version": {
2525
"type": "parameter",
2626
"datatype": "string",
27-
"defaultValue": "9.0.0-rc002",
27+
"defaultValue": "9.0.0-rc003",
2828
"description": "The version of Umbraco to load using NuGet",
2929
"replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
3030
},
3131
"namespaceReplacer": {
3232
"type": "generated",
33-
"generator": "coalesce",
33+
"generator": "regex",
34+
"dataType": "string",
35+
"replaces": "UmbracoPackage",
3436
"parameters": {
35-
"sourceVariableName": "name",
36-
"defaultValue": "UmbracoPackage",
37-
"fallbackVariableName": "name"
38-
},
39-
"replaces":"UmbracoPackage"
37+
"source": "name",
38+
"steps": [
39+
{
40+
"regex": "\\s",
41+
"replacement": "_"
42+
},
43+
{
44+
"regex": "-",
45+
"replacement": "_"
46+
},
47+
{
48+
"regex": "^[^a-zA-Z_]+",
49+
"replacement": "_"
50+
}
51+
]
52+
}
53+
},
54+
"msbuildReplacer": {
55+
"type": "generated",
56+
"generator": "regex",
57+
"dataType": "string",
58+
"replaces": "UmbracoPackageMsBuild",
59+
"parameters": {
60+
"source": "name",
61+
"steps": [
62+
{
63+
"regex": "\\s",
64+
"replacement": ""
65+
},
66+
{
67+
"regex": "\\.",
68+
"replacement": ""
69+
},
70+
{
71+
"regex": "-",
72+
"replacement": ""
73+
},
74+
{
75+
"regex": "^[^a-zA-Z_]+",
76+
"replacement": ""
77+
}
78+
]
79+
}
4080
},
4181
"Framework": {
4282
"type": "parameter",

‎build/templates/UmbracoPackage/UmbracoPackage.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<Description>...</Description>
99
<Product>...</Product>
1010
<PackageTags>umbraco plugin package</PackageTags>
11+
<RootNamespace>UmbracoPackage</RootNamespace>
1112
</PropertyGroup>
1213

1314
<ItemGroup>

‎build/templates/UmbracoPackage/build/UmbracoPackage.targets

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

33
<PropertyGroup>
4-
<UmbracoPackageContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoPackage\**\*.*</UmbracoPackageContentFilesPath>
4+
<UmbracoPackageMsBuildContentFilesPath>$(MSBuildThisFileDirectory)..\App_Plugins\UmbracoPackage\**\*.*</UmbracoPackageMsBuildContentFilesPath>
55
</PropertyGroup>
66

7-
<Target Name="CopyUmbracoPackageAssets" BeforeTargets="Build">
7+
<Target Name="CopyUmbracoPackageMsBuildAssets" BeforeTargets="Build">
88
<ItemGroup>
9-
<UmbracoPackageContentFiles Include="$(UmbracoPackageContentFilesPath)" />
9+
<UmbracoPackageMsBuildContentFiles Include="$(UmbracoPackageMsBuildContentFilesPath)" />
1010
</ItemGroup>
11-
<Message Text="Copying UmbracoPackage files: $(UmbracoPackageContentFilesPath) - #@(UmbracoPackageContentFiles->Count()) files" Importance="high" />
11+
<Message Text="Copying UmbracoPackage files: $(UmbracoPackageMsBuildContentFilesPath) - #@(UmbracoPackageMsBuildContentFiles->Count()) files" Importance="high" />
1212
<Copy
13-
SourceFiles="@(UmbracoPackageContentFiles)"
14-
DestinationFiles="@(UmbracoPackageContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\%(RecursiveDir)%(Filename)%(Extension)')"
13+
SourceFiles="@(UmbracoPackageMsBuildContentFiles)"
14+
DestinationFiles="@(UmbracoPackageMsBuildContentFiles->'$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\%(RecursiveDir)%(Filename)%(Extension)')"
1515
SkipUnchangedFiles="true" />
1616

1717
</Target>
1818

19-
<Target Name="ClearUmbracoPackageAssets" BeforeTargets="Clean">
19+
<Target Name="ClearUmbracoPackageMsBuildAssets" BeforeTargets="Clean">
2020
<ItemGroup>
21-
<UmbracoPackageDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\" />
21+
<UmbracoPackageMsBuildDir Include="$(MSBuildProjectDirectory)\App_Plugins\UmbracoPackage\" />
2222
</ItemGroup>
2323
<Message Text="Clear old UmbracoPackage data" Importance="high" />
24-
<RemoveDir Directories="@(UmbracoPackageDir)" />
24+
<RemoveDir Directories="@(UmbracoPackageMsBuildDir)" />
2525
</Target>
2626

2727
</Project>

0 commit comments

Comments
 (0)