Merge pull request #2184 from cwensley/curtis/net-6.0.200-support

.NET 6.0.2xx SDK support
picoe · May 5, 2022 · 89285e4 · 89285e4
2 parents 7d8de5c + 9301988
commit 89285e4
Show file tree

Hide file tree

Showing 209 changed files with 528 additions and 4,102 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,14 +9,14 @@ on:
     types: [ published ]
 
 env:
-  DotNetVersion: "6.0.100"
+  DotNetVersion: "6.0.202"
   BuildConfiguration: "Release"
   BuildParameters: "build/Build.proj /v:Minimal /consoleLoggerParameters:NoSummary /p:Configuration=Release /p:BuildVersion=${{ github.run_id }} /p:BuildBranch=${{ github.ref }}"
 
 jobs:
   build-windows:
 
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     steps:
     - uses: actions/checkout@v2
@@ -45,14 +45,14 @@ jobs:
       with:
         name: test
         path: |
-          artifacts/test/${{ env.BuildConfiguration }}/**/*
-          !artifacts/test/${{ env.BuildConfiguration }}/**/*Mac64.*
+          artifacts/test/*/${{ env.BuildConfiguration }}/**/*
+          !artifacts/test/Eto.Test.Mac64/**/*
 
     - name: Upload sample artifacts
       uses: actions/upload-artifact@v2
       with:
         name: samples
-        path: artifacts/samples/${{ env.BuildConfiguration }}/**/*
+        path: artifacts/samples/*/${{ env.BuildConfiguration }}/**/*
 
     - name: Upload log files
       if: ${{ failure() }}
@@ -111,16 +111,17 @@ jobs:
         name: nuget
         path: |
           artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.XamMac2*.nupkg
+          artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.macOS*.nupkg
           artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.Gtk2*.nupkg
 
     - name: Upload test artifacts
       uses: actions/upload-artifact@v2
       with:
         name: test
         path: |
-          artifacts/test/${{ env.BuildConfiguration }}/**/*XamMac2.*
-          artifacts/test/${{ env.BuildConfiguration }}/**/*Mac64.*
-          artifacts/test/${{ env.BuildConfiguration }}/**/*Gtk2.*
+          artifacts/test/Eto.Test.Mac64/${{ env.BuildConfiguration }}/**/Eto.Test.Mac64.dmg
+          artifacts/test/Eto.Test.XamMac2/${{ env.BuildConfiguration }}/**/Eto.Test.XamMac2.app
+          artifacts/test/Eto.Test.macOS/${{ env.BuildConfiguration }}/*/Eto.Test.macOS.app
 
     - name: Upload log files
       if: ${{ failure() }}

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
             "type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-mac64",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
+            "program": "${workspaceFolder}/artifacts/test/Eto.Test.Mac64/${config:var.configuration}/net6.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
 			// "targetArchitecture": "x86_64", // uncomment to test intel on M1
             "args": [],
             "console": "internalConsole",
@@ -19,19 +19,19 @@
 			"request": "launch",
 			"preLaunchTask": "build-mac64",
 			"program": ".",
-			"runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
+			"runtimeExecutable": "${workspaceFolder}/artifacts/test/Eto.Test.Mac64/${config:var.configuration}/net48/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
 			"passDebugOptionsViaEnvironmentVariable": true,
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart",
 			"justMyCode": false
         },
 		{
-            "name": "Eto.Test.XamMac2",
+            "name": "Eto.Test.macOS",
             "type": "coreclr",
 			"request": "launch",
-			"preLaunchTask": "build-xammac2",
-			"program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-macos/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
+			"preLaunchTask": "build-macos",
+			"program": "${workspaceFolder}/artifacts/test/Eto.Test.macOS/${config:var.configuration}/net6.0-macos/Eto.Test.macOS.app/Contents/MacOS/Eto.Test.macOS",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart",
@@ -43,7 +43,7 @@
 			"request": "launch",
 			"preLaunchTask": "build-xammac2",
 			"program": ".",
-			"runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
+			"runtimeExecutable": "${workspaceFolder}/artifacts/test/Eto.Test.XamMac2/${config:var.configuration}/net48/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
 			"passDebugOptionsViaEnvironmentVariable": true,
             "args": [],
             "console": "internalConsole",
@@ -55,7 +55,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-gtk",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0/Eto.Test.Gtk.dll",
+            "program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk/${config:var.configuration}/net6.0/Eto.Test.Gtk.dll",
             "args": [],
 			"osx": {
 				"env": {
@@ -72,7 +72,7 @@
 			"type": "mono",
 			"request": "launch",
 			"preLaunchTask": "build-gtk",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Gtk.exe",
+            "program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk/${config:var.configuration}/net48/Eto.Test.Gtk.exe",
 			"passDebugOptionsViaEnvironmentVariable": true,
             "args": [],
 			"osx": {
@@ -89,7 +89,7 @@
 			"type": "mono",
 			"request": "launch",
 			"preLaunchTask": "build-gtk2",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Gtk2.exe",
+            "program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk2/${config:var.configuration}/net48/Eto.Test.Gtk2.exe",
 			"passDebugOptionsViaEnvironmentVariable": true,
             "args": [],
             "console": "internalConsole",
@@ -101,7 +101,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-wpf",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-windows/Eto.Test.Wpf.exe",
+            "program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net6.0-windows/Eto.Test.Wpf.exe",
 			"targetArchitecture": "x86_64",
             "args": [],
             "console": "internalConsole",
@@ -113,7 +113,7 @@
 			"type": "clr",
 			"request": "launch",
 			"preLaunchTask": "build-wpf",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Wpf.exe",
+            "program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net48/Eto.Test.Wpf.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart",
@@ -124,7 +124,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-winforms",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-windows/Eto.Test.WinForms.exe",
+            "program": "${workspaceFolder}/artifacts/test/Eto.Test.WinForms/${config:var.configuration}/net6.0-windows/Eto.Test.WinForms.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart",
@@ -135,7 +135,7 @@
 			"type": "clr",
 			"request": "launch",
 			"preLaunchTask": "build-winforms",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.WinForms.exe",
+            "program": "${workspaceFolder}/artifacts/test/Eto.Test.WinForms/${config:var.configuration}/net48/Eto.Test.WinForms.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart",
@@ -146,7 +146,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-direct2d",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-windows/Eto.Test.Direct2D.exe",
+            "program": "${workspaceFolder}/artifacts/test/Eto.Test.Direct2D/${config:var.configuration}/net6.0-windows/Eto.Test.Direct2D.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart",

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -3,7 +3,7 @@
 	"tasks": [
 		{
 			"label": "build",
-			"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/build/Build.proj",
+			"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${input:configuration} ${workspaceFolder}/build/Build.proj",
 			"type": "shell",
 			"problemMatcher": "$msCompile",
 			"group": {
@@ -88,6 +88,16 @@
 				"clear": true
 			}
 		},
+		{
+			"label": "build-macos",
+			"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Mac/Eto.Test.macOS.csproj",
+			"type": "shell",
+			"group": "build",
+			"problemMatcher": "$msCompile",
+			"presentation": {
+				"clear": true
+			}
+		},
 		{
 			"label": "build-xammac2",
 			"command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj",
@@ -177,6 +187,15 @@
 				"Yes"
 			]
 		},
+		{
+			"type": "pickString",
+			"id": "configuration",
+			"description": "Build Configuration",
+			"options": [
+				"Debug",
+				"Release"
+			]
+		},
 		{
 			"type": "promptString",
 			"id": "version",

diff --git a/build/Build.proj b/build/Build.proj
@@ -268,10 +268,10 @@
       <Config Include="debug" Value="-c Debug" />
 
       <Build Include="build-net4" Create="-f net48" Build="build" />
-      <Build Include="build-net5" Create="-f net5.0" Build="build" />
-      <Build Include="build-rid-net5" Create="-f net5.0" Build="build -r osx-x64" />
-      <Build Include="publish-net5" Create="-f net5.0" Build="publish" />
-      <Build Include="publish-rid-net5" Create="-f net5.0" Build="publish -r osx-x64" />
+      <Build Include="build-net5" Create="-f net6.0" Build="build" />
+      <Build Include="build-rid-net5" Create="-f net6.0" Build="build -r osx-x64" />
+      <Build Include="publish-net5" Create="-f net6.0" Build="publish" />
+      <Build Include="publish-rid-net5" Create="-f net6.0" Build="publish -r osx-x64" />
 
       <Combined Include="combined" Value="-c" />
       <Combined Include="separate" Value="" Build="**/*.Mac.csproj" />

diff --git a/lib/monomac b/lib/monomac
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -3,6 +3,6 @@
   <Import Project="..\build\Common.Build.props" />
   <PropertyGroup>
     <Deterministic>false</Deterministic>
-    <BaseOutputPath>$(BasePath)artifacts\samples\</BaseOutputPath>
+    <BaseOutputPath>$(BasePath)artifacts\samples\$(MSBuildProjectName)\</BaseOutputPath>
   </PropertyGroup>
 </Project>
diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj b/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj
@@ -3,14 +3,15 @@
   <PropertyGroup>
     <UseXamarinMac>True</UseXamarinMac>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48</TargetFrameworks>
+    <TargetFrameworks>xamarinmac20</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
     <EnableDefaultContentItems>False</EnableDefaultContentItems>
     <CodeSigningKey>Mac Developer</CodeSigningKey>
     <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
     <MonoBundlingExtraArgs>--nowarn:2006 --nowarn:5220</MonoBundlingExtraArgs>
     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
     <EnableDefaultImageAssets>False</EnableDefaultImageAssets>
+    <LinkMode Condition="$(Configuration) == 'Release'">SdkOnly</LinkMode>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj b/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj
@@ -3,14 +3,15 @@
   <PropertyGroup>
     <UseXamarinMac>True</UseXamarinMac>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48</TargetFrameworks>
+    <TargetFrameworks>xamarinmac20</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
     <EnableDefaultContentItems>False</EnableDefaultContentItems>
     <CodeSigningKey>Mac Developer</CodeSigningKey>
     <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
     <MonoBundlingExtraArgs>--nowarn:2006 --nowarn:5220</MonoBundlingExtraArgs>
     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
     <EnableDefaultImageAssets>False</EnableDefaultImageAssets>
+    <LinkMode Condition="$(Configuration) == 'Release'">SdkOnly</LinkMode>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,6 +2,6 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\build\Common.Build.props" />
   <PropertyGroup>
-    <BaseOutputPath Condition="$(BaseOutputPath) == ''">$(BasePath)artifacts\core\</BaseOutputPath>
+    <BaseOutputPath Condition="$(BaseOutputPath) == ''">$(BasePath)artifacts\core\$(MSBuildProjectName)\</BaseOutputPath>
   </PropertyGroup>
 </Project>