Merge pull request #16 from jcdcdev/dev/v14

Dev/v14
jcdcdev · Oct 25, 2024 · 9272694 · 9272694
2 parents 15c7b2d + 4226ef6
commit 9272694
Show file tree

Hide file tree

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

diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 obj/
 bin/
 .idea/
+**/wwwroot/App_Plugins/UmbracoPackageTemplate/dist
diff --git a/...ackageTemplate/src/UmbracoPackageTemplate.TestSite/UmbracoPackageTemplate.TestSite.csproj b/...ackageTemplate/src/UmbracoPackageTemplate.TestSite/UmbracoPackageTemplate.TestSite.csproj
@@ -3,7 +3,6 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
-		<RootNamespace>TestSite.Thirteen</RootNamespace>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/...templates/UmbracoPackageTemplate/src/UmbracoPackageTemplate/UmbracoPackageTemplate.csproj b/...templates/UmbracoPackageTemplate/src/UmbracoPackageTemplate/UmbracoPackageTemplate.csproj
@@ -25,7 +25,7 @@
         <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     </PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+	<ItemGroup>
 		<PackageReference Include="Umbraco.Cms.Core" Version="[14.0.0,15.0.0)"/>
         <PackageReference Include="Umbraco.Cms.Api.Common" Version="[14.0.0,15.0.0)"/>
         <PackageReference Include="Umbraco.Cms.Api.Management" Version="[14.0.0,15.0.0)"/>
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,3 +2,4 @@ @@
     obj/
     bin/
     .idea/
+    **/wwwroot/App_Plugins/UmbracoPackageTemplate/dist