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.

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

Update OC 1.8.3 #435

Merged
merged 2 commits into from
May 1, 2024
Merged
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@
<PackageVersion Include="Lombiq.Tests.UI.Shortcuts" Version="9.1.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="OrchardCore.Application.Cms.Targets" Version="1.8.2" />
<PackageVersion Include="OrchardCore.ContentFields" Version="1.8.2" />
<PackageVersion Include="OrchardCore.ContentManagement" Version="1.8.2" />
<PackageVersion Include="OrchardCore.ContentManagement.Abstractions" Version="1.8.2" />
<PackageVersion Include="OrchardCore.ContentTypes" Version="1.8.2" />
<PackageVersion Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Html" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Indexing.Abstractions" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Localization" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Logging.NLog" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Module.Targets" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Navigation.Core" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Settings" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Templates" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Title" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Workflows.Abstractions" Version="1.8.2" />
<PackageVersion Include="OrchardCore.Application.Cms.Targets" Version="1.8.3" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the OCC packages should always target the .0 minor version of the latest version; i.e., 1.8.0 in this case, so people can use the packages regardless of them being on 1.8.0, 1.8.1, 1.8.2, or 1.8.3 (currently they're forced to use at least 1.8.2). During development and testing though, we should use the very latest, if somehow this can be done. @sarahelsaig what do you think?

Copy link
Member

@hishamco hishamco Apr 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sometimes, the patch version fixes a few bugs which is good to bump to the latest

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but that's not what I'm talking about.

Copy link
Member

@hishamco hishamco Apr 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, got it now you were referring to OCC :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea, @Piedone!

At first I was going to suggest using VersionOverride, but on second thought it would be cleaner to define a variable in the <PropertyGroup> above like:

  <PropertyGroup>
    ...
    <OrchardCoreVersion Condition="'$(NuGetBuild)' == 'true'">1.8.0</OrchardCoreVersion>
    <OrchardCoreVersion Condition="'$(NuGetBuild)' != 'true'">1.8.3</OrchardCoreVersion>
  </PropertyGroup>
  <ItemGroup>
    ...
    <PackageVersion Include="OrchardCore.Application.Cms.Targets" Version="$(OrchardCoreVersion)" />
    <PackageVersion Include="OrchardCore.ContentFields" Version="$(OrchardCoreVersion)" />
    ...
  </ItemGroup>

The added bonus here is that going forward we will only have to change either one or two lines on a version upgrade instead of 16.

Copy link
Contributor

@sarahelsaig sarahelsaig May 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out Lombiq.HelpfulLibraries requires OC 1.8.2 so for now this won't work but I'd like to revisit the idea after this: Lombiq/Helpful-Libraries#258

Also it looks like the Lombiq.* NuGet packages actually export the NuGetBuild symbol? This is very strange.
image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<PackageVersion Include="OrchardCore.ContentFields" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ContentManagement" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ContentManagement.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ContentTypes" Version="1.8.3" />
<PackageVersion Include="OrchardCore.ContentTypes.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Html" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Indexing.Abstractions" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Localization" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Logging.NLog" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Module.Targets" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Navigation.Core" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Settings" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Templates" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Title" Version="1.8.3" />
<PackageVersion Include="OrchardCore.Workflows.Abstractions" Version="1.8.3" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="Stripe.net" Version="43.15.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.2" />
<PackageVersion Include="System.Text.Json" Version="8.0.3" />
<PackageVersion Include="xunit" Version="2.7.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
</ItemGroup>
</Project>
Loading