Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 1.7.1 #14506

Merged
merged 4 commits into from
Oct 13, 2023
Merged

Release 1.7.1 #14506

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8650170
Release 1.7.1
MikeAlhayek Oct 13, 2023
5ab8a28
update release notes.
MikeAlhayek Oct 13, 2023
edd0925
Reverting VersionPrefix
MikeAlhayek Oct 13, 2023
dea0bb6
Update src/docs/releases/1.7.1.md
sebastienros Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
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.7):
Stable (release/1.7.1):

[![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.7.0
### 1.7.1

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ nav:
- Owners: docs/resources/owners/README.md
- Workshops: docs/resources/workshops/README.md
- Releases:
- 1.7.1: docs/releases/1.7.1.md
- 1.7.0: docs/releases/1.7.0.md
- 1.6.0: docs/releases/1.6.0.md
- 1.5.0: docs/releases/1.5.0.md
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore.Build/OrchardCore.Commons.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<LangVersion>10.0</LangVersion>
<VersionPrefix>1.7.0</VersionPrefix>
<VersionPrefix>1.7.1</VersionPrefix>
Copy link
Member Author

@MikeAlhayek MikeAlhayek Oct 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastienros this may not be needed here, right?

If we take this and merge it into main then we would have to update main all over again to 1.8.0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is required, but when we merge we'll fix the conflicts by using the main branch version.

Copy link
Member Author

@MikeAlhayek MikeAlhayek Oct 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just curious why is it required? The release tag v1.7.1 will define the version of the new release not the prefix.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might not be necessary for our release pipeline because we force it during build and package steps: https://github.com/OrchardCMS/OrchardCore/blob/main/.github/workflows/release_ci.yml#L40-L42

However it's used when publishing to the preview feed: https://github.com/OrchardCMS/OrchardCore/blob/main/.github/workflows/preview_ci.yml#L30-L31

So maybe we don't need it here. You can try to revert this change and we'll deploy as-is. I believe it should work. If the package version is not correct then it will fail and we can fix. Worst case the assembly file properties is not "totally" correct. Once we know we can add a comment to the file for future reference.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted. Let me know if you want to merge this one and then merge it back into main. I can release 1.7.1 if you are good with it.

<VersionSuffix></VersionSuffix>
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion src/OrchardCore/OrchardCore.Abstractions/Modules/Manifest/ManifestConstants.cs
View file
Open in desktop
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.7.0";
public const string OrchardCoreVersion = "1.7.1";

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

Expand Down
4 changes: 2 additions & 2 deletions src/README.md
View file
Open in desktop
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.7.0`.
The release notes can be found on <https://github.com/OrchardCMS/OrchardCore/releases/tag/v1.7.0>
The latest released version of Orchard Core is `1.7.1`.
The release notes can be found on <https://github.com/OrchardCMS/OrchardCore/releases/tag/v1.7.1>

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
View file
Open in desktop
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.7.0
dotnet new install OrchardCore.ProjectTemplates::1.7.1
```

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.7.0-* --nuget-source https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json
dotnet new install OrchardCore.ProjectTemplates::1.7.1-* --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.7.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.7.0`. For instance, instead of typing `dotnet new occms` use `dotnet new occms --orchard-version 1.7.0`
Due to a bug in the current published version, the following `dotnet new` commands will require the extra argument `--orchard-version 1.7.1`. For instance, instead of typing `dotnet new occms` use `dotnet new occms --orchard-version 1.7.1`

```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.7.0
Default: 1.7.1
```

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.7.0
Default: 1.7.1
```

```CMD
Expand Down
6 changes: 3 additions & 3 deletions src/docs/guides/add-admin-menu/README.md
View file
Open in desktop
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.7.0-*```
```dotnet new install OrchardCore.ProjectTemplates::1.7.1-*```

!!! 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.7.0-*```
```dotnet add .\MyModule\MyModule.csproj package OrchardCore.Admin --version 1.7.1-*```

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

## Adding our controller and views

Expand Down
2 changes: 1 addition & 1 deletion src/docs/guides/create-cms-application/README.md
View file
Open in desktop
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.7.0-*```
```dotnet new install OrchardCore.ProjectTemplates::1.7.1-*```

!!! 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
View file
Open in desktop
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.7.0-*```
```dotnet new install OrchardCore.ProjectTemplates::1.7.1-*```

!!! 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
View file
Open in desktop
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.7.0" />
<PackageReference Include="OrchardCore.Application.Cms.Core.Targets" Version="1.7.1" />
</ItemGroup>
```
This will add the packages from Orchard Core CMS
Expand Down
2 changes: 1 addition & 1 deletion src/docs/releases/1.2.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ This is a security release fixing multiple Cross-Site-Scripting vulnerabilities.
* Fix encoding issues by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/11008


**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.2.0...v1.2.1
**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.2.0...v1.2.1
14 changes: 14 additions & 0 deletions src/docs/releases/1.7.1.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Orchard Core 1.7.1

Release date: October 2023

This is a security release fixing multiple Cross-Site-Scripting vulnerabilities.

## What's Changed
* Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14397
* Fix workflow module page list issue when using PostgreSQL by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14428
sebastienros marked this conversation as resolved.
Show resolved Hide resolved
* Release 1.7.1 by @MikeAlhayek in https://github.com/OrchardCMS/OrchardCore/pull/14474
* Fix mysql functional tests by @sebastienros in https://github.com/OrchardCMS/OrchardCore/pull/14502


**Full Changelog**: https://github.com/OrchardCMS/OrchardCore/compare/v1.7.0...v1.7.1