Merged PR 7240: Port package to v11

- Add marketplace tag - Update to Umbraco v11 - Add marketplace manifest
Infocaster · Dec 2, 2022 · 148e32e · 148e32e
1 parent 1e77b5e
commit 148e32e
Show file tree

Hide file tree

Showing 11 changed files with 1,884 additions and 34 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -2,17 +2,17 @@ mode: ContinuousDeployment
 branches:
   feature:
     tag: alpha
-    regex: ^v10/feature/
-    source-branches: ['v10/develop']
+    regex: ^v11/feature/
+    source-branches: ['v11/develop']
   develop:
     tag: beta
-    regex: ^v10/develop$
+    regex: ^v11/develop$
   master:
     tag: ''
-    regex: ^v10/main$
+    regex: ^v11/main$
   hotfix:
     tag: 'beta'
-    regex: ^v10/hotfix
-    source-branches: ['v10/main']
+    regex: ^v11/hotfix
+    source-branches: ['v11/main']
 ignore:
   sha: []
diff --git a/Infocaster.Umbraco.DateFolders.Website/Infocaster.Umbraco.DateFolders.Website.csproj b/Infocaster.Umbraco.DateFolders.Website/Infocaster.Umbraco.DateFolders.Website.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Umbraco.Cms" Version="10.0.1" />
+		<PackageReference Include="Umbraco.Cms" Version="11.0.0" />
 		<PackageReference Include="Umbraco.TheStarterKit" Version="10.0.0" />
 	</ItemGroup>
 

diff --git a/Infocaster.Umbraco.DateFolders.Website/appsettings-schema.Umbraco.Cms.json b/Infocaster.Umbraco.DateFolders.Website/appsettings-schema.Umbraco.Cms.json
diff --git a/Infocaster.Umbraco.DateFolders.Website/appsettings.Development.json b/Infocaster.Umbraco.DateFolders.Website/appsettings.Development.json
@@ -18,8 +18,6 @@
     ]
   },
   "ConnectionStrings": {
-    "umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
-    "umbracoDbDSN_ProviderName": "Microsoft.Data.SQLite"
   },
   "Umbraco": {
     "CMS": {

diff --git a/Infocaster.Umbraco.DateFolders.Website/appsettings.json b/Infocaster.Umbraco.DateFolders.Website/appsettings.json
@@ -28,8 +28,18 @@
     "CreateDayFolders": false,
     "OrderByDescending": true,
     "FolderDocType": "dateFolder",
-    "ItemDocTypes": [ "blogpost" ],
-    "AllowedParentIds": [ 2222 ],
-    "AllowedParentDocTypes": ["blog"]
+    "ItemDocTypes": [
+      "blogpost"
+    ],
+    "AllowedParentIds": [
+      2222
+    ],
+    "AllowedParentDocTypes": [
+      "blog"
+    ]
+  },
+  "ConnectionStrings": {
+    "umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
+    "umbracoDbDSN_ProviderName": "Microsoft.Data.Sqlite"
   }
-}
+}
diff --git a/Infocaster.Umbraco.DateFolders.sln b/Infocaster.Umbraco.DateFolders.sln
@@ -3,6 +3,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D4AB3C86-E8DF-48BE-83F4-AF68BA1E4505}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infocaster.Umbraco.DateFolders.Website", "Infocaster.Umbraco.DateFolders.Website\Infocaster.Umbraco.DateFolders.Website.csproj", "{4F0E4D7B-4140-42E4-8058-9EF930E4503C}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infocaster.Umbraco.DateFolders", "src\Infocaster.Umbraco.DateFolders\Infocaster.Umbraco.DateFolders.csproj", "{B7ECD8B3-CAEC-4AC5-A0A1-54AAF1FC0E86}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AA602ED2-7945-49BA-BE5C-A31C5BA6E4B0}"
@@ -16,26 +20,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README-NUGET.md = README-NUGET.md
 		README.md = README.md
 		ReadMe.txt = ReadMe.txt
+		umbraco-marketplace.json = umbraco-marketplace.json
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D4AB3C86-E8DF-48BE-83F4-AF68BA1E4505}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infocaster.Umbraco.DateFolders.Website", "Infocaster.Umbraco.DateFolders.Website\Infocaster.Umbraco.DateFolders.Website.csproj", "{4F0E4D7B-4140-42E4-8058-9EF930E4503C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B7ECD8B3-CAEC-4AC5-A0A1-54AAF1FC0E86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B7ECD8B3-CAEC-4AC5-A0A1-54AAF1FC0E86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B7ECD8B3-CAEC-4AC5-A0A1-54AAF1FC0E86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B7ECD8B3-CAEC-4AC5-A0A1-54AAF1FC0E86}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4F0E4D7B-4140-42E4-8058-9EF930E4503C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4F0E4D7B-4140-42E4-8058-9EF930E4503C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F0E4D7B-4140-42E4-8058-9EF930E4503C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F0E4D7B-4140-42E4-8058-9EF930E4503C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7ECD8B3-CAEC-4AC5-A0A1-54AAF1FC0E86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7ECD8B3-CAEC-4AC5-A0A1-54AAF1FC0E86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7ECD8B3-CAEC-4AC5-A0A1-54AAF1FC0E86}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7ECD8B3-CAEC-4AC5-A0A1-54AAF1FC0E86}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/README.md b/README.md
@@ -53,6 +53,9 @@ After installing the package, just complete the configuration steps below and yo
 - **AllowedParentDocTypes** | (Optional) The doctype alias for the parent(s) to limit the creation of datefolders to. (e.g. "blog") - comma separated values are allowed for multiple doctype aliases
 
 ## Changelog
+Version 11.0.0
+- Updated to use umbraco v11
+
 Version 10.0.0
 - Updated to use umbraco v10.
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,13 +1,13 @@
 trigger:
   branches:
     include:
-    - v10/main
-    - v10/develop
-    - v10/release/*
-    - v10/hotfix
+    - v11/main
+    - v11/develop
+    - v11/release/*
+    - v11/hotfix
   tags:
     include:
-    - 10.*
+    - 11.*
 
 pool:
   name: Default
@@ -31,10 +31,10 @@ stages:
         updateAssemblyInfo: true
 
     - task: UseDotNet@2
-      displayName: 'Use .NET 6'
+      displayName: 'Use .NET 7'
       inputs:
         packageType: 'sdk'
-        version: '6.x'
+        version: '7.x'
 
     - task: DotNetCoreCLI@2
       displayName: 'dotnet restore'

diff --git a/nuget.config b/nuget.config
@@ -2,6 +2,5 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" protocolVersion="3" value="https://api.nuget.org/v3/index.json"/>
-    <add key="Infocaster" value="http://nexus.infocaster.net/repository/infocaster-nuget/"/>
   </packageSources>
 </configuration>
diff --git a/src/Infocaster.Umbraco.DateFolders/Infocaster.Umbraco.DateFolders.csproj b/src/Infocaster.Umbraco.DateFolders/Infocaster.Umbraco.DateFolders.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<ContentTargetFolders>.</ContentTargetFolders>
 		<PackageId>Infocaster.Umbraco.DateFolders</PackageId>
 		<Title>Infocaster.Umbraco.DateFolders</Title>
 		<Description>This package creates Datefolders (year/month(/day) for the specified doctype for Umbraco v9 and automatically puts content pages in the correct datefolder bases on the specified date field</Description>
 		<Product>Infocaster.Umbraco.DateFolders</Product>
 		<Authors>Infocaster B.V.</Authors>
-		<PackageTags>infocaster datefolders umbraco umbraco10 content management CMS</PackageTags>
+		<PackageTags>infocaster datefolders umbraco umbraco11 content management CMS umbraco-marketplace</PackageTags>
 		<Company>Infocaster B.V.</Company>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<RootNamespace>Infocaster.Umbraco.DateFolders</RootNamespace>
@@ -18,7 +18,7 @@
 		<PackageIcon>infocaster_nuget_yellow.png</PackageIcon>
 		<PackageReadmeFile>README-NUGET.md</PackageReadmeFile>
 		<RepositoryUrl>https://github.com/Infocaster/Datefolders</RepositoryUrl>
-		<PackageReleaseNotes>First release for Umbraco 10</PackageReleaseNotes>
+		<PackageReleaseNotes>First release for Umbraco 11</PackageReleaseNotes>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
 	</PropertyGroup>
@@ -39,7 +39,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Umbraco.Cms.Core" Version="10.0.0" />
+		<PackageReference Include="Umbraco.Cms.Core" Version="11.0.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/umbraco-marketplace.json b/umbraco-marketplace.json
@@ -0,0 +1,29 @@
+{
+    "$schema": "https://marketplace.umbraco.com/umbraco-marketplace-schema.json",
+    "Title": "Date folders",
+    "Category": "Editor Tools",
+    "PackageType": "Package",
+    "Tags": [
+        "folder",
+        "date",
+        "news",
+        "year",
+        "month",
+        "day"
+    ],
+    "LicenseTypes": ["Free"],
+    "AuthorDetails": {
+        "Url": "https://infocaster.net",
+        "ImageUrl": "https://github.com/InfocasterTechniek.png",
+        "Description": "Let's make the internet brighter",
+        "Contributors": [
+            "Dennis Heutinck",
+            "Erik Eelman",
+            "Joris Peters",
+            "Bram van den Bogaard",
+            "Fabian Hofman"
+        ]
+    },
+    "IssueTrackerUrl": "https://github.com/Infocaster/DateFolders/issues",
+    "DiscussionForumUrl": "https://github.com/Infocaster/DateFolders/discussions"
+}