Skip to content

Commit aa2d0ad

Browse files
committed
Merge branch 'main' into release/1.0
# Conflicts: # README.md
2 parents a89854c + 87b7a89 commit aa2d0ad

File tree

9 files changed

+20
-18
lines changed

9 files changed

+20
-18
lines changed

.github/workflows/pr_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- '**/*.md'
66
- 'mkdocs.yml'
77
- 'src/docs/**/*'
8-
branches: [ dev, main ]
8+
branches: [ dev, main, release/** ]
99
env:
1010
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1111
DOTNET_CLI_TELEMETRY_OPTOUT: true

.github/workflows/preview_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- '**/*.md'
66
- 'mkdocs.yml'
77
- 'src/docs/**/*'
8-
branches: [ dev, main ]
8+
branches: [ dev, main, release/** ]
99
env:
1010
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1111
DOTNET_CLI_TELEMETRY_OPTOUT: true

.github/workflows/release_ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
arrTag=(${GITHUB_REF//\// })
6363
VERSION="${arrTag[2]}"
6464
VERSION="${VERSION//v}"
65-
dotnet pack -c Release --no-restore --no-build -p:Version=$VERSION
65+
dotnet pack -c Release --no-restore --no-build -p:Version=$VERSION -p:TreatWarningsAsErrors=false
6666
dotnet nuget push './src/**/*.nupkg' -k ${{secrets.CLOUDSMITH_API_KEY}} -n true -s https://nuget.cloudsmith.io/orchardcore/preview/v3/index.json --skip-duplicate
6767
- name: Login to DockerHub
6868
if: matrix.os == 'ubuntu-latest'

README.md

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,27 @@ Orchard Core consists of two distinct projects:
1212

1313
## Build Status
1414

15-
Stable (master):
15+
Stable (release/1.0):
1616

17-
[![Build status](https://github.com/OrchardCMS/OrchardCore/workflows/Release%20-%20CI/badge.svg?branch=master)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Release+-+CI%22)
17+
[![Build status](https://github.com/OrchardCMS/OrchardCore/workflows/Release%20-%20CI/badge.svg?branch=release%2F1.0)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Release+-+CI%22)
1818
[![NuGet](https://img.shields.io/nuget/v/OrchardCore.Application.Cms.Targets.svg)](https://www.nuget.org/packages/OrchardCore.Application.Cms.Targets)
1919

20-
Nightly (dev):
20+
Nightly (main):
2121

22-
[![Build status](https://github.com/OrchardCMS/OrchardCore/workflows/Release%20-%20CI/badge.svg?branch=dev)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Release+-+CI%22)
22+
[![Build status](https://github.com/OrchardCMS/OrchardCore/workflows/Release%20-%20CI/badge.svg?branch=main)](https://github.com/OrchardCMS/OrchardCore/actions?query=workflow%3A%22Release+-+CI%22)
2323
[![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/)
2424

2525
## Status
2626

27-
### 1.0.0
27+
### 1.0
2828

29-
Here is a more detailed [Roadmap](https://github.com/OrchardCMS/OrchardCore/wiki/Roadmap).
29+
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.
30+
31+
Here is a more detailed [roadmap](https://github.com/OrchardCMS/OrchardCore/wiki/Roadmap).
3032

3133
## Getting Started
3234

33-
- Clone the repository using the command `git clone https://github.com/OrchardCMS/OrchardCore.git` and checkout the `dev` branch.
35+
- Clone the repository using the command `git clone https://github.com/OrchardCMS/OrchardCore.git` and checkout the `main` branch.
3436

3537
### Command line
3638

src/OrchardCore.Modules/OrchardCore.Lucene/OrchardCore.Lucene.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
</ItemGroup>
3939

4040
<ItemGroup>
41-
<PackageReference Include="Lucene.Net.Analysis.Common" NoWarn="NU5104" />
42-
<PackageReference Include="Lucene.Net.QueryParser" NoWarn="NU5104" />
43-
<PackageReference Include="Lucene.Net.Spatial" NoWarn="NU5104" />
41+
<PackageReference Include="Lucene.Net.Analysis.Common" />
42+
<PackageReference Include="Lucene.Net.QueryParser" />
43+
<PackageReference Include="Lucene.Net.Spatial" />
4444
</ItemGroup>
4545

4646
</Project>

src/OrchardCore/OrchardCore.Infrastructure/OrchardCore.Infrastructure.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="HtmlSanitizer" NoWarn="NU5104" />
17+
<PackageReference Include="HtmlSanitizer" />
1818
<PackageReference Include="MimeKit" />
1919
</ItemGroup>
2020

src/OrchardCore/OrchardCore.Lucene.Abstractions/OrchardCore.Lucene.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Lucene.Net" NoWarn="NU5104" />
18+
<PackageReference Include="Lucene.Net" />
1919
<PackageReference Include="Newtonsoft.Json" />
2020
</ItemGroup>
2121
</Project>

src/OrchardCore/OrchardCore.Lucene.Core/OrchardCore.Lucene.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Lucene.Net.QueryParser" NoWarn="NU5104" />
19-
<PackageReference Include="Lucene.Net.Spatial" NoWarn="NU5104" />
18+
<PackageReference Include="Lucene.Net.QueryParser" />
19+
<PackageReference Include="Lucene.Net.Spatial" />
2020
<ProjectReference Include="..\OrchardCore.Lucene.Abstractions\OrchardCore.Lucene.Abstractions.csproj" />
2121
<ProjectReference Include="..\OrchardCore.Queries.Abstractions\OrchardCore.Queries.Abstractions.csproj" />
2222
</ItemGroup>

src/OrchardCore/OrchardCore.Scripting.JavaScript/OrchardCore.Scripting.JavaScript.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Jint" NoWarn="NU5104" />
17+
<PackageReference Include="Jint" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

0 commit comments

Comments
 (0)