Граф коммитов

30 Коммитов

Автор SHA1 Сообщение Дата
Matthew Leibowitz 69fbd4fdd8
Add the embedding sample (#23647) 2024-07-19 17:11:28 +02:00
Matthew Leibowitz e708567eb2
Renamed the project because macOS uses .app (#23223)
* Renamed the project because macOS uses .app

* And the folder

* merge first

* ns
2024-06-25 11:36:25 +02:00
Javier Suárez 2d769c4091
[Testing] Split up current appium tests into separate projects (#21908)
* Split up current appium tests into separate projects

* Updated samples sln

* More updates on slns

* More changes

* More fixes

* More changes

* More changes

* More changes

* More changes

* Trying to fix Windows project build

* not needed

* revert

* this

* undo

* this

* add it all back

* fixes

* eventually

* huh?

* this

* builds at least

* this

* ui tests

* this

* More changes

* Added uitest project by platform

* Remove IgnoreIfPlatforms

* Changes in the uitests yml

* Updated slnfs

* Fix format errors

* Added samples slnf

* Recover UITest single project

* Updated solutions

* Updated project references in uitests yml

* Added removed UITests comments

* Removed unnecesary changes

* Revert more unneccesary changes

* Fixed build error on macOS

* More changes

* Fix wrong namespace

* Fix deploy issues

* Fix wrong test app path

* Fixed test project paths

* Moved snapshots

* Fix merge issues

* Remove more IgnoreIfPlatforms methods

* Fix merge issue

* Fix build errors

* hmmm

* Maybe this?

* unifi

* Update Microsoft.Maui-vscode.sln

* Updated test

* More fixes

* More fixes

* Updated projects

* Update cake scripts

* More changes

* Fixes in project tests path

* More fixes

* Moved snapshots

* Updated snapshots tests used path

* More changes

* More pending changes

* Fixes the golden tests

* More changes in tests

* Renamed test projects

* More changes

* Updated test

* Fix build error

* More updates

* Renamed projects

* More changes

* Move more projects

* More changes

* Fixed build errors

* Fixed error on mac sln

* More changes

* Updated App path

* - move testcases app into tests folder

* - fix project references

* - add missing targets file

* - fix tizen manifest

* - additional props

* Updated UITesting md

* Updated Development md

* More docs updates

---------

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
2024-05-16 13:20:07 +02:00
Rui Marinho 396f7f77aa
[ci] Move to arcade , remove GitInfo and Mono dependencies (#21487)
* try add internal

* needs missing paths

* [arcade] Add arcade files

* Try build with arcade

* Update internal

* try other pool

* Update default image for sdl

* try same pool for pack

* Update arcade release

* Remove gitinfo and update global.jso

* update nuget

* try again

* More updates

* Dont sign

* Fix package icon

* Update Controls.Build.Tasks.csproj

* Update Controls.Build.Tasks.csproj

* need set versions

* tre

* Use ArtifactsBinDir

* new binaries folder

* isShiping true

* more cleanup

* add post build

* fix

* try official

* try again

* DebugType to portable ?

* use one versions

* Add publish_build_assets

* again

* again

* Wrap on arcade job

* again

* use self

* again

* try again

* dupe

* remove dupes

* add Build Config

* More variables

* push

* Fix merge

* update to find the path

* Update scripts

* Add build config

* Update android scripts

* Remove more xunit versions

* Update xunit

* Update versions

* update more

* try this

* Fix versions

* Remove the test sdk by default

* Can this be false?

* No need to reference xunit.runner.visualstudio

* IsTestProject to false

* Fix more device tests paths

* Assembly should be 1.0

* Try fix msbuild tests

* Fix file version test

* Fix some culture tests

* try fix restore for next step

* Disable fileversion test

* Fix androidtests

* Fix android app finding

* Fix

* maybe this way it lauches

* Try compat

* Fix versions

* Fix image tests

* Try without this

* Fix build

* Update windows.cake

* Update windows.cake

* Update windows.cake

* Update provisioning.csx

* remove reference test sdk

* remove extra

* try fix compat uitests

* Fix build

* build control gallery uitest with dotnet test

* Remove nunit console

* Fix pushing test results for compat tests

* Set correct property msbuild props

* Update arcade

* Update Directory.Build.props

* Update Version.Details.xml

* Fix logs artifacts

* update source gen tests

* Use PackageIconFullPath so Arcade adds our file

* Remove file not used

* [ci] Push rollback for branch name

* Add Compatibility.UnitTests to sln

* Update dotnet.cake

* Update AssemblyInfoTests.cs

* Update pack.yml

* Remove extra files

* Update Microsoft.Maui.sln

* Update Microsoft.Maui-dev.sln

* Update pipeline

* Fix internal

* Try new catalyst cleanup

* Update catalyst

* Update iOS cake

* Fix Cg-gallery on iOS

* try again

* Refactor android cake

* Fix catalyst not finding the app

* Make sure to handle results all platforms

* Fix naming and test results

---------

Co-authored-by: Rui Marinho <ruimarinho@MSFT-M3-PRO.ihome>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2024-05-07 13:49:39 +01:00
Matthew Leibowitz 74c8c14695
Fix the incorrect manifest project name (#18488)
The project name should have the `.Manifest` suffix to indicate that it is the manifest.
The final package name is already correct as there was adjustment in the project to fix
it during the package process.
2023-11-03 10:19:24 +01:00
Scott Banning a597b9350c Only specify app path for Windows tests 2023-10-02 17:08:42 -07:00
scoban 75347d525f
Add UITest Gallery and some simple tests (#15191)
* Add UITest Gallery and some simple tests

* Auto-format source code

* Remove automation hints for mac accessibility and use mouse instead of touch pointer as its not supported

* Get the navigation bar back button for mac/ios tests

* Auto-format source code

* Fix bad merge for ios settings and minor tweaks/ignore tests

* Auto-format source code

* Try install 14.2 on monterrey

---------

Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
2023-05-31 00:55:00 +01:00
Rui Marinho dec8b249fb
[uitests] Work for get appium uitests with CI (#14488)
* More stuff with query

* Update to Appium 2.0

* Cleanup

* Fix tests

* Add mac tests

* Multiple testcase

* Fixes for  windows

* Deploy as unpackaged app

* Fixes for run UITests on windows

* Cleanup and move to TestUtils projects for Appium and Xamarin.UITest

* Fix references

* Add to mac sln

* Fix sln

* Add uitest yaml

* Fix sln

* Update yml

* more fixes

* again powershell

* fix ident

* Add path and try call cake

* Fix

* Start background

* Start appium on the background

* Just run android for now

* try install app

* try again

* if it fails continue

* fix paths

* appium

* try again

* try again

* fix

* again

* try again

* location of samples

* build samples

* do not skip xcode

* more debug info

* Publish test results

* nUnit tests for now

* try any file

* no retry

* try vstest

* FIX PATH

* install more drivers

* usenuget when building samples

* Move to helpers

* Try run iOS tests

* try build both

* Add ALLTests

* Android folder

* fixes

* try again

* Fix path

* Cleanup android cake

* cleanup iOS cake

* add mac cake

* fix version

* try again

* try again

* upDATE TOOLS

* try again

* fix again

* again

* again

* again

* rollback xharness

* increase timeout

* run with dotnet path

* Fix dir

* Try again

* fix

* Fix

* build and then run tests

* fix platformVersion passed to APPIUM

* Don t do verbosity

* Log for appium

* Try 16.2

* Add platform to appium logs

* Fix

* Start test server

* Wait for server to start

* Fix typo

* Add windows cake

* Set uitests windows yaml

* provision on macos only

* Fix path for app windows

* Rename winui

* Try again

* Make sure to stop and dispose the server

* fix template

* Install windows driver too

* Better appium install drivers

* specify device

* Fix binlog android

* Run device tests in release

* Try no path

* Try with debug configuration

* try build samples just for that platform

* Release

* rename to match platform

* try cleanup

* Add mac uitests

* Build only for catalyst

* Add information

* Version mac

* Fix folder path

* Try build and run windows tests

* more stuff on install script

* Add retry for ios

* run always on xamarin pool

* Fix windows

* Allow to pass configuration to catalyst

* Add bindir info

* Try fix windows build

* Try set env variables before

* [Sample] Clean fields when tapping login button

* Take screenshot before querying text element

* Enable automationmode-without-authentication

* Try using action instead

* Use same machine pool as ios/android for mac

* Change entry to not get autocorrect pop-up and add delay before click

* Disable keyboard completion for catalyst runs

* Auto-format source code

* Update sln

* Fix csproj

* Add Sample UITests

* Fix yaml

* Use the new app uitest sandbox project

* Remove old code

* Cleanup

* Fix Android manifest

* Fix build for tizen

* Rename projects

* Some more renames

* Fix ios for PR's

* Update MainPageTests.cs

* Add to mac slnf

* Try more stuff for the mac

* Try run before

* don t set automation mode

* Try Xcode select and move to ventura

* Fix script

* Dont xcode select

* Bool and not string

* try old appium

* Fix version

* Can we skip provisioning

* We can't skip provisioning

* Dont provision on windows

* Update sln and packages

* Update node

* Configure the windows path to the exe

* Auto-format source code

---------

Co-authored-by: Scott Banning <scoban@microsoft.com>
Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
2023-05-16 16:34:25 -05:00
Matthew Leibowitz db74ff7411 SourceGen now supports internal duplicate types
Fixes #14158
2023-03-25 19:01:12 +02:00
Shane Neuville 474d332f31
Create development path without compatibility projects (#13660) 2023-03-15 11:33:41 +02:00
Matthew Leibowitz 2dcc148208
Make MAUI into 1 workload and lots of NuGets instead of a full workload (#11206)
### Description

This change moves most - if not all - the logic, assemblies, build tasks, targets and props into NuGet packages. This allows .NET MAUI to be usable without having to care about what version of the workload is installed.

There are still a few things - mostly the automagic and Windows fixes - in the workload pack, but this is probably temporary and/or non-essential for the working of the build. Things like the project capabilities are still in the workload as this is needed for the IDE and cannot be in NuGet packages.

Everything else is now inside a NuGet package that can be upgraded, pinned and otherwise used without requiring VS to have installed the workload to match. There is the benefit of the NuGet packages being installed on disk and thus reducing/removing the need to download. But that is minimal now since we have smaller and fewer packages.
2023-02-07 15:09:25 +02:00
Matthew Leibowitz 6332e4803b And this one 2023-01-04 05:22:20 +02:00
Matthew Leibowitz 2ce65f2b8f Add Graphics DeviceTests 2023-01-04 05:05:15 +02:00
Rui Marinho f930c4060d Merge branch 'net7.0' into merge-net7
# Conflicts:
#	eng/Versions.props
#	eng/pipelines/common/provision.yml
#	src/Controls/Foldable/src/Controls.Foldable.csproj
#	src/Controls/samples/Controls.Sample/Pages/Compatibility/FramePage.xaml
#	src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj
#	src/Essentials/src/Platform/PlatformUtils.android.cs
#	src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj
#	src/Graphics/src/Text.Markdig/Graphics.Text.Markdig.csproj
2022-11-08 16:09:47 +00:00
Shane Neuville 6dc3d240b4
Consolidate handlertestbase (#11021)
* Consolidate HandlerTestBase code

* - remove classes from blazor tests

* - register correct ApplicationStub

* - use default mauiprogram

* - move stubs back

* - move more stubs back

* - remove frame related fix updates

* - fix viewhandler

* Update ViewHandler.cs

* - move all core specific tests to new project

* - add shared to blazor tests

* - fix build errors

* - comment out Tizen

* - fix font registration

* - scope dokdo registration to test

* - just set WxH if measure are still infinity

* - comment out search bar tests
2022-11-07 08:57:05 -07:00
Matthew Leibowitz e433fb3540 Update Microsoft.Maui-mac.slnf (#10954) 2022-10-28 01:56:41 +02:00
Matthew Leibowitz 5e920a3915
Update Microsoft.Maui-mac.slnf (#10954) 2022-10-28 00:23:10 +01:00
Matthew Leibowitz fd960e26e2 Merge remote-tracking branch 'origin/main' into net7.0
# Conflicts:
#	Directory.Build.props
#	eng/Version.Details.xml
#	eng/Versions.props
#	src/Controls/Foldable/src/Controls.Foldable.csproj
#	src/Workload/Microsoft.Maui.Dependencies/Microsoft.Maui.Dependencies.csproj
2022-07-28 06:00:49 +08:00
Peter Collins 0d9b0321d2
[workload] Remove Microsoft.Maui.Dependencies pack (#6871)
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2022-07-17 00:19:28 +02:00
Matthew Leibowitz 629b641812 Merge remote-tracking branch 'origin/main' into dev/graphics 2022-06-28 19:30:52 +02:00
Peter Collins d7ac541b4c [workload] Remove Microsoft.Maui.Extensions pack (#5918)
Reduces the number of nupkgs and msi files we produce and distribute by
removing the Microsoft.Maui.Extensions library pack.

Instead the packages are added via:

    --<PackageReference Include="Microsoft.Maui.Extensions" Version="$(MauiVersion)" IsImplicitlyDefined="true" />
    ++<PackageReference Include="Microsoft.Extensions.Configuration" Version="@MicrosoftExtensionsServicingPackageVersion@" IsImplicitlyDefined="true" />
    ++<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="@MicrosoftExtensionsPackageVersion@" IsImplicitlyDefined="true" />
    ++<PackageReference Include="Microsoft.Extensions.Logging" Version="@MicrosoftExtensionsPackageVersion@" IsImplicitlyDefined="true" />
    ++<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="@MicrosoftExtensionsServicingPackageVersion@" IsImplicitlyDefined="true" />

So projects that only have `UseMauiEssentials` won't get these packages, the behavior
should be the same, we just dropped 1 pack.
# Conflicts:
#	src/Workload/Microsoft.Maui.Sdk/Sdk/BundledVersions.in.targets
2022-06-21 18:16:58 +02:00
Matthew Leibowitz 91bc4e007a Deleted unsupported platforms and use project refs 2022-06-20 23:42:09 +02:00
Peter Collins dcde143eed
[workload] Remove Microsoft.Maui.Extensions pack (#5918)
Reduces the number of nupkgs and msi files we produce and distribute by
removing the Microsoft.Maui.Extensions library pack.

Instead the packages are added via:

    --<PackageReference Include="Microsoft.Maui.Extensions" Version="$(MauiVersion)" IsImplicitlyDefined="true" />
    ++<PackageReference Include="Microsoft.Extensions.Configuration" Version="@MicrosoftExtensionsServicingPackageVersion@" IsImplicitlyDefined="true" />
    ++<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="@MicrosoftExtensionsPackageVersion@" IsImplicitlyDefined="true" />
    ++<PackageReference Include="Microsoft.Extensions.Logging" Version="@MicrosoftExtensionsPackageVersion@" IsImplicitlyDefined="true" />
    ++<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="@MicrosoftExtensionsServicingPackageVersion@" IsImplicitlyDefined="true" />

So projects that only have `UseMauiEssentials` won't get these packages, the behavior
should be the same, we just dropped 1 pack.
2022-05-31 09:33:59 -05:00
Matthew Leibowitz 9aeaa32dbd
Merge the app and library sample projects (#6549)
* Merge the app and library sample projects

* Fixed namespaces and removed old platform projects

* flip order for ease

* fix this page
2022-04-27 15:08:08 -05:00
Jonathan Dick 680f1fbbdd
Improve Glide usage for Image Loading on Android (#5198)
* Make Glide load into imageview directly

* Refactor glide usage and implement listener

* Allow image views to autosize

* New test image

The old one was a png and blurry at the resizes, this one is svg to get the right density versions to make it clear we don't have a scaling issue in the code.

* Fix image size of Glide loaded font images

* Add glide ImageLoader to android aar project

* Use the helpers from the android aar

* Use autoscaling property from Font

* Merge image callbacks into one

* Add some benchmark tests

* More work on benchmark

* Remove unused helper methods

* Simplify callback

* Use custom glide targets instead of listeners

This allows .into to be used to start the request even in cases we have no image view target, and also means we don't need to add an extra listener to the cases where we use an image view...

* Benchmark uses non-resource/asset file

* Check if streams are empty

* Clean up tests

* Add glide model loader / factor for InputStream

* Refactor android platform code project

This removes the old Compatibility FormsViewGroup project and brings the FormsViewGroup class into the Core aar project, renames it MauiViewGroup.

Also refactored ViewHelpers and ImageHelpers into a single PlatformInterop class.

Finally, a few changes in this commit should fix some more tests.

* Fix a couple tests

* Update interop project

* Rework glide interop / image service

* Fix more tests

* Clear pending operations for image view targets

* Only load if we are supposed to apply the source

Original logic was a bit incorrect from reworking this code.

* Fix rebase

* More rebase fixes

* Fix solution filters

* Throw if request is cancelled in test

* Do not always clear first

* Run callback clear on ui thread

If we don't run these on the main thread we can see: Java.Lang.IllegalStateException : You can't start or clear loads in RequestListener or Target callbacks. If you're trying to start a fallback request when a load fails, use RequestBuilder#error(RequestBuilder). Otherwise consider posting your into() or clear() calls to the main thread using a Handler instead.

* Invoke clear on main thread in load calls too

* Fix refactor

* Fix api call
2022-03-24 10:56:03 -04:00
Jonathan Dick 553b69bc5c
Remove legacy TFMs (#4403)
* Remove legacy TFM projects

* Rename solution files

* Remove old sln files

* Help omnisharp

Adds an omnisharp.json config file to help ignore some projects that don't load well.

But also add an _omnisharp.sln since Omnisharp basically finds the first solution it can regardless of the config file excludes and will try and load those projects.  This puts it high in the list and is generally convenient to work on the main projects from the repo within omnisharp.

* Ignore .csx in omnisharp

* Fix android api level warning

* Fix up tfm logic

This will make net7.0 easier to start building against too.

* Make TFM runtime value dynamic

* Fix closing tag

* Add another project to omnisharp exclude

* Fix some logic

* Fix msbuild property function call

* Clean up resizetizer

These targets actually ship so they need to not just _use_ the Maui properties from directory build props

* Fix bad copy paste

* Another copy paste fix

* More fixes

* Add Controls.Xaml (missing) back to sln

* Drop S.N.Vectors version in csproj

It gets updated from other targets

* Don't set versions for WPF

* Bring back IsBindingProject

* Fix bad copy paste

* Make GetTfm static

* Fix missing namespace prefix

* Properly replace the TFM in BundledVersions

* Second replace should update the file the first one output

* Fix input for second replace

* Update the templates with the correct TFM

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2022-01-30 19:09:26 +00:00
Eilon Lipton 36d7e0e43b
Unify Windows shared source for BlazorWebView (#4159)
* Change WPF/WinForms/MAUI to use shared source instead of old 'WebView2' package, which is now removed
* Remove interfaces/wrappers from WinForms/WPF/MAUI
2022-01-17 15:10:30 +00:00
Eilon Lipton e57ef0b514 Initial projects and settings for BlazorWebView device tests 2021-12-08 14:14:06 -08:00
Matthew Leibowitz 1b45b6cfe7
Add the simplest sandbox app (#2886) 2021-10-11 19:31:31 +02:00
Matthew Leibowitz 10fa6fd2d5
Merge all the .NET 6 projects/solutions (#2505)
* Move Blazor into a separate folder

* Merge all the .NET 6 projects/solutions

* Windows projects

* that

* Make things better

* clean up

* fix that

* fast deploy debug

* remove that

* Fix paths

* fixing things

* fix that

* solutions

* fix builds for macos

* lols to me

* not a razor app

* Use LogicalName

* renamed

* No more Controls.SourceGen-net6

* Add Controls DeviceTests

* win

* update

* visibility

* Fix bug! Wee!

* - fix cake script to use correct sln for mac

* - change winui to just use vs-net6 target but default to global

* - fix VS-STable cake

* oops

* - copy info.plist local

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
2021-09-17 14:21:02 -05:00