Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
fail-fast: false
matrix:
umbraco-version:
- 17.1.0
- 17.4.0
- 18.0.0
steps:
- name: Check out repository
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ Run the example host against the Umbraco version whose document you want to use:
# Umbraco 17
dotnet run \
--project samples/TheBuilder.WebAnalytics.Example \
-p:UmbracoVersion=17.1.0
-p:UmbracoVersion=17.4.0

# Umbraco 18
dotnet run \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<CompressionEnabled>false</CompressionEnabled> <!-- Disable compression. E.g. for umbraco backoffice files. These files should be precompressed by node and not let dotnet handle it -->
<UmbracoVersion Condition="'$(UmbracoVersion)' == ''">17.1.0</UmbracoVersion>
<UmbracoVersion Condition="'$(UmbracoVersion)' == ''">17.4.0</UmbracoVersion>
<DefineConstants Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(UmbracoVersion)', '18.0.0'))">$(DefineConstants);UMBRACO_18_OR_LATER</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ItemGroup>
<PackageReference Include="Umbraco.Cms" Version="$(UmbracoVersion)" />
<PackageReference Include="Umbraco.Cms.DevelopmentMode.Backoffice" Version="$(UmbracoVersion)" />
</ItemGroup>
<PackageReference Include="SQLitePCLRaw.lib.e_sqlite3" Version="2.1.12" />
</ItemGroup>

<ItemGroup>
<!-- Opt-in to app-local ICU to ensure consistent globalization APIs across different platforms -->
Expand Down
9 changes: 6 additions & 3 deletions src/TheBuilder.WebAnalytics/TheBuilder.WebAnalytics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<StaticWebAssetBasePath>/</StaticWebAssetBasePath>
<UmbracoVersion Condition="'$(UmbracoVersion)' == ''">[17.1.0,19.0.0)</UmbracoVersion>
<UmbracoVersion Condition="'$(UmbracoVersion)' == ''">[17.4.0,19.0.0)</UmbracoVersion>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -29,12 +29,15 @@
</PropertyGroup>


<ItemGroup>
<ItemGroup>
<PackageReference Include="Umbraco.Cms.Web.Website" Version="$(UmbracoVersion)" />
<PackageReference Include="Umbraco.Cms.Web.Common" Version="$(UmbracoVersion)" />
<PackageReference Include="Umbraco.Cms.Api.Common" Version="$(UmbracoVersion)" />
<PackageReference Include="Umbraco.Cms.Api.Management" Version="$(UmbracoVersion)" />
</ItemGroup>
<!-- Pin patched versions until Umbraco's transitive dependencies catch up. -->
<PackageReference Include="MessagePack" Version="3.1.7" />
<PackageReference Include="Microsoft.OpenApi" Version="2.7.5" />
</ItemGroup>

<ItemGroup>
<!-- Dont include the client folder as part of packaging nuget build -->
Expand Down