Migrate net45 to net462, and build XamMac2 for .NET 6

- Test projects build for net48 and net6.0 vs net472 and net5.0
jnkvca · Nov 16, 2021 · 8a811be · 8a811be
1 parent 9e5349f
commit 8a811be
Show file tree

Hide file tree

Showing 45 changed files with 72 additions and 6,311 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-t4": {
-      "version": "2.2.0",
+      "version": "2.2.1",
       "commands": [
         "t4"
       ]

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ on:
     types: [ published ]
 
 env:
-  DotNetVersion: "5.0.100"
+  DotNetVersion: "6.0.100"
   BuildConfiguration: "Release"
   BuildParameters: "build/Build.proj /v:Minimal /consoleLoggerParameters:NoSummary /p:Configuration=Release /p:BuildVersion=${{ github.run_id }} /p:BuildBranch=${{ github.ref }}"
 
@@ -72,7 +72,7 @@ jobs:
 
   build-mac:
 
-    runs-on: macos-latest
+    runs-on: macos-11
 
     steps:
     - uses: actions/checkout@v2
@@ -84,19 +84,16 @@ jobs:
       with:
         dotnet-version: ${{ env.DotNetVersion }}
 
+    - name: Install macos workload
+      run: sudo dotnet workload install macos
+
     - name: Setup Xamarin and XCode
       uses: maxim-lobanov/setup-xamarin@v1
       with:
         mono-version: latest
         xamarin-mac-version: latest
-        xcode-version: latest
+        xcode-version: 13.1
 
-    # See https://github.com/actions/virtual-environments/issues/2790
-    - name: Fix issue with latest macos image
-      run: |
-        curl -o xamarinmac.pkg 'https://bosstoragemirror.blob.core.windows.net/wrench/xcode12.4/a4c70e7d04e3904d17aa60f6d640eb048081c757/4477741/package/notarized/xamarin.mac-7.4.0.10.pkg'
-        sudo installer -pkg xamarinmac.pkg -target /
-
     - name: Import code signing certificate
       if: github.event_name != 'pull_request'
       uses: apple-actions/import-codesign-certs@v1

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}/net5.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
@@ -17,7 +17,7 @@
 			"request": "launch",
 			"preLaunchTask": "build-mac64",
 			"program": ".",
-			"runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
+			"runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64",
 			"passDebugOptionsViaEnvironmentVariable": true,
             "args": [],
             "console": "internalConsole",
@@ -39,7 +39,7 @@
 			"request": "launch",
 			"preLaunchTask": "build-xammac2",
 			"program": ".",
-			"runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
+			"runtimeExecutable": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.XamMac2.app/Contents/MacOS/Eto.Test.XamMac2",
 			"passDebugOptionsViaEnvironmentVariable": true,
             "args": [],
             "console": "internalConsole",
@@ -50,7 +50,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-gtk",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net5.0/Eto.Test.Gtk.dll",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0/Eto.Test.Gtk.dll",
             "args": [],
             "console": "internalConsole",
             "stopAtEntry": false,
@@ -61,7 +61,7 @@
 			"type": "mono",
 			"request": "launch",
 			"preLaunchTask": "build-gtk",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.Gtk.exe",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Gtk.exe",
 			"passDebugOptionsViaEnvironmentVariable": true,
             "args": [],
             "console": "internalConsole",
@@ -72,7 +72,7 @@
 			"type": "mono",
 			"request": "launch",
 			"preLaunchTask": "build-gtk2",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.Gtk2.exe",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Gtk2.exe",
 			"passDebugOptionsViaEnvironmentVariable": true,
             "args": [],
             "console": "internalConsole",
@@ -83,7 +83,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-wpf",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net5.0-windows/Eto.Test.Wpf.exe",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-windows/Eto.Test.Wpf.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
@@ -93,7 +93,7 @@
 			"type": "clr",
 			"request": "launch",
 			"preLaunchTask": "build-wpf",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.Wpf.exe",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.Wpf.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
@@ -103,7 +103,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-winforms",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net5.0-windows/Eto.Test.WinForms.exe",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-windows/Eto.Test.WinForms.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
@@ -113,7 +113,7 @@
 			"type": "clr",
 			"request": "launch",
 			"preLaunchTask": "build-winforms",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net472/Eto.Test.WinForms.exe",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net48/Eto.Test.WinForms.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
@@ -123,7 +123,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build-direct2d",
-            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net5.0-windows/Eto.Test.Direct2D.exe",
+            "program": "${workspaceFolder}/artifacts/test/${config:var.configuration}/net6.0-windows/Eto.Test.Direct2D.exe",
             "args": [],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"

diff --git a/lib/monomac b/lib/monomac
diff --git a/samples/Gtk/EmbedEtoInGtk/EmbedEtoInGtk.csproj b/samples/Gtk/EmbedEtoInGtk/EmbedEtoInGtk.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/samples/Gtk/EmbedGtkInEto/EmbedGtkInEto.csproj b/samples/Gtk/EmbedGtkInEto/EmbedGtkInEto.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>WinExe</OutputType>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/samples/Tutorials/CSharp/Tutorial1/CS.Tutorial1.HelloWorld.csproj b/samples/Tutorials/CSharp/Tutorial1/CS.Tutorial1.HelloWorld.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>Tutorial1</RootNamespace>
     <Name>Tutorial1 - Hello World</Name>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/samples/Tutorials/CSharp/Tutorial2/CS.Tutorial2.MenusAndToolbars.csproj b/samples/Tutorials/CSharp/Tutorial2/CS.Tutorial2.MenusAndToolbars.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>Tutorial2</RootNamespace>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <MacBundleMono>False</MacBundleMono>

diff --git a/samples/Tutorials/CSharp/Tutorial3/CS.Tutorial3.TableLayout.csproj b/samples/Tutorials/CSharp/Tutorial3/CS.Tutorial3.TableLayout.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>Tutorial3</RootNamespace>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <MacBundleMono>False</MacBundleMono>

diff --git a/samples/Tutorials/CSharp/Tutorial4/CS.Tutorial4.Binding.csproj b/samples/Tutorials/CSharp/Tutorial4/CS.Tutorial4.Binding.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>Tutorial4</RootNamespace>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <MacBundleMono>False</MacBundleMono>

diff --git a/samples/Tutorials/FSharp/Tutorial1/FS.Tutorial1.HelloWorld.fsproj b/samples/Tutorials/FSharp/Tutorial1/FS.Tutorial1.HelloWorld.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>Tutorial1</RootNamespace>
     <Name>Tutorial1 - Hello World</Name>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/samples/Tutorials/FSharp/Tutorial2/FS.Tutorial2.MenusAndToolbars.fsproj b/samples/Tutorials/FSharp/Tutorial2/FS.Tutorial2.MenusAndToolbars.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>Tutorial2</RootNamespace>
     <Name>Tutorial2 - Menus and Toolbars</Name>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/samples/Tutorials/FSharp/Tutorial3/FS.Tutorial3.TableLayout.fsproj b/samples/Tutorials/FSharp/Tutorial3/FS.Tutorial3.TableLayout.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>Tutorial3</RootNamespace>
     <Name>Tutorial3 - Table Layout</Name>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/samples/Tutorials/FSharp/Tutorial4/FS.Tutorial4.Binding.fsproj b/samples/Tutorials/FSharp/Tutorial4/FS.Tutorial4.Binding.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <RootNamespace>Tutorial4</RootNamespace>
     <Name>Tutorial4 - Binding</Name>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

diff --git a/samples/WinForms/EmbedEtoInWinForms/EmbedEtoInWinForms.csproj b/samples/WinForms/EmbedEtoInWinForms/EmbedEtoInWinForms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -16,7 +16,7 @@
     <ProjectReference Include="..\..\..\src\Eto.WinForms\Eto.WinForms.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net48'">
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />

diff --git a/samples/WinForms/EmbedWinFormsInEto/EmbedWinFormsInEto.csproj b/samples/WinForms/EmbedWinFormsInEto/EmbedWinFormsInEto.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\..\..\src\Eto.WinForms\Eto.WinForms.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net472'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net48'">
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />

diff --git a/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj b/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <HaveWindowsDesktopSdk Condition="$(HaveWindowsDesktopSdk) == '' and $(OS) == 'Windows_NT'">true</HaveWindowsDesktopSdk>
 
-    <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
   </PropertyGroup>
 
   <Import Condition="'$(HaveWindowsDesktopSdk)' != 'true'" Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />

diff --git a/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj b/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <HaveWindowsDesktopSdk Condition="$(HaveWindowsDesktopSdk) == '' and $(OS) == 'Windows_NT'">true</HaveWindowsDesktopSdk>
 
-    <TargetFrameworks>net472;net5.0-windows</TargetFrameworks>
+    <TargetFrameworks>net48;net6.0-windows</TargetFrameworks>
   </PropertyGroup>
 
   <Import Condition="'$(HaveWindowsDesktopSdk)' != 'true'" Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />

diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj b/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj
@@ -3,12 +3,14 @@
   <PropertyGroup>
     <UseXamarinMac>True</UseXamarinMac>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <TargetFrameworks>net48</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>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj b/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj
@@ -3,12 +3,14 @@
   <PropertyGroup>
     <UseXamarinMac>True</UseXamarinMac>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <TargetFrameworks>net48</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>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Addins/Eto.Addin.VisualStudio.Mac/Eto.Addin.VisualStudio.Mac.csproj b/src/Addins/Eto.Addin.VisualStudio.Mac/Eto.Addin.VisualStudio.Mac.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <AssemblySearchPaths>$(AssemblySearchPaths);{gac}</AssemblySearchPaths>
   	<MDBinDir Condition="Exists('/opt/MonoDevelop/bin')">/opt/MonoDevelop/bin</MDBinDir>
   	<MDAddinsDir Condition="Exists('/opt/MonoDevelop/AddIns')">/opt/MonoDevelop/AddIns</MDAddinsDir>

diff --git a/src/Addins/Eto.Addin.VisualStudio.Windows/Eto.Addin.VisualStudio.Windows.csproj b/src/Addins/Eto.Addin.VisualStudio.Windows/Eto.Addin.VisualStudio.Windows.csproj
@@ -173,7 +173,7 @@
       <Name>Eto.Serialization.Xaml</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\Eto.Wpf\Eto.Wpf.csproj">
-      <AdditionalProperties>TargetFramework=net45</AdditionalProperties>
+      <AdditionalProperties>TargetFramework=net462</AdditionalProperties>
       <Project>{63137fa0-ca55-11e3-9c1a-0800200c9a66}</Project>
       <Name>Eto.Wpf</Name>
     </ProjectReference>

diff --git a/src/Addins/Eto.Forms.Templates/Eto.Forms.Templates.csproj b/src/Addins/Eto.Forms.Templates/Eto.Forms.Templates.csproj
@@ -8,7 +8,7 @@
 		<Description>Project and File templates for Eto.Forms</Description>
 		<Tags>cross-platform;gui;ui-framework;desktop;winforms;wpf;mac;osx;gtk;eto;eto.forms;dotnet-new</Tags>
 
-		<TargetFramework>netstandard1.0</TargetFramework>
+		<TargetFramework>netstandard2.0</TargetFramework>
 		<ContentTargetFolders>content</ContentTargetFolders>
 
 		<EnableDefaultItems>false</EnableDefaultItems>

diff --git a/src/Eto.Direct2D/Eto.Direct2D.csproj b/src/Eto.Direct2D/Eto.Direct2D.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <HaveWindowsDesktopSdk Condition="$(HaveWindowsDesktopSdk) == '' and $(OS) == 'Windows_NT'">true</HaveWindowsDesktopSdk>
 
-    <TargetFrameworks>netcoreapp3.1;net45</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
   </PropertyGroup>
 
   <Import Condition="'$(HaveWindowsDesktopSdk)' != 'true'" Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
@@ -33,7 +33,7 @@ You do not need to use any of the classes of this assembly (unless customizing t
     </PackageDescription>
   </PropertyGroup>
 
-  <ItemGroup Condition="$(TargetFramework) == 'net45'">
+  <ItemGroup Condition="$(TargetFramework) == 'net462'">
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />