Release 2.0.0 (#16427)

MikeAlhayek · sebastienros · web-flow · commit 8e090d33f998 · 2024-09-09T10:52:34.000-07:00
---------

Co-authored-by: Sébastien Ros &lt;sebastienros@gmail.com&gt;
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -71,7 +71,7 @@
     <PackageVersion Include="OpenIddict.Validation.AspNetCore" Version="5.7.0" />
     <PackageVersion Include="OpenIddict.Validation.DataProtection" Version="5.7.0" />
     <PackageVersion Include="OpenIddict.Validation.SystemNetHttp" Version="5.7.0" />
-    <PackageVersion Include="OrchardCore.Translations.All" Version="1.8.0" />
+    <PackageVersion Include="OrchardCore.Translations.All" Version="2.0.0" />
     <PackageVersion Include="PdfPig" Version="0.1.8" />
     <PackageVersion Include="Serilog.AspNetCore" Version="8.0.2" />
     <PackageVersion Include="Shortcodes" Version="1.3.4" />
diff --git a/NuGet.config b/NuGet.config
@@ -3,8 +3,25 @@
     <packageSources>
         <clear />
         <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
-        <!-- This feed should not be used when shipping on NuGet. It should just be used in the dev branch while dependencies are not available on NuGet.org -->
+        <!-- 
+        This feed is intended for development purposes only and should not be used when publishing to NuGet. 
+        It is meant to be utilized exclusively in the dev branch while certain dependencies are unavailable on NuGet.org.
+        
+        As multiple sources are being used, be sure to uncomment the 'packageSourceMapping' section below.
+        -->
         <!-- add key="OrchardCore" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" /-->
     </packageSources>
+
+    <!--
+        <packageSourceMapping>
+            <packageSource key="OrchardCore">
+                <package pattern="OrchardCore.*" />
+            </packageSource>
+            <packageSource key="NuGet">
+                <package pattern="*" />
+            </packageSource>
+        </packageSourceMapping>
+    -->
+
     <disabledPackageSources />
 </configuration>
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ Orchard Core consists of two distinct projects:
 
 ## Build Status
 
-Stable (`release/1.8.4`):
+Stable (`release/2.0.0`):
 
 [![Build status](https://github.com/OrchardCMS/OrchardCore/actions/workflows/release_ci.yml/badge.svg)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Release+-+CI%22)
 [![NuGet](https://img.shields.io/nuget/v/OrchardCore.Application.Cms.Targets.svg)](https://www.nuget.org/packages/OrchardCore.Application.Cms.Targets)
@@ -23,7 +23,7 @@ Nightly (`main`):
 [![Build status](https://github.com/OrchardCMS/OrchardCore/actions/workflows/preview_ci.yml/badge.svg)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Preview+-+CI%22)
 [![Cloudsmith](https://api-prd.cloudsmith.io/badges/version/orchardcore/preview/nuget/OrchardCore.Application.Cms.Targets/latest/x/?render=true&badge_token=gAAAAABey9hKFD_C-ZIpLvayS3HDsIjIorQluDs53KjIdlxoDz6Ntt1TzvMNJp7a_UWvQbsfN5nS7_0IbxCyqHZsjhmZP6cBkKforo-NqwrH5-E6QCrJ3D8%3D)](https://cloudsmith.io/~orchardcore/repos/preview/packages/detail/nuget/OrchardCore.Application.Cms.Targets/latest/)
 
-## Project Status: v1.8.4
+## Project Status: v2.0.0
 
 The software is production-ready, and capable of serving large mission-critical applications as well, and we're not aware of any fundamental bugs or missing features we deem crucial. Orchard Core continues to evolve, with each version bringing new improvements, and keeping up with the cutting-edge of .NET.
 
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -54,7 +54,7 @@ validation:
 # Add files here that are intentionally not in the navigation and thus omitted_files shouldn't warn about them.
 not_in_nav: |
   samples/
-  releases/2.0.0.md
+  releases/2.1.0.md
 
 # Extensions
 markdown_extensions:
@@ -271,6 +271,7 @@ nav:
       - Owners: resources/owners/README.md
       - Workshops: resources/workshops/README.md
   - Releases:
+      - 2.0.0: releases/2.0.0.md
       - 1.8.4: releases/1.8.4.md
       - 1.8.3: releases/1.8.3.md
       - 1.8.2: releases/1.8.2.md
diff --git a/src/OrchardCore.Build/OrchardCore.Commons.props b/src/OrchardCore.Build/OrchardCore.Commons.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <LangVersion>12.0</LangVersion>
-    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionPrefix>2.1.0</VersionPrefix>
     <VersionSuffix>preview</VersionSuffix>
     <VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
     <WarningsNotAsErrors>612,618</WarningsNotAsErrors>
diff --git a/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs b/src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs
@@ -5,7 +5,7 @@ public static class ManifestConstants
 {
     public const string OrchardCoreTeam = "The Orchard Core Team";
 
-    public const string OrchardCoreVersion = "1.8.4";
+    public const string OrchardCoreVersion = "2.0.0";
 
     public const string OrchardCoreWebsite = "https://orchardcore.net";
 
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/dotnetcli.host.json
@@ -12,6 +12,6 @@
   },
   "usageExamples": [
     "--framework net8.0",
-    "--orchard-version 1.8.4"
+    "--orchard-version 2.0.0"
   ]
 }
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Module/.template.config/template.json
@@ -45,7 +45,7 @@
       "datatype": "string",
       "description": "Specifies which version of Orchard Core packages to use.",
       "replaces": "$(TemplateOrchardPackageVersion)",
-      "defaultValue": "1.8.4"
+      "defaultValue": "2.0.0"
     }
   },
   "sources": [
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/dotnetcli.host.json
@@ -17,6 +17,6 @@
   "usageExamples": [
     "--framework net8.0",
     "--logger none",
-    "--orchard-version 1.8.4"
+    "--orchard-version 2.0.0"
   ]
 }
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Cms.Web/.template.config/template.json
@@ -51,7 +51,7 @@
       "datatype": "string",
       "description": "Specifies which version of Orchard Core packages to use.",
       "replaces": "$(TemplateOrchardPackageVersion)",
-      "defaultValue": "1.8.4"
+      "defaultValue": "2.0.0"
     },
     "UseNLog": {
       "type": "computed",
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/dotnetcli.host.json
@@ -12,6 +12,6 @@
   },
   "usageExamples": [
     "--framework net8.0",
-    "--orchard-version 1.8.4"
+    "--orchard-version 2.0.0"
   ]
 }
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Module/.template.config/template.json
@@ -31,7 +31,7 @@
       "datatype": "string",
       "description": "Specifies which version of Orchard Core packages to use.",
       "replaces": "$(TemplateOrchardPackageVersion)",
-      "defaultValue": "1.8.4"
+      "defaultValue": "2.0.0"
     }
   },
   "sources": [
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/dotnetcli.host.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/dotnetcli.host.json
@@ -12,6 +12,6 @@
   },
   "usageExamples": [
     "--framework net8.0",
-    "--orchard-version 1.8.4"
+    "--orchard-version 2.0.0"
   ]
 }
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Mvc.Web/.template.config/template.json
@@ -31,7 +31,7 @@
       "datatype": "string",
       "description": "Specifies which version of Orchard Core packages to use.",
       "replaces": "$(TemplateOrchardPackageVersion)",
-      "defaultValue": "1.8.4"
+      "defaultValue": "2.0.0"
     }
   },
   "sources": [],
diff --git a/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/template.json b/src/Templates/OrchardCore.ProjectTemplates/content/OrchardCore.Templates.Theme/.template.config/template.json
@@ -37,7 +37,7 @@
       "datatype": "string",
       "description": "Specifies which version of Orchard Core packages to use.",
       "replaces": "$(TemplateOrchardPackageVersion)",
-      "defaultValue": "1.8.4"
+      "defaultValue": "2.0.0"
     }
   },
   "sources": [
diff --git a/src/docs/README.md b/src/docs/README.md
@@ -58,7 +58,7 @@ Orchard Core CMS supports all major site building strategies:
 
 ## Status
 
-The latest released version of Orchard Core is `1.8.4`. The release notes can be found under [Releases](releases/1.8.4.md).
+The latest released version of Orchard Core is `2.0.0`. The release notes can be found under [Releases](releases/2.0.0.md).
 
 ## Getting Started
 
diff --git a/src/docs/getting-started/templates/README.md b/src/docs/getting-started/templates/README.md
@@ -9,13 +9,13 @@ More information about `dotnet new` can be found at <https://docs.microsoft.com/
 Once the .NET Core SDK has been installed, type the following command to install the templates for creating Orchard Core web applications:
 
 ```CMD
-dotnet new install OrchardCore.ProjectTemplates::1.8.4
+dotnet new install OrchardCore.ProjectTemplates::2.0.0
 ```
 
 This will use the most stable release of Orchard Core. In order to use the latest `main` branch of Orchard Core, the following command can be used:
 
 ```CMD
-dotnet new install OrchardCore.ProjectTemplates::1.8.4-* --nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json  
+dotnet new install OrchardCore.ProjectTemplates::2.0.0-* --nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json  
 ```
 
 ## Create a new website
@@ -44,7 +44,7 @@ Options:
 
   -ov|--orchard-version  Specifies which version of Orchard Core packages to use.
                          string - Optional
-                         Default: 1.8.4
+                         Default: 2.0.0
 ```
 
 Logging can be ignored with this command:
@@ -133,7 +133,7 @@ Options:
 
   -ov|--orchard-version  Specifies which version of Orchard Core packages to use.
                          string - Optional
-                         Default: 1.8.4
+                         Default: 2.0.0
 ```
 
 ```CMD
diff --git a/src/docs/guides/add-admin-menu/README.md b/src/docs/guides/add-admin-menu/README.md
@@ -19,8 +19,8 @@ There are different ways to create sites and modules for Orchard Core. You can l
 
 You can install the latest released templates using this command:
 
-```dotnet new install OrchardCore.ProjectTemplates::1.8.4-*```
- 
+```dotnet new install OrchardCore.ProjectTemplates::2.0.0-*```
+
 !!! note
     To use the development branch of the template add `--nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json`
 
@@ -40,10 +40,10 @@ The next step is to reference the module from the application, by adding a proje
 
 We also need a reference to the `OrchardCore.Admin` package in order to be able to implement the required interfaces:
 
-```dotnet add .\MyModule\MyModule.csproj package OrchardCore.Admin --version 1.8.4-*```
+```dotnet add .\MyModule\MyModule.csproj package OrchardCore.Admin --version 2.0.0-*```
 
 !!! note
-    To use the development branch of the template add ` --source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json --version 1.8.4-*`
+    To use the development branch of the template add ` --source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json --version 2.0.0-*`
 
 ## Adding our controller and views
 
diff --git a/src/docs/guides/create-cms-application/README.md b/src/docs/guides/create-cms-application/README.md
@@ -13,7 +13,7 @@ There are different ways to create sites and modules for Orchard Core. You can l
 
 In this guide we will use our "Code Generation Templates". You can install the latest stable release of the templates using this command:
 
-```dotnet new install OrchardCore.ProjectTemplates::1.8.4-*```
+```dotnet new install OrchardCore.ProjectTemplates::2.0.0-*```
 
 !!! note
     To use the development branch of the template add `--nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json`.
diff --git a/src/docs/guides/create-modular-application-mvc/README.md b/src/docs/guides/create-modular-application-mvc/README.md
@@ -18,7 +18,7 @@ There are different ways to create sites and modules for Orchard Core. You can l
 
 In this guide we will use our [Code Generation Templates](../../getting-started/templates/README.md). You can install the latest stable release of the templates using this command:
 
-```dotnet new install OrchardCore.ProjectTemplates::1.8.4-*```
+```dotnet new install OrchardCore.ProjectTemplates::2.0.0-*```
 
 !!! note
     To use the development branch of the template add `--nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json`
diff --git a/src/docs/guides/decoupled-cms/README.md b/src/docs/guides/decoupled-cms/README.md
@@ -69,7 +69,7 @@ This will allow for the Razor Pages to be reloaded without the need to recompile
 
 ```xml
 <ItemGroup>
-  <PackageReference Include="OrchardCore.Application.Cms.Core.Targets" Version="1.8.4" />
+  <PackageReference Include="OrchardCore.Application.Cms.Core.Targets" Version="2.0.0" />
 </ItemGroup>
 ```
 
diff --git a/src/docs/releases/2.0.0.md b/src/docs/releases/2.0.0.md
diff --git a/src/docs/releases/2.1.0.md b/src/docs/releases/2.1.0.md

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ public static class ManifestConstants`
`5`	`5`	`{`
`6`	`6`	`public const string OrchardCoreTeam = "The Orchard Core Team";`
`7`	`7`
`8`		`- public const string OrchardCoreVersion = "1.8.4";`
	`8`	`+ public const string OrchardCoreVersion = "2.0.0";`
`9`	`9`
`10`	`10`	`public const string OrchardCoreWebsite = "https://orchardcore.net";`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`},`
`13`	`13`	`"usageExamples": [`
`14`	`14`	`"--framework net8.0",`
`15`		`- "--orchard-version 1.8.4"`
	`15`	`+ "--orchard-version 2.0.0"`
`16`	`16`	`]`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@`
`45`	`45`	`"datatype": "string",`
`46`	`46`	`"description": "Specifies which version of Orchard Core packages to use.",`
`47`	`47`	`"replaces": "$(TemplateOrchardPackageVersion)",`
`48`		`- "defaultValue": "1.8.4"`
	`48`	`+ "defaultValue": "2.0.0"`
`49`	`49`	`}`
`50`	`50`	`},`
`51`	`51`	`"sources": [`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@`
`17`	`17`	`"usageExamples": [`
`18`	`18`	`"--framework net8.0",`
`19`	`19`	`"--logger none",`
`20`		`- "--orchard-version 1.8.4"`
	`20`	`+ "--orchard-version 2.0.0"`
`21`	`21`	`]`
`22`	`22`	`}`