Skip to content

OSOE-1208: Use our own MSBuild SDKs #110

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 5 commits into
base: issue/OSOE-925
Choose a base branch
from
Open

OSOE-1208: Use our own MSBuild SDKs #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db1c41f
Use SDK in all modules and themes where applicable.
sarahelsaig Mar 30, 2026
672bc8b
Remove `<IsLombiqProject>true</IsLombiqProject>` from projects.
sarahelsaig Mar 31, 2026
143b006
Update NuGet versions.
sarahelsaig Mar 31, 2026
6b25652
Use UI Test SDK where applicable.
sarahelsaig Mar 31, 2026
85352c4
Move "See the project website for detailed documentation." boilerplat…
sarahelsaig Apr 7, 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
28 changes: 8 additions & 20 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,36 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk/Sdk/Import.props" />
<Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk" Version="1.0.1-alpha.7.osoe-1208" />

<PropertyGroup>
<Title>Lombiq UI Kit for Orchard Core - UI Test Extensions</Title>
<Authors>Lombiq Technologies</Authors>
<Copyright>Copyright © 2022, Lombiq Technologies Ltd.</Copyright>
<Description>Lombiq UI Kit for Orchard Core - UI Test Extensions: Extensions to aid in UI testing Lombiq UI Kit for Orchard Core.</Description>
<PackageIcon>NuGetIcon.png</PackageIcon>
<CopyrightYear>2022</CopyrightYear>
<DescriptionBody>Extensions to aid in UI testing Lombiq UI Kit for Orchard Core.</DescriptionBody>
<PackageTags>OrchardCore;Lombiq;AspNetCore;UIKit</PackageTags>
<RepositoryUrl>https://github.com/Lombiq/Orchard-UIKit</RepositoryUrl>
<PackageProjectUrl>https://github.com/Lombiq/Orchard-UIKit/blob/dev/Lombiq.UIKit.Tests.UI/Readme.md</PackageProjectUrl>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Lombiq.UIKit\Lombiq.UIKit.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
<ProjectReference Include="..\..\..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
</ItemGroup>

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

<ItemGroup>
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Include="Readme.md" Pack="true" PackagePath="" />
</ItemGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk/Sdk/Import.targets" />
<Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk" Version="1.0.1-alpha.7.osoe-1208" />
</Project>
28 changes: 8 additions & 20 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,36 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk/Sdk/Import.props" />
<Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk" Version="1.0.1-alpha.7.osoe-1208" />

<PropertyGroup>
<Title>Lombiq UI Kit - Widgets for Orchard Core - UI Test Extensions</Title>
<Authors>Lombiq Technologies</Authors>
<Copyright>Copyright © 2022, Lombiq Technologies Ltd.</Copyright>
<Description>Lombiq UI Kit - Widgets for Orchard Core - UI Test Extensions: Extensions to aid in UI testing Lombiq UI Kit - Widgets for Orchard Core.</Description>
<PackageIcon>NuGetIcon.png</PackageIcon>
<CopyrightYear>2022</CopyrightYear>
<DescriptionBody>Extensions to aid in UI testing Lombiq UI Kit - Widgets for Orchard Core.</DescriptionBody>
<PackageTags>OrchardCore;Lombiq;AspNetCore;UIKit;UIKit.Widgets</PackageTags>
<RepositoryUrl>https://github.com/Lombiq/Orchard-UIKit</RepositoryUrl>
<PackageProjectUrl>https://github.com/Lombiq/Orchard-UIKit/blob/dev/Lombiq.UIKit.Widgets.Tests.UI/Readme.md</PackageProjectUrl>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Lombiq.UIKit.Widgets\Lombiq.UIKit.Widgets.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
<ProjectReference Include="..\..\..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
</ItemGroup>

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

<ItemGroup>
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Include="Readme.md" Pack="true" PackagePath="" />
</ItemGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk/Sdk/Import.targets" />
<Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.OrchardCore.Tests.UI.Sdk" Version="1.0.1-alpha.7.osoe-1208" />
</Project>
29 changes: 8 additions & 21 deletions Lombiq.UIKit.Widgets/Lombiq.UIKit.Widgets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<Project>
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Module.Sdk/Sdk/Import.props" />
<Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.OrchardCore.Module.Sdk" Version="1.0.1-alpha.7.osoe-1208" />

<PropertyGroup>
<Title>Lombiq UI Kit - Widgets for Orchard Core</Title>
<Authors>Lombiq Technologies</Authors>
<Copyright>Copyright © 2024, Lombiq Technologies Ltd.</Copyright>
<Description>Lombiq UI Kit - Widgets for Orchard Core: This module contains widgets based on shapes from Lombiq UI Kit. See the project website for detailed documentation.</Description>
<PackageIcon>NuGetIcon.png</PackageIcon>
<CopyrightYear>2024</CopyrightYear>
<DescriptionBody>This module contains widgets based on shapes from Lombiq UI Kit.</DescriptionBody>
<PackageTags>OrchardCore;Lombiq;AspNetCore;UI;UIKit;Widgets;front-end</PackageTags>
<RepositoryUrl>https://github.com/Lombiq/Orchard-UIKit</RepositoryUrl>
<PackageProjectUrl>https://github.com/Lombiq/Orchard-UIKit/blob/dev/Lombiq.UIKit.Widgets/Readme.md</PackageProjectUrl>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<None Include="Readme.md" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="3.0.0-preview-18960" />
<PackageReference Include="OrchardCore.Contents" Version="3.0.0-preview-18960" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="3.0.0-preview-18960" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="3.0.0-preview-18960" />
<PackageReference Include="OrchardCore.Flows" Version="3.0.0-preview-18960" />
<PackageReference Include="OrchardCore.Media" Version="3.0.0-preview-18960" />
</ItemGroup>
Expand All @@ -41,4 +26,6 @@
<ProjectReference Include="..\Lombiq.UIKit\Lombiq.UIKit.csproj" />
</ItemGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Module.Sdk/Sdk/Import.targets" />
<Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.OrchardCore.Module.Sdk" Version="1.0.1-alpha.7.osoe-1208" />
</Project>
55 changes: 14 additions & 41 deletions Lombiq.UIKit/Lombiq.UIKit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,33 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<Import Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.LibMan.Targets/Lombiq.MSBuild.LibMan.Targets.props"
Condition="'$(NuGetBuild)' != 'true'"/>

<Project>
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes>
<!-- This is disabled, 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
anything by it except for the rare cases of updates, but since LibMan touches the files, they'll show up as changed
in Git (at least in Git Extensions), even though their contents didn't change. -->
<UseLibMan>false</UseLibMan>
</PropertyGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Module.Sdk/Sdk/Import.props" />
<Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.props" Sdk="Lombiq.MSBuild.OrchardCore.Module.Sdk" Version="1.0.1-alpha.7.osoe-1208" />

<PropertyGroup>
<Title>Lombiq UI Kit for Orchard Core</Title>
<Authors>Lombiq Technologies</Authors>
<Copyright>Copyright © 2021, Lombiq Technologies Ltd.</Copyright>
<Description>Lombiq UI Kit for Orchard Core: This module contains reusable shapes like text editors, custom-style checkboxes, dropdown editors, and in the future potentially more complex editors. See the project website for detailed documentation.</Description>
<PackageIcon>NuGetIcon.png</PackageIcon>
<CopyrightYear>2021</CopyrightYear>
<DescriptionBody>This module contains reusable shapes like text editors, custom-style checkboxes, dropdown editors, and in the future potentially more complex editors.</DescriptionBody>
<PackageTags>OrchardCore;Lombiq;AspNetCore;UI;UIKit;front-end</PackageTags>
<RepositoryUrl>https://github.com/Lombiq/Orchard-UIKit</RepositoryUrl>
<PackageProjectUrl>https://github.com/Lombiq/Orchard-UIKit</PackageProjectUrl>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

<ItemGroup>
<None Include="..\Readme.md" />
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="3.0.0-preview-18960" GeneratePathProperty="true" />
<PackageReference Include="OrchardCore.Contents" Version="3.0.0-preview-18960" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="3.0.0-preview-18960" />
<PackageReference Include="OrchardCore.ResourceManagement" Version="3.0.0-preview-18960" />
<!-- 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
anything by it except for the rare cases of updates, but since LibMan touches the files, they'll show up as changed
in Git (at least in Git Extensions), even though their contents didn't change. -->
<!--<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="3.0.71" />-->
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
<ProjectReference Include="..\..\..\Libraries\Lombiq.HelpfulLibraries\Lombiq.HelpfulLibraries.OrchardCore\Lombiq.HelpfulLibraries.OrchardCore.csproj" />
<ProjectReference Include="..\..\..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI.AppExtensions\Lombiq.Tests.UI.AppExtensions.csproj" />
</ItemGroup>

<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.6.1-alpha.5.osoe-925" />
<PackageReference Include="Lombiq.Tests.UI.AppExtensions" Version="14.2.2-alpha.9.osoe-925" />
</ItemGroup>

<Import Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.LibMan.Targets/Lombiq.MSBuild.LibMan.Targets.targets"
Condition="'$(NuGetBuild)' != 'true'"/>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="../../../Utilities/Lombiq.MSBuild.Targets/Lombiq.MSBuild.OrchardCore.Module.Sdk/Sdk/Import.targets" />
<Import Condition="'$(NuGetBuild)' == 'true'" Project="Sdk.targets" Sdk="Lombiq.MSBuild.OrchardCore.Module.Sdk" Version="1.0.1-alpha.7.osoe-1208" />
</Project>
Loading