Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1048 commits
Select commit Hold shift + click to select a range
0c48793
Merge pull request #291 from dotnet/darc-main-14d4d8ec-079a-45f6-ac53…
Redth Feb 7, 2022
414a082
android-aot is now included in android
Redth Feb 7, 2022
e500275
Merge pull request #298 from dotnet/darc-main-923315f2-3f3d-4c35-8c55…
Redth Feb 7, 2022
02d5472
Color: FromRgb and FromRgba overloads that accept ints
swharden Feb 7, 2022
2f5a770
Color: constructor overloads that accept ints
swharden Feb 7, 2022
7c26e95
Color: constructor overloads that accept bytes
swharden Feb 7, 2022
2efd682
Color: clamp between 0 and 1.0 in constructor
swharden Feb 7, 2022
8ebe786
Color: autoformat
swharden Feb 7, 2022
f177632
Merge pull request #310 from swharden/color-overloads
jonlipsky Feb 12, 2022
27b3b23
Merge pull request #305 from swharden/302-scaled-path
jonlipsky Feb 12, 2022
6903828
Software Bill of Materials (SBOM) manifest generation
mjbond-msft Feb 15, 2022
f2222d5
Merge pull request #314 from dotnet/dev/bond/sbom
Redth Feb 15, 2022
35c2028
Renamed Rectangle to Rect and RectangleF to RectF
jsuarezruiz Feb 18, 2022
225360d
Update azure-pipelines.yml for Azure Pipelines
mattleibow Feb 21, 2022
dec0db3
[main] Update dependencies from xamarin/xamarin-android (#312)
dotnet-maestro[bot] Feb 22, 2022
164ae8c
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Feb 22, 2022
7b89f26
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Feb 23, 2022
8475274
Merge branch 'main' into rename-rectangle
jsuarezruiz Feb 24, 2022
923144d
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Feb 24, 2022
56f1062
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Feb 24, 2022
47c6d83
SBOM: Fix for conditional logic based on signingCondition (#322)
mjbond-msft Feb 24, 2022
dab2bfa
Bugfix: Grammar.
tracplus-hpaterson Feb 25, 2022
abd8cd3
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Feb 25, 2022
27d16e0
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Feb 25, 2022
8eb7422
[ci] Fix pools
rmarinho Feb 25, 2022
24a5554
Fix object usage
rmarinho Feb 25, 2022
4b373bb
More fixes
rmarinho Feb 25, 2022
3361540
remove property
rmarinho Feb 25, 2022
7389906
Remove extra stuff
rmarinho Feb 25, 2022
084d1a9
provisioning provisioningWindowsSdk
rmarinho Feb 25, 2022
6d19365
Try fix build
rmarinho Feb 25, 2022
2df2bf8
API 31
rmarinho Feb 25, 2022
0dd39d2
Don't build classic
rmarinho Feb 25, 2022
086b773
Revert "Don't build classic"
rmarinho Feb 25, 2022
177c4da
Bump TargetFrameworkVersion Android
rmarinho Feb 25, 2022
cbd19c7
Try again
rmarinho Feb 25, 2022
4a052e8
try fix condition
rmarinho Feb 25, 2022
c2b272b
Fix pipeline
rmarinho Feb 25, 2022
b0d8270
Remove extra nuspec
rmarinho Feb 25, 2022
b0bc27d
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Feb 26, 2022
1557e44
Merge pull request #327 from tracplus-hpaterson/patch-1
jonlipsky Feb 27, 2022
b11559c
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Feb 27, 2022
2e18b7f
Move to MonoAndroid12.0
rmarinho Feb 28, 2022
59dc6fd
Merge pull request #328 from dotnet/fix-pool
rmarinho Feb 28, 2022
1b07474
Fix Color Type converter
StephaneDelcroix Feb 28, 2022
fb554d9
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Mar 1, 2022
96f2b32
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Mar 1, 2022
8592fa3
Merge pull request #329 from dotnet/fix_color
Redth Mar 1, 2022
7c123d5
Fix workload sdk bands
Redth Mar 1, 2022
403212e
Merge pull request #326 from dotnet/darc-main-468b20d3-fc3c-4f66-a931…
Redth Mar 1, 2022
e6779ed
Merge branch 'main' into darc-main-f514bd6d-d72e-4bd4-88ed-19db4ff9175a
Redth Mar 1, 2022
a2ac103
Try pinning sdk to 200 to build
Redth Mar 1, 2022
085fea7
Fix workload sdk band install location in tizen script
Redth Mar 1, 2022
3fd9ff6
Merge pull request #323 from dotnet/darc-main-f514bd6d-d72e-4bd4-88ed…
Redth Mar 1, 2022
861b78e
Merge branch 'main' into rename-rectangle
Redth Mar 1, 2022
00f9154
Merge pull request #318 from dotnet/rename-rectangle
Redth Mar 1, 2022
af22be3
Update GitInfo.txt
Redth Mar 1, 2022
0e59917
Use 300 band to build
Redth Mar 2, 2022
2c05d43
Actual workload manifests are still 200
Redth Mar 2, 2022
da41b8c
Changes for updated tizen script
Redth Mar 2, 2022
e0defa0
escape replace
Redth Mar 2, 2022
629aa08
Restore Skia packages (#319)
mattleibow Mar 3, 2022
61d86e7
Renamed Geometry class to GeometryUtil
jsuarezruiz Mar 3, 2022
df144fa
Merge pull request #334 from dotnet/release/6.0.2xx-preview14
Redth Mar 3, 2022
23cb481
Include StrokeDashOffset property
jsuarezruiz Mar 7, 2022
9dfe466
Updated WinUI implementation
jsuarezruiz Mar 7, 2022
4b84f03
Updated samples
jsuarezruiz Mar 7, 2022
ae91428
Added Android and iOS implementations
jsuarezruiz Mar 7, 2022
f8a272d
Optimize Color Parsing
eerhardt Mar 9, 2022
aff703f
Consolidate the code and only switch on int/double.Parse.
eerhardt Mar 9, 2022
7457f88
Add more parsing unit tests.
eerhardt Mar 10, 2022
59c021c
Add Microsoft.Maui.Graphics.Benchmarks
eerhardt Mar 10, 2022
77623e6
Missing Rectangle to Rect renaming changes
jsuarezruiz Mar 10, 2022
4f93ca2
Merge pull request #344 from dotnet/pending-rect-renaming
rmarinho Mar 10, 2022
e99421b
Merge pull request #341 from dotnet/strokedashoffset
jonlipsky Mar 10, 2022
e91ab6f
Fix classic build
eerhardt Mar 10, 2022
0c66b70
Merge pull request #343 from eerhardt/OptimizeColorParsing
jonlipsky Mar 10, 2022
7c1ca91
Merge pull request #333 from dotnet/geometryutil
jonlipsky Mar 10, 2022
e0e6955
Revert Named Colors change
eerhardt Mar 10, 2022
ee53f77
Add ParseLightGoldenrodYellowWithSpace benchmark
eerhardt Mar 10, 2022
16c0ca5
Merge pull request #345 from eerhardt/RevertNamedColors
jonlipsky Mar 11, 2022
6785698
Renamed GradientStop to PaintGradientStop
jsuarezruiz Mar 15, 2022
3da78bc
Merge pull request #347 from dotnet/paintgradientstop
Redth Mar 15, 2022
7fc76fe
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Mar 23, 2022
3e28780
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Mar 23, 2022
101fc04
[ci] Build darc branches
rmarinho Mar 23, 2022
f847c1e
Merge branch 'main' into darc-main-84e56b1f-ab5a-4625-98ce-4eaea89ac95e
rmarinho Mar 23, 2022
2a652d0
Merge branch 'main' into darc-main-49ba7140-2043-41fc-b07c-75d4b6a9b57b
rmarinho Mar 23, 2022
c57362e
Try update install workloads
rmarinho Mar 23, 2022
a028ccf
BuildConfiguration.name
rmarinho Mar 23, 2022
ba9a950
try again
rmarinho Mar 23, 2022
1a12b2a
Build with installed .net
rmarinho Mar 23, 2022
49d4988
Remove old code
rmarinho Mar 23, 2022
27138ae
Add missing command
rmarinho Mar 23, 2022
75c8337
fix path where to install tizen
rmarinho Mar 23, 2022
635de33
Update winapp sdk
rmarinho Mar 23, 2022
08dc039
Install on global dotnet folder
rmarinho Mar 23, 2022
fe400e5
Try build with dotnet root
rmarinho Mar 24, 2022
1dc2f6b
Dont remove directory
rmarinho Mar 24, 2022
1eeed30
try pipeline again
rmarinho Mar 24, 2022
aebfed9
Fix condition
rmarinho Mar 24, 2022
9d7c528
dotnet slash
rmarinho Mar 24, 2022
8b6e3d1
try again
rmarinho Mar 24, 2022
d5d4b9e
Try with cake script
rmarinho Mar 24, 2022
1ea6290
Fix
rmarinho Mar 24, 2022
688fbc9
Update again
rmarinho Mar 24, 2022
9131c18
Update sdk internal
rmarinho Mar 24, 2022
32361f6
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Mar 24, 2022
220ae52
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Mar 24, 2022
2ca11b1
Merge pull request #351 from dotnet/try-build-updates
rmarinho Mar 24, 2022
d797737
Merge branch 'main' into darc-main-84e56b1f-ab5a-4625-98ce-4eaea89ac95e
rmarinho Mar 24, 2022
d0814d1
Merge branch 'main' into darc-main-49ba7140-2043-41fc-b07c-75d4b6a9b57b
rmarinho Mar 24, 2022
18b0fdc
Merge pull request #349 from dotnet/darc-main-84e56b1f-ab5a-4625-98ce…
rmarinho Mar 24, 2022
9342fa0
Merge pull request #350 from dotnet/darc-main-49ba7140-2043-41fc-b07c…
rmarinho Mar 24, 2022
ebca40e
Update band
rmarinho Mar 24, 2022
642cf8b
Bump rc 2
rmarinho Mar 24, 2022
248fb3f
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Mar 25, 2022
50ce911
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Mar 25, 2022
5f6f1f7
Push package info to maestro
pjcollins Mar 25, 2022
ea74e9d
Fix spacing
pjcollins Mar 25, 2022
68151b3
Fix the signed download path
pjcollins Mar 25, 2022
a3f7f0c
Merge pull request #354 from dotnet/push-maestro
rmarinho Mar 25, 2022
a30617c
Merge pull request #353 from dotnet/darc-main-bb4aabc1-ecc2-492f-ba68…
Redth Mar 26, 2022
38db3fe
Merge branch 'main' into darc-main-0632e072-908c-4578-9653-f32840570a13
Redth Mar 26, 2022
9bda4e1
Merge pull request #352 from dotnet/darc-main-0632e072-908c-4578-9653…
Redth Mar 26, 2022
0ef2f18
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Mar 26, 2022
9b87733
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Mar 26, 2022
d029639
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Mar 28, 2022
4561328
Merge pull request #356 from dotnet/darc-main-70168e80-3cbb-407a-b86b…
rmarinho Mar 28, 2022
0cc27cb
Merge pull request #355 from dotnet/darc-main-ec9cbc11-b528-4334-8404…
rmarinho Mar 28, 2022
882e97e
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Mar 29, 2022
473fcd5
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Mar 29, 2022
53e9048
Merge pull request #360 from dotnet/darc-main-0fb09dca-5702-48eb-84ac…
rmarinho Mar 29, 2022
654f512
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Mar 30, 2022
cafcbc2
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Mar 30, 2022
1796bf4
Merge pull request #363 from dotnet/darc-main-a998607c-201f-4ea0-b027…
rmarinho Mar 30, 2022
9caa335
Merge pull request #359 from dotnet/darc-main-da6e19e4-04cc-4c67-ad2c…
rmarinho Mar 31, 2022
dca93d7
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Mar 31, 2022
423a8f6
Merge pull request #366 from dotnet/darc-main-19bcd4e5-8f2f-48a7-942d…
rmarinho Mar 31, 2022
33513f3
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 1, 2022
53a5e07
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 1, 2022
f718a01
Merge pull request #369 from dotnet/darc-main-3ce03781-3e08-4def-b856…
rmarinho Apr 1, 2022
f6f7558
Merge pull request #370 from dotnet/darc-main-5603a3d7-daa9-4ee5-ae23…
rmarinho Apr 1, 2022
007cc84
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 2, 2022
b0f2812
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 2, 2022
65071bb
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 3, 2022
6783302
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 4, 2022
b6567c3
Merge pull request #372 from dotnet/darc-main-fcf880df-8f18-46ec-8482…
rmarinho Apr 4, 2022
95d4991
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 5, 2022
f21c6ba
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 5, 2022
8d550f5
Lower supported version for windows (#382)
buyaa-n Apr 6, 2022
484c936
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 6, 2022
48a4e1f
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 6, 2022
b24428e
Merge pull request #373 from dotnet/darc-main-5edfa6ff-bbfc-4cd4-97bc…
rmarinho Apr 6, 2022
c1a5469
Merge pull request #376 from dotnet/darc-main-bef89aa0-6354-43a8-9924…
rmarinho Apr 6, 2022
3cdaa82
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 6, 2022
5d4150b
Update the Windows Dependencies (#384)
mattleibow Apr 6, 2022
0507d03
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 7, 2022
479addb
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 7, 2022
43aa7ea
Merge pull request #385 from dotnet/darc-main-766c176f-26f8-43df-84d6…
rmarinho Apr 7, 2022
855fe28
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 7, 2022
08c796e
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 7, 2022
d42ac74
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 8, 2022
aba880f
Merge pull request #390 from dotnet/darc-main-1e30063a-2124-486e-a627…
rmarinho Apr 8, 2022
e6fd0cd
[main] Update dependencies from xamarin/xamarin-macios (#389)
dotnet-maestro[bot] Apr 9, 2022
1e8e1b8
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 9, 2022
1772276
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 9, 2022
de5b130
Specifiy the tizen sdk version to avoid Invoke-Request failure
rookiejava Apr 11, 2022
55d9dcc
Merge pull request #397 from rookiejava/fix-script
rmarinho Apr 12, 2022
21661be
Disable SBOM for now
rmarinho Apr 12, 2022
8e401cf
Merge branch 'main' into darc-main-e9be31b7-2d13-4688-a953-53a53573eab7
rmarinho Apr 12, 2022
038c93b
Merge branch 'main' into darc-main-146827ae-dc39-46d5-a4d5-4541c7d84118
rmarinho Apr 12, 2022
f0fea8b
Try enableSBOMSigning: false
rmarinho Apr 12, 2022
56fc1c9
Merge branch 'main' into darc-main-e9be31b7-2d13-4688-a953-53a53573eab7
rmarinho Apr 12, 2022
0c19e32
Merge branch 'main' into darc-main-146827ae-dc39-46d5-a4d5-4541c7d84118
rmarinho Apr 12, 2022
fac3d46
Merge pull request #393 from dotnet/darc-main-e9be31b7-2d13-4688-a953…
rmarinho Apr 12, 2022
d5d1d04
Merge pull request #394 from dotnet/darc-main-146827ae-dc39-46d5-a4d5…
rmarinho Apr 12, 2022
2a70550
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 13, 2022
f604076
Merge pull request #398 from dotnet/darc-main-52da0a1e-416f-40a9-9edf…
rmarinho Apr 13, 2022
4a40a08
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 19, 2022
c6b2fd6
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 19, 2022
c180cbe
Merge pull request #399 from dotnet/darc-main-24b88e96-dde0-4a94-8851…
rmarinho Apr 19, 2022
0227a9c
Merge pull request #400 from dotnet/darc-main-977bf1da-2c9b-4977-a1dc…
rmarinho Apr 19, 2022
afb3b64
Update SkiaSharp (#401)
mattleibow Apr 20, 2022
7c682a8
Bump to rc3
rmarinho Apr 20, 2022
53a8cf1
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 20, 2022
2a64af6
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 20, 2022
d764419
Merge pull request #403 from dotnet/darc-main-35727b16-3d70-41df-8830…
rmarinho Apr 20, 2022
4edea04
Merge pull request #404 from dotnet/darc-main-6509288d-2187-4626-9958…
rmarinho Apr 20, 2022
721429b
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 23, 2022
cbbf261
[main] Update dependencies from xamarin/xamarin-macios (#406)
dotnet-maestro[bot] Apr 23, 2022
152d42f
[main] Update dependencies from xamarin/xamarin-macios (#408)
dotnet-maestro[bot] Apr 26, 2022
19578e1
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] Apr 28, 2022
73fa399
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Apr 28, 2022
ea18f30
Merge pull request #412 from dotnet/darc-main-e3d0437d-c52e-4a95-8eba…
rmarinho Apr 28, 2022
4e0d156
Merge pull request #413 from dotnet/darc-main-61dd56a7-7b88-4b1a-9939…
rmarinho Apr 28, 2022
7b6daba
Bump WindowsAppSdk and Win2d versions
jfversluis May 2, 2022
cfc461d
Merge pull request #414 from dotnet/bump-win2d
Redth May 2, 2022
d793407
Bump WindowsAppSdk and Win2D versions (cont'd) (#415)
jfversluis May 3, 2022
cc22767
Update the Microsoft.Windows.SDK.NET dependency
mattleibow May 3, 2022
3d81347
[Tizen] Remove specifying Tizen sdk version
JoonghyunCho May 4, 2022
4efd0d9
Merge pull request #416 from JoonghyunCho/update-workload-install
rmarinho May 4, 2022
628ae7c
Bump Gitinfo to rc4
rmarinho May 4, 2022
1c3f42c
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] May 5, 2022
32d7b93
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 5, 2022
6c15d0e
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 6, 2022
1802d17
Incorrect type name
mattleibow May 7, 2022
89d2e85
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 7, 2022
7fba80c
Merge pull request #420 from dotnet/dev/fix-name
rmarinho May 9, 2022
0961c84
Update dependencies from https://github.com/xamarin/xamarin-macios bu…
dotnet-maestro[bot] May 10, 2022
c91dc2e
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] May 10, 2022
46f9d5f
Merge pull request #418 from dotnet/darc-main-65b6ce60-1201-4551-81d2…
rmarinho May 11, 2022
4e63ef8
Merge pull request #419 from dotnet/darc-main-d7aa1ec1-3fd4-4835-ba54…
rmarinho May 11, 2022
e903f4b
Update Version tags
rmarinho May 11, 2022
54b387a
Fix condition
rmarinho May 11, 2022
8b30795
Start building with stable SkiaSharp nugets (#430)
mattleibow May 12, 2022
ddc4c09
Merge pull request #431 from dotnet/main-version-test
Redth May 12, 2022
7c271fd
Used the signed feed (#432)
mattleibow May 12, 2022
6165c6c
Update GitInfo.txt
mattleibow May 12, 2022
864b7dd
Remove whitespace
mattleibow May 12, 2022
a3c1358
Update README.md (#435)
swharden May 31, 2022
1888953
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 2, 2022
a083c2d
Bump iOS
Redth Jun 2, 2022
1405c61
Bump iOS
Redth Jun 2, 2022
4c6f797
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 2, 2022
6343ecc
Update sdk band to 6.0.400
Redth Jun 2, 2022
5e059bb
Android, Mono, emsdk still 6.0.300
Redth Jun 2, 2022
6d82fde
Merge pull request #440 from dotnet/darc-main-a3471bea-84ff-49dd-8698…
Redth Jun 3, 2022
6e78518
Update GitInfo.txt
Redth Jun 3, 2022
0c5f627
Update GitInfo.txt
Redth Jun 3, 2022
fbb66af
Update dependencies from https://github.com/xamarin/xamarin-android b…
dotnet-maestro[bot] Jun 3, 2022
1fec614
Merge pull request #442 from dotnet/darc-main-c8710a06-33de-41a5-9d80…
rmarinho Jun 6, 2022
c969388
Merge remote-tracking branch 'graphics/main' into net6.0
mattleibow Jun 18, 2022
729f587
Merge remote-tracking branch 'origin/net6.0' into dev/graphics
mattleibow Jun 20, 2022
91bc4e0
Deleted unsupported platforms and use project refs
mattleibow Jun 20, 2022
acfc96f
Merge remote-tracking branch 'origin/net6.0' into dev/graphics
mattleibow Jun 22, 2022
629b641
Merge remote-tracking branch 'origin/main' into dev/graphics
mattleibow Jun 28, 2022
c75d9ef
Merge remote-tracking branch 'origin/main' into dev/graphics
mattleibow Jul 7, 2022
91ea9d5
Add Graphics samples and tests
mattleibow Jul 9, 2022
86ed75e
Add back the SkiaSharp libs and Samples
mattleibow Jul 11, 2022
cc20818
Foldable is also a sample project
mattleibow Jul 11, 2022
d9901b1
.net standard is not shipping
mattleibow Jul 11, 2022
e53782d
update versions
mattleibow Jul 11, 2022
104658f
Merge remote-tracking branch 'origin/main' into dev/graphics
mattleibow Jul 13, 2022
675e5cf
Merge remote-tracking branch 'origin/net6.0' into dev/graphics-net6
mattleibow Jul 13, 2022
c0daba2
Add Graphics samples and tests
mattleibow Jul 9, 2022
4a46fc3
Merge remote-tracking branch 'origin/net6.0' into dev/graphics
mattleibow Jul 14, 2022
5fc8647
Merge remote-tracking branch 'origin/main' into dev/graphics-main
mattleibow Jul 14, 2022
9c5cbc8
Merge branch 'dev/graphics' into dev/graphics-main
mattleibow Jul 14, 2022
34c1b81
Merge remote-tracking branch 'origin/main' into dev/graphics-main
mattleibow Jul 16, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<IncludeTizenTargetFrameworks Condition="'$(CI)' == 'true' or '$(TF_BUILD)' == 'true' or
Exists('$(DOTNET_ROOT)\sdk-manifests\$(DotNetVersionBand)\samsung.net.sdk.tizen\WorkloadManifest.json') or
Exists('$(ProgramFiles)\dotnet\sdk-manifests\$(DotNetVersionBand)\samsung.net.sdk.tizen\WorkloadManifest.json')">true</IncludeTizenTargetFrameworks>
<IncludeMacOSTargetFrameworks>true</IncludeMacOSTargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -51,6 +52,10 @@
<MauiPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(MauiPlatforms);$(WindowsMauiPlatforms)</MauiPlatforms>
<MauiPlatforms Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">$(MauiPlatforms);net$(_MauiDotNetVersion)-tizen</MauiPlatforms>

<!-- Graphics TFMs -->
<MauiGraphicsPlatforms>$(MauiPlatforms)</MauiGraphicsPlatforms>
<MauiGraphicsPlatforms Condition="'$(IncludeMacOSTargetFrameworks)' == 'true'">$(MauiGraphicsPlatforms);net$(_MauiDotNetVersion)-macos</MauiGraphicsPlatforms>

<!-- Work around the IDE not properly handling the NU1703 warning -->
<MauiPlatformsNoMacCat>net$(_MauiDotNetVersion)-ios;net$(_MauiDotNetVersion)-android</MauiPlatformsNoMacCat>
<MauiPlatformsNoMacCat Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(MauiPlatformsNoMacCat);$(WindowsMauiPlatforms)</MauiPlatformsNoMacCat>
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@

<!-- Until we get a new enough dotnet -->
<ItemGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.24" TargetingPackVersion="10.0.18362.24" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.24" TargetingPackVersion="10.0.19041.24" />
</ItemGroup>

<!--
Expand Down
3 changes: 3 additions & 0 deletions Microsoft.Maui-mac.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@
"src\\Core\\tests\\Benchmarks\\Core.Benchmarks.csproj",
"src\\Core\\tests\\DeviceTests\\Core.DeviceTests.csproj",
"src\\Core\\tests\\UnitTests\\Core.UnitTests.csproj",
"src\\Graphics\\src\\Graphics\\Graphics.csproj",
"src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
"src\\Graphics\\src\\Text.Markdig\\Graphics.Text.Markdig.csproj",
"src\\Essentials\\samples\\Sample.Server.WebAuthenticator\\Essentials.Sample.Server.WebAuthenticator.csproj",
"src\\Essentials\\samples\\Samples\\Essentials.Sample.csproj",
"src\\Essentials\\src\\Essentials.csproj",
Expand Down
1 change: 1 addition & 0 deletions Microsoft.Maui.BuildTasks.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"solution": {
"path": "Microsoft.Maui.sln",
"projects": [
"src\\Graphics\\src\\Graphics\\Graphics.csproj",
"src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks.csproj",
"src\\Controls\\src\\Core\\Controls.Core.csproj",
"src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
Expand Down
26 changes: 26 additions & 0 deletions Microsoft.Maui.Graphics.slnf
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"solution": {
"path": "Microsoft.Maui.sln",
"projects": [
"src\\Graphics\\samples\\GraphicsTester.Android\\GraphicsTester.Android.csproj",
"src\\Graphics\\samples\\GraphicsTester.MacCatalyst\\GraphicsTester.MacCatalyst.csproj",
"src\\Graphics\\samples\\GraphicsTester.Mac\\GraphicsTester.Mac.csproj",
"src\\Graphics\\samples\\GraphicsTester.Portable\\GraphicsTester.Portable.csproj",
"src\\Graphics\\samples\\GraphicsTester.Skia.Console\\GraphicsTester.Skia.Console.csproj",
"src\\Graphics\\samples\\GraphicsTester.Skia.Gtk\\GraphicsTester.Skia.Gtk.csproj",
"src\\Graphics\\samples\\GraphicsTester.Skia.Mac\\GraphicsTester.Skia.Mac.csproj",
"src\\Graphics\\samples\\GraphicsTester.Skia.Tizen\\GraphicsTester.Skia.Tizen.csproj",
"src\\Graphics\\samples\\GraphicsTester.Skia.Windows\\GraphicsTester.Skia.Windows.csproj",
"src\\Graphics\\samples\\GraphicsTester.WinUI.Desktop\\GraphicsTester.WinUI.Desktop.csproj",
"src\\Graphics\\samples\\GraphicsTester.iOS\\GraphicsTester.iOS.csproj",
"src\\Graphics\\src\\Graphics.Skia.GtkSharp\\Graphics.Skia.GtkSharp.csproj",
"src\\Graphics\\src\\Graphics.Skia.WPF\\Graphics.Skia.WPF.csproj",
"src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
"src\\Graphics\\src\\Graphics.Win2D\\Graphics.Win2D.csproj",
"src\\Graphics\\src\\Graphics\\Graphics.csproj",
"src\\Graphics\\src\\Text.Markdig\\Graphics.Text.Markdig.csproj",
"src\\Graphics\\tests\\Graphics.Benchmarks\\Graphics.Benchmarks.csproj",
"src\\Graphics\\tests\\Graphics.Tests\\Graphics.Tests.csproj"
]
}
}
3 changes: 3 additions & 0 deletions Microsoft.Maui.Packages-mac.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
"src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
"src\\Core\\src\\Core.csproj",
"src\\Essentials\\src\\Essentials.csproj",
"src\\Graphics\\src\\Graphics\\Graphics.csproj",
"src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
"src\\Graphics\\src\\Text.Markdig\\Graphics.Text.Markdig.csproj",
"src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj",
"src\\Templates\\src\\Microsoft.Maui.Templates.csproj",
"src\\Workload\\Microsoft.Maui.Controls.Ref\\Microsoft.Maui.Controls.Ref.csproj",
Expand Down
4 changes: 4 additions & 0 deletions Microsoft.Maui.Packages.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
"src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design.csproj",
"src\\Controls\\src\\Xaml\\Controls.Xaml.csproj",
"src\\Core\\src\\Core.csproj",
"src\\Graphics\\src\\Graphics\\Graphics.csproj",
"src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
"src\\Graphics\\src\\Graphics.Win2D\\Graphics.Win2D.csproj",
"src\\Graphics\\src\\Text.Markdig\\Graphics.Text.Markdig.csproj",
"src\\Essentials\\src\\Essentials.csproj",
"src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj",
"src\\Templates\\src\\Microsoft.Maui.Templates.csproj",
Expand Down
150 changes: 150 additions & 0 deletions Microsoft.Maui.sln
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,52 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedSource", "SharedSourc
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks.Droid", "src\Core\tests\Benchmarks.Droid\Benchmarks.Droid.csproj", "{5B56A734-D53C-4635-A53E-F889FCFCDD66}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Graphics", "Graphics", "{E4884871-4A1B-43BC-814F-E3D6E52B1673}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{42AB9AE1-631D-4AD4-85B7-910FF0940BDB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{936C47A9-A7EA-4FBD-8733-CED1D4100E69}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics", "src\Graphics\src\Graphics\Graphics.csproj", "{CF056C95-51C4-4366-9D06-41D2B15EFEE4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.Skia", "src\Graphics\src\Graphics.Skia\Graphics.Skia.csproj", "{918B7EE9-055B-4F5A-8F62-BB88913159B1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.Win2D", "src\Graphics\src\Graphics.Win2D\Graphics.Win2D.csproj", "{291F634A-2D8D-48B6-A1A0-BB9BC265D6E4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.Text.Markdig", "src\Graphics\src\Text.Markdig\Graphics.Text.Markdig.csproj", "{375B22F5-9D79-4D17-B759-F8220DFB8B70}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.Tests", "src\Graphics\tests\Graphics.Tests\Graphics.Tests.csproj", "{56BBFDBD-254F-42B6-9984-46E19C53FB00}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.Benchmarks", "src\Graphics\tests\Graphics.Benchmarks\Graphics.Benchmarks.csproj", "{56DF52FC-A48C-4757-8130-A412050CEBB8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Android", "src\Graphics\samples\GraphicsTester.Android\GraphicsTester.Android.csproj", "{2B02595C-BB82-44F2-8FB7-423EF2DE3A73}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.iOS", "src\Graphics\samples\GraphicsTester.iOS\GraphicsTester.iOS.csproj", "{0F1BC26B-5041-4D64-B533-2959287D8197}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Mac", "src\Graphics\samples\GraphicsTester.Mac\GraphicsTester.Mac.csproj", "{0A44978B-81FD-4565-9997-3E7218C66596}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.MacCatalyst", "src\Graphics\samples\GraphicsTester.MacCatalyst\GraphicsTester.MacCatalyst.csproj", "{B3DD0741-2EC3-4A54-82B7-73923DE4CF48}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Portable", "src\Graphics\samples\GraphicsTester.Portable\GraphicsTester.Portable.csproj", "{546614BB-07AA-4E8E-B6AE-EBDC183C4DAB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Console", "src\Graphics\samples\GraphicsTester.Skia.Console\GraphicsTester.Skia.Console.csproj", "{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Mac", "src\Graphics\samples\GraphicsTester.Skia.Mac\GraphicsTester.Skia.Mac.csproj", "{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Tizen", "src\Graphics\samples\GraphicsTester.Skia.Tizen\GraphicsTester.Skia.Tizen.csproj", "{20756558-1284-42D6-AB7B-3E59DF8A6B34}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Windows", "src\Graphics\samples\GraphicsTester.Skia.Windows\GraphicsTester.Skia.Windows.csproj", "{8441FA70-9041-4727-91B9-2F39881CC0EE}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.WinUI.Desktop", "src\Graphics\samples\GraphicsTester.WinUI.Desktop\GraphicsTester.WinUI.Desktop.csproj", "{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.Skia.GtkSharp", "src\Graphics\src\Graphics.Skia.GtkSharp\Graphics.Skia.GtkSharp.csproj", "{AFD9D653-08C4-456C-AA1B-F5C9F621D655}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.Skia.WPF", "src\Graphics\src\Graphics.Skia.WPF\Graphics.Skia.WPF.csproj", "{F26D31D3-CE4C-4F32-A77F-E2905C948674}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Gtk", "src\Graphics\samples\GraphicsTester.Skia.Gtk\GraphicsTester.Skia.Gtk.csproj", "{F351A992-18E4-473C-8ADD-2BA0BAA7B5A2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -496,6 +542,88 @@ Global
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Release|Any CPU.Build.0 = Release|Any CPU
{5B56A734-D53C-4635-A53E-F889FCFCDD66}.Release|Any CPU.Deploy.0 = Release|Any CPU
{CF056C95-51C4-4366-9D06-41D2B15EFEE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CF056C95-51C4-4366-9D06-41D2B15EFEE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CF056C95-51C4-4366-9D06-41D2B15EFEE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CF056C95-51C4-4366-9D06-41D2B15EFEE4}.Release|Any CPU.Build.0 = Release|Any CPU
{918B7EE9-055B-4F5A-8F62-BB88913159B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{918B7EE9-055B-4F5A-8F62-BB88913159B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{918B7EE9-055B-4F5A-8F62-BB88913159B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{918B7EE9-055B-4F5A-8F62-BB88913159B1}.Release|Any CPU.Build.0 = Release|Any CPU
{291F634A-2D8D-48B6-A1A0-BB9BC265D6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{291F634A-2D8D-48B6-A1A0-BB9BC265D6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{291F634A-2D8D-48B6-A1A0-BB9BC265D6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{291F634A-2D8D-48B6-A1A0-BB9BC265D6E4}.Release|Any CPU.Build.0 = Release|Any CPU
{375B22F5-9D79-4D17-B759-F8220DFB8B70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{375B22F5-9D79-4D17-B759-F8220DFB8B70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{375B22F5-9D79-4D17-B759-F8220DFB8B70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{375B22F5-9D79-4D17-B759-F8220DFB8B70}.Release|Any CPU.Build.0 = Release|Any CPU
{56BBFDBD-254F-42B6-9984-46E19C53FB00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56BBFDBD-254F-42B6-9984-46E19C53FB00}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56BBFDBD-254F-42B6-9984-46E19C53FB00}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56BBFDBD-254F-42B6-9984-46E19C53FB00}.Release|Any CPU.Build.0 = Release|Any CPU
{56DF52FC-A48C-4757-8130-A412050CEBB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{56DF52FC-A48C-4757-8130-A412050CEBB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56DF52FC-A48C-4757-8130-A412050CEBB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56DF52FC-A48C-4757-8130-A412050CEBB8}.Release|Any CPU.Build.0 = Release|Any CPU
{2B02595C-BB82-44F2-8FB7-423EF2DE3A73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B02595C-BB82-44F2-8FB7-423EF2DE3A73}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B02595C-BB82-44F2-8FB7-423EF2DE3A73}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{2B02595C-BB82-44F2-8FB7-423EF2DE3A73}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2B02595C-BB82-44F2-8FB7-423EF2DE3A73}.Release|Any CPU.Build.0 = Release|Any CPU
{2B02595C-BB82-44F2-8FB7-423EF2DE3A73}.Release|Any CPU.Deploy.0 = Release|Any CPU
{0F1BC26B-5041-4D64-B533-2959287D8197}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0F1BC26B-5041-4D64-B533-2959287D8197}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F1BC26B-5041-4D64-B533-2959287D8197}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{0F1BC26B-5041-4D64-B533-2959287D8197}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F1BC26B-5041-4D64-B533-2959287D8197}.Release|Any CPU.Build.0 = Release|Any CPU
{0F1BC26B-5041-4D64-B533-2959287D8197}.Release|Any CPU.Deploy.0 = Release|Any CPU
{0A44978B-81FD-4565-9997-3E7218C66596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A44978B-81FD-4565-9997-3E7218C66596}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A44978B-81FD-4565-9997-3E7218C66596}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A44978B-81FD-4565-9997-3E7218C66596}.Release|Any CPU.Build.0 = Release|Any CPU
{B3DD0741-2EC3-4A54-82B7-73923DE4CF48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B3DD0741-2EC3-4A54-82B7-73923DE4CF48}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B3DD0741-2EC3-4A54-82B7-73923DE4CF48}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B3DD0741-2EC3-4A54-82B7-73923DE4CF48}.Release|Any CPU.Build.0 = Release|Any CPU
{546614BB-07AA-4E8E-B6AE-EBDC183C4DAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{546614BB-07AA-4E8E-B6AE-EBDC183C4DAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{546614BB-07AA-4E8E-B6AE-EBDC183C4DAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{546614BB-07AA-4E8E-B6AE-EBDC183C4DAB}.Release|Any CPU.Build.0 = Release|Any CPU
{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094}.Release|Any CPU.Build.0 = Release|Any CPU
{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5E8D70F3-990D-4B40-8B13-AA818F21E8A0}.Release|Any CPU.Build.0 = Release|Any CPU
{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
{20756558-1284-42D6-AB7B-3E59DF8A6B34}.Release|Any CPU.Build.0 = Release|Any CPU
{8441FA70-9041-4727-91B9-2F39881CC0EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8441FA70-9041-4727-91B9-2F39881CC0EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8441FA70-9041-4727-91B9-2F39881CC0EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8441FA70-9041-4727-91B9-2F39881CC0EE}.Release|Any CPU.Build.0 = Release|Any CPU
{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5}.Release|Any CPU.Build.0 = Release|Any CPU
{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5}.Release|Any CPU.Deploy.0 = Release|Any CPU
{AFD9D653-08C4-456C-AA1B-F5C9F621D655}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AFD9D653-08C4-456C-AA1B-F5C9F621D655}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AFD9D653-08C4-456C-AA1B-F5C9F621D655}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AFD9D653-08C4-456C-AA1B-F5C9F621D655}.Release|Any CPU.Build.0 = Release|Any CPU
{F26D31D3-CE4C-4F32-A77F-E2905C948674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F26D31D3-CE4C-4F32-A77F-E2905C948674}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F26D31D3-CE4C-4F32-A77F-E2905C948674}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F26D31D3-CE4C-4F32-A77F-E2905C948674}.Release|Any CPU.Build.0 = Release|Any CPU
{F351A992-18E4-473C-8ADD-2BA0BAA7B5A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F351A992-18E4-473C-8ADD-2BA0BAA7B5A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F351A992-18E4-473C-8ADD-2BA0BAA7B5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F351A992-18E4-473C-8ADD-2BA0BAA7B5A2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -590,6 +718,28 @@ Global
{5FEA7500-0ACE-4C26-9A7B-2EB3958CBBC6} = {A9C514B9-1EE2-4A12-8E8A-CE16D87545C3}
{4F2926C8-43AB-4328-A735-D9EAD699F81D} = {ED7F28E0-D0AF-417D-983D-3D874EEE8554}
{5B56A734-D53C-4635-A53E-F889FCFCDD66} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
{42AB9AE1-631D-4AD4-85B7-910FF0940BDB} = {E4884871-4A1B-43BC-814F-E3D6E52B1673}
{1BA0121E-0B83-4C8F-81BE-C293E7E35DCE} = {E4884871-4A1B-43BC-814F-E3D6E52B1673}
{936C47A9-A7EA-4FBD-8733-CED1D4100E69} = {E4884871-4A1B-43BC-814F-E3D6E52B1673}
{CF056C95-51C4-4366-9D06-41D2B15EFEE4} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
{918B7EE9-055B-4F5A-8F62-BB88913159B1} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
{291F634A-2D8D-48B6-A1A0-BB9BC265D6E4} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
{375B22F5-9D79-4D17-B759-F8220DFB8B70} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
{56BBFDBD-254F-42B6-9984-46E19C53FB00} = {936C47A9-A7EA-4FBD-8733-CED1D4100E69}
{56DF52FC-A48C-4757-8130-A412050CEBB8} = {936C47A9-A7EA-4FBD-8733-CED1D4100E69}
{2B02595C-BB82-44F2-8FB7-423EF2DE3A73} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{0F1BC26B-5041-4D64-B533-2959287D8197} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{0A44978B-81FD-4565-9997-3E7218C66596} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{B3DD0741-2EC3-4A54-82B7-73923DE4CF48} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{546614BB-07AA-4E8E-B6AE-EBDC183C4DAB} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{EF6ACA06-D4DF-4C21-9F65-FBFEC6325094} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{5E8D70F3-990D-4B40-8B13-AA818F21E8A0} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{20756558-1284-42D6-AB7B-3E59DF8A6B34} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{8441FA70-9041-4727-91B9-2F39881CC0EE} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{4BF0AF30-6E18-47D8-B90C-E99C1917BEF5} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
{AFD9D653-08C4-456C-AA1B-F5C9F621D655} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
{F26D31D3-CE4C-4F32-A77F-E2905C948674} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
{F351A992-18E4-473C-8ADD-2BA0BAA7B5A2} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
Expand Down
Loading