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 XAT for new LibZipSharp #7309

Merged
merged 4 commits into from
Aug 26, 2022
Merged

Bump XAT for new LibZipSharp #7309

merged 4 commits into from
Aug 26, 2022

Conversation

grendello
Copy link
Contributor

No description provided.

Fixes NU1605 error:

         /Users/builder/azdo/_work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj : error NU1605: Detected package downgrade: Xamarin.LibZipSharp from 2.0.7 to 2.0.4. Reference the package directly from the project to select a different version.  [/Users/builder/azdo/_work/1/s/xamarin-android/Xamarin.Android.sln]
       /Users/builder/azdo/_work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj : error NU1605:  Xamarin.Android.Build.Tasks -> Microsoft.Android.Build.BaseTasks -> Xamarin.LibZipSharp (>= 2.0.7)  [/Users/builder/azdo/_work/1/s/xamarin-android/Xamarin.Android.sln]
       /Users/builder/azdo/_work/1/s/xamarin-android/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj : error NU1605:  Xamarin.Android.Build.Tasks -> Xamarin.LibZipSharp (>= 2.0.4) [/Users/builder/azdo/_work/1/s/xamarin-android/Xamarin.Android.sln]
        /Users/builder/azdo/_work/1/s/xamarin-android/build-tools/xaprepare/xaprepare/xaprepare.csproj : error NU1605: Detected package downgrade: Mono.Unix from 7.1.0-final.1.21458.1 to 7.0.0-final.1.21369.2. Reference the package directly from the project to select a different version. 
       /Users/builder/azdo/_work/1/s/xamarin-android/build-tools/xaprepare/xaprepare/xaprepare.csproj : error NU1605:  xaprepare -> Xamarin.LibZipSharp 2.0.7 -> Mono.Unix (>= 7.1.0-final.1.21458.1)
@jonpryor
Copy link
Member

jonpryor commented Aug 26, 2022

squash-and-merge:

Bump to mono/mono.posix@d8994ca, xamarin/LibZipSharp@98e9173

Changes: https://github.com/mono/mono.posix/compare/e1269a564a022b143769785714968a52091c10a4...d8994caaf29f0a95022ee4d1d51ae0a55150ce92

  * mono/mono.posix@d8994ca: Remove Windows support completely for now

    Fixes an issue in which Mono.Unix would try to resolve `libc`
    P/Invokes by looking for the `msvcrt` library on Unix machines.

  * mono/mono.posix@74d504f: Fix yaml template path
  * mono/mono.posix@127cf9e: [build] Don't rebuild managed code on packaging time on Windows

Changes: https://github.com/xamarin/LibZipSharp/compare/2.0.4...2.0.7

  * xamarin/LibZipSharp@98e9173: Bump version to 2.0.7
  * xamarin/LibZipSharp@6e1e1b3: Localized file check-in by OneLocBuild Task: Build definition ID 11678: Build ID 6581869 (#119)
  * xamarin/LibZipSharp@1c05430: LEGO: Merge pull request 118
  * xamarin/LibZipSharp@06d44d8: Localized file check-in by OneLocBuild Task: Build definition ID 11678: Build ID 6570668 (#117)
  * xamarin/LibZipSharp@37f3894: LEGO: Merge pull request 116
  * xamarin/LibZipSharp@6c0edc5: Update libzip and zlib submodules (#115)
  * xamarin/LibZipSharp@acd9a54: [Localization] Switch from xlf to resx files  (#112)
  * xamarin/LibZipSharp@3cece80: LEGO: Merge pull request 114
  * xamarin/LibZipSharp@fe336b4: LEGO: Merge pull request 113
  * xamarin/LibZipSharp@9aee99a: [Localization] Add OneLocBuild job (#111)
  * xamarin/LibZipSharp@bdfa9f8: Bump Mono.Unix to 7.1.0-final.1.21458.1 (#110)

Changes: https://github.com/xamarin/monodroid/compare/210073e19b9aa339d2099260e724c1f60df6fd70...100ccf969e58a633ec85af7627110bab6e9fe13d

  * xamarin/monodroid@100ccf969: Bump to xamarin/androidtools@81486ab, xamarin/android-sdk-installer@8cac7ea (#1264)

Changes: https://github.com/xamarin/xamarin-android-tools/compare/9c641b3e08e56db37467a64a2c5de2c7f7ddb3ef...29f11f2a304376bfa96de999a78083fe5a8174c6

  * xamarin/xamarin-android-tools@29f11f2 Bump to mono/mono.posix@d8994ca, xamarin/LibZipSharp@98e9173 (#193)
  * xamarin/xamarin-android-tools@7cfe683 [ci] Use Microsoft.SourceLink.GitHub (#192)
  * xamarin/xamarin-android-tools@01a0dde [Localization] Import translated resx files (#189)
  * xamarin/xamarin-android-tools@cc715d9 [Xamarin.Android.Tools.AndroidSdk] Permit NDK r25 (#190)
  * xamarin/xamarin-android-tools@3c55e9a Avoid `Environment.SpecialFolder.ApplicationData` (#188)
  * xamarin/xamarin-android-tools@0d55472 LEGO: Merge pull request 187
  * xamarin/xamarin-android-tools@6946512 Juno: check in to juno/hb_befb220e-87ce-47e9-a9e6-10ea592b2337_20220729154833425. (#186)
  * xamarin/xamarin-android-tools@6e3433a Juno: check in to juno/hb_befb220e-87ce-47e9-a9e6-10ea592b2337_20220729025332507. (#185)
  * xamarin/xamarin-android-tools@73c4388 [Xamarin.Android.Tools.AndroidSdk] Update SDK component for API-33 (#184)
  * xamarin/xamarin-android-tools@da3653e [Xamarin.Android.Tools.AndroidSdk] Add API-33 to KnownVersions
  * xamarin/xamarin-android-tools@327d433 [ci] Run OneLocBuild on a schedule (#180)
  * xamarin/xamarin-android-tools@8ab60e4 [ci] Use latest macOS and Windows images (#181)
  * xamarin/xamarin-android-tools@4dd3292 LEGO: Merge pull request 182
  * xamarin/xamarin-android-tools@56b61f1 [Localization] Add OneLocBuild job (#175)
  * xamarin/xamarin-android-tools@14076a6 [Xamarin.Android.Tools.AndroidSdk] Add API-32 to KnownVersions

@jonpryor
Copy link
Member

Waiting on the Windows build to complete successfully.

@dellis1972
Copy link
Contributor

Looks like we need to bump Mono.Unix in the android-sdk-installer which is pulled in via monodroid.

Could not load file or assembly 'Mono.Unix, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'.

@dellis1972
Copy link
Contributor

@jonpryor jonpryor merged commit 91f330f into dotnet:main Aug 26, 2022
@grendello grendello deleted the bump-xat branch August 26, 2022 20:41
grendello added a commit to grendello/xamarin-android that referenced this pull request Aug 31, 2022
* main:
  [ci] Split up signing for files to be notarized (dotnet#7321)
  [ci] Add support to net7.0 for multi-targeting in VS (dotnet#7311)
  [ci] Skip classic tests on .NET release branches (dotnet#7312)
  [tests] Use `$(AndroidSdkPlatformToolsVersion)`=33.0.3 (dotnet#7320)
  Bump to xamarin/java.interop/main@4f813cb2 (dotnet#7308)
  Bump to mono/mono.posix@d8994ca, dotnet/android-libzipsharp@98e9173 (dotnet#7309)
grendello added a commit to grendello/xamarin-android that referenced this pull request Aug 31, 2022
* mm-runtime:
  [ci] Split up signing for files to be notarized (dotnet#7321)
  [ci] Add support to net7.0 for multi-targeting in VS (dotnet#7311)
  [ci] Skip classic tests on .NET release branches (dotnet#7312)
  [tests] Use `$(AndroidSdkPlatformToolsVersion)`=33.0.3 (dotnet#7320)
  Bump to xamarin/java.interop/main@4f813cb2 (dotnet#7308)
  Bump to mono/mono.posix@d8994ca, dotnet/android-libzipsharp@98e9173 (dotnet#7309)
@github-actions github-actions bot locked and limited conversation to collaborators Jan 24, 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.

None yet

3 participants