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 1.6 in Orchard-Chart.js #54

Merged
merged 20 commits into from
Jun 18, 2023
Merged

OSOE-548: Upgrade to Orchard 1.6 in Orchard-Chart.js #54

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1d8c9a0
Updating ChartJs to 1.6.
Psichorex Apr 25, 2023
70fa8f0
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Psichorex Apr 29, 2023
d221894
Upgrading Lombiq.ChartJs.Tests.UI package.
Psichorex May 20, 2023
5c45aff
Updating to latest Lombiq alpha releases.
Psichorex May 22, 2023
d2ea258
Removing mistakenly included "v" from versions.
Psichorex May 22, 2023
978c22c
Updating to latest Lombiq.Tests.UI alpha release.
Psichorex May 22, 2023
34a4efa
Upgrading Lombiq.HelpfulLibraries.* package reference version
dministro Jun 9, 2023
88c1d69
Embedding debug info
dministro Jun 10, 2023
2e5fbb8
Embedding debug info in all projects in NuGet build
dministro Jun 10, 2023
c93b167
Merge branch 'dev' of https://github.com/Lombiq/Orchard-Chart.js into…
dministro Jun 10, 2023
81b284c
Merge branch 'issue/OSOE-548' of https://github.com/Lombiq/Orchard-Ch…
dministro Jun 10, 2023
ca6553b
Adding comments
dministro Jun 10, 2023
0b495bb
Grammar, code styling
Piedone Jun 10, 2023
9b065ec
Merge pull request #57 from Lombiq/issue/OSOE-641
Piedone Jun 10, 2023
592de86
Updating Lombiq.NodeJs.Extensions NuGet to latest alpha
Piedone Jun 11, 2023
d69e28a
Updating Lombiq.HelpfulLibraries NuGet reference to latest alpha
Piedone Jun 16, 2023
7ee2a9e
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 16, 2023
2c7398e
Merge remote-tracking branch 'origin/dev' into issue/OSOE-548
Piedone Jun 18, 2023
4998e48
Updating Lombiq NuGet references
Piedone Jun 18, 2023
16031fc
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
5 changes: 5 additions & 0 deletions .github/workflows/publish-nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ jobs:
uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev
secrets:
API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }}
with:
# Needed because the DebugType is set to "embedded" in the project files which results in empty snupkg files. To
# avoid the "The package does not contain any symbol (.pdb) files." error during NuGet publishing we should set
# this to "false".
dotnet-pack-include-symbols: "false"
13 changes: 10 additions & 3 deletions Lombiq.ChartJs.Samples/Lombiq.ChartJs.Samples.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
</ItemGroup>

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

<ItemGroup>
Expand All @@ -42,8 +42,15 @@
<ProjectReference Include="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.csproj" />
</ItemGroup>

<PropertyGroup Condition="'$(NuGetBuild)' == 'true'">
<!-- This is needed because we must use the same in Lombiq.ChartJs.Tests.UI.csproj. Embedded and portalbe DebugTypes
can't be mixed within the repository because we should set "dotnet-pack-include-symbols: false" to avoid "The
package does not contain any symbol (.pdb) files." during NuGet publishing. -->
<DebugType>embedded</DebugType>
</PropertyGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.3" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.4-alpha.0.osoe-548" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion Lombiq.ChartJs.Tests.UI/Lombiq.ChartJs.Tests.UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,14 @@
<ProjectReference Include="..\..\..\..\test\Lombiq.UITestingToolbox\Lombiq.Tests.UI\Lombiq.Tests.UI.csproj" />
</ItemGroup>

<PropertyGroup Condition="'$(NuGetBuild)' == 'true'">
<!-- This is needed to make debug symbols loadable during visual verification testing by
AssertVisualVerificationApproved to access the caller method source file name. -->
<DebugType>embedded</DebugType>
</PropertyGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.Tests.UI" Version="6.0.0" />
<PackageReference Include="Lombiq.Tests.UI" Version="6.0.2-alpha.1.osoe-641" />
</ItemGroup>

<ItemGroup>
Expand Down
13 changes: 10 additions & 3 deletions Lombiq.ChartJs/Lombiq.ChartJs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,24 @@
</ItemGroup>

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

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

<PropertyGroup Condition="'$(NuGetBuild)' == 'true'">
<!-- This is needed because we must use the same in Lombiq.ChartJs.Tests.UI.csproj. Embedded and portalbe DebugTypes
can't be mixed within the repository because we should set "dotnet-pack-include-symbols: false" to avoid "The
package does not contain any symbol (.pdb) files." during NuGet publishing. -->
<DebugType>embedded</DebugType>
</PropertyGroup>

<ItemGroup Condition="'$(NuGetBuild)' == 'true'">
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.1" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.3" />
<PackageReference Include="Lombiq.HelpfulLibraries.OrchardCore" Version="5.1.3-alpha.3.osoe-641" />
<PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.2.4-alpha.0.osoe-548" />
</ItemGroup>

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