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

135 Коммитов

Автор SHA1 Сообщение Дата
Rui Marinho 6aaf34303b
[uitests] Bump versions and fix script (#16917)
* [appium] Bump Versions

* [appium] Some fixes to the script

* [appium] Install also appium-doctor

* [provisioning] Allow skip provision all android api sdks

* Fix

* [cake] Bump nuget tool

* [uitests] Comment out CarouselView tests

* Remove grep doesn't exist on windows
2023-08-23 07:48:17 -05:00
Rui Marinho 573f7a590f
Update cake scripts (#15277)
* Update cake scripts

* Fix some issues

* Fix more duplicated variables

* Missing addin

* Try fix again

* Comment out

* Fix more scripts

* Don't use /tl , that's only net8
2023-05-29 14:45:41 +01:00
Shane Neuville cb2014b6ff
Cleanup cake file, add targets, fix for iOS Pair (#7241)
* Cleanup cake file, add targets, fix for iOS Pair

* - fix sln argument

* - add dogfood ps1

* - pack maui before opening external sln

* - add "pack" argument

* - exit earlier

* - script cleanup

* - move dogfood into cake and condtionally run

* - fix pack checks

* - open VS even if build tasks fail to build

* - change to warning

* - change CI check to error

* - set dotnet_root

* - fix vsmac

* - changes to omnisharp

* - switch to flags

* - fix clean
2022-05-18 12:14:05 +01: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
Rui Marinho 03ce2f628b
[cake] Make default cake install workloads first 2022-02-22 20:17:37 +00:00
Matthew Leibowitz 2f944b376e
Adding API diffs to the build (#4354) 2022-01-28 18:01:57 +02:00
Matthew Leibowitz 0369a6b3b6
Specify the minimum versions of the platforms (#2905)
* Specify the minimum versions of the platforms

* maccat 13.1

* win10

* Merge all the version numbers

* ws

* not needed as winui controls these numbers

* seems this is not real

* we are going global!
2021-10-20 10:41:34 -04: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
dotnet-maestro[bot] a6ed0a73d2
[main] Update dependencies from xamarin/xamarin-android (#2227)
* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.1xx-rc1-17e7b91b9d6f73195ee9684241b2731330e36f62-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-rc.1.140 -> To Version 30.0.100-rc.1.147

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-rc.1.21417.1 -> To Version 6.0.0-rc.1.21421.1 (parent: Microsoft.Dotnet.Sdk.Internal

* Update dependencies from https://github.com/xamarin/xamarin-android build 6.0.1xx-rc1-ed5ad127cc737620af6a8671151ea554eb298458-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-rc.1.140 -> To Version 31.0.100-rc.1.2

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-rc.1.21417.1 -> To Version 6.0.0-rc.1.21423.9 (parent: Microsoft.Dotnet.Sdk.Internal


Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Jonathan Dick <jond@hey.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-08-26 20:40:51 +02:00
Shane Neuville f84d447110
Call disconnect on shimmed NavPage Handler and fix image loading code that was running on the task pool (#2160)
* Call disconnect on previous handler when we change it out

* Update FragmentContainer.cs

* - don't set to null

* - tests

* - access via interface

* - add cake variables for building

* - fix

* - fix finish callback so it correctly resolves to UI Thread

* - fix build variable

* Update build.cake

* - just disconnect from navigation page for now

* only disconnect if previous handler is still set to me

* - just compile compatibility

* Update ElementHandler.cs

* - fix native view check

* - fix ios Clear

* -fix uikit

* - fix cleanup

* Update Element.Impl.cs
2021-08-24 18:00:24 -05:00
Matthew Leibowitz cadf5472f5
Add .NET 6 Device Test Runner & Migrate Tests to .NET 6 (#1359)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
2021-08-06 18:45:26 +02:00
Matthew Leibowitz 5222efeb46
Pass the path around (#1757) 2021-07-21 07:32:34 -04:00
dotnet-maestro[bot] 51d8407d55
[main] Update dependencies from xamarin/xamarin-android (#1577)
* Update dependencies from https://github.com/xamarin/xamarin-android build main-e5103b0f97d542ce14f2ceb9f2d3a247aa6d5964-1

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.73

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

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

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142

* Full Android workload has been renamed to android-aot

If you don't need AOT, the `android` workload excludes it.

Note that AOT isn't working yet, but we have the Mono packs setup.

* Use shortened Apple platform workload names

The names are now `maccatalyst`, `macos`, `ios`, and `tvos`.

* One more place the android workload name is used

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

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.142

Conflicts:
    eng/Versions.props

* Use shortened Apple platform workload names

The names are now `maccatalyst`, `macos`, `ios`, and `tvos`.

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

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.75

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

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

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.150

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

Microsoft.macOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.iOS.Sdk , Microsoft.tvOS.Sdk
 From Version 12.0.100-preview.6.63 -> To Version 12.0.100-ci.main.159

* Revert "[build] remove workaround for iOS AOT packages on Windows"

This reverts commit 5231ec3509c89325dfcfbe6ced89887d801b3f71.

* Add NoWarn=CS8032 for Razor

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

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.77

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

* Revert "Add NoWarn=CS8032 for Razor"

This reverts commit d7212d435c1341e80742bbca9e76e7cb4a201e47.

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

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.81

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

* Do it like a madman

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

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.83

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal

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

Microsoft.Android.Sdk.Windows
 From Version 30.0.100-preview.6.62 -> To Version 30.0.100-ci.main.84

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal,Microsoft.Extensions.Primitives,Microsoft.AspNetCore.App.Runtime.win-x64,Microsoft.Extensions.Hosting.Abstractions,Microsoft.Extensions.DependencyInjection.Abstractions,Microsoft.Extensions.DependencyInjection,Microsoft.Extensions.Configuration.Abstractions,Microsoft.Extensions.Configuration,Microsoft.Extensions.Logging.Abstractions,Microsoft.Extensions.Logging,Microsoft.Extensions.Logging.Console,Microsoft.Extensions.Logging.Debug,Microsoft.Extensions.FileProviders.Abstractions,Microsoft.Extensions.FileProviders.Embedded,Microsoft.AspNetCore.Authorization,Microsoft.AspNetCore.Components.WebView,Microsoft.AspNetCore.Components.Web,Microsoft.JSInterop,Microsoft.WindowsDesktop.App.Runtime.win-x64,System.CodeDom
 From Version 6.0.0-preview.6.21352.12 -> To Version 6.0.0-preview.7.21326.8 (parent: Microsoft.Dotnet.Sdk.Internal


Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-07-19 20:48:03 +02:00
Matthew Leibowitz ded8983b30
Changes to make net6 device tests run (#1453)
* Initial code for the device test runner

* Add some source gen :)

* clean up

* don't need this

* moar!

* a bit more

* Things now can run!

* just n case

* Code!!!

* Improvements

* more things

* that changed

* new files

* that

* cowboy

* more improvements

* This seems to run again :)

* Fix runners

* Essentials tests

* WinUI tests

* add winui single proj

* single-project-ify the winui apps

* add tests

* The tests

* Build the new toys

* one file for now

* make it look better

* names

* add stages

* :)

* Tests

* fixes

* try this on for size

* extra task for beter stats

* sigh

* slightly better

* start again

* looks like I did it?

* tests!

* net6

* this

* Publish test results

* try this for now

* that

* dfsadf

* The Xcode may be incorrectly named on CI

* - -> _

* wrong way around

* that

* this

* that

* Verbose

* v4

* getting crazy here

* asdf

* try that

* asdf

* comments

* who knows

* try this way

* ;

* just give up

* madness

* Maybe this???

* adf

* sadfasd

* sdf

* wdtf

* build all now

* pack

* new things

* samples

* device tests

* that

* local

* DF

* boom

* :)

* sadf

* heh

* try that

* prepend path

* PATH

* :)

* use the command line args

* try this

* maybe this

* :)

* do that too

* info

* fp

* trim! fix!

* We gotta build twice otherwise fix targets

* drop dotnet

* things

* drop that for now

* Property not Item

* that

* new things

* paths

* Versions

* Try get Android building

* ?

* that

* Move to sub folders

* Remove empty entitlements and install certs

* Auto-include bundle resources

* Link="%(RecursiveDir)%(FileName)%(Extension)"

* fix ios

* Try bumping a tiny bit

* don't be fancy

* use a dictionary

* moving cheese

* new beta!

* Make sure Xxcode is ready

* sdfsa

* undo now

* Move the animation system into the services

* Services can't be null

* Essentials is now needed

* try this

* huh?

* remove windows

* !

* empty entitlements

* not their either
2021-06-25 19:55:28 -04:00
Shane Neuville 06edd2ee91
Try fix android (#1170)
* print things

* - more print

* - force path

* - set env variables

* - path

* - cake

* - set for user

* - set paths

* - set variables

* - fix path

* - remove prints

* - remove things

* - remove

* - remove it all

* - remove step

* - add setup sdk paths back in
2021-06-03 17:26:11 -04:00
Eilon Lipton 16ed13640c
Change Cake help text to show new 'dotnet-pack' target (#1038) 2021-05-17 13:38:31 -05:00
Rui Marinho 2363233566
uisng MBBuild 16.10 to build/pack (#997)
* Build with preview

* Add msbuildPath to cake

* [Build] Build tasks first

* Installl Universal

* Fix it
2021-05-11 08:20:27 +01:00
Shane Neuville 4f9fada370
Move ps1 files into cake targets (#926)
* Move build scripts from powershell to cake

* - fix yaml

* change BUILD_CONFIGURATION to configuration

* - IsDependentOn not needed for powershell scripts

* - fix up build settings

* - fix android target

* Update dotnet.cake

* - simplify android

* - add dogfood target

* - fix winui build and add winui stage

* - remove depends on

* - maybe?

* - remove gallery for now
2021-05-04 22:05:54 +01:00
Shane Neuville 8fada09507
Navigation tweaks for Android/iOS (#896)
* Android Navigation Fixes

* - fix iOS back button

* - fix app bar title

* - set content

* - fix up titles

Co-authored-by: E.Z. Hart <hartez@users.noreply.github.com>
2021-04-30 22:01:42 -05:00
Shane Neuville 218dcd4b7a
Add Control Gallery to WinUI solution (#737)
* WinUI CG

* - checkpoint compile 1

* - CG  Core

* - compatibility tests

* - fix namespaces

* - compile gallery

* - Fix WinUI quirks

* - GetForCurrentView

* - fix some more MG

* - fix up UI tests

* - fix winui tests to start up window and then locate top window manually

* - Namespaces
2021-04-19 10:06:12 -04:00
Shane Neuville 18e0f4ebbc
Fix cake VS-WINUI Target (#699)
* Fix WinUI Cake script for building WinUI

* - fix clean script to ignore dotnet folders
2021-04-09 18:16:04 -05:00
Rachel Kang 8997cd2805
Create semantics page (#679)
* Create SemanticsPage

* Add SemanticsPage

* Dedup csproj compile line

* - add nullability test

* - fix bit operator and add tests

* - fix vsmac builds

* - fix test

* Update Startup.cs

* Update Maui.Controls.Sample.WinUI (Package).wapproj

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
2021-04-08 19:49:47 -05:00
Rui Marinho 1e55dd9aea
[Build] Build buildtasks before open on vs 2021-04-07 12:25:36 +01:00
Matthew Leibowitz 6a71d58824
Add the LabelHandler for WinUI (#655)
* Add the LabelHandler for WinUI

* Windows is beautiful

* ws

* my bad. it does work.

* Revert "my bad. it does work."

This reverts commit 3c985b530dc2a84d53ef7900e7d7db715fb03a18.

* Revert "Revert "my bad. it does work.""

This reverts commit 4b4e0b3be1c5b19255b0ffccad87c11b25ecb0a3.

* not this now

* Don't remove all the xaml on non-Windows

Android and iOS are non-Windows and thus they lose all XAML files. THis only came in with WinUI and is only noticeable since we started using the App.xaml as the main entry point.

* - add build step to winui cake

* Moving toys

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
2021-04-06 10:56:33 -05:00
Eilon Lipton e0b7d31cc6
Update build.cake to support pre-release VS (#636) 2021-04-01 21:55:38 -05:00
Shane Neuville fe3452ced9
WinUI (#548)
* WinUI3 Desktop Head

* - Fix up Compatibility Proiect

* - fix conditionals

* - temp remove windows pack restriction

* - namespace fixes

* - winui

* - add WinUI to SLN

* - change handlers to windows

* - fixes

* - additional handlers

* - essentials fixes

* - msbuild

* - add more

* - fix comment

* - transitive

* - check for windows

* - windows conditional

* - vs path

* - restore;build

* - remove target

* - build first

* -remove

* Building again!

* - add global.json file

* - set MauiPlatforms

* - remove things

* Make it at least run

* - split out restore/build

* - magic?

* -  5

* Put stuff here and try more

* - add restore

* - fix essentials

* Get it closer

* Go simple or go home

* diffs

* - net5 checks

* - winui fixes

* - files

* - preview versions

* - maybe?

* - add code back in

* Update package.ps1

Fix usage of $dotnet, moved around if and try-finally

* Whoops

* Update package.ps1

Add /restore flag, fix double //

* - fixed pri runtime paths

* - copy xbf files around

* - fix

* - fix path

* Fonts

* - windows only nugets

* - fix targets

* Fonts now working

* ws

* //TODO WINUI3

* More mappings

* - builds

* - remove props

* - props

* Button has all the things done so far

* - layout basics

* Don't reference the build tasks, then all is well

* - shims

* - fix shim measuring

* - fix resource loading

* Uncomment the things in Forms

* - tweak measure

* update

* Remove old code

* Revert "Remove old code"

This reverts commit 2b63ebab0e5fdc180360e5aa4ee04c3df964a8cc.

* Add image for goodness

* - measure

* - always build winui for core

* - add created handlers

* - add mappers

* Build windows and macos now

* Always pack

* - call arrange on the children again

* - fix

* - embrace it

* - fix condition

* - maybe

* This might work

* that

* - fix

* - fix

* - no more

* Use the correct path to the image

* No more SimpleApp

* This actually works...

Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
2021-03-25 09:02:01 -05:00
Rui Marinho ef26e75a92
[UITests] Fix more paths for iOS tests 2021-03-23 15:32:23 +00:00
Rui Marinho cb7370ab95
[UITests] Fix path to iOS app 2021-03-23 15:15:18 +00:00
Rui Marinho 02f337e6a7
[UITests] Fix some naming and path on cake 2021-03-23 14:42:49 +00:00
Jonathan Peppers bb20b25e35
[build] bootstrap a local .\bin\dotnet\ with .NET Workloads (#514)
Based on: https://github.com/jonathanpeppers/maui-workload

This adds a new `DotNet.csproj` that provisions a local .NET 6 install
into `.\bin\dotnet\`.

Next, it uses versions defined in `eng/Versions.props` as required by
.NET version bumping infrastructure (called Darc):

    <Project>
      <PropertyGroup>
        <MicrosoftNETSdkPackageVersion>6.0.100-preview.2.21155.3</MicrosoftNETSdkPackageVersion>
        <MicrosoftAndroidSdkPackageVersion>11.0.200-ci.main.148</MicrosoftAndroidSdkPackageVersion>
        <MicrosoftMacCatalystSdkPackageVersion>14.3.100-ci.main.337</MicrosoftMacCatalystSdkPackageVersion>
        <MicrosoftiOSSdkPackageVersion>14.4.100-ci.main.1192</MicrosoftiOSSdkPackageVersion>
      </PropertyGroup>
    </Project>

Next, we can use these versions to consume NuGet packages for workloads:

    <PackageDownload Include="Microsoft.NET.Workload.Android"     Version="[$(MicrosoftAndroidSdkPackageVersion)]" />
    <PackageDownload Include="Microsoft.NET.Workload.MacCatalyst" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
    <PackageDownload Include="Microsoft.NET.Workload.iOS"         Version="[$(MicrosoftiOSSdkPackageVersion)]" />

Then the other packs they depend on:

    <PackageDownload Include="Microsoft.Android.Ref"            Version="[$(MicrosoftAndroidSdkPackageVersion)]" />
    <PackageDownload Include="Microsoft.Android.Sdk.win-x64"    Version="[$(MicrosoftAndroidSdkPackageVersion)]" Condition="$([MSBuild]::IsOSPlatform('windows'))" />
    <PackageDownload Include="Microsoft.Android.Sdk.osx-x64"    Version="[$(MicrosoftAndroidSdkPackageVersion)]" Condition="$([MSBuild]::IsOSPlatform('osx'))" />
    <PackageDownload Include="Microsoft.Android.Sdk.BundleTool" Version="[$(MicrosoftAndroidSdkPackageVersion)]" />
    <PackageDownload Include="Microsoft.MacCatalyst.Ref"        Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
    <PackageDownload Include="Microsoft.MacCatalyst.Sdk"        Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
    <PackageDownload Include="Microsoft.iOS.Ref"                Version="[$(MicrosoftiOSSdkPackageVersion)]" />
    <PackageDownload Include="Microsoft.iOS.Sdk"                Version="[$(MicrosoftiOSSdkPackageVersion)]" />

After doing this, I can build .NET 6 projects with:

    > .\bin\dotnet\dotnet.exe build .\src\Controls\samples\Controls.Sample.SingleProject\Maui.Controls.Sample.SingleProject.csproj

I can even build MacCatalyst apps on Windows!

I updated `build.cake` so the following builds for .NET 6 and opens
Visual Studio:

    > dotnet cake --target=VS-NET6

This is the equivalent of these commands if you want to run them
individually:

    dotnet build src\DotNet\DotNet.csproj
    .\bin\dotnet\dotnet build Microsoft.Maui.BuildTasks-net6.sln
    .\bin\dotnet\dotnet build Microsoft.Maui-net6.sln
    .\eng\dogfood.ps1

~~ Other Changes ~~

* Rework CI setup to use .\bin\dotnet\dotnet
* We don't need boots or URLs anymore
* Fixed `MSBuildTests` to use .\bin\dotnet\dotnet if found and fall
  back to the system `dotnet`
* Moved `.nuspec\package.ps1` to `eng\package.ps1`

~~ What problems does this solve? ~~

* MacCatalyst builds on Windows! (offline build that checks C#)
* Building Maui always gets you the right things installed.
* Maui becoming a .NET workload will be a breeze. We can copy files
  into `.\bin\dotnet\sdk-manifests` and `.\bin\dotnet\packs`.
* We can use Darc to bump dependencies within .NET:

https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md
2021-03-22 10:16:06 +00:00
Rui Marinho d74a03a0b7
Try build ControlGallery Android on CI (#525)
* Try build ControlGallery

Try build android controlgallery new path

Fix

Fix android uitests reference

Don't build iOS for now

* - only set content description for UI Test build

* Add Environment.Build.props back

* Update boots version

* Fix LinkDescription.xml

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
2021-03-17 18:59:35 +00:00
Shane Neuville 7477a8678f
Add iOS Gallery (#530)
* Add iOS Gallery

* - linker fixes

* - fix ios gallery

* - Enable CI

* - fix typo

* - add gallery

* - fix xaml tests
2021-03-17 16:27:38 +00:00
Matthew Leibowitz d9a92455bb
[Handlers] Fonts and Label FontFamily, FontAttributes & FontSize (#13888)
* Move all core font logic into an instance

* Doing lots of things to get things working :)

* Add a small compat sample

* Fixed the sample for Android

* Fix the iOS sample

* Clean this up

* revert that

* Added a fonts sample page

* Implement all the things

* Fix things

* Prevent duplicate attributes

* fix null ref warning

* Fix null exception in resizetizer

* Initialize forms because we are actually using it

* Loads of stuff in here, will need to dissect :)

* Create a sln for the build tasks

* fix null ref warnings/errors

* oops

* never null here

* just these

* Only setup the font loader if it exists

* test more things

* Add this back to label

* New attributes

* Add tests for the label

* remove compat samples

* Add iOS tests

* No longer needed

* this

* Add [PortHandler]

* mergies

* this will be cool to keep

* Add resizetizer

* All good now
2021-03-03 19:30:32 +00:00
Jonathan Dick 6aaa984d78
Make .NET 6 Packable (#13881)
* Add some common nupkg properties to everything

* Remove project property refactored into directory build props

* Remove properties now in common dir build props

* Add net6 version of project

* More net6

* Only target netstandard2.0 now

net4* is no longer needed as there's no more vs2017 support

* Clean up strong naming a bit

* Update dependencies

* Package all the things for build tasks in the -t:Pack

* Add more net6 project versions

* Clean up whitespace

* Needed moar NET6

* Name fixes

* Added meta project for packaging and package script

* Remove assembly copyright (now duplicates)

* Add resizetizer, add params to package script

* Disable strong naming for now

We need to re-evaluate how we do this a bit, we should probably use the `al` tool to do it now, and I believe the StrongNamer package may not work anymore, but we can do the same thing in a custom target at a later date.

* Fix path to tasks assembly

* don't build ios on android specific project

* Finish rename of toolbox file

* - add cake

* - fix cake extras

* fix the copy for the IDE

* Try packing on CI

* versions baby!

* build release

* this should od it

* this

* oops

* Move to an empty folder

* Use new symbol formats

* no symbols for build tasks and the head

* symbol all the things

* Compiler error with commented out code XD

* oopsies

* only build transitive

* Try this

* log everything

* This might work

* REPORTS

* previews

* needed

* versions

* duh

* Update build.cake

Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-03-02 12:36:17 -05:00
Shane Neuville 06d9d33d52
Wire up Controls.Layouts and Content Page (#13878)
* Wire up Controls.Layouts and Content Page

* - cleanup code

* - cleanup code

* - fix up page renderer

* - add better testing scenario

* - fix tests

* Update MainPage.cs

* Update MauiAppCompatActivity.cs

* - net6 attributes

* - Remove NS from sample

* - give non net6 projects unique assembly names

* - fix accent color

* - fix arrange call

* - PR comments

* - remove cast

* - add system color back
2021-03-01 14:42:59 -06:00
Matthew Leibowitz e81949278a
Start Running Device Tests (#13762)
* Improve the Android testing

* Add a longer boot timeout for CI (it takes about 5 mins to boot)
* Fail the command if the tests failed
* Pass the arch correctly
Add support for selecting the emulator "skin" or "type"

* Make sure to unify the runs

* fail the build if the tests failed
* copy the test result files to <out-dir>/TestResults.xml

* Just getting something going

* This

* Update device-tests-android.yml

* Run the correct script

* Fix the restore config file

* Install the emulator

* Use separate lines for readability

* Move to a new pipeline

* Renamed

* this

* Update handlers.yml

* test2

* Update device-tests.yml

* Update device-tests.yml

* af

* Update device-tests.yml

* not sure

* Revert "not sure"

This reverts commit 2d722aba9737370fc9c48fa02e3a2b4b02efa769.

* not sure

* Update device-tests.yml

* Update device-tests.yml

* Update device-tests.yml

* sadfasdf

* Update device-tests.yml

* Update device-tests.yml

* Update device-tests.yml

* Run everything correctly again

* change this

* Get some vars

* Better things

* Better name

* Oops

* Update device-tests-android.yml

* Fix the tests

* Test this

* Update device-tests.yml

* Update device-tests.yml

* things

* more

* fix

* disable ios stuff

* need the envvars

* enabling the profiles again

* push the other one

* better

* can't use the shared runtime

* aadsf

* essentials ios

* adfs

* fix things

* change package names

* oops

* Reverts

* finals

* Fix android tests

* Make sure to pass the context to Platform.Init
* Add support for running tests inside an actual Activity
* Prepare to move the shared code into a new assembly for reuse

* move

* quick build to test

* Revert "quick build to test"

This reverts commit dd92838e995d363eab38e699e4ec4c26cf1b3bea.
2021-02-26 10:14:43 +00:00
Jonathan Dick ac201994f2
Rename all of the things... All of them. (#13847)
* Rename all the things!

* Fix sln on cake

* targets

* Rename all the things!

* Fix sln on cake

* Add this back so the build works

* Added .nuspec\* back

* Remove Core from XamlC

* Update Build.Tasks

* Fix ErrorMessages

* Try fix build

* Update gitignore

* Update Microsoft.Maui-net6.sln

* Fix controlgallery reference

* Fix Maui reference on iOS sample

* Fix ControLGallery sln

* Fix xaml unit tests

* Fix Maps references

* Fix ControlGallery

* Don't build gallery

* Compile 462 for new

* Dont build UAP

* AndroidUseIntermediateDesignerFile

* Fix UAP

* Don't build control gallery for now

Co-authored-by: Rui Marinho <me@ruimarinho.net>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
2021-02-24 23:50:31 +00:00
Shane Neuville 61ce3a6cd3
Remove DevopsNuget.config (#13814)
* Remove DevopsNuget.config

* - keep nuget reference

* - no more cake for you xamarin

* - remove

* - remove adb

* - config

* - test

* - try mme

* - nuget

* - remove config
2021-02-22 18:02:09 +00:00
Shane Neuville a01f005906
Convert UAP Platform Head to use WinUI 3 Desktop (#13584)
* WinUI3

* - fix merge errors

* - Setup Control Gallery

* - Fix Control Gallery issues

* - clean up webview2

* - remove comments

* - moving images around

* - wireup keydown

* - update packageid to match

* - merge fixes

* - fix up extra code

* - remove nuspec changes

* - dualscreen

* - uncomment code

* - fix nuget

* - organize page loading better

* - fix nuspec

* - ignore

* - build cake with xbf flags

* - nuspec updates

* - fix nuspec

* - nuget updates

* - remove extra pri

* - fix vsmac

* - fix vsmac builds

* - fix build tasks compile

* - review fixes

* - remove platform from forms.sln
2021-02-11 18:09:28 +00:00
Shane Neuville 9fe1b41cf2
Setup Maui.sln with a set of net6 projects (#13433)
* net6 projects

* - additional

* - net6 nullable fixes

* - provision sdks

* - net6.0

* - change to 5.0.0

* - update cake provisioning

* - net6 fixes

* - fix up platform heads

* - fix global.json

* - add net6 nuget feeds

* - fix up platform heads and net6 if defs

* - simplify

* - add dotnet core build of maui sln

* - update readme

* - net6 yaml target

* - remove net6 build from nuget

* - simplify provisioning

* - write json file

* - net6 via yaml

* - fix parameters

* - more boots

* - yaml

* - base yaml pipeline off net6-samples

* - yaml yaml yaml

* - mac yaml

* - add binlogs

* - set AndroidRestoreOnBuild to false

* - browser assembly

* - fix artifacts directories

* - fix NET6 artifacts

* - update to preview bits

* Update handlers.yml

* [Build]Deploy android sample app

* - restore from devops config

Co-authored-by: Rui Marinho <me@ruimarinho.net>
2021-02-10 16:24:09 -06:00
Shane Neuville 8ba807ef95 Merge branch 'main' into main-handler
# Conflicts:
#	EmbeddingTestBeds/Embedding.Droid/Directory.Build.targets
#	Stubs/Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android (Forwarders).csproj
#	Xamarin.Forms.ControlGallery.Android/FormsAppCompatActivity.cs
#	Xamarin.Forms.ControlGallery.Android/Nuget.Build.targets
#	Xamarin.Forms.ControlGallery.Android/Xamarin.Forms.ControlGallery.Android.csproj
#	Xamarin.Forms.ControlGallery.WindowsUniversal/Xamarin.Forms.ControlGallery.WindowsUniversal.csproj
#	Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
#	Xamarin.Forms.Controls/Xamarin.Forms.Controls.csproj
#	Xamarin.Forms.Core.Android.UITests/Xamarin.Forms.Core.Android.UITests.csproj
#	Xamarin.Forms.Core.UnitTests/Xamarin.Forms.Core.UnitTests.csproj
#	Xamarin.Forms.Core.Windows.UITests/Xamarin.Forms.Core.Windows.UITests.csproj
#	Xamarin.Forms.Core.iOS.UITests/Xamarin.Forms.Core.iOS.UITests.csproj
#	Xamarin.Forms.Core.macOS.UITests/Xamarin.Forms.Core.macOS.UITests.csproj
#	Xamarin.Forms.DualScreen.UnitTests/Xamarin.Forms.DualScreen.UnitTests.csproj
#	Xamarin.Forms.DualScreen/Xamarin.Forms.DualScreen.csproj
#	Xamarin.Forms.Maps.Android/Xamarin.Forms.Maps.Android.csproj
#	Xamarin.Forms.Platform.Android.UnitTests/Xamarin.Forms.Platform.Android.UnitTests.csproj
#	Xamarin.Forms.Platform.Android/AppCompat/NavigationPageRenderer.cs
#	Xamarin.Forms.Platform.Android/AppCompat/Platform.cs
#	Xamarin.Forms.Platform.Android/Renderers/EditorRenderer.cs
#	Xamarin.Forms.Platform.Android/Renderers/EntryRenderer.cs
#	Xamarin.Forms.Platform.Android/Renderers/SearchBarRenderer.cs
#	Xamarin.Forms.Platform.Android/Renderers/SliderRenderer.cs
#	Xamarin.Forms.Platform.Android/Xamarin.Forms.Platform.Android.csproj
#	Xamarin.Forms.Platform.UAP.UnitTests/Xamarin.Forms.Platform.UAP.UnitTests.csproj
#	Xamarin.Forms.Platform.iOS.UnitTests/Xamarin.Forms.Platform.iOS.UnitTests.csproj
#	Xamarin.Forms.Platform.iOS/Platform.cs
#	Xamarin.Forms.Xaml.UnitTests/Xamarin.Forms.Xaml.UnitTests.csproj
#	build/steps/build-android.yml
#	build/steps/build-osx.yml
#	src/ControlGallery/src/Xamarin.Forms.Controls.Issues.Shared/Issue13551.cs
#	src/ControlGallery/src/Xamarin.Forms.Controls.Issues.Shared/Issue13616.xaml
#	src/ControlGallery/src/Xamarin.Forms.Controls.Issues.Shared/Issue13616.xaml.cs
#	src/ControlGallery/src/Xamarin.Forms.Controls.Issues.Shared/Issue8701.cs
#	src/ControlGallery/src/Xamarin.Forms.Controls.Issues.Shared/VisualGallery.xaml
#	src/ControlGallery/src/Xamarin.Forms.Controls.Issues.Shared/VisualGallery.xaml.cs
#	src/Forms/test/Xamarin.Forms.Core.UnitTests/ShellNavigationStateTests.cs
#	src/Platform.Renderers/test/Xamarin.Forms.Platform.Android.UnitTests/ResourceManagerTests.cs
#	src/Platform.Renderers/test/Xamarin.Forms.Platform.Android.UnitTests/Resources/drawable/DrawableTest.png
#	src/Platform.Renderers/test/Xamarin.Forms.Platform.Android.UnitTests/Resources/layout/LayoutTest.axml
2021-02-08 19:09:38 -06:00
Rui Marinho 3b750d4113
Merge branch '4.8.0' into 5.0.0
# Conflicts:
#	build/steps/build-android.yml
#	build/steps/build-osx.yml
#	build/steps/build-windows.yml
2021-02-08 10:34:50 +00:00
Shane Neuville b79a76493a
Switch build scripts to use dotnet cake (#13691)
* Switch build scripts to use dotnet cake

* - pin to version 0.38.5

* - cake version

* - dotnet first

* quotes

* - windows fix

* - fix bash to ignore empty parameters

* - roll back android

* - kudos

* - fix

* - shift

* - empty space
2021-02-08 10:30:40 +00:00
Matthew Leibowitz 520c136c31
Add API levels 26 (8.0) and 27 (8.1) (#13613) 2021-02-02 09:50:34 -06:00
Rui Marinho 667cd8da8e Merge branch 'main' into main-handler 2021-02-01 16:08:11 +00:00
Rui Marinho 2cffcdc4a8 [Build] Remove powershell provision 2021-01-31 17:39:37 +00:00
Rui Marinho bb44376684
[Build] Small provisioning fixes (#13594)
* Update azure-pipelines.yml

* Update provisioning.csx

* Remove not needed  files

* Update .net version

* Provision powershell

* Update build.cake
2021-01-31 17:28:09 +00:00
Shane Neuville b80c008f30
Remove Slider Handler and Fix Maps, Shapes and Fix CarV Renderers (#13586)
* Check state of UI Tests with no handlers

* - add CarouselViewRenderer and IndicatorViewRenderer

* - indicator view

* - fix google api key writing

* - PathRenderer

* - RadioButton

* - All the shapes

* - fix shape elements
2021-01-30 18:26:20 -06:00
Rui Marinho 9dcdee2ace Merge branch 'main' into main-handler 2021-01-25 14:40:08 +00:00
Rui Marinho b45e87f45e
[Handlers] Build controlgallery and UItests for it (#13485)
* Update cake and yaml

* Reset simulator isn't working

* [Build] Remove restore from yaml

* [Build]Update the restore on cake

* [Build] Build android gallery uitests from cake
2021-01-24 16:05:53 +00:00