Skip to content

Commit

Permalink
Release 1.6 (#13416)
Browse files Browse the repository at this point in the history
Co-authored-by: Mike Alhayek <[email protected]>
  • Loading branch information
sebastienros and MikeAlhayek authored Apr 13, 2023
1 parent 7b28eea commit b672e46
Show file tree
Hide file tree
Showing 16 changed files with 68 additions and 24 deletions.
1 change: 1 addition & 0 deletions .github/workflows/functional_all_db.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
env:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
DOTNET_CLI_TELEMETRY_OPTOUT: true

jobs:
test_functional_mvc:
name: Functional Tests - MVC
Expand Down
2 changes: 1 addition & 1 deletion NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<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 -->
<!--add key="OrchardCore" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" /-->
<!-- add key="OrchardCore" value="https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json" /-->
</packageSources>
<disabledPackageSources />
</configuration>
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Orchard Core consists of two distinct projects:

## Build Status

Stable (release/1.5):
Stable (release/1.6):

[![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)
Expand All @@ -30,7 +30,7 @@ Nightly (main):

## Status

### 1.5.0
### 1.6.0

The software is finished -- and by finished, we mean there are no show-stopping, little-children-killing bugs in it. That we know of. There are probably numerous lower-priority bugs triaged into the next point release or service pack, as well.

Expand Down
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@ nav:
- Owners: docs/resources/owners/README.md
- Workshops: docs/resources/workshops/README.md
- Releases:
- 1.6.0: docs/releases/1.6.0.md
- 1.5.0: docs/releases/1.5.0.md
- 1.4.0: docs/releases/1.4.0.md
- 1.3.0: docs/releases/1.3.0.md
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Build/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<PackageManagement Include="NodaTime" Version="3.1.9" />
<PackageManagement Include="OpenIddict.AspNetCore" Version="4.2.0" />
<PackageManagement Include="OpenIddict.Core" Version="4.2.0" />
<PackageManagement Include="OrchardCore.Translations.All" Version="1.5.0" />
<PackageManagement Include="OrchardCore.Translations.All" Version="1.6.1" />
<PackageManagement Include="PdfPig" Version="0.1.7" />
<PackageManagement Include="Serilog.AspNetCore" Version="6.1.0" />
<PackageManagement Include="Shortcodes" Version="1.3.3" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public static class ManifestConstants
{
public const string OrchardCoreTeam = "The Orchard Core Team";

public const string OrchardCoreVersion = "1.5.0";
public const string OrchardCoreVersion = "1.6.0";

public const string OrchardCoreWebsite = "https://orchardcore.net";

Expand Down
4 changes: 2 additions & 2 deletions src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ Orchard Core CMS supports all major site building strategies:

## Status

The latest released version of Orchard Core is `1.5.0`.
The release notes can be found on <https://github.com/OrchardCMS/OrchardCore/releases/tag/v1.5.0>
The latest released version of Orchard Core is `1.6.0`.
The release notes can be found on <https://github.com/OrchardCMS/OrchardCore/releases/tag/v1.6.0>

Here is a more detailed [roadmap](https://github.com/OrchardCMS/OrchardCore/wiki/Roadmap).

Expand Down
10 changes: 5 additions & 5 deletions src/docs/getting-started/templates/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0
dotnet new install OrchardCore.ProjectTemplates::1.6.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.5.0-* --nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json
dotnet new install OrchardCore.ProjectTemplates::1.6.0-* --nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json
```

## Create a new website
Expand All @@ -25,7 +25,7 @@ dotnet new install OrchardCore.ProjectTemplates::1.5.0-* --nuget-source https://
#### Generate an Orchard Cms Web Application

!!! warning
Due to a bug in the current published version, the following `dotnet new` commands will require the extra argument `--orchard-version 1.5.0`. For instance, instead of typing `dotnet new occms` use `dotnet new occms --orchard-version 1.5.0`
Due to a bug in the current published version, the following `dotnet new` commands will require the extra argument `--orchard-version 1.6.0`. For instance, instead of typing `dotnet new occms` use `dotnet new occms --orchard-version 1.6.0`

```CMD
dotnet new occms
Expand All @@ -47,7 +47,7 @@ Options:
-ov|--orchard-version Specifies which version of Orchard Core packages to use.
string - Optional
Default: 1.5.0
Default: 1.6.0
```

Logging can be ignored with this command:
Expand Down Expand Up @@ -134,7 +134,7 @@ Options:
-ov|--orchard-version Specifies which version of Orchard Core packages to use.
string - Optional
Default: 1.5.0
Default: 1.6.0
```

```CMD
Expand Down
6 changes: 3 additions & 3 deletions src/docs/guides/add-admin-menu/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ 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.5.0-*```
```dotnet new install OrchardCore.ProjectTemplates::1.6.0-*```

!!! note
To use the development branch of the template add `--nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json`
Expand All @@ -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.5.0-*```
```dotnet add .\MyModule\MyModule.csproj package OrchardCore.Admin --version 1.6.0-*```

!!! note
To use the development branch of the template add ` --source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json --version 1.5.0-*`
To use the development branch of the template add ` --source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json --version 1.6.0-*`

## Adding our controller and views

Expand Down
2 changes: 1 addition & 1 deletion src/docs/guides/create-cms-application/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0-*```
```dotnet new install OrchardCore.ProjectTemplates::1.6.0-*```

!!! note
To use the development branch of the template add `--nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json`
Expand Down
2 changes: 1 addition & 1 deletion src/docs/guides/create-modular-application-mvc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/). You can install the latest stable release of the templates using this command:

```dotnet new install OrchardCore.ProjectTemplates::1.5.0-*```
```dotnet new install OrchardCore.ProjectTemplates::1.6.0-*```

!!! note
To use the development branch of the template add `--nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json`
Expand Down
2 changes: 1 addition & 1 deletion src/docs/guides/decoupled-cms/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.0" />
<PackageReference Include="OrchardCore.Application.Cms.Core.Targets" Version="1.6.0" />
</ItemGroup>
```
This will add the packages from Orchard Core CMS
Expand Down
7 changes: 6 additions & 1 deletion src/docs/releases/1.6.0.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Orchard Core 1.6.0

Release date: Not yet released
Release date: March 2023

This release contains many bug fixes, performance upgrade, and enhancements. It is recommended to update your existing Orchard Core deployments with this version.

## Breaking Changes

Expand Down Expand Up @@ -28,6 +30,9 @@ Here is a list of the new permissions
| `DeleteUsersInRole_{0}` | allows deleting users in a given role. |
| `AssignRoleToUsers_{0}` | allows assigning users to a given role. |

### `OrchardCore.Roles` Module
As of version 1.6, the default roles are no longer auto created. Setup recipe *must* define the default roles to be used. The Roles feature will automatically map all known permissions to the defined roles each time a feature is enabled. For more info on creating roles using recipe, visit the [Roles Step documentation](../reference/modules/Recipes/README.md#roles-step).

### `OrchardCore.Search` Module

The property `SearchProviderAreaName` in the `SearchSettings` class was renamed to `ProviderName`. If you are using both `Lucene` and `Elasticsearch` search providers at the same time, you'll need to update the search settings by setting the default search provider to one of the two.
Expand Down
1 change: 1 addition & 0 deletions src/docs/topics/publishing-releases/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Update the source so everything looks like on the new version.
- [ ] Update the `OrchardCore.Commons.props` file with `<VersionSuffix></VersionSuffix>` such that preview build numbers are not injected in packages. Verify the `VersionPrefix` tag matches the released version.
- [ ] Update module versions in `src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs`.
- [ ] Update the version in the command lines in from all documentation files.
- [ ] Create a new milestone.

### Test the release

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,43 @@ global.log = function(msg) {
};

// Build the dotnet application in release mode
function build(dir) {
global.log("Building ...");
child_process.spawnSync("dotnet", ["build", "-c", "Release"], { cwd: dir });
function build(dir, dotnetVersion) {
global.log("version: 3");

// "dotnet" command arguments.
let runArgs = [
'build',
'--configuration', 'Release',
'--framework', dotnetVersion
];

// "dotnet" process options.
let runOpts = {
cwd: dir
};

try {
// Run dotnet build process, blocks until process completes.
let { status, error, stderr, stdout } = child_process.spawnSync('dotnet', runArgs, runOpts);

if (error) {
throw error;
}

if (status !== 0) {
if (stderr.length > 0) {
throw new Error(stderr.toString());
}
throw new Error(stdout.toString());
}

console.log(stdout.toString());
console.log('Build successful.');
}
catch (error) {
console.error(error);
console.error('Failed to build.');
}
}

// destructive action that deletes the App_Data folder
Expand All @@ -29,7 +63,7 @@ function host(dir, assembly, { appDataLocation='./App_Data', dotnetVersion='net7
if (fs.existsSync(path.join(dir, `bin/Release/${dotnetVersion}/`, assembly))) {
global.log("Application already built, skipping build");
} else {
build(dir);
build(dir, dotnetVersion);
}
global.log("Starting application ...");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ global.log = function(msg) {
// Build the dotnet application in release mode
export function build(dir) {
global.log("Building ...");
child_process.spawnSync("dotnet", ["build", "-c", "Release"], { cwd: dir });
var result = child_process.spawnSync("dotnet", ["build", "-c", "Release"], { cwd: dir });
global.log("Built ...");
global.log(result.output);
}

// destructive action that deletes the App_Data folder
Expand Down

0 comments on commit b672e46

Please sign in to comment.