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

Merge Maui.Graphics into Maui! (net7.0 / main) #8739

Merged
merged 1,048 commits into from
Jul 26, 2022
Merged

Merge Maui.Graphics into Maui! (net7.0 / main) #8739

merged 1,048 commits into from
Jul 26, 2022

Conversation

mattleibow
Copy link
Member

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

Redth and others added 30 commits February 7, 2022 12:29
@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
@mjbond-msft
SBOM: Fix for conditional logic based on signingCondition (#322)
47c6d83 
* Attempt to evaluate signingCondition to include/exclude settings at the time the sbom stage is run

* Evaluate signingCondition as part of a condition property and not as a conditional expression

* Apply signingCondition to the stages defined for PRs and CIs

* Try using two SBOM jobs with opposing conditional logic within the same stage

* Unique names for SBOM jobs

* SBOM: Execute PR job based on unsignedCondition

* Remove closing paren from unsignedCondition

* Remove stage name as parameter to condition

* Remove succeeded() from original signingCondition

* Multi-line conditions

* Use single signingCondition

* SBOM: Unsigned PR job: Include condition for success of the windows (build) stage

* Target production support for the SBOM shared template job name & display name

* Ensure SBOM_PR job only executes if the build 'windows' job succeeds by making the SBOM stage dependent on the success of the windows stage

* Spell out acronyms in comments
@tracplus-hpaterson
Bugfix: Grammar.
dab2bfa
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
abd8cd3 
…ild 20220224.52

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.75
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-android b…
27d16e0 
…uild main-b3cb3a9e49bbffed4fd00f716ce04ab502396fae-1

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

Dependency coherency updates

Microsoft.NETCore.App.Ref
 From Version 6.0.3 -> To Version 6.0.3 (parent: Microsoft.Android.Sdk.Windows
@rmarinho
[ci] Fix pools
8eb7422
@rmarinho
Fix object usage
24a5554
@rmarinho
More fixes
4b373bb
@rmarinho
remove property
3361540
@rmarinho
Remove extra stuff
7389906
@rmarinho
provisioning provisioningWindowsSdk
084d1a9
dotnet-maestro bot and others added 19 commits June 3, 2022 23:29
@dotnet-maestro
Update dependencies from https://github.com/xamarin/xamarin-android b…
fbb66af 
…uild 6.0.4xx-052bfb661739066b8598f5b0b066cee5a99a1e15-1

Microsoft.Android.Sdk.Windows
 From Version 32.0.414 -> To Version 32.0.415
@rmarinho
Merge pull request #442 from dotnet/darc-main-c8710a06-33de-41a5-9d80…
1fec614 
…-ffd2c718c6b8

[main] Update dependencies from xamarin/xamarin-android
@mattleibow
Merge remote-tracking branch 'graphics/main' into net6.0
c969388
@mattleibow
Merge remote-tracking branch 'origin/net6.0' into dev/graphics
729f587
@mattleibow
Deleted unsupported platforms and use project refs
91bc4e0
@mattleibow
Merge remote-tracking branch 'origin/net6.0' into dev/graphics
acfc96f
@mattleibow
Merge remote-tracking branch 'origin/main' into dev/graphics
629b641
@mattleibow
Merge remote-tracking branch 'origin/main' into dev/graphics
c75d9ef
@mattleibow
Add Graphics samples and tests
91ea9d5
@mattleibow
Add back the SkiaSharp libs and Samples
86ed75e
@mattleibow
Foldable is also a sample project
cc20818
@mattleibow
.net standard is not shipping
d9901b1
@mattleibow
update versions
e53782d
@mattleibow
Merge remote-tracking branch 'origin/main' into dev/graphics
104658f
@mattleibow
Merge remote-tracking branch 'origin/net6.0' into dev/graphics-net6
675e5cf
@mattleibow
Add Graphics samples and tests
c0daba2
@mattleibow
Merge remote-tracking branch 'origin/net6.0' into dev/graphics
4a46fc3
@mattleibow
Merge remote-tracking branch 'origin/main' into dev/graphics-main
5fc8647
@mattleibow
Merge branch 'dev/graphics' into dev/graphics-main
9c5cbc8
@mattleibow mattleibow self-assigned this Jul 14, 2022
@mattleibow mattleibow added the area-drawing Shapes, Borders, Shadows, Graphics, BoxView, custom drawing label Jul 14, 2022
@mattleibow
Merge remote-tracking branch 'origin/main' into dev/graphics-main
34c1b81 
# Conflicts:
#	src/Controls/Foldable/src/Controls.Foldable.csproj
#	src/Core/src/Core.csproj
#	src/Essentials/src/Essentials.csproj
@mattleibow mattleibow merged commit 5e68060 into main Jul 26, 2022
@mattleibow mattleibow deleted the dev/graphics-main branch July 26, 2022 20:03
This was referenced Jul 26, 2022
Closed
Open
Closed
Closed
@github-actions github-actions bot locked and limited conversation to collaborators Dec 19, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jsuarezruiz jsuarezruiz jsuarezruiz approved these changes

Assignees

@mattleibow mattleibow

Labels
area-drawing Shapes, Borders, Shadows, Graphics, BoxView, custom drawing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Move Maui.Graphics into the main .NET MAUI repository