Skip to content

OSOE-1208: Use our own MSBuild SDKs #92

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

Merged
Piedone merged 14 commits into from
Apr 27, 2026
Merged

OSOE-1208: Use our own MSBuild SDKs #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ff8e478
Use SDK in all modules and themes where applicable.
sarahelsaig Mar 30, 2026
da6912c
Remove `<IsLombiqProject>true</IsLombiqProject>` from projects.
sarahelsaig Mar 31, 2026
9e67c92
Update NuGet versions.
sarahelsaig Mar 31, 2026
2eb0b61
Use UI Test SDK where applicable.
sarahelsaig Mar 31, 2026
52049ac
Create new SLNX files.
sarahelsaig Apr 2, 2026
a16f8f0
Update validate-nuget-publish.yml issue branch.
sarahelsaig Apr 2, 2026
a9ad6df
Remove SLN files.
sarahelsaig Apr 3, 2026
cb2b87a
Move "See the project website for detailed documentation." boilerplat…
sarahelsaig Apr 7, 2026
f3fcdc5
Cleanup.
sarahelsaig Apr 24, 2026
3571913
Merge remote-tracking branch 'origin/issue/OSOE-925' into issue/OSOE-…
sarahelsaig Apr 24, 2026
24cb227
Update NuGet and apply library SDK where applicable
sarahelsaig Apr 24, 2026
e9d3b5c
Merge remote-tracking branch 'origin/issue/OSOE-1208' into issue/OSOE…
sarahelsaig Apr 25, 2026
7bb5b2b
Merge pull request #94 from Lombiq/issue/OSOE-1199
DemeSzabolcs Apr 27, 2026
a937598
Update GHA branch selectors.
sarahelsaig Apr 27, 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.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,20 @@
<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.10.osoe-1208" />

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

<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.12.osoe-925" />
</ItemGroup>

<ItemGroup>
<None Include="NuGetIcon.png" Pack="true" PackagePath="" />
<None Include="Readme.md" />
</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.10.osoe-1208" />
</Project>
31 changes: 0 additions & 31 deletions Lombiq.JsonEditor.sln
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions Lombiq.JsonEditor.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<Solution>
<Project Path="Lombiq.JsonEditor.Test.UI/Lombiq.JsonEditor.Tests.UI.csproj" />
<Project Path="Lombiq.JsonEditor/Lombiq.JsonEditor.csproj" />
</Solution>
54 changes: 8 additions & 46 deletions Lombiq.JsonEditor/Lombiq.JsonEditor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,19 @@
<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>
</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.10.osoe-1208" />

<PropertyGroup>
<Title>Lombiq JSON Editor for Orchard Core</Title>
<Authors>Lombiq Technologies</Authors>
<Copyright>Copyright © 2021, Lombiq Technologies Ltd.</Copyright>
<Description>Lombiq JSON Editor for Orchard Core: Orchard Core module for displaying a JSON Editor like on (https://jsoneditoronline.org/. See the project website for detailed documentation.</Description>
<PackageIcon>NuGetIcon.png</PackageIcon>
<CopyrightYear>2021</CopyrightYear>
<DescriptionBody>Orchard Core module for displaying a JSON Editor like on (https://jsoneditoronline.org/.</DescriptionBody>
<PackageTags>OrchardCore;Lombiq;AspNetCore;JSONEditor</PackageTags>
<RepositoryUrl>https://github.com/Lombiq/Orchard-JSON-Editor</RepositoryUrl>
<PackageProjectUrl>https://github.com/Lombiq/Orchard-JSON-Editor</PackageProjectUrl>
<PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression>
</PropertyGroup>

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

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

<ItemGroup>
<PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="3.0.71" />
<PackageReference Include="OrchardCore.Module.Targets" Version="3.0.0-preview-18975" GeneratePathProperty="true" />
<PackageReference Include="OrchardCore.Contents" Version="3.0.0-preview-18975" />
<PackageReference Include="OrchardCore.ContentManagement" Version="3.0.0-preview-18975" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="3.0.0-preview-18975" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="3.0.0-preview-18975" />
<PackageReference Include="OrchardCore.ContentFields" Version="3.0.0-preview-18975" />
</ItemGroup>

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

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="12.6.1-alpha.7.osoe-925" />
<PackageReference Include="Lombiq.MSBuild.LibMan.Targets" Version="1.0.0-alpha.12.nest-643" />
<PackageReference Include="Lombiq.HelpfulLibraries.Attributes" Version="12.6.1-alpha.7.osoe-925" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
<PackageReference Include="Lombiq.HelpfulLibraries.SourceGenerators" Version="12.6.1-alpha.7.osoe-925" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</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.10.osoe-1208" />
</Project>
Loading