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

Jump to bottom

OSOE-548: Upgrade to Orchard Core 1.6 in Orchard-Privacy #56

Merged
merged 20 commits into from
Jun 18, 2023
Merged

OSOE-548: Upgrade to Orchard Core 1.6 in Orchard-Privacy #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
da8d2b8
Upgrading to OC 1.6
Psichorex Apr 25, 2023
a61a776
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex Apr 29, 2023
835222e
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex May 12, 2023
d7a744e
Removing AddDataMigration workaround.
Psichorex May 12, 2023
0a6be81
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex May 15, 2023
a09c9b5
Upgrading Lombiq.ChartJs.Tests.UI package.
Psichorex May 20, 2023
e88a86f
Updating to latest Lombiq alpha releases.
Psichorex May 22, 2023
c4ca58d
Removing mistakenly included "v" from versions.
Psichorex May 22, 2023
2d7a337
Updating to latest Lombiq.Tests.UI alpha release.
Psichorex May 22, 2023
ff36276
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex May 24, 2023
521d493
Upgrading Lombiq.HelpfulLibraries.* package reference version
dministro Jun 9, 2023
cf43cfb
Merge branch 'dev' of https://github.com/Lombiq/Orchard-Privacy into …
dministro Jun 10, 2023
dc68502
Merge branch 'issue/OSOE-548' of https://github.com/Lombiq/Orchard-Pr…
dministro Jun 10, 2023
df16b1a
Merge pull request #64 from Lombiq/issue/OSOE-641
Piedone Jun 10, 2023
28b434c
Updating Lombiq.NodeJs.Extensions NuGet to latest alpha
Piedone Jun 11, 2023
504187f
Updating Lombiq.HelpfulLibraries NuGet reference to latest alpha
Piedone Jun 16, 2023
71abbe9
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 16, 2023
633133f
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 18, 2023
8caabb4
Updating Lombiq NuGet references
Piedone Jun 18, 2023
b2553b2
Updating Lombiq NuGet references to release versions
Piedone Jun 18, 2023
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
14 changes: 7 additions & 7 deletions Lombiq.Privacy.Samples/Lombiq.Privacy.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,23 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.Forms" Version="1.5.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.Workflows" Version="1.5.0" />
<PackageReference Include="OrchardCore.Forms" Version="1.6.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
<PackageReference Include="OrchardCore.Workflows" Version="1.6.0" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulExtensions" Version="5.0.0" />
<PackageReference Include="Lombiq.HelpfulExtensions" Version="5.0.1" />
</ItemGroup>

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

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

<ItemGroup>
<None Include="License.md" Pack="true" PackagePath="" />
<None Include="Readme.md" />
Expand Down
4 changes: 2 additions & 2 deletions Lombiq.Privacy.Tests.UI/Lombiq.Privacy.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
<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="6.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="6.0.1" />
</ItemGroup>

<ItemGroup>
Expand Down
22 changes: 11 additions & 11 deletions Lombiq.Privacy/Lombiq.Privacy.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OrchardCore.CustomSettings" Version="1.5.0" />
<PackageReference Include="OrchardCore.Forms" Version="1.5.0" />
<PackageReference Include="OrchardCore.Liquid" Version="1.5.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.5.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.5.0" />
<PackageReference Include="OrchardCore.Navigation" Version="1.5.0" />
<PackageReference Include="OrchardCore.Users" Version="1.5.0" />
<PackageReference Include="OrchardCore.CustomSettings" Version="1.6.0" />
<PackageReference Include="OrchardCore.Forms" Version="1.6.0" />
<PackageReference Include="OrchardCore.Liquid" Version="1.6.0" />
<PackageReference Include="OrchardCore.Module.Targets" Version="1.6.0" />
<PackageReference Include="OrchardCore.ContentManagement" Version="1.6.0" />
<PackageReference Include="OrchardCore.ContentTypes.Abstractions" Version="1.6.0" />
<PackageReference Include="OrchardCore.DisplayManagement" Version="1.6.0" />
<PackageReference Include="OrchardCore.Navigation" Version="1.6.0" />
<PackageReference Include="OrchardCore.Users" Version="1.6.0" />
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' != 'true'">
Expand All @@ -50,8 +50,8 @@
</ItemGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.1" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.0" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.2" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.2" />
</ItemGroup>

<Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />
Expand Down