Merge pull request #46 from Bjornmamman/develop

Target 7 and Umbraco V11 Release

.gitignore

@@ -9,22 +9,64 @@ src/TreeMenu/Config
 src/TreeMenu/Web.config
 src/.vs
 *.nupkg
-build/SimpleTreeMenu_*.zip
-src/Website/bin
-src/Website/obj
-src/Website/Umbraco
-src/Website/App_Data/cache
-src/Website/App_Data/Logs
-src/Website/App_Data/Models
-src/Website/App_Data/TEMP
-!src/Website/bin/Our.Umbraco.SimpleTreeMenu.dll
-src/node_modules
-release
-src/WebsiteV9/wwwroot/App_Plugins
-src/WebsiteV9/umbraco
-src/Website/App_Data
+
+**/build
+**/node_modules
+**/release
+
+
+## Ignore Umbraco files/folders generated for each instance
+##
+## Get latest from https://github.com/github/gitignore/blob/main/Umbraco.gitignore
+
+# Note: VisualStudio gitignore rules may also be relevant
+
+# Umbraco
+# Ignore unimportant folders generated by Umbraco
+**/App_Data/Logs/
+**/App_Data/[Pp]review/
+**/App_Data/TEMP/
+**/App_Data/NuGetBackup/
+
+# Ignore Umbraco content cache file
+**/App_Data/umbraco.config
+
+## this [Uu]mbraco/ folder should be created by cmd like `Install-Package UmbracoCms -Version 8.5.3`
+## you can find your Umbraco version in your Web.config. (i.e. <add key="Umbraco.Core.ConfigurationStatus" value="8.5.3" />)
+## Uncomment this line if you think it fits the way you work on your project.
+## **/[Uu]mbraco/
+
+## The [Mm]edia/ folder contains content. Content may vary by environment and should therefore not be added to source control.
+## Uncomment this line if you think it fits the way you work on your project.
+## **/[Mm]edia/ 
+
+# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
+# Make sure to include details from VisualStudio.gitignore BEFORE this
+!**/App_Data/[Pp]ackages/*
+!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*
+!**/[Uu]mbraco/[Vv]iews/[Pp]ackages/*
+
+# ImageProcessor DiskCache
+**/App_Data/cache/
+
+# Ignore the Models Builder models out of date flag
+**/ood.flag
+
+# NEW for version 9 .Net 5 (Core)
+#ignore umbraco backoffice assest from wwwroot
+**/wwwroot/umbraco/
+
+# SQLite files
+*.sqlite.db*
+
+#ignore umbraco data/views/settings
+**/umbraco/
+
+#include default location for modelsbuilder output
+!**/umbraco/models
+
+#include default location for packages
+!**/umbraco/Data/packages
 src/WebsiteV8/App_Data
-src/WebsiteV8/Umbraco
 src/WebsiteV8/bin
-src/WebsiteV9/App_Plugins/UmbracoForms
-src/WebsiteV8/Views/MacroPartials
+src/WebsiteV10/umbraco/Data

src/TreeMenu.sln

@@ -24,6 +24,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebsiteV9", "WebsiteV9\Webs
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebsiteV10", "WebsiteV10\WebsiteV10.csproj", "{962F90BA-D601-4490-ABC8-0293554FAD32}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebsiteV11", "WebsiteV11\WebsiteV11.csproj", "{2D267437-6A23-4BAC-823B-E8C1AED7C11C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -46,6 +48,10 @@ Global
 		{962F90BA-D601-4490-ABC8-0293554FAD32}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{962F90BA-D601-4490-ABC8-0293554FAD32}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{962F90BA-D601-4490-ABC8-0293554FAD32}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D267437-6A23-4BAC-823B-E8C1AED7C11C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D267437-6A23-4BAC-823B-E8C1AED7C11C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D267437-6A23-4BAC-823B-E8C1AED7C11C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D267437-6A23-4BAC-823B-E8C1AED7C11C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/TreeMenu/TreeMenu.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net472;net5.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>net472;net5.0;net6.0;net7.0</TargetFrameworks>
 		<RootNamespace>Our.Umbraco.SimpleTreeMenu</RootNamespace>
 
 		<IncludeContentInPack>true</IncludeContentInPack>
@@ -13,7 +13,7 @@
 		<Description>Typed Treemenu for Umbraco</Description>
 		<PackageIcon>icon.png</PackageIcon>
 		<PackageId>Our.Umbraco.SimpleTreeMenu</PackageId>
-		<Version>3.0.0</Version>
+		<Version>4.0.0</Version>
 		<PackageProjectUrl>https://our.umbraco.com/packages/website-utilities/simpletreemenu/</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/Bjornmamman/Our.Umbraco.SimpleTreeMenu</RepositoryUrl>
 		<Description>Typed Treemenu for Umbraco</Description>
@@ -34,6 +34,11 @@
 		<PackageReference Include="Umbraco.Cms.Web.Website" Version="10.0.0" />
 		<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.0.0" />
 	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+		<PackageReference Include="Umbraco.Cms.Web.Website" Version="11.0.0" />
+		<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="11.0.0" />
+	</ItemGroup>
 
 	<ItemGroup>