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

Added sub-dependencies of AspNetWebApi to package #6227

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Added sub-dependencies of AspNetWebApi to package #6227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions Build/Tasks/packaging.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,11 @@
"/bin/WebMatrix.Data.dll",
"/bin/WebMatrix.WebData.dll",
"/Install/Module/DNNCE_Website.Deprecated_*_Install.zip",
"/bin/WebFormsMvp.dll"
"/bin/WebFormsMvp.dll",
"/bin/Newtonsoft.Json.Bson.dll",
"/bin/System.Memory.dll",
"/bin/System.Threading.Tasks.Extensions",
"/bin/System.Runtime.CompilerServices.Unsafe.dll"
],
"installInclude": ["/Install/InstallWizard.aspx.cs"],
"upgradeExclude": [
Expand All @@ -56,7 +60,10 @@
"/bin/Newtonsoft.Json.dll",
"/Config/DotNetNuke.config",
"/Install/InstallWizard.aspx",
"/bin/WebFormsMvp.dll"
"/bin/WebFormsMvp.dll",
"/bin/System.Memory.dll",
"/bin/System.Threading.Tasks.Extensions.dll",
"/bin/System.Runtime.CompilerServices.Unsafe.dll"
],
"symbolsInclude": [
"/bin/*.pdb",
Expand Down
20 changes: 20 additions & 0 deletions DNN Platform/Components/Microsoft.AspNetWebApi/Microsoft.AspNetWebApi.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,26 @@
<name>System.Web.Http.WebHost.dll</name>
<version>5.2.8</version>
</assembly>
<assembly>
<path>bin</path>
<name>Newtonsoft.Json.Bson.dll</name>
<version>5.2.8</version>
</assembly>
<assembly>
<path>bin</path>
<name>Newtonsoft.Json.dll</name>
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it correct that we include this here, as it is already included in another package (

Dnn.Platform/DNN Platform/Components/Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn

Line 22 in ce45a3b

<name>Newtonsoft.Json.dll</name>
)

I assume this is still ok as this is how third-party modules would behave, but I think this is the first time we have had this question come up.

Copy link
Contributor

Choose a reason for hiding this comment

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

It won't hurt anything to include it twice, though I would recommend removing it since it does have its own package.

Copy link
Contributor

Choose a reason for hiding this comment

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

I guess the right thing would be to add a dependency on the Newtonsoft package, rather than the DLL. But, if we're going to a quick fix here, what's in the PR doesn't break anything, so I'm fine leaving it as is.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmm, good point on the package dependency, but if this package should try and install first, would it automatically reorder the package install order, anyone has experience with that scenario ? I would see a great benefit in using a package dependency as if the sub-dependency has sub-dependencies of its own, it solves that too.

<version>13.0.1</version>
</assembly>
<assembly>
<path>bin</path>
<name>System.Memory.dll</name>
<version>4.5.5</version>
</assembly>
<assembly>
<path>bin</path>
<name>System.Threading.Tasks.Extensions.dll</name>
<version>4.5.4</version>
</assembly>
</assemblies>
</component>
</components>
Expand Down