-
Notifications
You must be signed in to change notification settings - Fork 0
OSOE-1208: Use our own MSBuild SDKs #35
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.
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
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
4f1ffcf
Use SDK in all modules and themes where applicable.
sarahelsaig ea8aae2
Remove `<IsLombiqProject>true</IsLombiqProject>` from projects.
sarahelsaig d0505cd
Update NuGet versions.
sarahelsaig 3f08756
Use UI Test SDK where applicable.
sarahelsaig 0457e1b
Create new SLNX files.
sarahelsaig 24b8e6f
Update validate-nuget-publish.yml issue branch.
sarahelsaig bc6a14e
Remove SLN files.
sarahelsaig 34c62ee
Move "See the project website for detailed documentation." boilerplat…
sarahelsaig 0be5f80
Cleanup.
sarahelsaig 397922c
Merge remote-tracking branch 'origin/issue/OSOE-925' into issue/OSOE-…
sarahelsaig 82ade56
Update NuGet and apply library SDK where applicable
sarahelsaig 655509e
Merge remote-tracking branch 'origin/issue/OSOE-1208' into issue/OSOE…
sarahelsaig 46d7b1c
Merge pull request #36 from Lombiq/issue/OSOE-1199
DemeSzabolcs b5239b5
Update GHA branch selectors.
sarahelsaig File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
32 changes: 9 additions & 23 deletions
32
...q.Hosting.BuildVersionDisplay.Tests.UI/Lombiq.Hosting.BuildVersionDisplay.Tests.UI.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,20 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <Project> | ||
| <PropertyGroup> | ||
| <TargetFramework>net10.0</TargetFramework> | ||
| <DefaultItemExcludes>$(DefaultItemExcludes);.git*</DefaultItemExcludes> | ||
| </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 Hosting - Build Version Display for Orchard Core - UI Test Extensions</Title> | ||
| <Authors>Lombiq Technologies</Authors> | ||
| <Copyright>Copyright © 2023, Lombiq Technologies Ltd.</Copyright> | ||
| <Description>Lombiq Hosting - Build Version Display for Orchard Core - UI Test Extensions: Extension methods that test various features in Lombiq Hosting - Build Version Display for Orchard Core.</Description> | ||
| <PackageIcon>NuGetIcon.png</PackageIcon> | ||
| <CopyrightYear>2023</CopyrightYear> | ||
| <DescriptionBody>Extension methods that test various features in Lombiq Hosting - Build Version Display for Orchard Core.</DescriptionBody> | ||
| <PackageTags>OrchardCore;Lombiq;AspNetCore;CodeGeneration;ShapeTracing;Widgets</PackageTags> | ||
| <RepositoryUrl>https://github.com/Lombiq/Hosting-Build-Version-Display</RepositoryUrl> | ||
| <PackageProjectUrl> | ||
| https://github.com/Lombiq/Hosting-Build-Version-Display/tree/dev/Lombiq.Hosting.BuildVersionDisplay.Tests.UI</PackageProjectUrl> | ||
| <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression> | ||
| <PackageProjectUrl>https://github.com/Lombiq/Hosting-Build-Version-Display/tree/dev/Lombiq.Hosting.BuildVersionDisplay.Tests.UI</PackageProjectUrl> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="Readme.md" /> | ||
| <None Include="NuGetIcon.png" Pack="true" PackagePath="" /> | ||
| </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.12.osoe-925" /> | ||
| </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> |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <Solution> | ||
| <Project Path="Lombiq.Hosting.BuildVersionDisplay.Tests.UI/Lombiq.Hosting.BuildVersionDisplay.Tests.UI.csproj" /> | ||
| <Project Path="Lombiq.Hosting.BuildVersionDisplay/Lombiq.Hosting.BuildVersionDisplay.csproj" /> | ||
| </Solution> |
40 changes: 8 additions & 32 deletions
40
Lombiq.Hosting.BuildVersionDisplay/Lombiq.Hosting.BuildVersionDisplay.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,31 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Razor"> | ||
|
|
||
| <Project> | ||
| <PropertyGroup> | ||
| <TargetFramework>net10.0</TargetFramework> | ||
| <AddRazorSupportForMvc>true</AddRazorSupportForMvc> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <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 Hosting - Build Version Display for Orchard Core</Title> | ||
| <Authors>Lombiq Technologies</Authors> | ||
| <Copyright>Copyright © 2023, Lombiq Technologies Ltd.</Copyright> | ||
| <Description>Lombiq Hosting - Build Version Display for Orchard Core: Orchard Core module to display the build version (i.e. .NET assembly version or other) on the admin of the Default tenant. See the project website for detailed documentation.</Description> | ||
| <PackageIcon>NuGetIcon.png</PackageIcon> | ||
| <CopyrightYear>2023</CopyrightYear> | ||
| <DescriptionBody>Orchard Core module to display the build version (i.e. .NET assembly version or other) on the admin of the Default tenant.</DescriptionBody> | ||
| <PackageTags>OrchardCore;Lombiq;AspNetCore;Hosting;</PackageTags> | ||
| <RepositoryUrl>https://github.com/Lombiq/Hosting-Build-Version-Display</RepositoryUrl> | ||
| <PackageProjectUrl>https://github.com/Lombiq/Hosting-Build-Version-Display</PackageProjectUrl> | ||
| <PackageLicenseExpression>BSD-3-Clause</PackageLicenseExpression> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="NuGetIcon.png" Pack="true" PackagePath="" /> | ||
| <!-- If this is not explicitly specified then OrchardCore.Module.Targets will take over the build folder and it | ||
| won't be included. --> | ||
| <None Include="build\Lombiq.Hosting.BuildVersionDisplay.targets" Pack="true" PackagePath="build\Lombiq.Hosting.BuildVersionDisplay.targets" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <FrameworkReference Include="Microsoft.AspNetCore.App" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="OrchardCore.Module.Targets" Version="3.0.0-preview-18975" /> | ||
| <PackageReference Include="OrchardCore.DisplayManagement" Version="3.0.0-preview-18975" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Include="..\Readme.md" Link="Readme.md" /> | ||
| </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" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- The targets file will be automatically imported when using the project from NuGet but needs an explicit import | ||
| when used from source. --> | ||
| <Import Project="build/Lombiq.Hosting.BuildVersionDisplay.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> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.