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

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

Merged
merged 3 commits into from
Mar 28, 2024
Merged

Conversation

jpobst
Copy link
Contributor

@jpobst jpobst commented Mar 22, 2024

Update NuGet.ProjectModel to the latest version. This new version requires a newer version of Newtonsoft.Json, so update to the latest of it as well.

Remove unneeded NuGet PackageReferences.

@jpobst jpobst marked this pull request as ready for review March 25, 2024 18:19
Comment on lines 31 to 33
<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

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

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.

@jpobst jpobst merged commit 183e1ec into main Mar 28, 2024
48 checks passed
@jpobst jpobst deleted the bump-nugets branch March 28, 2024 17:50
grendello added a commit that referenced this pull request Mar 29, 2024
* main:
  Bump to dotnet/installer@dc43d363d2 9.0.100-preview.4.24175.5 (#8828)
  [Xamarin.Android.Build.Tasks] Update to newer ILRepack which supports debug files. (#8839)
  Bump 'NuGet.*' and 'Newtonsoft.Json' NuGet versions. (#8825)
grendello added a commit that referenced this pull request Apr 2, 2024
* main:
  Bump to dotnet/installer@dc43d363d2 9.0.100-preview.4.24175.5 (#8828)
  [Xamarin.Android.Build.Tasks] Update to newer ILRepack which supports debug files. (#8839)
  Bump 'NuGet.*' and 'Newtonsoft.Json' NuGet versions. (#8825)
  Localized file check-in by OneLocBuild Task (#8844)
  [LayoutBindings] Fix '[Preserve]' is obsolete warnings (#8529)
  LEGO: Merge pull request 8837
grendello added a commit that referenced this pull request Apr 3, 2024
* main:
  Bump to dotnet/installer@dc43d363d2 9.0.100-preview.4.24175.5 (#8828)
  [Xamarin.Android.Build.Tasks] Update to newer ILRepack which supports debug files. (#8839)
  Bump 'NuGet.*' and 'Newtonsoft.Json' NuGet versions. (#8825)
  Localized file check-in by OneLocBuild Task (#8844)
  [LayoutBindings] Fix '[Preserve]' is obsolete warnings (#8529)
  LEGO: Merge pull request 8837
  [ci] Use managed identity for ApiScan (#8823)
  [Xamarin.Android.Build.Tasks] DTBs should not rm generator output (#8706)
  [Xamarin.Android.Build.Tasks] Bump to NuGet 6.7.1 (#8833)
  $(AndroidPackVersionSuffix)=preview.4; net9 is 34.99.0.preview.4 (#8831)
  Localized file check-in by OneLocBuild Task (#8824)
  [Xamarin.Android.Build.Tasks] Enable POM verification features. (#8649)
  [runtime] Optionally disable inlining (#8798)
  Fix assembly count when satellite assemblies are present (#8790)
  [One .NET] new "greenfield" projects are trimmed by default (#8805)
  Localized file check-in by OneLocBuild Task (#8819)
  LEGO: Merge pull request 8820
@github-actions github-actions bot locked and limited conversation to collaborators Apr 28, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants