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

[net7.0] Update dependencies from xamarin/xamarin-macios #9848

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Sep 1, 2022

This pull request updates the following dependencies

From https://github.com/xamarin/xamarin-macios

  • Subscription: 25c1cfea-ca28-4ea7-686a-08da860f1a55
  • Build: 20220831.12
  • Date Produced: August 31, 2022 7:50:38 PM UTC
  • Commit: 2ddb7a6d681ce2f659b796184aee7e4a2991ae0c
  • Branch: refs/heads/net7.0

@ghost ghost added the area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions label Sep 1, 2022
@rmarinho rmarinho added 7.0-rc2 Created by mkArtakMSFT do-not-merge Don't merge this PR labels Sep 1, 2022
mattleibow and others added 21 commits September 6, 2022 09:44
* Try fix API docs

* Replace color namespace

* Fix image paths

* Revert "Fix image paths"

This reverts commit 40b7066.

* Fix namespaces

* Refix namespaces

* Fix image paths for realsies

* More fixes

* Fixes everywhere

* Fixfixfix

* Update Thickness.xml
* Correctly layout the WebView page contents

- Fixes #9884
- FIxes #9890

* Remove extra changes
# Conflicts:
#	src/Controls/src/Core/BrushTypeConverter.cs
#	src/Controls/src/Core/ClickGestureRecognizer.cs
#	src/Controls/src/Core/HandlerImpl/Element/Element.Impl.cs
#	src/Controls/src/Core/ImageSourceConverter.cs
#	src/Controls/src/Core/OpenGLView.cs
#	src/Controls/src/Core/Shapes/PathFigure.cs
#	src/Controls/src/Core/Shapes/PathGeometry.cs
#	src/Controls/src/Core/TapGestureRecognizer.cs
#	src/Controls/src/Core/TappedEventArgs.cs
# Conflicts:
#	.nuspec/maui.aotprofile.txt
* Remove pipelines check

* Fix yaml
* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.4xx-09d789e820226e201eb29c5f3e78404124a42497-1

Microsoft.Android.Sdk.Windows
 From Version 32.0.465 -> To Version 32.0.466

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.401-servicing.22419.11 -> To Version 6.0.401-servicing.22451.18 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.4xx-a220db565c19618eb987718f5bad775f113b55b5-1

Microsoft.Android.Sdk.Windows
 From Version 32.0.465 -> To Version 32.0.467

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.401-servicing.22419.11 -> To Version 6.0.401-servicing.22451.18 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.4xx-04623cdc317c3da5efce46cb16d94befe4833125-1

Microsoft.Android.Sdk.Windows
 From Version 32.0.465 -> To Version 32.0.468

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.401-servicing.22419.11 -> To Version 6.0.402-servicing.22457.1 (parent: Microsoft.Android.Sdk.Windows

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Bumps Microsoft.Web.WebView2 from 1.0.1293.44 to 1.0.1343.22.

---
updated-dependencies:
- dependency-name: Microsoft.Web.WebView2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Added pending Core xml comments

* Updated comments
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
#	eng/pipelines/common/provision.yml
<MicrosofttvOSSdkPackageVersion>15.4.1024-rc.1</MicrosofttvOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>15.4.1051-rc.2</MicrosoftiOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>15.4.1051-rc.2</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>12.3.1051-rc.2</MicrosoftmacOSSdkPackageVersion>
Copy link
Member

Choose a reason for hiding this comment

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

Is this correct 12.3 for macOS ?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, it's the latest available macOS SDK from Apple.

@rmarinho
Copy link
Member

rmarinho commented Sep 8, 2022

Humm

D:\a\_work\1\s\src\DotNet\Dependencies\Workloads.csproj : error NU1102: Unable to find package Microsoft.NET.Sdk.MacCatalyst.Manifest-7.0.100-rc.1 with version (= 15.4.1051-rc.2) [D:\a\_work\1\s\src\DotNet\DotNet.csproj]

myroot and others added 21 commits September 8, 2022 23:05
* Fixes wrong declared CommandMapper types

* move changes to unshipped

Co-authored-by: Matthew Leibowitz <[email protected]>
# Conflicts:
#	eng/Version.Details.xml
# Conflicts:
#	src/SingleProject/Resizetizer/test/UnitTests/Resizetizer.UnitTests.csproj
* Create ReleaseSchedule.md

* Update README.md

* Update ReleaseSchedule.md
* Update Graphics.csproj

* Update Graphics.csproj
@jonathanpeppers jonathanpeppers changed the base branch from net7.0 to darc-net7.0-ad2b83ef-daac-46c0-ac00-901dfe922996 September 9, 2022 16:49
@jonathanpeppers
Copy link
Member

Going to merge this one into #9968 shortly, but looks like I need to rebase it.

…ild 20220831.12

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1024-rc.1 -> To Version 15.4.1051-rc.2
…ild 20220831.12

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1029-rc.1 -> To Version 15.4.1051-rc.2
@jonathanpeppers jonathanpeppers force-pushed the darc-net7.0-2947011e-e14f-480d-a26f-a25faa782973 branch from 0e56c6d to 1565a1f Compare September 9, 2022 16:54
@jonathanpeppers
Copy link
Member

I don't understand what GitHub is showing on the diff now. Going to close and trigger a new one.

@dotnet-maestro dotnet-maestro bot deleted the darc-net7.0-2947011e-e14f-480d-a26f-a25faa782973 branch September 9, 2022 16:59
@github-actions github-actions bot locked and limited conversation to collaborators Dec 17, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
7.0-rc2 Created by mkArtakMSFT area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions do-not-merge Don't merge this PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants