diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index b47d1b958..4c219a524 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.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 index 5b81a49be..442b02c72 100644 --- 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: Install tools run: | nuget install -Verbosity quiet opencover -Version 4.6.519 -OutputDirectory tools diff --git a/.github/workflows/publish_to_nuget.yml b/.github/workflows/publish_to_nuget.yml index 601020921..a337792f0 100644 --- a/.github/workflows/publish_to_nuget.yml +++ b/.github/workflows/publish_to_nuget.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET Core @ Latest uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.100-rc.2.21505.57 + dotnet-version: '6.0.x' source-url: https://api.nuget.org/v3/index.json env: NUGET_AUTH_TOKEN: ${{secrets.NugetAuthToken}} diff --git a/Directory.Build.props b/Directory.Build.props index a8105bfd4..f31b3b9b2 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - 10.0.0-alpha1 + 10.0.0 Piranha CMS Piranha CMS Copyright (c) .NET Foundation and Contributors diff --git a/README.md b/README.md index c09a865e7..6d5ff0583 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ ## About -This is a **complete rewrite** of Piranha CMS for `.NET Core`. The goal of this rewrite -is to create a version capable of targeting multiple platforms & frameworks with minimal -dependencies, but still provide a flexible & high performance CMS library. +This is a **complete rewrite** of Piranha CMS. The goal of this rewrite is to create +a version capable of targeting multiple platforms & frameworks with minimal dependencies, +but still provide a flexible & high performance CMS library. -Piranha is currently built for `.NET 5` and uses in its simplest form the following awesome packages: +Piranha is currently built for `.NET 6` and uses in its simplest form the following awesome packages: * [AutoMapper](https://github.com/AutoMapper/AutoMapper) * [Markdig](https://github.com/xoofx/markdig) @@ -33,7 +33,7 @@ Piranha is currently built for `.NET 5` and uses in its simplest form the follow ### Prerequisites -* [.NET 5.0 SDK](https://dotnet.microsoft.com/download/dotnet/5.0) +* [.NET 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0) * An IDE or Editor of your choice ### Create a new project from our templates diff --git a/core/Piranha.AspNetCore.SimpleSecurity/Piranha.AspNetCore.SimpleSecurity.csproj b/core/Piranha.AspNetCore.SimpleSecurity/Piranha.AspNetCore.SimpleSecurity.csproj index 83b1f72b7..e19e2de45 100644 --- a/core/Piranha.AspNetCore.SimpleSecurity/Piranha.AspNetCore.SimpleSecurity.csproj +++ b/core/Piranha.AspNetCore.SimpleSecurity/Piranha.AspNetCore.SimpleSecurity.csproj @@ -16,7 +16,7 @@ - + diff --git a/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj b/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj index b5d1b3a41..bde6c0ccf 100644 --- a/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj +++ b/core/Piranha.AspNetCore/Piranha.AspNetCore.csproj @@ -14,7 +14,7 @@ - + diff --git a/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj b/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj index 6ca374599..5f6317dd4 100644 --- a/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj +++ b/core/Piranha.AttributeBuilder/Piranha.AttributeBuilder.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 Library for defining content types with Attributes diff --git a/core/Piranha.Azure.BlobStorage/Piranha.Azure.BlobStorage.csproj b/core/Piranha.Azure.BlobStorage/Piranha.Azure.BlobStorage.csproj index b20c3f141..11a30fed4 100644 --- a/core/Piranha.Azure.BlobStorage/Piranha.Azure.BlobStorage.csproj +++ b/core/Piranha.Azure.BlobStorage/Piranha.Azure.BlobStorage.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 Piranha.Azure $(NoWarn);1591 Package for storing uploaded media assets on Azure Blob Storage diff --git a/core/Piranha.Azure.Search/Piranha.Azure.Search.csproj b/core/Piranha.Azure.Search/Piranha.Azure.Search.csproj index 389e8c513..712b81312 100644 --- a/core/Piranha.Azure.Search/Piranha.Azure.Search.csproj +++ b/core/Piranha.Azure.Search/Piranha.Azure.Search.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net6.0 $(NoWarn);1591 diff --git a/core/Piranha.ImageSharp/Piranha.ImageSharp.csproj b/core/Piranha.ImageSharp/Piranha.ImageSharp.csproj index 3036207dc..a48245283 100644 --- a/core/Piranha.ImageSharp/Piranha.ImageSharp.csproj +++ b/core/Piranha.ImageSharp/Piranha.ImageSharp.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 $(NoWarn);1591 Package for processing uploaded images using ImageSharp diff --git a/core/Piranha.Local.FileStorage/Piranha.Local.FileStorage.csproj b/core/Piranha.Local.FileStorage/Piranha.Local.FileStorage.csproj index bcdef6981..f86fe7512 100644 --- a/core/Piranha.Local.FileStorage/Piranha.Local.FileStorage.csproj +++ b/core/Piranha.Local.FileStorage/Piranha.Local.FileStorage.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 $(NoWarn);1591 Package for storing uploaded media assets on disc diff --git a/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj b/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj index 9392b18b6..a6a027e82 100644 --- a/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj +++ b/core/Piranha.Manager.Localization/Piranha.Manager.Localization.csproj @@ -11,7 +11,7 @@ - + diff --git a/core/Piranha.Manager/Piranha.Manager.csproj b/core/Piranha.Manager/Piranha.Manager.csproj index 747cf52f9..9e72c27d5 100644 --- a/core/Piranha.Manager/Piranha.Manager.csproj +++ b/core/Piranha.Manager/Piranha.Manager.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/core/Piranha/Piranha.csproj b/core/Piranha/Piranha.csproj index 6dc3c90a3..a8274b67a 100644 --- a/core/Piranha/Piranha.csproj +++ b/core/Piranha/Piranha.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 $(NoWarn);1591 Core package for Piranha CMS for .NET Core @@ -11,10 +11,8 @@ - - - - + + diff --git a/data/Piranha.Data.EF.SQLServer/Piranha.Data.EF.SQLServer.csproj b/data/Piranha.Data.EF.SQLServer/Piranha.Data.EF.SQLServer.csproj index 1937f65aa..006f09084 100644 --- a/data/Piranha.Data.EF.SQLServer/Piranha.Data.EF.SQLServer.csproj +++ b/data/Piranha.Data.EF.SQLServer/Piranha.Data.EF.SQLServer.csproj @@ -11,7 +11,7 @@ - + diff --git a/data/Piranha.Data.EF.SQLite/Piranha.Data.EF.SQLite.csproj b/data/Piranha.Data.EF.SQLite/Piranha.Data.EF.SQLite.csproj index 4bd673012..f1ef601b9 100644 --- a/data/Piranha.Data.EF.SQLite/Piranha.Data.EF.SQLite.csproj +++ b/data/Piranha.Data.EF.SQLite/Piranha.Data.EF.SQLite.csproj @@ -11,7 +11,7 @@ - + diff --git a/data/Piranha.Data.EF/Piranha.Data.EF.csproj b/data/Piranha.Data.EF/Piranha.Data.EF.csproj index 1dab32d90..c0df68b0a 100644 --- a/data/Piranha.Data.EF/Piranha.Data.EF.csproj +++ b/data/Piranha.Data.EF/Piranha.Data.EF.csproj @@ -12,7 +12,7 @@ - + diff --git a/identity/Piranha.AspNetCore.Identity.MySQL/Piranha.AspNetCore.Identity.MySQL.csproj b/identity/Piranha.AspNetCore.Identity.MySQL/Piranha.AspNetCore.Identity.MySQL.csproj index cc3fa6170..22ed30ab8 100644 --- a/identity/Piranha.AspNetCore.Identity.MySQL/Piranha.AspNetCore.Identity.MySQL.csproj +++ b/identity/Piranha.AspNetCore.Identity.MySQL/Piranha.AspNetCore.Identity.MySQL.csproj @@ -11,7 +11,7 @@ - + diff --git a/identity/Piranha.AspNetCore.Identity.PostgreSQL/Piranha.AspNetCore.Identity.PostgreSQL.csproj b/identity/Piranha.AspNetCore.Identity.PostgreSQL/Piranha.AspNetCore.Identity.PostgreSQL.csproj index 757be553a..f287dae43 100644 --- a/identity/Piranha.AspNetCore.Identity.PostgreSQL/Piranha.AspNetCore.Identity.PostgreSQL.csproj +++ b/identity/Piranha.AspNetCore.Identity.PostgreSQL/Piranha.AspNetCore.Identity.PostgreSQL.csproj @@ -11,7 +11,7 @@ - + diff --git a/identity/Piranha.AspNetCore.Identity.SQLServer/Piranha.AspNetCore.Identity.SQLServer.csproj b/identity/Piranha.AspNetCore.Identity.SQLServer/Piranha.AspNetCore.Identity.SQLServer.csproj index a39ba7f6c..16a205e39 100644 --- a/identity/Piranha.AspNetCore.Identity.SQLServer/Piranha.AspNetCore.Identity.SQLServer.csproj +++ b/identity/Piranha.AspNetCore.Identity.SQLServer/Piranha.AspNetCore.Identity.SQLServer.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/identity/Piranha.AspNetCore.Identity.SQLite/Piranha.AspNetCore.Identity.SQLite.csproj b/identity/Piranha.AspNetCore.Identity.SQLite/Piranha.AspNetCore.Identity.SQLite.csproj index 4cf478ae2..56b731b85 100644 --- a/identity/Piranha.AspNetCore.Identity.SQLite/Piranha.AspNetCore.Identity.SQLite.csproj +++ b/identity/Piranha.AspNetCore.Identity.SQLite/Piranha.AspNetCore.Identity.SQLite.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/identity/Piranha.AspNetCore.Identity/Piranha.AspNetCore.Identity.csproj b/identity/Piranha.AspNetCore.Identity/Piranha.AspNetCore.Identity.csproj index 4e8371f9a..24fb7c3a2 100644 --- a/identity/Piranha.AspNetCore.Identity/Piranha.AspNetCore.Identity.csproj +++ b/identity/Piranha.AspNetCore.Identity/Piranha.AspNetCore.Identity.csproj @@ -12,8 +12,8 @@ - - + + all runtime; build; native; contentfiles; analyzers