Skip to content

Commit

Permalink
Reviewed Umbraco dependencies
Browse files Browse the repository at this point in the history
- Bumped v10 to latest v10.0.0-rc5
- Lowered v8 back to v8.17.0 (as not relying on anything in v8.18)
  • Loading branch information
leekelleher committed Jun 10, 2022
1 parent 0e0d0a0 commit 1d7623f
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Given there are now multiple versions of Contentment that support multiple versi
- The [`dev/v1.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v1.x) branch is for Contentment **v1.4.x** patch releases, this targets Umbraco **v8.6.1**.
- The [`dev/v2.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v2.x) branch is for Contentment **v2.2.x** patch releases, this targets Umbraco **v8.14.0**.
- The [`dev/v3.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v3.x) branch is for Contentment **v3.x** (current) releases, this targets both Umbraco **v8.17.0** and **v9.0.0**.
- The [`dev/v4.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v4.x) branch is for Contentment **v4.x** (next) releases, this targets Umbraco **v8.18.0**, **v9.5.0** and **v10.0.0**.
- The [`dev/v4.x`](https://github.com/leekelleher/umbraco-contentment/tree/dev/v4.x) branch is for Contentment **v4.x** (next) releases, this targets Umbraco **v8.17.0**, **v9.5.0** and **v10.0.0**.


### Further reading
Expand Down
2 changes: 1 addition & 1 deletion .github/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Downloads are available on the [releases page](https://github.com/leekelleher/um

_**Please note...**_

- v4.x has been developed against **Umbraco v8.18.0** (on .NET 4.7), **Umbraco v9.5.0** (on .NET 5.0 only) and **Umbraco v10.0.0** (on .NET 6.0), it will support those versions and above.
- v4.x has been developed against **Umbraco v8.17.0** (on .NET 4.7), **Umbraco v9.5.0** (on .NET 5.0 only) and **Umbraco v10.0.0** (on .NET 6.0), it will support those versions and above.
- v3.x has been developed against **Umbraco v8.17.0** and **Umbraco v9.0.0**, it will work on latest Umbraco v8.x and v9.x releases.
- v2.x has been developed against **Umbraco v8.14.0**, it will still work on latest Umbraco v8.x releases.
- v1.x has been developed against **Umbraco v8.6.1**, it will still work on latest Umbraco v8.x releases.
Expand Down
4 changes: 2 additions & 2 deletions .github/ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Property Editors are:

### v4.0

- A breaking-change release _(following SemVer guidelines),_ of v3.x features that will compile against both Umbraco v8.18.0, v9.5.0 and v10.0.
- A breaking-change release _(following SemVer guidelines),_ of v3.x features that will compile against both Umbraco v8.17.0, v9.5.0 and v10.0.0.

### v4.1

Expand All @@ -101,7 +101,7 @@ Property Editors are:

### v5.0

- A breaking-change release _(following SemVer guidelines),_ dropping support for Umbraco v8 and v9, to only compile against Umbraco v10.0. This would have the same features as v4.x.
- A breaking-change release _(following SemVer guidelines),_ dropping support for Umbraco v8 and v9, to only compile against Umbraco v10.0.0. This would have the same features as v4.x.

### v5.1

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.0-alpha004
4.0.0-alpha005
2 changes: 1 addition & 1 deletion build/build-pkgs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ $licenseName = 'Mozilla Public License Version 2.0';
$licenseUrl = 'https://mozilla.org/MPL/2.0/';
$authorName = 'Lee Kelleher';
$authorUrl = 'https://leekelleher.com/';
$minUmbracoVersion = 8,18,0;
$minUmbracoVersion = 8,17,0;
$copyright = "Copyright " + [char]0x00A9 + " " + (Get-Date).year + " $authorName";
$tags = "umbraco";

Expand Down
6 changes: 3 additions & 3 deletions build/manifest-nuget-core.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
<repository type="git" url="$repositoryUrl$" />
<dependencies>
<group targetFramework="net472">
<dependency id="UmbracoCms.Web" version="[8.18.0, 9.0.0)" />
<dependency id="UmbracoCms.Web" version="[8.17.0, 9.0.0)" />
</group>
<group targetFramework="net5.0">
<dependency id="Umbraco.Cms.Web.Website" version="[9.5.0, 10.0.0)" />
<dependency id="Umbraco.Cms.Web.BackOffice" version="[9.5.0, 10.0.0)" />
</group>
<group targetFramework="net6.0">
<dependency id="Umbraco.Cms.Web.Website" version="[10.0.0-rc4, 13.0.0)" />
<dependency id="Umbraco.Cms.Web.BackOffice" version="[10.0.0-rc4, 13.0.0)" />
<dependency id="Umbraco.Cms.Web.Website" version="[10.0.0-rc5, 12.0.0)" />
<dependency id="Umbraco.Cms.Web.BackOffice" version="[10.0.0-rc5, 12.0.0)" />
</group>
</dependencies>
</metadata>
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Cms.10.x/Umbraco.Cms.10.x.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="10.0.0-rc4" />
<PackageReference Include="uSync" Version="10.0.0-beta1" />
<PackageReference Include="Umbraco.Cms" Version="10.0.0-rc5" />
<PackageReference Include="uSync" Version="10.0.0-rc5" />
<ProjectReference Include="..\Umbraco.Community.Contentment\Umbraco.Community.Contentment.csproj" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Cms.8.x/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

### Demo Umbraco website

This is a demo website, using Umbraco v8.18.0, to showcase the features of the Contentment package.
This is a demo website, using Umbraco v8.17.0, to showcase the features of the Contentment package.

It should be considered as a continual work-in-progress.

It could have the potential to be serve as a starter kit, however it is opinionated, in that it used uSync and ModelsBuilder configurations.

Umbraco version `8.18.0` is intentionally used, as that is the minimum version of Umbraco that latest version of Contentment supports.
Umbraco version `8.17.0` is intentionally used, as that is the minimum version of Umbraco that latest version of Contentment supports.

Feel free to use it, modify it, or don't use it, I don't care. Only please don't ask me to support your use of it.

Expand Down
2 changes: 1 addition & 1 deletion src/Umbraco.Community.Contentment/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ internal static partial class Package
public const string LicenseUrl = "https://mozilla.org/MPL/2.0/";

#if NET472
public static readonly System.Version MinimumSupportedUmbracoVersion = new System.Version(8, 18, 0);
public static readonly System.Version MinimumSupportedUmbracoVersion = new System.Version(8, 17, 0);
#elif NET5_0
public static readonly System.Version MinimumSupportedUmbracoVersion = new System.Version(9, 5, 0);
#else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<Title>Contentment for Umbraco</Title>
<Description>Contentment, a collection of components for Umbraco.</Description>
<PackageTags>umbraco</PackageTags>
<Version>4.0.0-alpha004</Version>
<Version>4.0.0-alpha005</Version>
<Company>Umbrella Inc Ltd</Company>
<Authors>Lee Kelleher</Authors>
<Copyright>2019 © Lee Kelleher</Copyright>
Expand All @@ -20,7 +20,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" />
<PackageReference Include="Our.Umbraco.Community.Polyfill" Version="1.2.0-rc2" />
<PackageReference Include="UmbracoCms.Web" Version="8.18.0" />
<PackageReference Include="UmbracoCms.Web" Version="8.17.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
Expand All @@ -29,8 +29,8 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Umbraco.Cms.Web.Website" Version="10.0.0-rc4" />
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.0.0-rc4" />
<PackageReference Include="Umbraco.Cms.Web.Website" Version="10.0.0-rc5" />
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.0.0-rc5" />
</ItemGroup>

<Target Name="RemoveLuceneAnalyzer" BeforeTargets="CoreCompile">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Contentment",
"version": "4.0.0-alpha004",
"version": "4.0.0-alpha005",
"css": [ "~/App_Plugins/Contentment/contentment.css" ],
"javascript": [ "~/App_Plugins/Contentment/contentment.js" ]
}

0 comments on commit 1d7623f

Please sign in to comment.