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

[main] Update dependencies from dotnet/installer #7769

Merged
merged 3 commits into from
Feb 15, 2023
Merged

[main] Update dependencies from dotnet/installer #7769

merged 3 commits into from
Feb 15, 2023

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Feb 6, 2023

This pull request updates the following dependencies

From https://github.com/dotnet/installer

  • Subscription: 0ba14476-1d1a-452a-3b67-08da9690aef0
  • Build: 20230205.6
  • Date Produced: February 6, 2023 8:20:01 AM UTC
  • Commit: d25a3bbf0c5ea90b8b5b4b2dabfabad48b6c107e
  • Branch: refs/heads/main

@dotnet-maestro
Update dependencies from https://github.com/dotnet/installer build 20…
a34451d 
…230205.6

Microsoft.Dotnet.Sdk.Internal
 From Version 8.0.100-alpha.1.23080.11 -> To Version 8.0.100-preview.2.23105.6
@jonathanpeppers
Manually fix up Maestro dependency names
f0c395c 
Renamed:

    Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-alpha.1

To be `preview.2`:

    Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2

Then got the latest build number here:

https://maestro-prod.westus2.cloudapp.azure.com/3074/https:%2F%2Fgithub.com%2Fdotnet%2Finstaller/latest/graph

Lastly, I ran this using the build number:

    darc update-dependencies --id 165885
@jonathanpeppers
Merge branch 'main' into darc-main-156de042-6459-4172-b765-65475ffcafea
df7a075
jonathanpeppers
jonathanpeppers approved these changes Feb 15, 2023
View reviewed changes
Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

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

Only failure is InstallAndroidDependenciesTest:

_AndroidSdkDirectory was not set to new SDK path.
Expected: True
But was:  False

I saw this on some other PRs, so let's investigate if it keeps happening.

I think it's unrelated to the changes here.

@jonathanpeppers jonathanpeppers merged commit 6cd0d38 into main Feb 15, 2023
@jonathanpeppers jonathanpeppers deleted the darc-main-156de042-6459-4172-b765-65475ffcafea branch February 15, 2023 17:16
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 15, 2023
@grendello
Merge branch 'main' into classloader-thread-init
3437e9d 
* main:
  [Xamarin.Android.Build.Tasks] FileWrites&libraryprojectimports.cache (dotnet#7780)
  Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 17, 2023
@grendello
Merge branch 'main' into no-ndk-lib-stubs
2b53bd8 
* main:
  [tests] Bump NUnit versions to latest (dotnet#7802)
  [Microsoft.Android.Sdk.ILLink] target `net7.0` temporarily (dotnet#7803)
  [tests] `InstallAndroidDependenciesTest` can use `platform-tools` 34.0.0 (dotnet#7800)
  Bump to xamarin/Java.Interop/main@9e0a469 (dotnet#7797)
  [Xamarin.Android.Build.Tasks] FileWrites&libraryprojectimports.cache (dotnet#7780)
  Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)
  [lgtm] Fix LGTM-reported issues (dotnet#1074)
  [ci] Report issues in the API docs build log (dotnet#7784)
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 22, 2023
@grendello
Merge branch 'main' into http-compression-fix
876c32e 
* main:
  [tests] Bump NUnit versions to latest (dotnet#7802)
  [Microsoft.Android.Sdk.ILLink] target `net7.0` temporarily (dotnet#7803)
  [tests] `InstallAndroidDependenciesTest` can use `platform-tools` 34.0.0 (dotnet#7800)
  Bump to xamarin/Java.Interop/main@9e0a469 (dotnet#7797)
  [Xamarin.Android.Build.Tasks] FileWrites&libraryprojectimports.cache (dotnet#7780)
  Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 22, 2023
@grendello
Merge branch 'main' into no-bundleassemblies
8032a0d 
* main:
  Add Unit Test for testOnly apps (dotnet#7637)
  [build] Only build the latest API level (dotnet#7786)
  [Xamarin.Android.Build.Tasks] Improve aapt2+file not found handling (dotnet#7644)
  [MSBuildDeviceIntegration] Fix duplicated test parameter (dotnet#7809)
  [tests] Bump NUnit versions to latest (dotnet#7802)
  [Microsoft.Android.Sdk.ILLink] target `net7.0` temporarily (dotnet#7803)
  [tests] `InstallAndroidDependenciesTest` can use `platform-tools` 34.0.0 (dotnet#7800)
  Bump to xamarin/Java.Interop/main@9e0a469 (dotnet#7797)
  [Xamarin.Android.Build.Tasks] FileWrites&libraryprojectimports.cache (dotnet#7780)
  Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 22, 2023
@grendello
Merge branch 'main' into maybe-fix-zip
02b022b 
* main:
  Add Unit Test for testOnly apps (dotnet#7637)
  [build] Only build the latest API level (dotnet#7786)
  [Xamarin.Android.Build.Tasks] Improve aapt2+file not found handling (dotnet#7644)
  [MSBuildDeviceIntegration] Fix duplicated test parameter (dotnet#7809)
  [tests] Bump NUnit versions to latest (dotnet#7802)
  [Microsoft.Android.Sdk.ILLink] target `net7.0` temporarily (dotnet#7803)
  [tests] `InstallAndroidDependenciesTest` can use `platform-tools` 34.0.0 (dotnet#7800)
  Bump to xamarin/Java.Interop/main@9e0a469 (dotnet#7797)
  [Xamarin.Android.Build.Tasks] FileWrites&libraryprojectimports.cache (dotnet#7780)
  Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)
  [lgtm] Fix LGTM-reported issues (dotnet#1074)
  [ci] Report issues in the API docs build log (dotnet#7784)
grendello added a commit that referenced this pull request Feb 24, 2023
@grendello
Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (#…
c8b2cc0 
…7769)"

Context: dotnet/runtime#82597

This reverts commit 6cd0d38.

We need to do it because a recent update to the `Microsoft.NET.ILLink`
package broke our build:

   Microsoft.Android.Sdk.ILLink.csproj : error NU1202: Package Microsoft.NET.ILLink 8.0.0-preview.2.23123.5 is not compatible with net7.0 (.NETCoreApp,Version=v7.0). Package Microsoft.NET.ILLink 8.0.0-preview.2.23123.5 supports: net8.0 (.NETCoreApp,Version=v8.0)

This happened because the version of `Microsoft.NET.ILLink` that
we have configured in `en/Version.Details.xml` was removed from
the dotnet8 feed and the closest matching version is installed instead.

An attempt to fix it was to switch the `Microsoft.Android.Sdk.ILLink`
project back to `net8.0` but, alas, the new `Microsoft.NET.ILLink` package
version misses dependency on Cecil, also causing our build to fail:

   src/Microsoft.Android.Sdk.ILLink/ApplyPreserveAttribute.cs(9,12): error CS0234: The type or namespace name 'Cecil' does not exist in the namespace 'Mono'
   src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/LinkDesignerBase.cs(161,41): error CS0246: The type or namespace name 'MethodDefinition' could not be found
   ...
    626 Warning(s)
    359 Error(s)

Reverting 6cd0d38 puts as back on the `alpha1`
release of net8 and fixes the build until we have a real solution available.
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 24, 2023
@grendello
Merge branch 'main' into no-ndk-lib-stubs
64e5fb6 
* main:
  Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)"
  LEGO: Merge pull request 7828
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 24, 2023
@grendello
Merge branch 'main' into maybe-fix-zip
d081e3e 
* main:
  Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)"
  LEGO: Merge pull request 7828
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 24, 2023
@grendello
Merge branch 'main' into no-bundleassemblies
ab016ec 
* main:
  Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)"
  LEGO: Merge pull request 7828
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 24, 2023
@grendello
Merge branch 'main' into classloader-thread-init
20f2ef1 
* main:
  Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)"
  LEGO: Merge pull request 7828
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 24, 2023
@grendello
Merge branch 'main' into native-code-classic-cleanup
b233500 
* main:
  Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)"
  LEGO: Merge pull request 7828
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 24, 2023
@grendello
Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (d…
b2fd01e 
…otnet#7769)"

This reverts commit 6cd0d38.
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 24, 2023
@grendello
Merge branch 'main' into http-compression-fix
2f75cb0 
* main:
  Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)"
  LEGO: Merge pull request 7828
grendello added a commit to grendello/xamarin-android that referenced this pull request Feb 27, 2023
@grendello
Merge branch 'main' into issue7819
1b1df89 
* main:
  Localized file check-in by OneLocBuild (dotnet#7827)
  Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (dotnet#7769)"
  LEGO: Merge pull request 7828
  LEGO: Merge pull request 7825
  Bump to xamarin/Java.Interop/main@bbaeda6f (dotnet#7799)
  Bump NDK to r25c (dotnet#7808)
  [Xamarin.Android.Build.Tests] Improve logcat logging in failed tests (dotnet#7816)
  [Mono.Android] Update api-compat reference file for current API-33 (dotnet#7822)
@github-actions github-actions bot locked and limited conversation to collaborators Jan 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jonathanpeppers jonathanpeppers jonathanpeppers approved these changes

@pjcollins pjcollins Awaiting requested review from pjcollins pjcollins is a code owner

@jonpryor jonpryor Awaiting requested review from jonpryor jonpryor is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jonathanpeppers