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

Bump 'NuGet.*' and 'Newtonsoft.Json' NuGet versions. #8825

Merged
merged 3 commits into from
Mar 28, 2024
Merged

Bump 'NuGet.*' and 'Newtonsoft.Json' NuGet versions. #8825

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb439af
Bump 'NuGet.*' and 'Newtonsoft.Json' NuGet versions.
jpobst Mar 22, 2024
839e2ac
Remove unneeded NuGet package references.
jpobst Mar 25, 2024
a5d6afd
Merge branch 'main' into bump-nugets
jpobst Mar 26, 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
2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<LibZipSharpVersion>3.1.1</LibZipSharpVersion>
<MicroBuildCoreVersion>1.0.0</MicroBuildCoreVersion>
<MonoCecilVersion>0.11.4</MonoCecilVersion>
<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
<NuGetApiPackageVersion>5.4.0</NuGetApiPackageVersion>
<LZ4PackageVersion>1.1.11</LZ4PackageVersion>
<MonoOptionsVersion>6.12.0.148</MonoOptionsVersion>
Expand Down
6 changes: 3 additions & 3 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" GeneratePathProperty="true" />
<PackageReference Include="ILRepack" Version="2.0.18" />
<PackageReference Include="Irony" />
<PackageReference Include="NuGet.Common" Version="6.7.0" />
<PackageReference Include="NuGet.Packaging" Version="6.7.0" />
<PackageReference Include="NuGet.ProjectModel" Version="6.7.0" />
<PackageReference Include="NuGet.Common" Version="6.9.1" />
<PackageReference Include="NuGet.Packaging" Version="6.9.1" />
<PackageReference Include="NuGet.ProjectModel" Version="6.9.1" />
Copy link
Member

Choose a reason for hiding this comment

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

Does anything actually use these? I have a vague memory of:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, we started using them for Java binding dependency verification: https://github.com/xamarin/xamarin-android/pull/8649/files#diff-747215dcfa29e845d4d353aacccca25500165f49c03992ed7b789a7bdfc54031.

We use it to read the NuGet project.assets.json file.

Copy link
Member

Choose a reason for hiding this comment

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

Does something need to ship NuGet.Packaging.dll? I was looking for it in:

Copy link
Contributor Author

@jpobst jpobst Mar 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I think it gets ILRepack'd into Xamarin.Android.Build.Tasks.dll.

Copy link
Member

@jonathanpeppers jonathanpeppers Mar 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

No, I didn't find it there either:

https://github.com/xamarin/xamarin-android/blob/51bcefdbf08a2c17ab0633d5aee37f22acf5164d/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets#L278-L280

Ideally, we could stop IL repacking at some point. It causes problems when debugging this assembly, etc.

Is there at least one MSBuild test for this feature? Just wondering how it can load these assemblies -- maybe it "finds" them in the .NET SDK?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are tests for this feature: https://github.com/xamarin/xamarin-android/blob/main/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs#L775-L892

You may be right that it is finding the assemblies from another process.

<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />
<PackageReference Include="System.CodeDom" />
<PackageReference Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
Expand Down
Loading