Updated to v10.0

PiranhaCMS · Nov 10, 2021 · 4a60f35 · 4a60f35
1 parent feacf71
commit 4a60f35
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 63 deletions.
diff --git a/.github/workflows/dotnet_linux.yml b/.github/workflows/dotnet_linux.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100-rc.2.21505.57
+        dotnet-version: '6.0.x'
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/.github/workflows/dotnet_win.yml b/.github/workflows/dotnet_win.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100-rc.2.21505.57
+        dotnet-version: '6.0.x'
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

diff --git a/.github/workflows/publish_to_nuget.yml b/.github/workflows/publish_to_nuget.yml
@@ -16,6 +16,7 @@ jobs:
     - name: Setup .NET Core @ Latest
       uses: actions/setup-dotnet@v1
       with:
+        dotnet-version: '6.0.x'
         source-url: https://api.nuget.org/v3/index.json
       env:
         NUGET_AUTH_TOKEN: ${{secrets.NugetAuthToken}}

diff --git a/nuspec/Piranha.Templates.nuspec b/nuspec/Piranha.Templates.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>Piranha.Templates</id>
-    <version>10.0.0-alpha1</version>
+    <version>10.0.0</version>
     <title>Piranha CMS Templates</title>
     <authors>Piranha CMS</authors>
     <owners>Piranha CMS</owners>

diff --git a/src/empty/Empty.csproj b/src/empty/Empty.csproj
@@ -5,23 +5,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Piranha" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.AspNetCore" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.AttributeBuilder" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.ImageSharp" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager.LocalAuth" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager.TinyMCE" Version="10.0.0-alpha1" />
+    <PackageReference Include="Piranha" Version="10.0.0" />
+    <PackageReference Include="Piranha.AspNetCore" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="10.0.0" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="10.0.0" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="10.0.0" />
+    <PackageReference Include="Piranha.AttributeBuilder" Version="10.0.0" />
+    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="10.0.0" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="10.0.0" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="10.0.0" />
+    <PackageReference Include="Piranha.ImageSharp" Version="10.0.0" />
+    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager.LocalAuth" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager.TinyMCE" Version="10.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/module/TemplateModule.csproj b/src/module/TemplateModule.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Piranha" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.AspNetCore.Hosting" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager" Version="10.0.0-alpha1" />
+    <PackageReference Include="Piranha" Version="10.0.0" />
+    <PackageReference Include="Piranha.AspNetCore.Hosting" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager" Version="10.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/web/mvc/Controllers/SetupController.cs b/src/web/mvc/Controllers/SetupController.cs
@@ -234,7 +234,7 @@ await _api.Media.SaveAsync(new Piranha.Models.StreamMediaContent()
             post3.Blocks.Add(new HtmlBlock
             {
                 Body = 
-                    "<p class=\"lead\">Please note that this is a preview version of Piranha CMS.</p>"
+                    "<p class=\"lead\">Big thanks to [@aatmmr](https://github.com/aatmmr), [@brianpopow](https://github.com/brianpopow) and [@tedvanderveen](https://github.com/tedvanderveen) for their contributions and all of the people who has helped with translating the manager.</p>"
             });
             post3.Blocks.Add(new ColumnBlock
             {
@@ -252,11 +252,13 @@ await _api.Media.SaveAsync(new Piranha.Models.StreamMediaContent()
                             "* Update to .NET 6 [#1733](https://github.com/piranhacms/piranha.core/issues/1733)\n" +
                             "* Use Identify to get image width and height [#1734](https://github.com/piranhacms/piranha.core/pull/1734)\n" +
                             "* Clean up application startup [#1738](https://github.com/piranhacms/piranha.core/issues/1738)\n" +
-                            "* Add markdown block [#1744](https://github.com/piranhacms/piranha.core/issues/1744)\n\n" +
+                            "* Add markdown block [#1744](https://github.com/piranhacms/piranha.core/issues/1744)\n" +
+                            "* Remove description attributes [#1747](https://github.com/piranhacms/piranha.core/issues/1747)\n\n" +
                             "#### Manager\n\n" +
                             "* Add content settings (with region support) [#1524](https://github.com/piranhacms/piranha.core/issues/1524)\n" +
                             "* Update Summernote package [#1730](https://github.com/piranhacms/piranha.core/issues/1730)\n" +
-                            "* Manager security update [#1741](https://github.com/piranhacms/piranha.core/issues/1741)\n\n" +
+                            "* Manager security update [#1741](https://github.com/piranhacms/piranha.core/issues/1741)\n" +
+                            "* Redesign Add page button in manager [#1748](https://github.com/piranhacms/piranha.core/issues/1748)\n\n" +
                             "#### Bugfixes\n\n" +
                             "* Cannot access disposed object [#1701](https://github.com/piranhacms/piranha.core/issues/1701)\n" +
                             "* Invalid PageField URL in Manager [#1705](https://github.com/piranhacms/piranha.core/issues/1705)\n"

diff --git a/src/web/mvc/MvcWeb.csproj b/src/web/mvc/MvcWeb.csproj
@@ -5,23 +5,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Piranha" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.AspNetCore" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.AttributeBuilder" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.ImageSharp" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager.LocalAuth" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager.TinyMCE" Version="10.0.0-alpha1" />
+    <PackageReference Include="Piranha" Version="10.0.0" />
+    <PackageReference Include="Piranha.AspNetCore" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="10.0.0" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="10.0.0" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="10.0.0" />
+    <PackageReference Include="Piranha.AttributeBuilder" Version="10.0.0" />
+    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="10.0.0" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="10.0.0" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="10.0.0" />
+    <PackageReference Include="Piranha.ImageSharp" Version="10.0.0" />
+    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager.LocalAuth" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager.TinyMCE" Version="10.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/web/razor/Controllers/SetupController.cs b/src/web/razor/Controllers/SetupController.cs
@@ -234,7 +234,7 @@ await _api.Media.SaveAsync(new Piranha.Models.StreamMediaContent()
             post3.Blocks.Add(new HtmlBlock
             {
                 Body = 
-                    "<p class=\"lead\">Please note that this is a preview version of Piranha CMS.</p>"
+                    "<p class=\"lead\">Big thanks to [@aatmmr](https://github.com/aatmmr), [@brianpopow](https://github.com/brianpopow) and [@tedvanderveen](https://github.com/tedvanderveen) for their contributions and all of the people who has helped with translating the manager.</p>"
             });
             post3.Blocks.Add(new ColumnBlock
             {
@@ -252,11 +252,13 @@ await _api.Media.SaveAsync(new Piranha.Models.StreamMediaContent()
                             "* Update to .NET 6 [#1733](https://github.com/piranhacms/piranha.core/issues/1733)\n" +
                             "* Use Identify to get image width and height [#1734](https://github.com/piranhacms/piranha.core/pull/1734)\n" +
                             "* Clean up application startup [#1738](https://github.com/piranhacms/piranha.core/issues/1738)\n" +
-                            "* Add markdown block [#1744](https://github.com/piranhacms/piranha.core/issues/1744)\n\n" +
+                            "* Add markdown block [#1744](https://github.com/piranhacms/piranha.core/issues/1744)\n" +
+                            "* Remove description attributes [#1747](https://github.com/piranhacms/piranha.core/issues/1747)\n\n" +
                             "#### Manager\n\n" +
                             "* Add content settings (with region support) [#1524](https://github.com/piranhacms/piranha.core/issues/1524)\n" +
                             "* Update Summernote package [#1730](https://github.com/piranhacms/piranha.core/issues/1730)\n" +
-                            "* Manager security update [#1741](https://github.com/piranhacms/piranha.core/issues/1741)\n\n" +
+                            "* Manager security update [#1741](https://github.com/piranhacms/piranha.core/issues/1741)\n" +
+                            "* Redesign Add page button in manager [#1748](https://github.com/piranhacms/piranha.core/issues/1748)\n\n" +
                             "#### Bugfixes\n\n" +
                             "* Cannot access disposed object [#1701](https://github.com/piranhacms/piranha.core/issues/1701)\n" +
                             "* Invalid PageField URL in Manager [#1705](https://github.com/piranhacms/piranha.core/issues/1705)\n"

diff --git a/src/web/razor/RazorWeb.csproj b/src/web/razor/RazorWeb.csproj
@@ -5,23 +5,23 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Piranha" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.AspNetCore" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.AttributeBuilder" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.ImageSharp" Version="10.0.0-alpha1" />
-    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager.LocalAuth" Version="10.0.0-alpha1" />
-    <PackageReference Include="Piranha.Manager.TinyMCE" Version="10.0.0-alpha1" />
+    <PackageReference Include="Piranha" Version="10.0.0" />
+    <PackageReference Include="Piranha.AspNetCore" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="10.0.0" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="10.0.0" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="10.0.0" />
+    <PackageReference Include="Piranha.AttributeBuilder" Version="10.0.0" />
+    <PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="10.0.0" />
+    <PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="10.0.0" />
+    <PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="10.0.0" />
+    <PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="10.0.0" />
+    <PackageReference Include="Piranha.ImageSharp" Version="10.0.0" />
+    <PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager.LocalAuth" Version="10.0.0" />
+    <PackageReference Include="Piranha.Manager.TinyMCE" Version="10.0.0" />
   </ItemGroup>
 
 </Project>