Skip to content

OSOE-925: Upgrade OC preview #107

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

Open
sarahelsaig wants to merge 35 commits into
base: dev
Choose a base branch
from
Open

OSOE-925: Upgrade OC preview #107

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
3c10cd6
Update OC versions to preview.
sarahelsaig Jan 7, 2026
d13908f
Upgrade OC preview.
sarahelsaig Jan 14, 2026
96abe6a
Update branch selector.
sarahelsaig Jan 19, 2026
4e6f779
Update branch selectors.
sarahelsaig Jan 19, 2026
c75bc45
CompatibilitySuppressions.xml
sarahelsaig Jan 20, 2026
5b4ba62
Nuget.
sarahelsaig Jan 20, 2026
9fa66ab
Delete all CompatibilitySuppressions so we may start from scratch.
sarahelsaig Jan 20, 2026
94e4c24
CompatibilitySuppressions.xml
sarahelsaig Jan 20, 2026
f8e9088
Upgrade OC preview.
sarahelsaig Jan 22, 2026
6b745bd
HL nuget
sarahelsaig Jan 22, 2026
21f9557
Update UITT NuGet.
sarahelsaig Jan 22, 2026
8c8e05d
UC preview update.
sarahelsaig Jan 23, 2026
6252091
Update HL nuget.
sarahelsaig Jan 23, 2026
1cd1804
Update OC preview.
sarahelsaig Jan 27, 2026
d3a4242
Update HL NuGet.
sarahelsaig Jan 28, 2026
9f54ef1
Merge remote-tracking branch 'origin/dev' into issue/OSOE-925
sarahelsaig Jan 29, 2026
5b94ed7
Update OC preview.
sarahelsaig Feb 4, 2026
be2c969
Update OC preview.
sarahelsaig Feb 5, 2026
09d04da
Update HL Nuget.
sarahelsaig Feb 5, 2026
23c3ce1
Update UITT nuget.
sarahelsaig Feb 5, 2026
1aaa978
Upda
sarahelsaig Feb 6, 2026
143534d
Update OC to avoid missing method exceptions.
sarahelsaig Feb 12, 2026
84f0850
Update OC preview and fix build errors.
sarahelsaig Feb 21, 2026
3811052
Update OC preview.
sarahelsaig Feb 22, 2026
5bf7c34
Update HL nuget.
sarahelsaig Feb 22, 2026
3c45225
UITT nuget
sarahelsaig Feb 22, 2026
b7c78e3
Update HL nuget correctly.
sarahelsaig Feb 22, 2026
61eb98d
Update UITT nuget correctly.
sarahelsaig Feb 22, 2026
21ba2eb
Update OC preview.
sarahelsaig Mar 7, 2026
6273d13
Update nugets.
sarahelsaig Mar 7, 2026
1f8fe3a
Merge remote-tracking branch 'origin/dev' into issue/OSOE-925
sarahelsaig Mar 20, 2026
dfde820
Update OC preview.
sarahelsaig Mar 20, 2026
979fc42
Update OC preview.
sarahelsaig Mar 29, 2026
e9571dc
Update UITT nuget.
sarahelsaig Mar 29, 2026
56660c2
Update OC preview.
sarahelsaig Apr 8, 2026
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/publish-nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ on:
jobs:
publish-nuget:
name: Publish to NuGet
uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/OSOE-925
secrets:
API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/validate-nuget-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ on:
jobs:
validate-nuget-publish:
name: Validate NuGet Publish
uses: Lombiq/GitHub-Actions/.github/workflows/validate-nuget-publish.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/validate-nuget-publish.yml@issue/OSOE-925
8 changes: 8 additions & 0 deletions Lombiq.UIKit.Tests.UI/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net8.0</Target>
</Suppression>
</Suppressions>
4 changes: 2 additions & 2 deletions Lombiq.UIKit.Tests.UI/Lombiq.UIKit.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="14.2.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="14.2.2-alpha.1.osoe-925" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions Lombiq.UIKit.Widgets.Tests.UI/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net8.0</Target>
</Suppression>
</Suppressions>
4 changes: 2 additions & 2 deletions Lombiq.UIKit.Widgets.Tests.UI/Lombiq.UIKit.Widgets.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -25,7 +25,7 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="14.2.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="14.2.2-alpha.1.osoe-925" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions Lombiq.UIKit.Widgets/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net8.0</Target>
</Suppression>
</Suppressions>
14 changes: 7 additions & 7 deletions Lombiq.UIKit.Widgets/Lombiq.UIKit.Widgets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down Expand Up @@ -29,12 +29,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="2.1.0" />
<PackageReference Include="OrchardCore.Contents" Version="2.1.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.1.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.1.0" />
<PackageReference Include="OrchardCore.Flows" Version="2.1.0" />
<PackageReference Include="OrchardCore.Media" Version="2.1.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="3.0.0-preview-18892" />
<PackageReference Include="OrchardCore.Contents" Version="3.0.0-preview-18892" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="3.0.0-preview-18892" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="3.0.0-preview-18892" />
<PackageReference Include="OrchardCore.Flows" Version="3.0.0-preview-18892" />
<PackageReference Include="OrchardCore.Media" Version="3.0.0-preview-18892" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 8 additions & 0 deletions Lombiq.UIKit/CompatibilitySuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- https://learn.microsoft.com/dotnet/fundamentals/package-validation/diagnostic-ids -->
<Suppressions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Suppression>
<DiagnosticId>PKV006</DiagnosticId>
<Target>net8.0</Target>
</Suppression>
</Suppressions>
14 changes: 7 additions & 7 deletions Lombiq.UIKit/Lombiq.UIKit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Condition="'$(NuGetBuild)' != 'true'"/>

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
</PropertyGroup>
Expand All @@ -31,10 +31,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="2.1.0" GeneratePathProperty="true" />
<PackageReference Include="OrchardCore.Contents" Version="2.1.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="2.1.0" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="2.1.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="3.0.0-preview-18892" GeneratePathProperty="true" />
<PackageReference Include="OrchardCore.Contents" Version="3.0.0-preview-18892" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="3.0.0-preview-18892" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="3.0.0-preview-18892" />
<!-- This is commented out, because restoring Slick via LibMan is flaky, see
https://github.com/Lombiq/GitHub-Actions/issues/549. So, we keep the library in the repository. Uncomment this
temporarily while updating the Slick snapshot locally. It's not enabled locally either because we don't gain
Expand All @@ -50,8 +50,8 @@

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.MSBuild.LibMan.Targets" Version="1.0.0-alpha.12.nest-643" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.5.0" />
<PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="14.2.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.5.1-alpha.7.osoe-925" />
<PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="14.2.2-alpha.1.osoe-925" />
</ItemGroup>

<Import Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.LibMan.Targets/Lombiq.MSBuild.LibMan.Targets.targets"
Expand Down
Loading