Skip to content

Merge Maui.Graphics into Maui! (net6.0) #8147

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
Closed
mattleibow wants to merge 1,038 commits into from
Closed

Merge Maui.Graphics into Maui! (net6.0) #8147

mattleibow wants to merge 1,038 commits into from

Conversation

@mattleibow
Copy link
Member

@mattleibow mattleibow commented Jun 18, 2022 •
edited
Loading

Description of Change

There are several reasons this is a good idea:

  • issues are easily triaged and managed from a single repo
  • no need to manage a separate repo for a few APIs
  • far less dependency management - none in fact
  • easy to develop graphics changes/fixes without having to do weird things

Tasks

  • Bring in code from Maui.Graphics
  • Integrate source into Maui build system
  • Remove non-Maui platforms (SharpDX, UWP, JS)
  • Integrate samples into Maui build and/or Maui samples
  • Integrate tests into Maui build

The only code changes to this was to make sure it could build in the new, stricter repo. This included changes to nullability checks and other warnings. There is no functional changes and I even copied over the same tests and samples.

The reason to not use maui itself in the graphics samples is because:
a) I didn't want to change anything
b) maui is not required and testing graphics without maui is not hard or a lot of code
c) allows devs to contribute to graphics without even touching maui code in this repo.

I have also opened issues for each platform that was not brought along. This included GTK, UWP and Blazor. Not because we don't want to support them, just that we never published nugets for them, they don't build as-is and this PR has to be merged soon. Those platforms can be added to this repo in a new PR if there is any demand for it.

Issues Fixed

Fixes #7901

dotnet-maestro bot and others added 30 commits February 1, 2022 13:38
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-android b…
0b41ec3 
…uild main-71e6ecd67b08394482317c94db9ff35dc051ffbc-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.46 -> To Version 31.0.200-preview.14.52

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.200-rtm.22074.2 -> To Version 6.0.200-rtm.22078.8 (parent: Microsoft.Android.Sdk.Windows
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
aaa752f 
…ild 20220201.40

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.13.1 -> To Version 15.2.300-preview.14.147
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-android b…
85c9fb0 
…uild main-4a71aa6217dabc75b8616ee72440d85352868118-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.46 -> To Version 31.0.200-preview.14.53

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal
 From Version 6.0.200-rtm.22074.2 -> To Version 6.0.200-rtm.22078.8 (parent: Microsoft.Android.Sdk.Windows
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
b1c034a 
…ild 20220202.38

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.13.1 -> To Version 15.2.300-preview.14.163
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
c40bd31 
…ild 20220203.53

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.13.1 -> To Version 15.2.300-preview.14.182
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
7234b03 
…ild 20220204.44

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.13.1 -> To Version 15.2.300-preview.14.200
@swharden
PathF: AsScaledPath overload for distinct X and Y scales
f08548b 
This commit adds a PathF.AsScaledPath overload that allows the user to specify distinct X and Y scales. This is a necessary precursor for DrawPath, FillPath, and ClipPath to respect canvas scale settings. #302
@swharden
GraphicsTester: add scaled path tests
1685857 
This commit adds a DrawPathsScaled AbstractScenario (complimenting the existing DrawLinesScaled scenario) to demonstrate PathF scaling functionality #302
@swharden
GraphicsTester: add ScaleCanvas scenario
30a5793 
Add a new abstract scenario to demonstrate Canvas.Scale() with distinct X and Y scales. This test currently demonstrates a bug described by #302 where only the X scale is respected when drawing paths.
@swharden
ScalingCanvas: DrawPath, FillPath, and ClipPath respect Y scale
7de546c 
This commit fixes a bug described by #302 where DrawPath, FillPath, and ClipPath only considered the X scale factor. This fix resolves this issue, as demonstrated by the new ScaleCanvas GraphicsTester scenario.
@Redth
Merge pull request #291 from dotnet/darc-main-14d4d8ec-079a-45f6-ac53…
0c48793 
…-89eaef8bacdf

[main] Update dependencies from xamarin/xamarin-macios
@Redth
android-aot is now included in android
414a082
@Redth
Merge pull request #298 from dotnet/darc-main-923315f2-3f3d-4c35-8c55…
e500275 
…-9981cf2e4b88

[main] Update dependencies from xamarin/xamarin-android
@swharden
Color: FromRgb and FromRgba overloads that accept ints
02d5472 
Without these overloads it is possible that integers (expected to be 0-255) are interpreted as floats and clamped between 0 and 1.0 #308, #253
@swharden
Color: constructor overloads that accept ints
2f5a770 
Without these overloads it is possible that integers (expected to be 0-255) are interpreted as floats and clamped between 0 and 1.0 #308, #253
@swharden
Color: constructor overloads that accept bytes
7c26e95 
Since methods FromRgb() and FromRgba() have overloads that accept bytes it seems logical that there are matching constructors that accept this data type. #308, #253
@swharden
Color: clamp between 0 and 1.0 in constructor
2efd682
@swharden
Color: autoformat
8ebe786
@jonlipsky
Merge pull request #310 from swharden/color-overloads
f177632 
Color: add overloads so `int` does not get clamped like a `float`
@jonlipsky
Merge pull request #305 from swharden/302-scaled-path
27b3b23 
ScalingCanvas: DrawPath, FillPath, and ClipPath respect distinct X and Y scales
@mjbond-msft
Software Bill of Materials (SBOM) manifest generation
6903828
@Redth
Merge pull request #314 from dotnet/dev/bond/sbom
f2222d5 
Software Bill of Materials (SBOM) manifest generation
@jsuarezruiz
Renamed Rectangle to Rect and RectangleF to RectF
35c2028
@mattleibow
Update azure-pipelines.yml for Azure Pipelines
225360d
@dotnet-maestro @Redth @mattleibow
[main] Update dependencies from xamarin/xamarin-android (#312)
dec0db3 
* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220207.42

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.217

* Update dependencies from https://github.com/xamarin/xamarin-android build main-4342afd8dc89202bb501d0552a7945fbed8101d3-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.57

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref
 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22106.1 (parent: Microsoft.Android.Sdk.Windows

* Remove emsdk explicit version

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220208.27

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.235

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220209.36

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.244

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220210.25

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.249

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220211.24

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.252

* Update dependencies from https://github.com/xamarin/xamarin-android build main-f9892cc8e63f6990ef4e4c426dde66a84d0d3816-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.74

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref
 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220214.17

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.14.200 -> To Version 15.2.300-preview.14.254

* Update dependencies from https://github.com/xamarin/xamarin-android build main-ee4322054292a8f6e33ca6c53fe9ce609fce3c95-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.77

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref
 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220215.73

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.14.200 -> To Version 15.2.302-preview.14.5

* Update dependencies from https://github.com/xamarin/xamarin-android build main-db56e3877069a5c519f61a0b1722726f890c77a6-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.84

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref
 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220216.36

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.14.200 -> To Version 15.2.302-preview.14.18

* Update dependencies from https://github.com/xamarin/xamarin-android build main-25e0eefbd20bb4778a4717e4ef587a080c82bca0-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.89

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref
 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-ebdd4b826cc208202ac1793484cad2fe0036abc2-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.91

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build main-d73e048af287b32c69d825191337927081bf8d3c-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.93

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220219.1

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.300-preview.14.200 -> To Version 15.2.302-preview.14.34

* Update dependencies from https://github.com/xamarin/xamarin-android build main-0583ca1d3a44f4ffc6a29b487ef2b4ed33d2c067-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.95

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows

* Bump iOS,  bring back emsdk

* try removing the signing until we can build

* try get things to run

* 🕵🏼

* wrong thing

* and vs again

* wrong files

* build all again

* Update dependencies from https://github.com/xamarin/xamarin-android build main-0583ca1d3a44f4ffc6a29b487ef2b4ed33d2c067-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.53 -> To Version 31.0.200-preview.14.95

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.200-rtm.22078.8 -> To Version 6.0.200-rtm.22107.3 (parent: Microsoft.Android.Sdk.Windows

* Try this way

* And this one

* moar

* asdf

* asdf

* asdf

* try params

* asdf

* asdf

* asdf

* sadf

* asdf

* :(

* asdf

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: redth <jondick@gmail.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
164ae8c 
…ild 20220221.19 (#321)

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.302-preview.14.34 -> To Version 15.2.302-preview.14.40

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-android b…
7b89f26 
…uild main-5d2bc5eded8442da5baf35ee67bf4f719b8d466f-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.95 -> To Version 31.0.200-preview.14.97
@jsuarezruiz
Merge branch 'main' into rename-rectangle
8475274
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
923144d 
…ild 20220223.36

Microsoft.tvOS.Sdk , Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk
 From Version 15.2.302-preview.14.40 -> To Version 15.2.302-preview.14.56
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-android b…
56f1062 
…uild main-4fb6056c555c3f293c068740e7a10a1be5de784c-1

Microsoft.Android.Sdk.Windows
 From Version 31.0.200-preview.14.95 -> To Version 31.0.200-preview.14.99
@mattleibow mattleibow changed the base branch from net6.0 to main July 7, 2022 22:02
@mattleibow mattleibow changed the base branch from main to net6.0 July 13, 2022 00:50
@mattleibow mattleibow modified the milestones: .NET 7, 6.0-servicing Jul 13, 2022
This was referenced Jul 13, 2022
Open
Open
Open
Open
Open
Open
Open
Open
Closed
Closed
@mattleibow mattleibow removed the do-not-merge Don't merge this PR label Jul 13, 2022
@mattleibow mattleibow marked this pull request as ready for review July 13, 2022 01:19
@mattleibow mattleibow requested review from PureWeen and Redth July 13, 2022 01:19
@mattleibow mattleibow changed the title Merge Maui.Graphics into Maui! Merge Maui.Graphics into Maui! (net6.0) Jul 14, 2022
@mattleibow
Copy link
Member Author

mattleibow commented Jul 26, 2022

Merged into main with this PR: #8739

No need for net6 to have this much changes as we can still release from the previous repo.

@mattleibow mattleibow closed this Jul 26, 2022
@mattleibow mattleibow deleted the dev/graphics branch July 26, 2022 20:04
@github-actions github-actions bot locked and limited conversation to collaborators Dec 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@Redth Redth Awaiting requested review from Redth

@PureWeen PureWeen Awaiting requested review from PureWeen

Assignees

@mattleibow mattleibow

Labels

area-drawing Shapes, Borders, Shadows, Graphics, BoxView, custom drawing

Projects

None yet

Milestone

6.0-servicing

Development

Successfully merging this pull request may close these issues.

Move Maui.Graphics into the main .NET MAUI repository