Merge pull request #17 from jcdcdev/dev/v15

15.0.0
jcdcdev · Oct 27, 2024 · 1278eda · 1278eda
2 parents 15c7b2d + 9b43bf2
commit 1278eda
Show file tree

Hide file tree

Showing 35 changed files with 1,671 additions and 1,382 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,7 +12,8 @@ jobs:
           project-name: 'jcdcdev.Umbraco.PackageTemplate'
           project-path: './src/jcdcdev.Umbraco.PackageTemplate.csproj'
           dotnet-pack: false
-          umbraco-version: 13
+          umbraco-version: 15
+          dotnet-version: "9"
   build:
     runs-on: ubuntu-latest
     steps:
@@ -24,4 +25,5 @@ jobs:
           npm-enabled: true
           npm-working-dir: "./src/templates/UmbracoPackageTemplate/src/UmbracoPackageTemplate.Client"
           npm-run-command: 'build'
-          umbraco-version: 13
+          umbraco-version: 15
+          dotnet-version: "9"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,8 @@ jobs:
           project-name: 'jcdcdev.Umbraco.PackageTemplate'
           project-path: './src/jcdcdev.Umbraco.PackageTemplate.csproj'
           dotnet-pack: false
-          umbraco-version: 13
+          umbraco-version: 15
+          dotnet-version: "9"
       - name: Release
         uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main 
         with:

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 obj/
 bin/
 .idea/
+**/wwwroot/App_Plugins/UmbracoPackageTemplate/dist
+*.orig
diff --git a/src/templates/UmbracoPackageTemplate/.github/workflows/build.yml b/src/templates/UmbracoPackageTemplate/.github/workflows/build.yml
@@ -13,4 +13,5 @@ jobs:
           project-path: src/UmbracoPackageTemplate/UmbracoPackageTemplate.csproj
           npm-working-dir: src/UmbracoPackageTemplate.Client
           npm-enabled: true
+          dotnet-version: "9"
           umbraco-version: TOKEN_UMBRACO_VERSION
diff --git a/src/templates/UmbracoPackageTemplate/.github/workflows/release.yml b/src/templates/UmbracoPackageTemplate/.github/workflows/release.yml
@@ -19,6 +19,7 @@ jobs:
           npm-working-dir: src/UmbracoPackageTemplate.Client
           npm-enabled: true
           umbraco-version: TOKEN_UMBRACO_VERSION
+          dotnet-version: "9"
       - name: Release
         uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main
         with:

diff --git a/src/templates/UmbracoPackageTemplate/.gitignore b/src/templates/UmbracoPackageTemplate/.gitignore
@@ -355,4 +355,4 @@ MigrationBackup/
 # Rider
 *.sqlite.db*
 .idea/
-/src/jcdcdev.Umbraco.PackageTemplate/wwwroot/App_Plugins/jcdcdev.Umbraco.PackageTemplate/dist
+*/App_Plugins/UmbracoPackageTemplate/dist