Setup Maui.sln with a set of net6 projects #13433

PureWeen · 2021-01-17T16:23:10Z

Description of Change

Provision current NET6 SDKs that are listed here https://github.com/xamarin/net6-samples
Remove Sample.Mac because those are currently not being used
Setup a specific Maui.sln that only has net6 projects added
- 16.9 P4 is required to build and run Maui.sln so this is why it's a bunch of separate projects
Modified our generic targets file to handle net6.0 TFMs
NET6 has additional rules about nullability which is why this PR also includes nullability fixes

Testing Procedure

PR Checklist

Targets the correct branch
Tests are passing (or failures are unrelated)

build.cake

PureWeen · 2021-02-01T20:55:13Z

NuGet.config

    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
    <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
+    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />


@rmarinho these are needed to build the net6 platform heads

https://github.com/xamarin/Xamarin.Legacy.Sdk/blob/main/samples/nuget.config#L7

PureWeen · 2021-02-02T17:21:59Z

eng/pipelines/handlers.yml

+          - template: common/controlgallery-android.yml
+
+  - stage: build_net6_windows


These YAML steps were taken from here

https://github.com/xamarin/net6-samples/blob/main/azure-pipelines.yml

For installing the latest NET6 bits and such
At some point this will all get moved into easier to provision bits via the dotnet tool

PureWeen · 2021-02-02T17:23:02Z

src/Platform.Handlers/samples/Sample.Droid/Sample.Droid-net6.csproj

+  <ItemGroup>
+    <ProjectReference Include="..\Sample\Sample-net6.csproj" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
+    <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.3.0.4" />


This is needed so that the linker runs successfully against Essentials.

Nuget currently won't pull in all the correct dlls transitively since these are AndroidX dlls and not Net6

PureWeen · 2021-02-02T17:23:47Z

src/Platform.Handlers/samples/Sample.iOS/AppDelegate.cs

 	public class AppDelegate : FormsApplicationDelegate, IUIApplicationDelegate
+#else


Commenting this out for now with NET6 targets because Platform.iOS is built against XA and not net6-ios

Once Platform.iOS is built against net6-ios then we can go back to FormsApplicationDelegate

PureWeen · 2021-02-02T17:24:28Z

src/Platform.Handlers/src/Xamarin.Platform.Handlers/Platform/iOS/ViewExtensions.cs

@@ -22,7 +22,7 @@ public static void UpdateBackgroundColor(this UIView nativeView, IView view)

 			var color = view.BackgroundColor;

-			if (color != null && !color.IsDefault)
+			if (!color.IsDefault)


Nullability checks inside NET6 throw a warning here because color will always be not null

PureWeen · 2021-02-02T17:24:58Z

eng/Environment.Build.props

@@ -38,7 +38,7 @@

  <!-- Auto install any missing Android SDKs -->
  <PropertyGroup Condition="'$(CI)' == 'true'">
-    <AndroidRestoreOnBuild Condition="'$(AndroidRestoreOnBuild)' == ''">True</AndroidRestoreOnBuild>
+    <AndroidRestoreOnBuild Condition="'$(AndroidRestoreOnBuild)' == ''">False</AndroidRestoreOnBuild>


This property currently doesn't work with NET6

PureWeen · 2021-02-10T21:18:36Z

eng/pipelines/handlers.yml

+
+          - powershell: |
+              & dotnet restore Maui.sln --configfile eng\DevopsNuget.config


@rmarinho FYI

PureWeen · 2021-02-10T21:18:44Z

eng/pipelines/handlers.yml

+
+          - bash: |
+              dotnet restore Maui.sln --configfile eng/DevopsNuget.config &&


@rmarinho FYI

jonathanpeppers · 2021-02-11T01:48:15Z

.nuspec/Xamarin.Forms.MultiTargeting.targets

+
+  <!-- iOS -->
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0-ios' ">
+    <DefineConstants>$(DefineConstants);IOS</DefineConstants>


This should be defined by default in .NET 6. Is it not?

jonathanpeppers · 2021-02-11T01:49:15Z

.nuspec/Xamarin.Forms.MultiTargeting.targets

+
+  <!-- Android -->
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-android'))">
+    <DefineConstants>$(DefineConstants);MONOANDROID</DefineConstants>


I think you could use the ANDROID define instead, it is there by default in .NET 6.

jonathanpeppers · 2021-02-11T01:50:26Z

README.md

+## Maui.sln
+
+### SDKS required
+- Install the SDKs listed here https://github.com/xamarin/net6-samples


We moved the repo to dotnet/net6-mobile-samples

PureWeen requested a review from Redth January 17, 2021 16:23

PureWeen commented Jan 17, 2021

View reviewed changes

build.cake Outdated Show resolved Hide resolved

jonathanpeppers reviewed Jan 17, 2021

View reviewed changes

build.cake Outdated Show resolved Hide resolved

PureWeen commented Feb 1, 2021

View reviewed changes

PureWeen changed the title ~~[WiP] Net6 projects for .NET MAUI~~ Setup Maui.sln with a set of net6 projects Feb 1, 2021

PureWeen commented Feb 2, 2021

View reviewed changes

PureWeen requested review from rmarinho and jonathanpeppers February 2, 2021 17:25

PureWeen marked this pull request as ready for review February 2, 2021 17:25

PureWeen added 16 commits February 10, 2021 14:14

net6 projects

d39199e

- additional

e9272d7

- net6 nullable fixes

f9cd373

- provision sdks

60c60cd

- net6.0

a914ea6

- change to 5.0.0

c1d3017

- update cake provisioning

61105aa

- net6 fixes

2ee51b7

- fix up platform heads

111e501

- fix global.json

c428892

- add net6 nuget feeds

b4d679d

- fix up platform heads and net6 if defs

35d909c

- simplify

0b00b2c

- add dotnet core build of maui sln

1fe92ce

- update readme

caea497

- net6 yaml target

75fd857

PureWeen and others added 18 commits February 10, 2021 14:17

- remove net6 build from nuget

9eb6007

- simplify provisioning

1a84596

- write json file

905ef62

- net6 via yaml

6319bda

- fix parameters

2ec2520

- more boots

e43d68a

- yaml

391b707

- base yaml pipeline off net6-samples

3c76d75

- yaml yaml yaml

5f2cfee

- mac yaml

b67949b

- add binlogs

0917e6a

- set AndroidRestoreOnBuild to false

ac5e63e

- browser assembly

d46d687

- fix artifacts directories

3598819

- fix NET6 artifacts

b31b66f

- update to preview bits

90e479a

Update handlers.yml

db030e9

[Build]Deploy android sample app

34add85

PureWeen force-pushed the net6_projects branch from eeebbd2 to 34add85 Compare February 10, 2021 20:20

- restore from devops config

e9f81f9

PureWeen commented Feb 10, 2021

View reviewed changes

eng/pipelines/handlers.yml

- powershell: |

& dotnet restore Maui.sln --configfile eng\DevopsNuget.config

Copy link

Contributor Author

PureWeen Feb 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rmarinho FYI

PureWeen commented Feb 10, 2021

View reviewed changes

eng/pipelines/handlers.yml

- bash: |

dotnet restore Maui.sln --configfile eng/DevopsNuget.config &&

Copy link

Contributor Author

PureWeen Feb 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rmarinho FYI

rmarinho approved these changes Feb 10, 2021

View reviewed changes

PureWeen merged commit 9fe1b41 into main-handler Feb 10, 2021

PureWeen deleted the net6_projects branch February 10, 2021 22:24

jonathanpeppers reviewed Feb 11, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Setup Maui.sln with a set of net6 projects #13433

Setup Maui.sln with a set of net6 projects #13433

PureWeen commented Jan 17, 2021 •

edited

Loading

PureWeen Feb 1, 2021

PureWeen Feb 2, 2021

PureWeen Feb 2, 2021

PureWeen Feb 2, 2021

PureWeen Feb 2, 2021

PureWeen Feb 2, 2021

PureWeen Feb 10, 2021

PureWeen Feb 10, 2021

jonathanpeppers Feb 11, 2021

jonathanpeppers Feb 11, 2021

jonathanpeppers Feb 11, 2021

		- template: common/controlgallery-android.yml

		- stage: build_net6_windows

		public class AppDelegate : FormsApplicationDelegate, IUIApplicationDelegate
		#else


		- powershell: \|
		& dotnet restore Maui.sln --configfile eng\DevopsNuget.config


		- bash: \|
		dotnet restore Maui.sln --configfile eng/DevopsNuget.config &&

Setup Maui.sln with a set of net6 projects #13433

Setup Maui.sln with a set of net6 projects #13433

Conversation

PureWeen commented Jan 17, 2021 • edited Loading

Description of Change

Testing Procedure

PR Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PureWeen commented Jan 17, 2021 •

edited

Loading