Skip to content

Commit

Permalink
Merge branch 'feature/dependency-bump' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
AaronSadlerUK committed Feb 15, 2024
2 parents 058eaa1 + 1cb9c42 commit 42704f3
Show file tree
Hide file tree
Showing 22 changed files with 22,682 additions and 794 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,3 @@
[submodule "src/UmbCheckout.Stripe.uSync"]
path = src/UmbCheckout.Stripe.uSync
url = https://github.com/UmbHost/UmbCheckout.Stripe.uSync.git
[submodule "src/UmbCheckout.Stripe.Forms"]
path = src/UmbCheckout.Stripe.Forms
url = https://github.com/UmbHost/UmbCheckout.Stripe.Forms
12 changes: 11 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ UmbCheckout is an eCommerce solution for Umbraco which integrates with Stripe Ch

## Getting started

Supports Umbraco V10+ (Currently only test with V10)
Only long term support (LTS) versions for Umbraco are officially supported.

Community contributions for short term support versions (STS) are welcome.

Currently it has been officially tested against Umbraco v10 and v13.

## Documentation

Expand Down Expand Up @@ -48,6 +52,12 @@ There are a number of addon features available with a paid license.

## Getting started with the TestSite

Run the test site for the Umbraco version you wish to test against:

Umbraco 10 - UmbCheckout.TestSite.v10
Umbraco 11 - UmbCheckout.TestSite.v11
Umbraco 13 - UmbCheckout.TestSite.v13

Install the test site, discard any Git Changes and then Import Everything using uSync

### Contribution guidelines
Expand Down
24 changes: 0 additions & 24 deletions src/UmbCheckout.Backoffice/Composers/RegisterFilesComposer.cs

This file was deleted.

13 changes: 0 additions & 13 deletions src/UmbCheckout.Backoffice/Files/UmbCheckoutCssFIle.cs

This file was deleted.

This file was deleted.

13 changes: 0 additions & 13 deletions src/UmbCheckout.Backoffice/Files/UmbCheckoutResourcesJsFIle.cs

This file was deleted.

13 changes: 0 additions & 13 deletions src/UmbCheckout.Backoffice/Files/UmbCheckoutSettingsJsFIle.cs

This file was deleted.

36 changes: 26 additions & 10 deletions src/UmbCheckout.Backoffice/UmbCheckout.Backoffice.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<StaticWebAssetBasePath>App_Plugins</StaticWebAssetBasePath>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<Nullable>enable</Nullable>
Expand All @@ -23,25 +23,41 @@
</PropertyGroup>

<ItemGroup>
<None Include="..\..\icon.png">
<EmbeddedResource Include="..\..\icon.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\..\README.md">
</EmbeddedResource>
<EmbeddedResource Include="..\..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<PackageReference Include="UmbHost.Licensing" Version="1.3.0" />
</ItemGroup>

<ItemGroup>
<SupportedPlatform Include="browser" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.21" />
<PackageReference Include="Umbraco.Cms.Core" Version="10.6.1" />
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.6.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.21" />
<PackageReference Include="Umbraco.Cms.Core" Version="10.8.1" />
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="10.8.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.0" />
<PackageReference Include="Umbraco.Cms.Core" Version="11.4.2" />
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="11.4.2" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
<PackageReference Include="Umbraco.Cms.Core" Version="13.0.0" />
<PackageReference Include="Umbraco.Cms.Web.BackOffice" Version="13.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\UmbCheckout.Core\UmbCheckout.Core.csproj" />
Expand Down
Loading

0 comments on commit 42704f3

Please sign in to comment.