Add .NET 6 Device Test Runner & Migrate Tests to .NET 6 (dotnet#1359)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jonathan Peppers <[email protected]> Co-authored-by: Rui Marinho <[email protected]> Co-authored-by: Shane Neuville <[email protected]>
MartyIX · Aug 6, 2021 · cadf547 · cadf547
1 parent 95c7e76
commit cadf547
Show file tree

Hide file tree

Showing 671 changed files with 7,378 additions and 9,159 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -8,12 +8,6 @@
  "dotnet-cake"
  ]
  },
- "microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.21165.2",
- "commands": [
- "xharness"
- ]
- },
  "powershell": {
  "version": "7.1.2",
  "commands": [

diff --git a/.nuspec/Microsoft.Maui.TestUtils.DeviceTests.Runners.targets b/.nuspec/Microsoft.Maui.TestUtils.DeviceTests.Runners.targets
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Project ToolsVersion="4.0" xmlns="https://schemas.microsoft.com/developer/msbuild/2003">
+
+ <ItemGroup>
+ <CompilerVisibleProperty Include="RootNamespace" />
+ <CompilerVisibleProperty Include="ApplicationId" />
+ <CompilerVisibleProperty Include="ApplicationTitle" />
+ <CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="IsMauiSplashScreen" />
+ <AdditionalFiles Include="@(MauiSplashScreen)" IsMauiSplashScreen="True" />
+ </ItemGroup>
+
+</Project>
diff --git a/Compatibility.ControlGallery.sln b/Compatibility.ControlGallery.sln
@@ -89,7 +89,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Xaml.UnitTests", "
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestUtils", "TestUtils", "{0F9BA970-11B1-4ACA-AF41-1021AFC0F29C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils", "src\TestUtils\TestUtils\src\TestUtils.csproj", "{E4CB9988-7348-4D55-A08E-85907732F8DA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils", "src\TestUtils\src\TestUtils\TestUtils.csproj", "{E4CB9988-7348-4D55-A08E-85907732F8DA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils.DeviceTests", "src\TestUtils\TestUtils.DeviceTests\src\TestUtils.DeviceTests.csproj", "{551B2209-4298-4D60-B55C-79077B8BC244}"
 EndProject

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,12 +2,7 @@
  <Import Project="eng\Versions.props" />
 
  <PropertyGroup>
- <!-- Workaround: https://github.com/dotnet/sdk/issues/19050 -->
- <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
- </PropertyGroup>
-
- <PropertyGroup>
- <BuildForWinUI Condition=" ('$(SolutionFileName)' == 'Microsoft.Maui.WinUI.sln' OR '$(SolutionFileName)' == 'BlazorWindows-net6.sln') AND '$(Packing)' == ''">true</BuildForWinUI>
+ <BuildForWinUI Condition=" ($(SolutionFileName.Contains('winui')) OR '$(SolutionFileName)' == 'BlazorWindows-net6.sln') AND '$(Packing)' == ''">true</BuildForWinUI>
  <BuildForAndroid Condition="'$(SolutionFileName)' == 'Microsoft.Maui.Droid.sln' AND '$(Packing)' == ''">true</BuildForAndroid>
  <BuildForNet6 Condition="'$(Packing)' == 'true' OR $(MSBuildProjectFile.Contains('SingleProject')) OR $(MSBuildProjectFile.Contains('Profiling')) OR $(MSBuildProjectFile.Contains('net6')) OR $(SolutionFileName.Contains('net6')) OR '$(BuildForWinUI)' == 'true' OR '$(BuildForAndroid)' == 'true'">true</BuildForNet6>
  <MauiPlatforms>net6.0-ios;net6.0-maccatalyst;net6.0-android</MauiPlatforms>
@@ -36,11 +31,16 @@
  <NonNet6EssentialsPlatforms Condition="'$(BuildNonNet6ForAndroid)' == 'true'">netstandard2.0;netstandard2.1;MonoAndroid10.0</NonNet6EssentialsPlatforms>
  <SymbolPackageFormat>snupkg</SymbolPackageFormat>
 
+ <!-- <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles> -->
+
  <!-- HACK: WinUI seems to have issues without this -->
  <GenerateLibraryLayout>true</GenerateLibraryLayout>
  <DisableEmbeddedXbf>false</DisableEmbeddedXbf>
 
  <DefineConstants Condition="$(TargetFramework.Contains('-windows'))">$(DefineConstants);WINDOWS</DefineConstants>
+
+ <!-- Workaround: https://github.com/dotnet/sdk/issues/19050 -->
+ <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
  </PropertyGroup>
 
  <PropertyGroup>

diff --git a/Microsoft.Maui-net6.sln b/Microsoft.Maui-net6.sln
diff --git a/Microsoft.Maui-winui.sln b/Microsoft.Maui-winui.sln
diff --git a/Microsoft.Maui.BuildTasks-net6.sln b/Microsoft.Maui.BuildTasks-net6.sln
diff --git a/Microsoft.Maui.BuildTasks-net6.slnf b/Microsoft.Maui.BuildTasks-net6.slnf
@@ -0,0 +1,12 @@
+{
+ "solution": {
+ "path": "Microsoft.Maui-net6.sln",
+ "projects": [
+ "src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks-net6.csproj",
+ "src\\Controls\\src\\Core\\Controls.Core-net6.csproj",
+ "src\\Controls\\src\\Xaml\\Controls.Xaml-net6.csproj",
+ "src\\Core\\src\\Core-net6.csproj",
+ "src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj"
+ ]
+ }
+}
diff --git a/Microsoft.Maui.Droid.sln b/Microsoft.Maui.Droid.sln
@@ -44,7 +44,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Maui.Templates",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestUtils", "TestUtils", "{6998CAA1-11D4-46B2-B80F-0AC882F58124}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils", "src\TestUtils\TestUtils\src\TestUtils.csproj", "{FBB3270F-1924-4A72-845E-A6DF39C402F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils", "src\TestUtils\src\TestUtils\TestUtils.csproj", "{FBB3270F-1924-4A72-845E-A6DF39C402F6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.UnitTests", "src\Core\tests\UnitTests\Core.UnitTests.csproj", "{92644F6F-5946-48FC-A21A-A3D6EE24E8B3}"
 EndProject
@@ -58,7 +58,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BlazorWebView", "BlazorWebView", "{1614D1A4-5C3D-4D5B-8C89-426E37A564EF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebView.Maui", "src\BlazorWebView\src\core\Microsoft.AspNetCore.Components.WebView.Maui.csproj", "{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebView.Maui", "src\BlazorWebView\src\Maui\Microsoft.AspNetCore.Components.WebView.Maui.csproj", "{F7F2B379-52CE-4802-9EC9-0D7967B6BFB7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MauiRazorClassLibrarySample", "src\BlazorWebView\samples\MauiRazorClassLibrarySample\MauiRazorClassLibrarySample.csproj", "{A33803A8-D398-49F3-B5E8-8C812237829A}"
 EndProject

diff --git a/Microsoft.Maui.Packages-net6.slnf b/Microsoft.Maui.Packages-net6.slnf
@@ -0,0 +1,33 @@
+{
+ "solution": {
+ "path": "Microsoft.Maui-net6.sln",
+ "projects": [
+ "src\\BlazorWebView\\src\\Maui\\Microsoft.AspNetCore.Components.WebView.Maui.csproj",
+ "src\\BlazorWebView\\src\\WebView2\\Microsoft.AspNetCore.Components.WebView.WebView2.csproj",
+ "src\\Compatibility\\Android.FormsViewGroup\\src\\Compatibility.Android.FormsViewGroup-net6.csproj",
+ "src\\Compatibility\\Core\\src\\Compatibility-net6.csproj",
+ "src\\Controls\\Maps\\src\\Controls.Maps-net6.csproj",
+ "src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks-net6.csproj",
+ "src\\Controls\\src\\Core.Design\\Controls.Core.Design-net6.csproj",
+ "src\\Controls\\src\\Core\\Controls.Core-net6.csproj",
+ "src\\Controls\\src\\SourceGen\\Controls.SourceGen-net6.csproj",
+ "src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design-net6.csproj",
+ "src\\Controls\\src\\Xaml\\Controls.Xaml-net6.csproj",
+ "src\\Core\\src\\Core-net6.csproj",
+ "src\\Essentials\\src\\Essentials-net6.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",
+ "src\\Workload\\Microsoft.Maui.Controls.Runtime\\Microsoft.Maui.Controls.Runtime.csproj",
+ "src\\Workload\\Microsoft.Maui.Controls.Sdk\\Microsoft.Maui.Controls.Sdk.csproj",
+ "src\\Workload\\Microsoft.Maui.Core.Ref\\Microsoft.Maui.Core.Ref.csproj",
+ "src\\Workload\\Microsoft.Maui.Core.Runtime\\Microsoft.Maui.Core.Runtime.csproj",
+ "src\\Workload\\Microsoft.Maui.Dependencies\\Microsoft.Maui.Dependencies.csproj",
+ "src\\Workload\\Microsoft.Maui.Essentials.Ref\\Microsoft.Maui.Essentials.Ref.csproj",
+ "src\\Workload\\Microsoft.Maui.Essentials.Runtime\\Microsoft.Maui.Essentials.Runtime.csproj",
+ "src\\Workload\\Microsoft.Maui.Extensions\\Microsoft.Maui.Extensions.csproj",
+ "src\\Workload\\Microsoft.Maui.Resizetizer.Sdk\\Microsoft.Maui.Resizetizer.Sdk.csproj",
+ "src\\Workload\\Microsoft.NET.Sdk.Maui\\Microsoft.NET.Sdk.Maui.csproj"
+ ]
+ }
+}
diff --git a/Microsoft.Maui.Packages-winui.slnf b/Microsoft.Maui.Packages-winui.slnf
@@ -0,0 +1,23 @@
+{
+ "solution": {
+ "path": "Microsoft.Maui-winui.sln",
+ "projects": [
+ "src\\BlazorWebView\\src\\Maui\\Microsoft.AspNetCore.Components.WebView.Maui.csproj",
+ "src\\BlazorWebView\\src\\WebView2\\Microsoft.AspNetCore.Components.WebView.WebView2.csproj",
+ "src\\BlazorWebView\\src\\WindowsForms\\Microsoft.AspNetCore.Components.WebView.WindowsForms.csproj",
+ "src\\BlazorWebView\\src\\Wpf\\Microsoft.AspNetCore.Components.WebView.Wpf.csproj",
+ "src\\Compatibility\\Core\\src\\Compatibility-net6.csproj",
+ "src\\Controls\\Maps\\src\\Controls.Maps-net6.csproj",
+ "src\\Controls\\src\\Build.Tasks\\Controls.Build.Tasks-net6.csproj",
+ "src\\Controls\\src\\Core.Design\\Controls.Core.Design-net6.csproj",
+ "src\\Controls\\src\\Core\\Controls.Core-net6.csproj",
+ "src\\Controls\\src\\SourceGen\\Controls.SourceGen-net6.csproj",
+ "src\\Controls\\src\\Xaml.Design\\Controls.Xaml.Design-net6.csproj",
+ "src\\Controls\\src\\Xaml\\Controls.Xaml-net6.csproj",
+ "src\\Core\\src\\Core-net6.csproj",
+ "src\\Essentials\\src\\Essentials-net6.csproj",
+ "src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj",
+ "src\\Templates\\src\\Microsoft.Maui.Templates.csproj"
+ ]
+ }
+}
diff --git a/Microsoft.Maui.Packages.Desktop-winui.slnf b/Microsoft.Maui.Packages.Desktop-winui.slnf
@@ -0,0 +1,10 @@
+{
+ "solution": {
+ "path": "Microsoft.Maui-winui.sln",
+ "projects": [
+ "src\\BlazorWebView\\src\\WebView2\\Microsoft.AspNetCore.Components.WebView.WebView2.csproj",
+ "src\\BlazorWebView\\src\\WindowsForms\\Microsoft.AspNetCore.Components.WebView.WindowsForms.csproj",
+ "src\\BlazorWebView\\src\\Wpf\\Microsoft.AspNetCore.Components.WebView.Wpf.csproj"
+ ]
+ }
+}