Skip to content
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

OSOE-859: Add option to verify-dotnet-consolidation to ignore projects matching a given pattern in Lombiq.GitHub.Actions #772

Merged
merged 15 commits into from
May 20, 2024
Merged

OSOE-859: Add option to verify-dotnet-consolidation to ignore projects matching a given pattern in Lombiq.GitHub.Actions #772

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d7e869a
Use workflow with updated consolidation.
sarahelsaig May 18, 2024
407488a
Organize package versions.
sarahelsaig May 18, 2024
643991a
Fix typo.
sarahelsaig May 18, 2024
7534068
Fix version selectors.
sarahelsaig May 18, 2024
3db5f41
Debug logging.
sarahelsaig May 18, 2024
0706871
Fix wrong GHA input used.
sarahelsaig May 18, 2024
d133d15
submodule
sarahelsaig May 18, 2024
bde5e92
Merge remote-tracking branch 'origin/dev' into issue/OSOE-859
sarahelsaig May 18, 2024
c5ef099
Don't break if the exclude path is missing.
sarahelsaig May 19, 2024
c7ee507
Doc end line.
sarahelsaig May 19, 2024
bab8d35
Fix called GitHub Action does not match expected Ref 'issue/OSOE-859'.
sarahelsaig May 20, 2024
389487d
Merge remote-tracking branch 'origin/dev' into issue/OSOE-859
Piedone May 20, 2024
5224be2
PackageReference not actually needed
sarahelsaig May 20, 2024
66b7664
Reverting issue branch references for GHA
Piedone May 20, 2024
ff27b44
Updating submodules to merged dev
Piedone May 20, 2024
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
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
github.event.label.name == 'run-windows-build' ||
(github.event.review.state == 'APPROVED' && contains(github.event.pull_request.labels.*.name, 'requires-windows-build')))
name: Build and Test Windows - root solution (larger runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-859
with:
parent-job-name: "root-solution-larger-runners"
machine-types: "['windows-2022-8core']"
Expand All @@ -53,7 +53,7 @@ jobs:
build-and-test-standard-runners:
if: github.ref_name == github.event.repository.default_branch
name: Build and Test Windows - root solution (standard runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-859
with:
parent-job-name: "root-solution-standard-runners"
# Since dev builds are not awaited by anyone, they can run on the slower free runners.
Expand All @@ -73,7 +73,7 @@ jobs:
github.event.label.name == 'run-windows-build' ||
(github.event.review.state == 'APPROVED' && contains(github.event.pull_request.labels.*.name, 'requires-windows-build'))
name: Build and Test Windows - NuGetTest solution
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-859
with:
parent-job-name: "nuget-solution"
machine-types: "['windows-2022']"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build-and-test-larger-runners:
if: github.ref_name != github.event.repository.default_branch
name: Build and Test - root solution (larger runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-859
with:
parent-job-name: "root-solution-larger-runners"
machine-types: "['buildjet-4vcpu-ubuntu-2204']"
Expand All @@ -27,7 +27,7 @@ jobs:
build-and-test-standard-runners:
if: github.ref_name == github.event.repository.default_branch
name: Build and Test - root solution (standard runners)
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-859
with:
# Since dev builds are not awaited by anyone, they can run on the slower free runners.
parent-job-name: "root-solution-standard-runners"
Expand All @@ -39,7 +39,7 @@ jobs:

build-and-test-nuget-test:
name: Build and Test - NuGetTest solution
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@dev
uses: Lombiq/GitHub-Actions/.github/workflows/build-and-test-orchard-core.yml@issue/OSOE-859
with:
parent-job-name: nuget-solution
build-directory: NuGetTest
Expand Down
2 changes: 1 addition & 1 deletion src/Libraries/Lombiq.HelpfulLibraries
Open in desktop
Submodule Lombiq.HelpfulLibraries updated 4 files
+1 −1 Lombiq.HelpfulLibraries.AspNetCore/Lombiq.HelpfulLibraries.AspNetCore.csproj
+1 −1 Lombiq.HelpfulLibraries.LinqToDb/Lombiq.HelpfulLibraries.LinqToDb.csproj
+20 −20 Lombiq.HelpfulLibraries.OrchardCore/Lombiq.HelpfulLibraries.OrchardCore.csproj
+6 −6 Lombiq.HelpfulLibraries.Samples/Lombiq.HelpfulLibraries.Samples.csproj
8 changes: 4 additions & 4 deletions src/Lombiq.OSOCE.Web/Lombiq.OSOCE.Web.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.8.2" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.0" />
<PackageReference Include="OrchardCore.Admin.Abstractions" Version="1.8.3" />
<PackageReference Include="OrchardCore.Application.Cms.Targets" Version="1.8.3" />
<PackageReference Include="OrchardCore.Logging.NLog" Version="1.8.3" />
<PackageReference Include="SixLabors.ImageSharp.Web" Version="3.1.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.AuditTrailExtensions
Open in desktop
Submodule Lombiq.AuditTrailExtensions updated 1 files
+4 −4 Lombiq.AuditTrailExtensions.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.ChartJs
Open in desktop
Submodule Lombiq.ChartJs updated 2 files
+2 −2 Lombiq.ChartJs.Samples/Lombiq.ChartJs.Samples.csproj
+1 −1 Lombiq.ChartJs/Lombiq.ChartJs.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.ContentEditors
Open in desktop
Submodule Lombiq.ContentEditors updated 2 files
+2 −2 Lombiq.ContentEditors.Samples/Lombiq.ContentEditors.Samples.csproj
+7 −7 Lombiq.ContentEditors/Lombiq.ContentEditors.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.DataTables
Open in desktop
Submodule Lombiq.DataTables updated 3 files
+2 −2 Lombiq.DataTables.Samples/Lombiq.DataTables.Samples.csproj
+3 −3 Lombiq.DataTables/Lombiq.DataTables.csproj
+1 −1 Lombiq.DataTables/Tests/Lombiq.DataTables.Tests/Lombiq.DataTables.Tests.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.HelpfulExtensions
Open in desktop
Submodule Lombiq.HelpfulExtensions updated 1 files
+12 −12 Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.Hosting.Azure.ApplicationInsights
Open in desktop
Submodule Lombiq.Hosting.Azure.ApplicationInsights updated 1 files
+6 −6 Lombiq.Hosting.Azure.ApplicationInsights/Lombiq.Hosting.Azure.ApplicationInsights.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.Hosting.BuildVersionDisplay
Open in desktop
Submodule Lombiq.Hosting.BuildVersionDisplay updated 1 files
+2 −2 Lombiq.Hosting.BuildVersionDisplay/Lombiq.Hosting.BuildVersionDisplay.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.Hosting.Tenants
Open in desktop
Submodule Lombiq.Hosting.Tenants updated 8 files
+4 −4 Lombiq.Hosting.Tenants.Admin.Login/Lombiq.Hosting.Tenants.Admin.Login.csproj
+8 −8 Lombiq.Hosting.Tenants.EmailQuotaManagement/Lombiq.Hosting.Tenants.EmailQuotaManagement.csproj
+3 −3 Lombiq.Hosting.Tenants.EnvironmentRobots/Lombiq.Hosting.Tenants.EnvironmentRobots.csproj
+5 −5 Lombiq.Hosting.Tenants.FeaturesGuard/Lombiq.Hosting.Tenants.FeaturesGuard.csproj
+3 −3 Lombiq.Hosting.Tenants.IdleTenantManagement/Lombiq.Hosting.Tenants.IdleTenantManagement.csproj
+7 −7 Lombiq.Hosting.Tenants.Maintenance/Lombiq.Hosting.Tenants.Maintenance.csproj
+3 −3 Lombiq.Hosting.Tenants.Management/Lombiq.Hosting.Tenants.Management.csproj
+4 −4 Lombiq.Hosting.Tenants.MediaStorageManagement/Lombiq.Hosting.Tenants.MediaStorageManagement.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.JsonEditor
Open in desktop
Submodule Lombiq.JsonEditor updated 1 files
+6 −6 Lombiq.JsonEditor/Lombiq.JsonEditor.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.LoginAsAnybody
Open in desktop
Submodule Lombiq.LoginAsAnybody updated 1 files
+3 −3 Lombiq.LoginAsAnybody/Lombiq.LoginAsAnybody.csproj
8 changes: 4 additions & 4 deletions src/Modules/Lombiq.OSOCE.Samples/Lombiq.OSOCE.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.2" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.8.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.8.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.8.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.Privacy
Open in desktop
Submodule Lombiq.Privacy updated 2 files
+3 −3 Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj
+9 −9 Lombiq.Privacy/Lombiq.Privacy.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.TrainingDemo
Open in desktop
Submodule Lombiq.TrainingDemo updated 3 files
+2 −1 .github/workflows/build-and-test-orchard.yml
+4 −3 Lombiq.TrainingDemo.Web/Lombiq.TrainingDemo.Web.csproj
+15 −15 Lombiq.TrainingDemo/Lombiq.TrainingDemo.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.UIKit
Open in desktop
Submodule Lombiq.UIKit updated 1 files
+4 −4 Lombiq.UIKit/Lombiq.UIKit.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.VueJs
Open in desktop
Submodule Lombiq.VueJs updated 2 files
+4 −4 Lombiq.VueJs.Samples/Lombiq.VueJs.Samples.csproj
+3 −3 Lombiq.VueJs/Lombiq.VueJs.csproj
2 changes: 1 addition & 1 deletion src/Modules/Lombiq.Walkthroughs
Open in desktop
Submodule Lombiq.Walkthroughs updated 1 files
+5 −5 Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj
2 changes: 1 addition & 1 deletion src/Themes/Lombiq.BaseTheme
Open in desktop
Submodule Lombiq.BaseTheme updated 2 files
+2 −2 Lombiq.BaseTheme.Samples/Lombiq.BaseTheme.Samples.csproj
+6 −6 Lombiq.BaseTheme/Lombiq.BaseTheme.csproj
2 changes: 1 addition & 1 deletion src/Themes/Lombiq.Hosting.MediaTheme
Open in desktop
Submodule Lombiq.Hosting.MediaTheme updated 3 files
+6 −6 Lombiq.Hosting.MediaTheme.Bridge/Lombiq.Hosting.MediaTheme.Bridge.csproj
+4 −4 Lombiq.Hosting.MediaTheme.Tests.Theme/Lombiq.Hosting.MediaTheme.Tests.Theme.csproj
+1 −1 Lombiq.Hosting.MediaTheme/Lombiq.Hosting.MediaTheme.csproj
2 changes: 1 addition & 1 deletion src/Utilities/Lombiq.SetupExtensions
Open in desktop
Submodule Lombiq.SetupExtensions updated 1 files
+2 −2 Lombiq.SetupExtensions.csproj
2 changes: 1 addition & 1 deletion test/Lombiq.UITestingToolbox
Open in desktop
Submodule Lombiq.UITestingToolbox updated 3 files
+2 −2 Lombiq.Tests.UI.AppExtensions/Lombiq.Tests.UI.AppExtensions.csproj
+9 −9 Lombiq.Tests.UI.Shortcuts/Lombiq.Tests.UI.Shortcuts.csproj
+4 −4 Lombiq.Tests.UI/Lombiq.Tests.UI.csproj
2 changes: 1 addition & 1 deletion tools/Lombiq.GitHub.Actions
Open in desktop
Submodule Lombiq.GitHub.Actions updated 6 files
+36 −0 .github/actions/verify-dotnet-consolidation/Test-DotnetPackageConsolidation.ps1
+18 −15 .github/actions/verify-dotnet-consolidation/action.yml
+11 −1 .github/workflows/build-and-test-dotnet.yml
+11 −1 .github/workflows/build-and-test-orchard-core.yml
+2 −2 .github/workflows/build-dotnet.yml
+2 −2 .github/workflows/validate-this-gha-refs.yml
Loading