dotnet · rmarinho · Mar 22, 2021 · Mar 11, 2021
@@ -18,8 +18,7 @@
 	<Import Project="$(MSBuildThisFileDirectory)Microsoft.Maui.Controls.DefaultItems.targets" Condition="'$(MSBuildSDKsPath)'!=''" />
 
 	<ItemGroup>
-		<ProjectCapability Include="XamarinForms" />
-		<ProjectCapability Include="Maui" />
+		<ProjectCapability Include="Maui" Condition="'$(_ExcludeMauiProjectCapability)' != 'true'" />
 	</ItemGroup>
 
 	<!-- Check Tasks ABI and other validations -->

@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="eng\Version.props" />
   <PropertyGroup>
     <_MauiBuildTasksLocation>$(_MauiBuildTasksLocation)</_MauiBuildTasksLocation>
     <_MauiBuildTasksLocation Condition="'$(_MauiBuildTasksLocation)' == ''">$(MSBuildThisFileDirectory).nuspec\</_MauiBuildTasksLocation>

@@ -83,6 +83,7 @@ Global
 		{BE50FAEF-4096-48B5-B9CE-EE0C38F15A18}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C3439E6-73D7-4F8E-A64A-5448F5CB18DE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -91,6 +92,7 @@ Global
 		{D7FE9FD0-144A-4199-93FC-3AD62325F1D6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
 		{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB495F62-CFE6-4975-AED8-F26B6C5D0113}.Release|Any CPU.Build.0 = Release|Any CPU
 		{75C380E0-CE53-4C01-B89F-CF685331DE18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

@@ -29,8 +29,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuspec", ".nuspec", "{7E12
 		.nuspec\Microsoft.Maui.Controls.SingleProject.targets = .nuspec\Microsoft.Maui.Controls.SingleProject.targets
 		.nuspec\Microsoft.Maui.Controls.targets = .nuspec\Microsoft.Maui.Controls.targets
 		.nuspec\Microsoft.Maui.Resizetizer.targets = .nuspec\Microsoft.Maui.Resizetizer.targets
-		.nuspec\package.ps1 = .nuspec\package.ps1
 		.nuspec\proguard.cfg = .nuspec\proguard.cfg
+		eng\package.ps1 = eng\package.ps1
+		eng\dogfood.ps1 = eng\dogfood.ps1
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core", "src\Controls\src\Core\Controls.Core.csproj", "{57B8B73D-C3B5-4C42-869E-7B2F17D354AC}"

@@ -32,13 +32,42 @@ dotnet tool install Cake.Tool -g
 #### IDE
 - If you have Visual Studio 16.9 P4 installed you can open `Maui.sln` and run it from there.
 
-#### Command Line
+#### .NET 6
 
+You can run a `Cake` target to bootstrap .NET 6 in `bin\dotnet` and launch Visual Studio:
+
+```dotnetcli
+dotnet cake --target=VS-NET6
+```
+_NOTE: VS Mac is not yet supported._
+
+You can also run commands individually:
+```dotnetcli
+# Provision .NET 6 in bin\dotnet
+dotnet build src\DotNet\DotNet.csproj
+# Builds Maui MSBuild tasks
+.\bin\dotnet\dotnet build Microsoft.Maui.BuildTasks-net6.sln
+# Builds the rest of Maui
+.\bin\dotnet\dotnet build Microsoft.Maui-net6.sln
+# (Windows-only) to launch Visual Studio
+.\eng\dogfood.ps1
 ```
-dotnet build src\Controls\samples\Controls.Sample.Droid\Maui.Controls.Sample.Droid-net6.csproj -t:Run
-dotnet build src\Controls\samples\Controls.Sample.iOS\Maui.Controls.Sample.iOS-net6.csproj -t:Run
+
+To build & run .NET 6 sample apps, you will also need to use `.\bin\dotnet\dotnet`:
+```dotnetcli
+.\bin\dotnet\dotnet build src\Controls\samples\Controls.Sample.Droid\Maui.Controls.Sample.Droid-net6.csproj -t:Run
+.\bin\dotnet\dotnet build src\Controls\samples\Controls.Sample.iOS\Maui.Controls.Sample.iOS-net6.csproj -t:Run
 ```
 
+Try try out a "single project", you will need the `-f` switch to choose the platform:
+
+```dotnetcli
+.\bin\dotnet\dotnet build src\Controls\samples\Controls.Sample.SingleProject\Maui.Controls.Sample.SingleProject.csproj t:Run -f net6.0-android --no-restore
+.\bin\dotnet\dotnet build src\Controls\samples\Controls.Sample.SingleProject\Maui.Controls.Sample.SingleProject.csproj t:Run -f net6.0-ios --no-restore
+```
+
+Note that `--no-restore` is a workaround until [dotnet#15485](https://github.com/dotnet/sdk/issues/15485) is fixed in a future preview.
+
 ## Current News
 
 [March 11, 2021 - Announcing .NET 6 Preview 2](https://devblogs.microsoft.com/dotnet/announcing-net-6-preview-2/)

@@ -670,7 +670,7 @@ Task("NuGetPack")
     var settings = new DotNetCoreToolSettings
     {
         DiagnosticOutput = true,
-        ArgumentCustomization = args => args.Append($"./.nuspec/package.ps1 -configuration \"{configuration}\"")
+        ArgumentCustomization = args => args.Append($"./eng/package.ps1 -configuration \"{configuration}\"")
     };
 
    DotNetCoreTool("pwsh", settings);
@@ -886,12 +886,12 @@ Task("Android100")
 
 
 Task("VS-NET6")
-    .IsDependentOn("Clean")
     .Does(() =>
     {
-        DotNetCoreRestore("Microsoft.Maui-net6.sln");
-        DotNetCoreBuild("Microsoft.Maui-net6.sln");
-        StartVisualStudio("Microsoft.Maui-net6.sln");
+        DotNetCoreBuild("./src/DotNet/Dotnet.csproj");
+        var ext = IsRunningOnWindows() ? ".exe" : "";
+        DotNetCoreBuild("./Microsoft.Maui.BuildTasks-net6.sln", new DotNetCoreBuildSettings { ToolPath = $"./bin/dotnet/dotnet{ext}" });
+        StartVisualStudioForDotNet6();
     });
 
 Task("VS")
@@ -1206,6 +1206,22 @@ void StartVisualStudio(string sln = "./Microsoft.Maui.sln")
          StartProcess("open", new ProcessSettings{ Arguments = sln });
 }
 
+void StartVisualStudioForDotNet6(string sln = "./Microsoft.Maui-net6.sln")
+{
+    if (isCIBuild)
+        return;
+    if (!IsRunningOnWindows())
+    {
+        Information("This target is only supported on Windows.");
+        return;
+    }
+    var vsLatest = VSWhereLatest();
+    if (vsLatest == null)
+        throw new Exception("Unable to find Visual Studio!");
+    var devenv = vsLatest.CombineWithFilePath("./Common7/IDE/devenv.exe");
+    StartProcess("powershell", $"./eng/dogfood.ps1 -vs '{devenv}' -sln '{sln}'");
+}
+
 MSBuildSettings GetMSBuildSettings(PlatformTarget? platformTarget = PlatformTarget.MSIL, string buildConfiguration = null)
 {
     var buildSettings =  new MSBuildSettings {

@@ -0,0 +1,9 @@
+<Project>
+  <!--Package versions-->
+  <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>
@@ -0,0 +1,102 @@
+<#
+  .SYNOPSIS
+  *Windows-only* Launches Visual Studio with environment variables to use the local ./bin/dotnet/dotnet.exe.
+
+  .DESCRIPTION
+  *Windows-only* Launches Visual Studio with environment variables to use the local ./bin/dotnet/dotnet.exe.
+  Script based on:
+  https://github.com/dotnet/runtime/blob/1be117d8e7c0cd29ebc55cbcff2a7fa70604ed39/eng/build.ps1#L186-L208
+  https://github.com/dotnet/runtime/blob/1be117d8e7c0cd29ebc55cbcff2a7fa70604ed39/eng/common/tools.ps1#L109
+
+  .PARAMETER vs
+  The path to Visual Studio, defaults to:
+  "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe".
+
+  .PARAMETER sln
+  The path to a .sln or .project file, defaults to "Microsoft.Maui-net6.sln".
+
+  .PARAMETER modify
+  Modify the environment variables in the current session. This would
+  allow the "dotnet" command to work instead of ".\bin\dotnet\dotnet".
+  However, it would be good to do this in a new terminal session,
+  since you would have trouble running "dotnet build" if it needs to
+  provision .NET 6 and the iOS/Android workloads again.
+
+  .EXAMPLE
+  PS> .\scripts\dogfood.ps1
+
+  .EXAMPLE
+  PS> .\scripts\dogfood.ps1 -vs "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\devenv.exe"
+
+  .EXAMPLE
+  PS> .\scripts\dogfood.ps1 -sln .\path\to\MySolution.sln
+#>
+
+param(
+  [string]$vs = "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\devenv.exe",
+  [string]$sln,
+  [switch]$modify
+)
+
+$dotnet=Join-Path $PSScriptRoot ../bin/dotnet/
+$dotnet=(Get-Item $dotnet).FullName
+
+if (-Not $sln) {
+    $sln=Join-Path $PSScriptRoot ../Microsoft.Maui-net6.sln
+    $sln=(Get-Item $sln).FullName
+}
+
+# Modify global.json, so the IDE can load
+$globaljson = Join-Path $PSScriptRoot ../global.json
+[xml] $xml = Get-Content (Join-Path $PSScriptRoot Version.props)
+$json = Get-Content $globaljson | ConvertFrom-Json
+$json | Add-Member sdk (New-Object -TypeName PSObject) -Force
+$json.sdk | Add-Member version $xml.Project.PropertyGroup.MicrosoftNETSdkPackageVersion -Force
+$json | ConvertTo-Json | Set-Content $globaljson
+
+# NOTE: I've not found a better way to do this
+# see: https://github.com/PowerShell/PowerShell/issues/3316
+$oldDOTNET_INSTALL_DIR=$env:DOTNET_INSTALL_DIR
+$oldDOTNET_ROOT=$env:DOTNET_ROOT
+$oldDOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=$env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR
+$oldDOTNET_MULTILEVEL_LOOKUP=$env:DOTNET_MULTILEVEL_LOOKUP
+$oldMSBuildEnableWorkloadResolver=$env:MSBuildEnableWorkloadResolver
+$old_ExcludeMauiProjectCapability=$env:_ExcludeMauiProjectCapability
+$oldPATH=$env:PATH
+
+try {
+    $env:DOTNET_INSTALL_DIR=$dotnet
+
+    # This tells .NET to use the bootstrapped runtime
+    $env:DOTNET_ROOT=$env:DOTNET_INSTALL_DIR
+
+    # This tells MSBuild to load the SDK from the directory of the bootstrapped SDK
+    $env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=$env:DOTNET_ROOT
+
+    # This tells .NET not to go looking for .NET in other places
+    $env:DOTNET_MULTILEVEL_LOOKUP=0
+
+    # This enables workload support inside the IDE
+    $env:MSBuildEnableWorkloadResolver=$true
+
+    # This disables the Maui @(ProjectCapability), a temporary workaround for 16.9
+    $env:_ExcludeMauiProjectCapability=$true
+
+    # Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
+    $env:PATH=($env:DOTNET_ROOT + ";" + $env:PATH)
+
+    # Launch VS
+    & "$vs" "$sln"
+} finally {
+    if (-Not $modify) {
+        $env:DOTNET_INSTALL_DIR = $oldDOTNET_INSTALL_DIR
+        $env:DOTNET_ROOT=$oldDOTNET_ROOT
+        $env:DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR=$oldDOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR
+        $env:DOTNET_MULTILEVEL_LOOKUP=$oldDOTNET_MULTILEVEL_LOOKUP
+        $env:MSBuildEnableWorkloadResolver=$oldMSBuildEnableWorkloadResolver
+        $env:_ExcludeMauiProjectCapability=$old_ExcludeMauiProjectCapability
+        $env:PATH=$oldPATH
+    }
+}
+
+exit 0
@@ -0,0 +1,17 @@
+param ([string] $configuration = 'Debug')
+
+$artifacts = Join-Path $PSScriptRoot ../artifacts
+
+# Bootstrap .\bin\dotnet\
+$csproj = Join-Path $PSScriptRoot ../src/DotNet/DotNet.csproj
+& dotnet build $csproj -bl:$artifacts/dotnet-$configuration.binlog
+
+$ext = if ($IsWindows) { ".exe" } else { "" }
+$dotnet = Join-Path $PSScriptRoot ../bin/dotnet/dotnet$ext
+$sln = Join-Path $PSScriptRoot ../Microsoft.Maui-net6.sln
+
+# Build with .\bin\dotnet\dotnet.exe
+& $dotnet pack $sln `
+    -c:$configuration `
+    -p:SymbolPackageFormat=snupkg `
+    -bl:$artifacts/maui-$configuration.binlog
@@ -16,7 +16,9 @@ steps:
       provisioning_script: $(provisionator.path)
       provisioning_extra_args: $(provisionator.extraArguments)
 
-  - template: dotnet-install.yml
+  - powershell: |
+      & dotnet build src\DotNet\DotNet.csproj -bl:${{ parameters.artifactsTargetFolder }}\$(BuildConfiguration)-dotnet.binlog
+    displayName: install .NET
 
   - powershell: |
       $(System.DefaultWorkingDirectory)/build.ps1 --target provision --TeamProject="$(System.TeamProject)"
@@ -67,7 +69,7 @@ steps:
     displayName: 'Copy Files dlls'
     inputs:
       Contents: |
-        **/bin/**/*.dll
+        src/**/bin/**/*.dll
       TargetFolder: ${{ parameters.artifactsTargetFolder }}
 
   - task: PublishBuildArtifacts@1