Skip to content

Commit

Permalink
Update to latest package versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
tidyui committed Mar 6, 2024
1 parent 98621e0 commit 44114d5
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 169 deletions.
2 changes: 1 addition & 1 deletion nuspec/Piranha.Templates.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata>
<id>Piranha.Templates</id>
<version>10.3.0</version>
<version>11.0.0</version>
<title>Piranha CMS Templates</title>
<authors>Piranha CMS</authors>
<owners>Piranha CMS</owners>
Expand Down
36 changes: 18 additions & 18 deletions src/empty/Empty.csproj
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Piranha" Version="10.3.0" />
<PackageReference Include="Piranha.AspNetCore" Version="10.3.0" />
<PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="10.3.0" />
<PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="10.3.0" />
<PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="10.3.0" />
<PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="10.3.0" />
<PackageReference Include="Piranha.AttributeBuilder" Version="10.3.0" />
<PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="10.3.0" />
<PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="10.3.0" />
<PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="10.3.0" />
<PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="10.3.0" />
<PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="10.3.0" />
<PackageReference Include="Piranha.ImageSharp" Version="10.3.0" />
<PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="10.3.0" />
<PackageReference Include="Piranha.Manager" Version="10.3.0" />
<PackageReference Include="Piranha.Manager.LocalAuth" Version="10.3.0" />
<PackageReference Include="Piranha.Manager.TinyMCE" Version="10.3.0" />
<PackageReference Include="Piranha" Version="11.0.0" />
<PackageReference Include="Piranha.AspNetCore" Version="11.0.0" />
<PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="11.0.0" />
<PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="11.0.0" />
<PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="11.0.0" />
<PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="11.0.0" />
<PackageReference Include="Piranha.AttributeBuilder" Version="11.0.0" />
<PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="11.0.0" />
<PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="11.0.0" />
<PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="11.0.0" />
<PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="11.0.0" />
<PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="11.0.0" />
<PackageReference Include="Piranha.ImageSharp" Version="11.0.0" />
<PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="11.0.0" />
<PackageReference Include="Piranha.Manager" Version="11.0.0" />
<PackageReference Include="Piranha.Manager.LocalAuth" Version="11.0.0" />
<PackageReference Include="Piranha.Manager.TinyMCE" Version="11.0.0" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/module/TemplateModule.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Piranha" Version="10.3.0" />
<PackageReference Include="Piranha.AspNetCore.Hosting" Version="10.3.0" />
<PackageReference Include="Piranha.Manager" Version="10.3.0" />
<PackageReference Include="Piranha" Version="11.0.0" />
<PackageReference Include="Piranha.AspNetCore.Hosting" Version="11.0.0" />
<PackageReference Include="Piranha.Manager" Version="11.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
56 changes: 1 addition & 55 deletions src/web/mvc/Controllers/SetupController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -214,60 +214,6 @@ await _api.Media.SaveAsync(new Piranha.Models.StreamMediaContent()
});
await _api.Posts.SaveAsync(post2);

var post3 = await StandardPost.CreateAsync(_api);
post3.Id = Guid.NewGuid();
post3.BlogId = blogPage.Id;
post3.Category = "Piranha";
post3.Tags.Add("Development", "Release Info");
post3.Title = "What's New In 10.0";
post3.Slug = "whats-new";
post3.MetaKeywords = "Piranha, Version, Information";
post3.MetaDescription = "Here you can find information about what's included in the current release.";
post3.PrimaryImage = images["bird-s-eye-view-photography-of-lighted-city-3573383.jpg"];
post3.Excerpt = "Here you can find information about what's included in the current release.";
post3.Published = DateTime.Now;

post3.Blocks.Add(new HtmlBlock
{
Body =
"<p class=\"lead\">Big thanks to <a href=\"https://github.com/aatmmr\">@aatmmr</a>, <a href=\"https://github.com/brianpopow\">@brianpopow</a> and <a href=\"https://github.com/tedvanderveen\">@tedvanderveen</a> for their contributions and all of the people who has helped with translating the manager.</p>"
});
post3.Blocks.Add(new ColumnBlock
{
Items = new List<Block>
{
new MarkdownBlock
{
Body =
"#### Core\n\n" +
"* Remove the need to use MARS for SQL Server [#1417](https://github.com/piranhacms/piranha.core/issues/1417)\n" +
"* Detect EXIF orientation on mobile pictures [#1442](https://github.com/piranhacms/piranha.core/issues/1442)\n" +
"* Update BlobStorage to use Azure.Storage.Blobs [#1564](https://github.com/piranhacms/piranha.core/pull/1564)\n" +
"* Update Pomelo.EntityFrameworkCore.MySql [#1646](https://github.com/piranhacms/piranha.core/pull/1646)\n" +
"* Add sort order to fields [#1732](https://github.com/piranhacms/piranha.core/issues/1732)\n" +
"* 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" +
"* 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" +
"* 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"
},
new ImageBlock
{
Body = images["person-looking-at-phone-and-at-macbook-pro-1181244.jpg"]
}
}
});

await _api.Posts.SaveAsync(post3);

var comment = new Piranha.Models.PostComment
{
Author = "Håkan Edling",
Expand All @@ -276,7 +222,7 @@ await _api.Media.SaveAsync(new Piranha.Models.StreamMediaContent()
Body = "Awesome to see that the project is up and running! Now maybe it's time to start customizing it to your needs. You can find a lot of information in the official docs.",
IsApproved = true
};
await _api.Posts.SaveCommentAsync(post3.Id, comment);
await _api.Posts.SaveCommentAsync(post2.Id, comment);

return Redirect("~/");
}
Expand Down
36 changes: 18 additions & 18 deletions src/web/mvc/MvcWeb.csproj
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Piranha" Version="10.3.0" />
<PackageReference Include="Piranha.AspNetCore" Version="10.3.0" />
<PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="10.3.0" />
<PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="10.3.0" />
<PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="10.3.0" />
<PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="10.3.0" />
<PackageReference Include="Piranha.AttributeBuilder" Version="10.3.0" />
<PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="10.3.0" />
<PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="10.3.0" />
<PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="10.3.0" />
<PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="10.3.0" />
<PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="10.3.0" />
<PackageReference Include="Piranha.ImageSharp" Version="10.3.0" />
<PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="10.3.0" />
<PackageReference Include="Piranha.Manager" Version="10.3.0" />
<PackageReference Include="Piranha.Manager.LocalAuth" Version="10.3.0" />
<PackageReference Include="Piranha.Manager.TinyMCE" Version="10.3.0" />
<PackageReference Include="Piranha" Version="11.0.0" />
<PackageReference Include="Piranha.AspNetCore" Version="11.0.0" />
<PackageReference Condition="$(UseSQLite) != False" Include="Piranha.AspNetCore.Identity.SQLite" Version="11.0.0" />
<PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.AspNetCore.Identity.SQLServer" Version="11.0.0" />
<PackageReference Condition="$(UseMySql) == True" Include="Piranha.AspNetCore.Identity.MySql" Version="11.0.0" />
<PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.AspNetCore.Identity.PostgreSql" Version="11.0.0" />
<PackageReference Include="Piranha.AttributeBuilder" Version="11.0.0" />
<PackageReference Condition="$(UseBlobStorage) == True" Include="Piranha.Azure.BlobStorage" Version="11.0.0" />
<PackageReference Condition="$(UseSQLite) != False" Include="Piranha.Data.EF.SQLite" Version="11.0.0" />
<PackageReference Condition="$(UseSQLServer) == True" Include="Piranha.Data.EF.SQLServer" Version="11.0.0" />
<PackageReference Condition="$(UseMySql) == True" Include="Piranha.Data.EF.MySql" Version="11.0.0" />
<PackageReference Condition="$(UsePostgreSql) == True" Include="Piranha.Data.EF.PostgreSql" Version="11.0.0" />
<PackageReference Include="Piranha.ImageSharp" Version="11.0.0" />
<PackageReference Condition="$(UseBlobStorage) != True" Include="Piranha.Local.FileStorage" Version="11.0.0" />
<PackageReference Include="Piranha.Manager" Version="11.0.0" />
<PackageReference Include="Piranha.Manager.LocalAuth" Version="11.0.0" />
<PackageReference Include="Piranha.Manager.TinyMCE" Version="11.0.0" />
</ItemGroup>

</Project>
56 changes: 1 addition & 55 deletions src/web/razor/Controllers/SetupController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -214,60 +214,6 @@ await _api.Media.SaveAsync(new Piranha.Models.StreamMediaContent()
});
await _api.Posts.SaveAsync(post2);

var post3 = await StandardPost.CreateAsync(_api);
post3.Id = Guid.NewGuid();
post3.BlogId = blogPage.Id;
post3.Category = "Piranha";
post3.Tags.Add("Development", "Release Info");
post3.Title = "What's New In 10.0";
post3.Slug = "whats-new";
post3.MetaKeywords = "Piranha, Version, Information";
post3.MetaDescription = "Here you can find information about what's included in the current release.";
post3.PrimaryImage = images["bird-s-eye-view-photography-of-lighted-city-3573383.jpg"];
post3.Excerpt = "Here you can find information about what's included in the current release.";
post3.Published = DateTime.Now;

post3.Blocks.Add(new HtmlBlock
{
Body =
"<p class=\"lead\">Big thanks to <a href=\"https://github.com/aatmmr\">@aatmmr</a>, <a href=\"https://github.com/brianpopow\">@brianpopow</a> and <a href=\"https://github.com/tedvanderveen\">@tedvanderveen</a> for their contributions and all of the people who has helped with translating the manager.</p>"
});
post3.Blocks.Add(new ColumnBlock
{
Items = new List<Block>
{
new MarkdownBlock
{
Body =
"#### Core\n\n" +
"* Remove the need to use MARS for SQL Server [#1417](https://github.com/piranhacms/piranha.core/issues/1417)\n" +
"* Detect EXIF orientation on mobile pictures [#1442](https://github.com/piranhacms/piranha.core/issues/1442)\n" +
"* Update BlobStorage to use Azure.Storage.Blobs [#1564](https://github.com/piranhacms/piranha.core/pull/1564)\n" +
"* Update Pomelo.EntityFrameworkCore.MySql [#1646](https://github.com/piranhacms/piranha.core/pull/1646)\n" +
"* Add sort order to fields [#1732](https://github.com/piranhacms/piranha.core/issues/1732)\n" +
"* 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" +
"* 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" +
"* 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"
},
new ImageBlock
{
Body = images["person-looking-at-phone-and-at-macbook-pro-1181244.jpg"]
}
}
});

await _api.Posts.SaveAsync(post3);

var comment = new Piranha.Models.PostComment
{
Author = "Håkan Edling",
Expand All @@ -276,7 +222,7 @@ await _api.Media.SaveAsync(new Piranha.Models.StreamMediaContent()
Body = "Awesome to see that the project is up and running! Now maybe it's time to start customizing it to your needs. You can find a lot of information in the official docs.",
IsApproved = true
};
await _api.Posts.SaveCommentAsync(post3.Id, comment);
await _api.Posts.SaveCommentAsync(post2.Id, comment);

return Redirect("~/");
}
Expand Down
Loading

0 comments on commit 44114d5

Please sign in to comment.