diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index cedb8217e2..82a69185a4 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -29,6 +29,6 @@ ## Specifications - Version: - - Platform(s): + - Platform(s): - Operating System(s): diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec9127122c..855f3a8a49 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,7 +9,7 @@ on: types: [ published ] env: - DotNetVersion: "7.0.108" + DotNetVersion: "7.0.116" BuildConfiguration: "Release" BuildParameters: "build/Build.proj /v:Minimal /consoleLoggerParameters:NoSummary /p:Configuration=Release /p:BuildVersion=${{ github.run_id }} /p:BuildBranch=${{ github.ref }}" @@ -28,9 +28,6 @@ jobs: with: dotnet-version: ${{ env.DotNetVersion }} - - name: Setup msbuild - uses: microsoft/setup-msbuild@v1 - - name: Build run: dotnet build ${{ env.BuildParameters }} /p:Platform=Windows /t:Build /bl:artifacts/log/Build.Windows.binlog @@ -81,13 +78,11 @@ jobs: - name: Install macos workload run: sudo dotnet workload install macos --from-rollback-file dotnet-workloads.json - - name: Setup Xamarin and XCode - uses: maxim-lobanov/setup-xamarin@v1 + - name: Setup XCode + uses: maxim-lobanov/setup-xcode@v1 with: - mono-version: latest - xamarin-mac-version: latest - xcode-version: latest - + xcode-version: latest-stable + - name: Import code signing certificate if: github.event_name != 'pull_request' uses: apple-actions/import-codesign-certs@v1 @@ -113,7 +108,6 @@ jobs: with: name: nuget path: | - artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.XamMac2*.nupkg artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.macOS*.nupkg - name: Upload test artifacts @@ -122,7 +116,6 @@ jobs: name: test path: | 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 diff --git a/.vscode/launch.json b/.vscode/launch.json index d6455148fa..5589dcd55a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -6,7 +6,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build-mac64", - "program": "${workspaceFolder}/artifacts/test/Eto.Test.Mac64/${config:var.configuration}/net6.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64", + "program": "${workspaceFolder}/artifacts/test/Eto.Test.Mac64/${config:var.configuration}/net7.0/Eto.Test.Mac64.app/Contents/MacOS/Eto.Test.Mac64", // "targetArchitecture": "x86_64", // uncomment to test intel on M1 "args": [], "console": "internalConsole", @@ -30,30 +30,18 @@ "type": "coreclr", "request": "launch", "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", + "program": "${workspaceFolder}/artifacts/test/Eto.Test.macOS/${config:var.configuration}/net7.0-macos/Eto.Test.macOS.app/Contents/MacOS/Eto.Test.macOS", "args": [], "console": "internalConsole", "internalConsoleOptions": "openOnSessionStart", "justMyCode": false - }, - { - "name": "Eto.Test.XamMac2 - mono", - "type": "mono", - "request": "launch", - "preLaunchTask": "build-xammac2", - "program": ".", - "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", - "internalConsoleOptions": "openOnSessionStart" }, { "name": "Eto.Test.Gtk", "type": "coreclr", "request": "launch", "preLaunchTask": "build-gtk", - "program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk/${config:var.configuration}/net6.0/Eto.Test.Gtk.dll", + "program": "${workspaceFolder}/artifacts/test/Eto.Test.Gtk/${config:var.configuration}/net7.0/Eto.Test.Gtk.dll", "args": [], "osx": { "env": { @@ -97,7 +85,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build-wpf", - "program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net6.0-windows/Eto.Test.Wpf.exe", + "program": "${workspaceFolder}/artifacts/test/Eto.Test.Wpf/${config:var.configuration}/net7.0-windows/Eto.Test.Wpf.exe", // "targetArchitecture": "x86_64", "args": [], "console": "internalConsole", @@ -120,7 +108,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build-winforms", - "program": "${workspaceFolder}/artifacts/test/Eto.Test.WinForms/${config:var.configuration}/net6.0-windows/Eto.Test.WinForms.exe", + "program": "${workspaceFolder}/artifacts/test/Eto.Test.WinForms/${config:var.configuration}/net7.0-windows/Eto.Test.WinForms.exe", "args": [], "console": "internalConsole", "internalConsoleOptions": "openOnSessionStart", @@ -142,7 +130,7 @@ "type": "coreclr", "request": "launch", "preLaunchTask": "build-direct2d", - "program": "${workspaceFolder}/artifacts/test/Eto.Test.Direct2D/${config:var.configuration}/net6.0-windows/Eto.Test.Direct2D.exe", + "program": "${workspaceFolder}/artifacts/test/Eto.Test.Direct2D/${config:var.configuration}/net7.0-windows/Eto.Test.Direct2D.exe", "args": [], "console": "internalConsole", "internalConsoleOptions": "openOnSessionStart", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 2446b3525e..264404a84a 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -98,16 +98,6 @@ "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", - "type": "shell", - "group": "build", - "problemMatcher": "$msCompile", - "presentation": { - "clear": true - } - }, { "label": "build-wpf", "command": "dotnet build ${config:var.buildProperties} /p:Configuration=${config:var.configuration} ${workspaceFolder}/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj", diff --git a/README.md b/README.md index 2fc4bf0ed7..0fd4e3f64c 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,6 @@ Your project only needs to reference Eto.dll, and include the corresponding plat * Eto.dll - Eto.Forms (UI), Eto.Drawing (Graphics), and platform loading * Eto.Mac64.dll - Lightweight Mac platform using .NET 6+ or mono -* Eto.XamMac2.dll - Xamarin.Mac Unified platform for Mac to embed mono * Eto.macOS.dll - .NET 6+ platform for Mac (for use with the net6.0-macos target) * Eto.WinForms.dll - Windows Forms platform using GDI+ for graphics * Eto.Direct2D.dll - Windows Forms platform using Direct2D for graphics @@ -137,7 +136,7 @@ Your project only needs to reference Eto.dll, and include the corresponding plat Currently supported targets --------------------------- -* OS X: MonoMac, Xamarin.Mac, or net6.0-macos +* OS X: MonoMac or net6.0-macos * Linux: GTK+ 3 * Windows: Windows Forms (using GDI or Direct2D) or WPF diff --git a/build/Build.proj b/build/Build.proj index 4ac5b8cd61..b38cee9f13 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -203,8 +203,6 @@ - - @@ -221,33 +219,23 @@ - - - - - - + Condition="$([MSBuild]::IsOSPlatform(Windows)) and %(CombinedId) == 'combined' and %(LanguageId) == 'fs' and (%(OtherId) != 'wf_macos' and %(OtherId) != 'wf')" /> @@ -260,14 +248,9 @@ Condition="%(CombinedId) == 'separate'" BuildCommand="%(BuildCommand) && cd %(ProjectName).Gtk && dotnet build && cd .." /> - - - - + @@ -303,10 +286,10 @@ - - - - + + + + diff --git a/build/Common.Build.props b/build/Common.Build.props index 0e8e2d69fb..9c5fbcd524 100644 --- a/build/Common.Build.props +++ b/build/Common.Build.props @@ -20,8 +20,8 @@ True - - $(NoWarn);NU5105 + + $(NoWarn);NU5105;CS8981 10 true diff --git a/build/Common.props b/build/Common.props index 838866c090..2166a0d90e 100644 --- a/build/Common.props +++ b/build/Common.props @@ -9,12 +9,6 @@ Mac Windows - \Library\Frameworks\Xamarin.Mac.framework\Versions\Current\ - $(XamarinMacPath)lib\mono\ - $(XamarinMacPath)lib\msbuild\ - False - True - $(BasePath)artifacts\ $(ArtifactsDir)obj\$(OSPlatform)\$(MSBuildProjectName)\ $(BasePath)src\ diff --git a/build/Xamarin.Mac.targets b/build/Xamarin.Mac.targets deleted file mode 100644 index 8a69e7bc96..0000000000 --- a/build/Xamarin.Mac.targets +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - \Library\Frameworks\Xamarin.Mac.framework\Versions\Current\ - $(XamarinMacPath)lib\mono\ - $(XamarinMacPath)lib\msbuild\ - False - True - - True - - - - Exe - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {810C163F-4746-4721-8B8E-88A3673A62EA};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - - True - True - $(DefineConstants);XAMMAC;XAMMAC2;UNIFIED - - <_XamMacLanguage Condition="$(MSBuildProjectFile.EndsWith('.csproj'))">CSharp - <_XamMacLanguage Condition="$(MSBuildProjectFile.EndsWith('.fsproj'))">FSharp - <_XamMacLanguage Condition="$(MSBuildProjectFile.EndsWith('.vbproj'))">VisualBasic - - $(XamarinMacTargetsPath)Xamarin.Mac.$(_XamMacLanguage).targets - $(XamarinMacTargetsPath)Xamarin.Mac.ObjcBinding.$(_XamMacLanguage).targets - - Xamarin.Mac - v2.0 - - False - True - None - - - $(XamarinMacLibPath)4.5\ - $(XamarinMacLibPath)Xamarin.Mac\ - 16.8 - - - - - <_FullFrameworkReferenceAssemblyPaths>$(FrameworkPathOverride) - <_TargetFrameworkDirectories>$(FrameworkPathOverride) - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $([System.String]::Copy('%(Filename)').Replace('.designer', ''))%(Extension) - - - - - - - - - - - - - - - - - - - - - - diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/AppDelegate.cs b/samples/MacOS/EmbedEtoInMacOS/AppDelegate.cs similarity index 93% rename from samples/XamarinMac/EmbedEtoInXamarinMac/AppDelegate.cs rename to samples/MacOS/EmbedEtoInMacOS/AppDelegate.cs index f9d996a0c9..33265f89d0 100644 --- a/samples/XamarinMac/EmbedEtoInXamarinMac/AppDelegate.cs +++ b/samples/MacOS/EmbedEtoInMacOS/AppDelegate.cs @@ -1,7 +1,7 @@ using AppKit; using Foundation; -namespace EmbedEtoInXamarinMac +namespace EmbedEtoInMacOS { [Register("AppDelegate")] public class AppDelegate : NSApplicationDelegate diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/Contents.json rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/Contents.json b/samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/Contents.json similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/Contents.json rename to samples/MacOS/EmbedEtoInMacOS/Assets.xcassets/Contents.json diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj b/samples/MacOS/EmbedEtoInMacOS/EmbedEtoInMacOS.csproj similarity index 64% rename from samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj rename to samples/MacOS/EmbedEtoInMacOS/EmbedEtoInMacOS.csproj index 8469fab1fa..b66554d97c 100644 --- a/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj +++ b/samples/MacOS/EmbedEtoInMacOS/EmbedEtoInMacOS.csproj @@ -1,17 +1,12 @@ - True Exe - xamarinmac20 - False - False + net7.0-macos Mac Developer 3rd Party Mac Developer Installer - --nowarn:2006 --nowarn:5220 - 10.14 + 10.15 False - SdkOnly @@ -28,19 +23,9 @@ - - - - - - - - - + - - \ No newline at end of file diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Entitlements.plist b/samples/MacOS/EmbedEtoInMacOS/Entitlements.plist similarity index 100% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Entitlements.plist rename to samples/MacOS/EmbedEtoInMacOS/Entitlements.plist diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Info.plist b/samples/MacOS/EmbedEtoInMacOS/Info.plist similarity index 89% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Info.plist rename to samples/MacOS/EmbedEtoInMacOS/Info.plist index c95384b850..7b78d270a5 100644 --- a/samples/XamarinMac/EmbedEtoInXamarinMac/Info.plist +++ b/samples/MacOS/EmbedEtoInMacOS/Info.plist @@ -3,15 +3,15 @@ CFBundleName - EmbedEtoInXamarinMac + EmbedEtoInMacOS CFBundleIdentifier - ca.picoe.EmbedEtoInXamarinMac + ca.picoe.EmbedEtoInMacOS CFBundleShortVersionString 1.0 CFBundleVersion 1 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en CFBundleInfoDictionaryVersion diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Main.cs b/samples/MacOS/EmbedEtoInMacOS/Main.cs similarity index 89% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Main.cs rename to samples/MacOS/EmbedEtoInMacOS/Main.cs index eb4280084d..7a10af4863 100644 --- a/samples/XamarinMac/EmbedEtoInXamarinMac/Main.cs +++ b/samples/MacOS/EmbedEtoInMacOS/Main.cs @@ -1,6 +1,6 @@ using AppKit; -namespace EmbedEtoInXamarinMac +namespace EmbedEtoInMacOS { static class MainClass { diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Main.storyboard b/samples/MacOS/EmbedEtoInMacOS/Main.storyboard similarity index 99% rename from samples/XamarinMac/EmbedEtoInXamarinMac/Main.storyboard rename to samples/MacOS/EmbedEtoInMacOS/Main.storyboard index 8148ce470d..f298acbb8b 100644 --- a/samples/XamarinMac/EmbedEtoInXamarinMac/Main.storyboard +++ b/samples/MacOS/EmbedEtoInMacOS/Main.storyboard @@ -12,11 +12,11 @@ - + - + - + @@ -30,7 +30,7 @@ - + @@ -48,7 +48,7 @@ - + @@ -661,7 +661,7 @@ - + diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/MyEtoPanel.cs b/samples/MacOS/EmbedEtoInMacOS/MyEtoPanel.cs similarity index 95% rename from samples/XamarinMac/EmbedEtoInXamarinMac/MyEtoPanel.cs rename to samples/MacOS/EmbedEtoInMacOS/MyEtoPanel.cs index da3ff4c9f7..9eaefa7d34 100644 --- a/samples/XamarinMac/EmbedEtoInXamarinMac/MyEtoPanel.cs +++ b/samples/MacOS/EmbedEtoInMacOS/MyEtoPanel.cs @@ -2,7 +2,7 @@ using Eto.Forms; using Eto.Drawing; -namespace EmbedEtoInXamarinMac +namespace EmbedEtoInMacOS { /// /// Eto.Forms panel to embed in an existing MonoMac app diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.cs b/samples/MacOS/EmbedEtoInMacOS/ViewController.cs similarity index 97% rename from samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.cs rename to samples/MacOS/EmbedEtoInMacOS/ViewController.cs index 2b758d0364..4257279782 100644 --- a/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.cs +++ b/samples/MacOS/EmbedEtoInMacOS/ViewController.cs @@ -5,7 +5,7 @@ using Eto.Forms; using Foundation; -namespace EmbedEtoInXamarinMac +namespace EmbedEtoInMacOS { public partial class ViewController : NSViewController { diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.designer.cs b/samples/MacOS/EmbedEtoInMacOS/ViewController.designer.cs similarity index 92% rename from samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.designer.cs rename to samples/MacOS/EmbedEtoInMacOS/ViewController.designer.cs index e40facd20a..8b8ff2675f 100644 --- a/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.designer.cs +++ b/samples/MacOS/EmbedEtoInMacOS/ViewController.designer.cs @@ -7,7 +7,7 @@ using Foundation; using System.CodeDom.Compiler; -namespace EmbedEtoInXamarinMac +namespace EmbedEtoInMacOS { [Register ("ViewController")] partial class ViewController diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/AppDelegate.cs b/samples/MacOS/EmbedMacOSInEto/AppDelegate.cs similarity index 93% rename from samples/XamarinMac/EmbedXamarinMacInEto/AppDelegate.cs rename to samples/MacOS/EmbedMacOSInEto/AppDelegate.cs index 9d76743b40..206e85d80f 100644 --- a/samples/XamarinMac/EmbedXamarinMacInEto/AppDelegate.cs +++ b/samples/MacOS/EmbedMacOSInEto/AppDelegate.cs @@ -1,7 +1,7 @@ using AppKit; using Foundation; -namespace EmbedXamarinMacInEto +namespace EmbedMacOSInEto { [Register("AppDelegate")] public class AppDelegate : NSApplicationDelegate diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/Contents.json rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/Contents.json b/samples/MacOS/EmbedMacOSInEto/Assets.xcassets/Contents.json similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/Contents.json rename to samples/MacOS/EmbedMacOSInEto/Assets.xcassets/Contents.json diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj b/samples/MacOS/EmbedMacOSInEto/EmbedMacOSInEto.csproj similarity index 61% rename from samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj rename to samples/MacOS/EmbedMacOSInEto/EmbedMacOSInEto.csproj index a00b99e943..efe0212741 100644 --- a/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj +++ b/samples/MacOS/EmbedMacOSInEto/EmbedMacOSInEto.csproj @@ -1,17 +1,11 @@ - True Exe - xamarinmac20 - False - False + net7.0-macos Mac Developer 3rd Party Mac Developer Installer - --nowarn:2006 --nowarn:5220 - 10.14 - False - SdkOnly + 10.15 @@ -28,18 +22,10 @@ - - - - - - - + - + - - \ No newline at end of file diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Entitlements.plist b/samples/MacOS/EmbedMacOSInEto/Entitlements.plist similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/Entitlements.plist rename to samples/MacOS/EmbedMacOSInEto/Entitlements.plist diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Info.plist b/samples/MacOS/EmbedMacOSInEto/Info.plist similarity index 88% rename from samples/XamarinMac/EmbedXamarinMacInEto/Info.plist rename to samples/MacOS/EmbedMacOSInEto/Info.plist index 6287d31075..8e6aa7456f 100644 --- a/samples/XamarinMac/EmbedXamarinMacInEto/Info.plist +++ b/samples/MacOS/EmbedMacOSInEto/Info.plist @@ -3,15 +3,15 @@ CFBundleName - EmbedXamarinMacInEto + EmbedMacOSInEto CFBundleIdentifier - ca.picoe.EmbedXamarinMacInEto + ca.picoe.EmbedMacOSInEto CFBundleShortVersionString 1.0 CFBundleVersion 1 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en CFBundleInfoDictionaryVersion diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Main.cs b/samples/MacOS/EmbedMacOSInEto/Main.cs similarity index 86% rename from samples/XamarinMac/EmbedXamarinMacInEto/Main.cs rename to samples/MacOS/EmbedMacOSInEto/Main.cs index 79f74f3d01..f949faff7f 100644 --- a/samples/XamarinMac/EmbedXamarinMacInEto/Main.cs +++ b/samples/MacOS/EmbedMacOSInEto/Main.cs @@ -2,7 +2,7 @@ using AppKit; using Eto.Forms; -namespace EmbedXamarinMacInEto +namespace EmbedMacOSInEto { static class MainClass { diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/MainForm.cs b/samples/MacOS/EmbedMacOSInEto/MainForm.cs similarity index 94% rename from samples/XamarinMac/EmbedXamarinMacInEto/MainForm.cs rename to samples/MacOS/EmbedMacOSInEto/MainForm.cs index 3cda2d61bc..547bbea3e1 100644 --- a/samples/XamarinMac/EmbedXamarinMacInEto/MainForm.cs +++ b/samples/MacOS/EmbedMacOSInEto/MainForm.cs @@ -2,7 +2,7 @@ using Eto.Drawing; using Eto.Forms; -namespace EmbedXamarinMacInEto +namespace EmbedMacOSInEto { public class MainForm : Form { diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.cs b/samples/MacOS/EmbedMacOSInEto/MyNativeView.cs similarity index 94% rename from samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.cs rename to samples/MacOS/EmbedMacOSInEto/MyNativeView.cs index 6815beed72..55fdc431f2 100644 --- a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.cs +++ b/samples/MacOS/EmbedMacOSInEto/MyNativeView.cs @@ -4,7 +4,7 @@ using Foundation; using AppKit; -namespace EmbedXamarinMacInEto +namespace EmbedMacOSInEto { public partial class MyNativeView : AppKit.NSView { diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.designer.cs b/samples/MacOS/EmbedMacOSInEto/MyNativeView.designer.cs similarity index 79% rename from samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.designer.cs rename to samples/MacOS/EmbedMacOSInEto/MyNativeView.designer.cs index 1317b08cf3..4842b8d6b9 100644 --- a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.designer.cs +++ b/samples/MacOS/EmbedMacOSInEto/MyNativeView.designer.cs @@ -1,4 +1,4 @@ -namespace EmbedXamarinMacInEto +namespace EmbedMacOSInEto { // Should subclass AppKit.NSView diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.xib b/samples/MacOS/EmbedMacOSInEto/MyNativeView.xib similarity index 100% rename from samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.xib rename to samples/MacOS/EmbedMacOSInEto/MyNativeView.xib diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.cs b/samples/MacOS/EmbedMacOSInEto/MyNativeViewController.cs similarity index 96% rename from samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.cs rename to samples/MacOS/EmbedMacOSInEto/MyNativeViewController.cs index f68a643947..a326f18ef3 100644 --- a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.cs +++ b/samples/MacOS/EmbedMacOSInEto/MyNativeViewController.cs @@ -4,7 +4,7 @@ using Foundation; using AppKit; -namespace EmbedXamarinMacInEto +namespace EmbedMacOSInEto { public partial class MyNativeViewController : AppKit.NSViewController { diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.designer.cs b/samples/MacOS/EmbedMacOSInEto/MyNativeViewController.designer.cs similarity index 82% rename from samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.designer.cs rename to samples/MacOS/EmbedMacOSInEto/MyNativeViewController.designer.cs index 3c8c0eaa7c..f7c7bf54cf 100644 --- a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.designer.cs +++ b/samples/MacOS/EmbedMacOSInEto/MyNativeViewController.designer.cs @@ -1,4 +1,4 @@ -namespace EmbedXamarinMacInEto +namespace EmbedMacOSInEto { // Should subclass AppKit.NSViewController diff --git a/samples/Samples.sln b/samples/Samples.sln index 306453bfb9..ae30347cda 100755 --- a/samples/Samples.sln +++ b/samples/Samples.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29613.14 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamarinMac", "XamarinMac", "{F65C2B2B-BE0E-4AF5-B65B-3F770F8D54CF}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MacOS", "MacOS", "{F65C2B2B-BE0E-4AF5-B65B-3F770F8D54CF}" ProjectSection(MonoDevelopProperties) = preProject - BaseDirectory = XamarinMac + BaseDirectory = MacOS EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Eto", "Eto", "{19A4EA01-CA9E-4390-B448-974152AB5706}" @@ -61,9 +61,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS.Tutorial3.TableLayout", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS.Tutorial4.Binding", "Tutorials\CSharp\Tutorial4\CS.Tutorial4.Binding.csproj", "{DDC8A290-2F20-11E4-8C21-0800200C9A66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbedEtoInXamarinMac", "XamarinMac\EmbedEtoInXamarinMac\EmbedEtoInXamarinMac.csproj", "{BD58EE60-9197-4C28-87C7-85AA13E02332}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbedEtoInMacOS", "MacOS\EmbedEtoInMacOS\EmbedEtoInMacOS.csproj", "{BD58EE60-9197-4C28-87C7-85AA13E02332}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbedXamarinMacInEto", "XamarinMac\EmbedXamarinMacInEto\EmbedXamarinMacInEto.csproj", "{41266591-508F-40B6-9360-AFECE6FBFC27}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbedMacOSInEto", "MacOS\EmbedMacOSInEto\EmbedMacOSInEto.csproj", "{41266591-508F-40B6-9360-AFECE6FBFC27}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{212A0614-C2B8-4BA8-9EA6-3CD26A5629D2}" ProjectSection(SolutionItems) = preProject @@ -71,8 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{212A0614 Directory.Build.targets = Directory.Build.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac2", "..\src\Eto.Mac\Eto.XamMac2.csproj", "{6C147DFC-0EC3-4B94-8239-D0A47A035739}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Gtk", "..\src\Eto.Gtk\Eto.Gtk.csproj", "{800E0242-6368-4F10-AE85-1B218C08463C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoMac", "..\lib\monomac\src\MonoMac.csproj", "{23244704-480A-4158-9823-532F67AAEBD2}" @@ -83,6 +81,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "monomac", "monomac", "{028C EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "generator", "..\lib\monomac\src\generator.csproj", "{5124D2E8-236E-4CB6-9065-5E44DCE3B636}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.macOS", "..\src\Eto.Mac\Eto.macOS.csproj", "{92EFB481-2B2D-4491-9523-4FB7F442509C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Linux = Debug|Linux @@ -301,14 +301,6 @@ Global {41266591-508F-40B6-9360-AFECE6FBFC27}.Release|Mac.ActiveCfg = Release|Any CPU {41266591-508F-40B6-9360-AFECE6FBFC27}.Release|Mac.Build.0 = Release|Any CPU {41266591-508F-40B6-9360-AFECE6FBFC27}.Release|Windows.ActiveCfg = Release|Any CPU - {6C147DFC-0EC3-4B94-8239-D0A47A035739}.Debug|Linux.ActiveCfg = Debug|Any CPU - {6C147DFC-0EC3-4B94-8239-D0A47A035739}.Debug|Mac.ActiveCfg = Debug|Any CPU - {6C147DFC-0EC3-4B94-8239-D0A47A035739}.Debug|Mac.Build.0 = Debug|Any CPU - {6C147DFC-0EC3-4B94-8239-D0A47A035739}.Debug|Windows.ActiveCfg = Debug|Any CPU - {6C147DFC-0EC3-4B94-8239-D0A47A035739}.Release|Linux.ActiveCfg = Release|Any CPU - {6C147DFC-0EC3-4B94-8239-D0A47A035739}.Release|Mac.ActiveCfg = Release|Any CPU - {6C147DFC-0EC3-4B94-8239-D0A47A035739}.Release|Mac.Build.0 = Release|Any CPU - {6C147DFC-0EC3-4B94-8239-D0A47A035739}.Release|Windows.ActiveCfg = Release|Any CPU {800E0242-6368-4F10-AE85-1B218C08463C}.Debug|Linux.ActiveCfg = Debug|Any CPU {800E0242-6368-4F10-AE85-1B218C08463C}.Debug|Linux.Build.0 = Debug|Any CPU {800E0242-6368-4F10-AE85-1B218C08463C}.Debug|Mac.ActiveCfg = Debug|Any CPU @@ -357,6 +349,14 @@ Global {5124D2E8-236E-4CB6-9065-5E44DCE3B636}.Release|Mac.Build.0 = Release|Any CPU {5124D2E8-236E-4CB6-9065-5E44DCE3B636}.Release|Windows.ActiveCfg = Release|Any CPU {5124D2E8-236E-4CB6-9065-5E44DCE3B636}.Release|Windows.Build.0 = Release|Any CPU + {92EFB481-2B2D-4491-9523-4FB7F442509C}.Debug|Linux.ActiveCfg = Debug|Any CPU + {92EFB481-2B2D-4491-9523-4FB7F442509C}.Debug|Mac.ActiveCfg = Debug|Any CPU + {92EFB481-2B2D-4491-9523-4FB7F442509C}.Debug|Mac.Build.0 = Debug|Any CPU + {92EFB481-2B2D-4491-9523-4FB7F442509C}.Debug|Windows.ActiveCfg = Debug|Any CPU + {92EFB481-2B2D-4491-9523-4FB7F442509C}.Release|Linux.ActiveCfg = Release|Any CPU + {92EFB481-2B2D-4491-9523-4FB7F442509C}.Release|Mac.ActiveCfg = Release|Any CPU + {92EFB481-2B2D-4491-9523-4FB7F442509C}.Release|Mac.Build.0 = Release|Any CPU + {92EFB481-2B2D-4491-9523-4FB7F442509C}.Release|Windows.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -384,12 +384,12 @@ Global {DDC8A290-2F20-11E4-8C21-0800200C9A66} = {C1F05813-B09E-4946-808C-42D46BF999A3} {BD58EE60-9197-4C28-87C7-85AA13E02332} = {F65C2B2B-BE0E-4AF5-B65B-3F770F8D54CF} {41266591-508F-40B6-9360-AFECE6FBFC27} = {F65C2B2B-BE0E-4AF5-B65B-3F770F8D54CF} - {6C147DFC-0EC3-4B94-8239-D0A47A035739} = {19A4EA01-CA9E-4390-B448-974152AB5706} {800E0242-6368-4F10-AE85-1B218C08463C} = {19A4EA01-CA9E-4390-B448-974152AB5706} {23244704-480A-4158-9823-532F67AAEBD2} = {028C71AC-ACDF-48D3-B2AC-811FC787C70F} {E8BF4713-68B0-452A-A798-B448FC07CA0C} = {028C71AC-ACDF-48D3-B2AC-811FC787C70F} {028C71AC-ACDF-48D3-B2AC-811FC787C70F} = {19A4EA01-CA9E-4390-B448-974152AB5706} {5124D2E8-236E-4CB6-9065-5E44DCE3B636} = {028C71AC-ACDF-48D3-B2AC-811FC787C70F} + {92EFB481-2B2D-4491-9523-4FB7F442509C} = {19A4EA01-CA9E-4390-B448-974152AB5706} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C5EE3ED5-BFCC-4709-9FC2-0053C18D5883} diff --git a/samples/SdkTest/Info.plist b/samples/SdkTest/Info.plist index 499e1a7658..17e2c6b90b 100644 --- a/samples/SdkTest/Info.plist +++ b/samples/SdkTest/Info.plist @@ -9,7 +9,7 @@ CFBundleShortVersionString 1.0 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en NSHumanReadableCopyright diff --git a/samples/SdkTest/SdkTest.csproj b/samples/SdkTest/SdkTest.csproj index 143cd0350e..0d9bc5a6e4 100644 --- a/samples/SdkTest/SdkTest.csproj +++ b/samples/SdkTest/SdkTest.csproj @@ -3,7 +3,7 @@ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/.template.config/dotnetcli.host.json b/src/Eto.Forms.Templates/content/App-CSharp/.template.config/dotnetcli.host.json index 79cb666a76..c075813ca2 100755 --- a/src/Eto.Forms.Templates/content/App-CSharp/.template.config/dotnetcli.host.json +++ b/src/Eto.Forms.Templates/content/App-CSharp/.template.config/dotnetcli.host.json @@ -22,10 +22,6 @@ "longName": "include-solution", "shortName": "sln" }, - "IncludeXamMac": { - "longName": "include-xammac", - "shortName": "xm" - }, "IncludeWinForms": { "longName": "include-winforms", "shortName": "wf" diff --git a/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json b/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json index abd8e60320..2a90ae007e 100755 --- a/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json +++ b/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json @@ -49,12 +49,6 @@ "dataType": "bool", "defaultValue": "false" }, - "IncludeXamMac": { - "type": "parameter", - "description": "Include a Xamarin.Mac project to embed mono when\ncompiling on macOS", - "dataType": "bool", - "defaultValue": "false" - }, "IncludeMacOS": { "type": "parameter", "description": "Include a MacOS workload project when compiling on macOS", @@ -157,7 +151,6 @@ { "condition": "!UseCodePreview", "exclude": [ "**/*.eto.*" ] }, { "condition": "!UseXeto", "exclude": [ "**/*.xeto", "**/*.xeto.*" ] }, { "condition": "!UseJeto", "exclude": [ "**/*.jeto", "**/*.jeto.*" ] }, - { "condition": "!IncludeXamMac", "exclude": [ "**/EtoApp.1.XamMac.csproj" ] }, { "condition": "!IncludeMacOS", "exclude": [ "**/EtoApp.1.MacOS.csproj" ] } ] }, @@ -177,7 +170,6 @@ "condition": "!Combined", "modifiers": [ { "condition": "!IncludeWinForms", "exclude": [ "**/EtoApp.1.WinForms/**/*" ] }, - { "condition": "!IncludeXamMac", "exclude": [ "**/EtoApp.1.XamMac/**/*" ] }, { "condition": "!IncludeMacOS", "exclude": [ "**/EtoApp.1.MacOS/**/*" ] } ] }, @@ -202,7 +194,6 @@ { "path": "EtoApp.1.Mac/EtoApp.1.Mac.csproj", "condition": "!Combined" }, { "path": "EtoApp.1.WinForms/EtoApp.1.WinForms.csproj", "condition": "!Combined && IncludeWinForms" }, { "path": "EtoApp.1.Wpf/EtoApp.1.Wpf.csproj", "condition": "!Combined" }, - { "path": "EtoApp.1.XamMac/EtoApp.1.XamMac.csproj", "condition": "!Combined && IncludeXamMac" }, { "path": "EtoApp.1.MacOS/EtoApp.1.MacOS.csproj", "condition": "!Combined && IncludeMacOS" } ], "guids": [ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.sln b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.sln index 8cd3a40ea9..e0e18d656d 100644 --- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.sln +++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1.sln @@ -18,10 +18,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.Mac", "EtoApp.1.Ma EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.Wpf", "EtoApp.1.Wpf\EtoApp.1.Wpf.csproj", "{7D9523D1-01EC-4E34-A559-03F332E64346}" EndProject -#if IncludeXamMac -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.XamMac", "EtoApp.1.XamMac\EtoApp.1.XamMac.csproj", "{05DB20E8-D401-4094-8096-88499C50E28A}" -EndProject -#endif #if IncludeMacOS Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.MacOS", "EtoApp.1.MacOS\EtoApp.1.MacOS.csproj", "{D1C2E89F-8DF5-43F5-B07E-C91A5EDBF6C8}" EndProject @@ -56,12 +52,6 @@ Global {7D9523D1-01EC-4E34-A559-03F332E64346}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.Build.0 = Release|Any CPU -#if IncludeXamMac - {05DB20E8-D401-4094-8096-88499C50E28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05DB20E8-D401-4094-8096-88499C50E28A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05DB20E8-D401-4094-8096-88499C50E28A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05DB20E8-D401-4094-8096-88499C50E28A}.Release|Any CPU.Build.0 = Release|Any CPU -#endif #if IncludeMacOS {D1C2E89F-8DF5-43F5-B07E-C91A5EDBF6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1C2E89F-8DF5-43F5-B07E-C91A5EDBF6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj index 61fb92a55a..a753b25fac 100755 --- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj +++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj @@ -4,7 +4,7 @@ @@ -13,7 +13,6 @@ EtoApp._1 True - True True True True diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Info.plist b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Info.plist index b630d13bc6..63a252e61f 100644 --- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Info.plist +++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/Info.plist @@ -9,7 +9,7 @@ CFBundleShortVersionString 1.0 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en NSHumanReadableCopyright diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Info.plist b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Info.plist index cf881cbdbc..e308f1740a 100644 --- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Info.plist +++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/Info.plist @@ -9,7 +9,7 @@ CFBundleShortVersionString 1.0 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en NSHumanReadableCopyright diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj index 6400df28d9..647ca186b3 100755 --- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj +++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj @@ -3,7 +3,7 @@ net6.0-macos Exe EtoApp._1 - 10.14 + 10.15 osx-x64;osx-arm64 diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png deleted file mode 100644 index d0b5a8098e..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png deleted file mode 100644 index f4c8d29047..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png deleted file mode 100644 index ebb5a0fe4e..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png deleted file mode 100644 index 0986d31beb..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png deleted file mode 100644 index f4c8d29047..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png deleted file mode 100644 index a142c83fb1..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png deleted file mode 100644 index 0986d31beb..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png deleted file mode 100644 index 412d6ca9b4..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png deleted file mode 100644 index a142c83fb1..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png deleted file mode 100644 index e99022ae84..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 6b28545295..0000000000 --- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images": [ - { - "filename": "AppIcon-16.png", - "size": "16x16", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-16@2x.png", - "size": "16x16", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32.png", - "size": "32x32", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32@2x.png", - "size": "32x32", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128.png", - "size": "128x128", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128@2x.png", - "size": "128x128", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256.png", - "size": "256x256", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256@2x.png", - "size": "256x256", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512.png", - "size": "512x512", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512@2x.png", - "size": "512x512", - "scale": "2x", - "idiom": "mac" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/Contents.json b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/Contents.json deleted file mode 100644 index 4caf392f92..0000000000 --- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/EtoApp.1.XamMac.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/EtoApp.1.XamMac.csproj deleted file mode 100755 index db6dc6bffa..0000000000 --- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/EtoApp.1.XamMac.csproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - Debug - AnyCPU - {05DB20E8-D401-4094-8096-88499C50E28A} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - EtoApp._1.XamMac - EtoApp.1.XamMac - v2.0 - Xamarin.Mac - Resources - - - true - portable - false - bin\Debug - DEBUG; - prompt - 4 - false - Mac Developer - false - false - false - true - true - HttpClientHandler - None - - - - - false - - - true - bin\Release - - - prompt - 4 - false - true - false - true - true - true - SdkOnly - HttpClientHandler - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4A7EEA91-18CE-4C33-8501-76049670866D} - EtoApp.1 - - - - - 2.7.2-dev - - - - \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Info.plist b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Info.plist deleted file mode 100644 index 9048d56c9f..0000000000 --- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleName - EtoApp - CFBundleIdentifier - com.example.EtoApp - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.14 - CFBundleDevelopmentRegion - en - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - NSHumanReadableCopyright - - NSPrincipalClass - NSApplication - XSAppIconAssets - Assets.xcassets/AppIcon.appiconset - - diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs deleted file mode 100755 index fa89389543..0000000000 --- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.XamMac/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using AppKit; -using Eto.Forms; - -namespace EtoApp._1.XamMac -{ - class Program - { - static void Main(string[] args) - { - new Application(Eto.Platforms.XamMac2).Run(new MainForm()); - } - } -} diff --git a/src/Eto.Forms.Templates/content/App-FSharp/.template.config/dotnetcli.host.json b/src/Eto.Forms.Templates/content/App-FSharp/.template.config/dotnetcli.host.json index 79cb666a76..c075813ca2 100755 --- a/src/Eto.Forms.Templates/content/App-FSharp/.template.config/dotnetcli.host.json +++ b/src/Eto.Forms.Templates/content/App-FSharp/.template.config/dotnetcli.host.json @@ -22,10 +22,6 @@ "longName": "include-solution", "shortName": "sln" }, - "IncludeXamMac": { - "longName": "include-xammac", - "shortName": "xm" - }, "IncludeWinForms": { "longName": "include-winforms", "shortName": "wf" diff --git a/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json b/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json index dbcd9a128a..520621d1dc 100755 --- a/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json +++ b/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json @@ -49,12 +49,6 @@ "dataType": "bool", "defaultValue": "false" }, - "IncludeXamMac": { - "type": "parameter", - "description": "Include a Xamarin.Mac project to embed mono when\ncompiling on macOS", - "dataType": "bool", - "defaultValue": "false" - }, "IncludeMacOS": { "type": "parameter", "description": "Include a MacOS workload project when compiling on macOS", @@ -157,7 +151,6 @@ { "condition": "!UseCodePreview", "exclude": [ "**/*.eto.*" ] }, { "condition": "!UseXeto", "exclude": [ "**/*.xeto", "**/*.xeto.*" ] }, { "condition": "!UseJeto", "exclude": [ "**/*.jeto", "**/*.jeto.*" ] }, - { "condition": "!IncludeXamMac", "exclude": [ "**/EtoApp.1.XamMac.fsproj" ] }, { "condition": "!IncludeMacOS", "exclude": [ "**/EtoApp.1.MacOS.fsproj" ] } ] }, @@ -177,7 +170,6 @@ "condition": "!Combined", "modifiers": [ { "condition": "!IncludeWinForms", "exclude": [ "**/EtoApp.1.WinForms/**/*" ] }, - { "condition": "!IncludeXamMac", "exclude": [ "**/EtoApp.1.XamMac/**/*" ] }, { "condition": "!IncludeMacOS", "exclude": [ "**/EtoApp.1.MacOS/**/*" ] } ] }, @@ -202,7 +194,6 @@ { "path": "EtoApp.1.Mac/EtoApp.1.Mac.fsproj", "condition": "!Combined" }, { "path": "EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj", "condition": "!Combined && IncludeWinForms" }, { "path": "EtoApp.1.Wpf/EtoApp.1.Wpf.csproj", "condition": "!Combined" }, - { "path": "EtoApp.1.XamMac/EtoApp.1.XamMac.fsproj", "condition": "!Combined && IncludeXamMac" }, { "path": "EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj", "condition": "!Combined && IncludeMacOS" } ], "guids": [ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.sln b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.sln index f4befe95c7..f23424e659 100644 --- a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.sln +++ b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1.sln @@ -18,10 +18,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.Mac", "EtoApp.1.Ma EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.Wpf", "EtoApp.1.Wpf\EtoApp.1.Wpf.csproj", "{7D9523D1-01EC-4E34-A559-03F332E64346}" EndProject -#if IncludeXamMac -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.XamMac", "EtoApp.1.XamMac\EtoApp.1.XamMac.fsproj", "{05DB20E8-D401-4094-8096-88499C50E28A}" -EndProject -#endif #if IncludeMacOS Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "EtoApp.1.MacOS", "EtoApp.1.MacOS\EtoApp.1.MacOS.fsproj", "{D1C2E89F-8DF5-43F5-B07E-C91A5EDBF6C8}" EndProject @@ -56,12 +52,6 @@ Global {7D9523D1-01EC-4E34-A559-03F332E64346}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.Build.0 = Release|Any CPU -#if IncludeXamMac - {05DB20E8-D401-4094-8096-88499C50E28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05DB20E8-D401-4094-8096-88499C50E28A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05DB20E8-D401-4094-8096-88499C50E28A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05DB20E8-D401-4094-8096-88499C50E28A}.Release|Any CPU.Build.0 = Release|Any CPU -#endif #if IncludeMacOS {D1C2E89F-8DF5-43F5-B07E-C91A5EDBF6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1C2E89F-8DF5-43F5-B07E-C91A5EDBF6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU diff --git a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj index 7464a96b0b..9a03b7579c 100644 --- a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj +++ b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj @@ -4,7 +4,7 @@ @@ -13,7 +13,6 @@ EtoApp._1 True - True True True True diff --git a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/Info.plist b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/Info.plist index cf881cbdbc..e308f1740a 100644 --- a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/Info.plist +++ b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/Info.plist @@ -9,7 +9,7 @@ CFBundleShortVersionString 1.0 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en NSHumanReadableCopyright diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/Info.plist b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/Info.plist index cf881cbdbc..e308f1740a 100644 --- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/Info.plist +++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/Info.plist @@ -9,7 +9,7 @@ CFBundleShortVersionString 1.0 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en NSHumanReadableCopyright diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj index 98bea81204..10ee558a75 100755 --- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj +++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.fsproj @@ -3,7 +3,7 @@ net6.0-macos Exe EtoApp._1 - 10.14 + 10.15 osx-x64;osx-arm64 diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/Program.fs b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/Program.fs index cf420ebebc..7346799081 100755 --- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/Program.fs +++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.MacOS/Program.fs @@ -1,4 +1,4 @@ -namespace EtoApp._1.XamMac +namespace EtoApp._1.macOS module Program = open System diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png deleted file mode 100644 index d0b5a8098e..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png deleted file mode 100644 index f4c8d29047..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png deleted file mode 100644 index ebb5a0fe4e..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png deleted file mode 100644 index 0986d31beb..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png deleted file mode 100644 index f4c8d29047..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png deleted file mode 100644 index a142c83fb1..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png deleted file mode 100644 index 0986d31beb..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png deleted file mode 100644 index 412d6ca9b4..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png deleted file mode 100644 index a142c83fb1..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png deleted file mode 100644 index e99022ae84..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 6b28545295..0000000000 --- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images": [ - { - "filename": "AppIcon-16.png", - "size": "16x16", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-16@2x.png", - "size": "16x16", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32.png", - "size": "32x32", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32@2x.png", - "size": "32x32", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128.png", - "size": "128x128", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128@2x.png", - "size": "128x128", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256.png", - "size": "256x256", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256@2x.png", - "size": "256x256", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512.png", - "size": "512x512", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512@2x.png", - "size": "512x512", - "scale": "2x", - "idiom": "mac" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/Contents.json b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/Contents.json deleted file mode 100644 index 4caf392f92..0000000000 --- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/EtoApp.1.XamMac.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/EtoApp.1.XamMac.fsproj deleted file mode 100755 index bfbe1dcc87..0000000000 --- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/EtoApp.1.XamMac.fsproj +++ /dev/null @@ -1,99 +0,0 @@ - - - - Debug - AnyCPU - {05DB20E8-D401-4094-8096-88499C50E28A} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{F2A71F9B-5D33-465A-A702-920D77279786} - true - Exe - EtoApp._1.XamMac - EtoApp.1.XamMac - v2.0 - Xamarin.Mac - Resources - PackageReference - - - true - portable - false - bin\Debug - DEBUG - prompt - false - Mac Developer - false - false - false - true - true - - - HttpClientHandler - None - - - None - - - true - bin\Release - - - prompt - false - true - false - true - true - true - None - true - - - HttpClientHandler - - - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2.7.2-dev - - - 5.0.0 - - - - - {4A7EEA91-18CE-4C33-8501-76049670866D} - EtoApp.1 - - - \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Info.plist b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Info.plist deleted file mode 100644 index 541286e3f0..0000000000 --- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleName - EtoApp.XamMac - CFBundleIdentifier - ca.picoe.EtoApp - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.14 - CFBundleDevelopmentRegion - en - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - NSHumanReadableCopyright - - NSPrincipalClass - NSApplication - XSAppIconAssets - Assets.xcassets/AppIcon.appiconset - - diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Program.fs b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Program.fs deleted file mode 100755 index a61ee57dc3..0000000000 --- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.XamMac/Program.fs +++ /dev/null @@ -1,12 +0,0 @@ -namespace EtoApp._1.XamMac -module Program = - - open System - open EtoApp._1 - - [] - [] - let Main(args) = - let app = new Eto.Forms.Application(Eto.Platforms.XamMac2) - app.Run(new MainForm()) - 0 \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/dotnetcli.host.json b/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/dotnetcli.host.json index 79cb666a76..c075813ca2 100755 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/dotnetcli.host.json +++ b/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/dotnetcli.host.json @@ -22,10 +22,6 @@ "longName": "include-solution", "shortName": "sln" }, - "IncludeXamMac": { - "longName": "include-xammac", - "shortName": "xm" - }, "IncludeWinForms": { "longName": "include-winforms", "shortName": "wf" diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json b/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json index 06940a5b56..0ebc70337c 100755 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json +++ b/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json @@ -49,12 +49,6 @@ "dataType": "bool", "defaultValue": "false" }, - "IncludeXamMac": { - "type": "parameter", - "description": "Include a Xamarin.Mac project to embed mono when\ncompiling on macOS", - "dataType": "bool", - "defaultValue": "false" - }, "IncludeMacOS": { "type": "parameter", "description": "Include a MacOS workload project when compiling on macOS", @@ -157,7 +151,6 @@ { "condition": "!UseCodePreview", "exclude": [ "**/*.eto.*" ] }, { "condition": "!UseXeto", "exclude": [ "**/*.xeto", "**/*.xeto.*" ] }, { "condition": "!UseJeto", "exclude": [ "**/*.jeto", "**/*.jeto.*" ] }, - { "condition": "!IncludeXamMac", "exclude": [ "**/EtoApp.1.XamMac.vbproj" ] }, { "condition": "!IncludeMacOS", "exclude": [ "**/EtoApp.1.MacOS.vbproj" ] } ] }, @@ -177,7 +170,6 @@ "condition": "!Combined", "modifiers": [ { "condition": "!IncludeWinForms", "exclude": [ "**/EtoApp.1.WinForms/**/*" ] }, - { "condition": "!IncludeXamMac", "exclude": [ "**/EtoApp.1.XamMac/**/*" ] }, { "condition": "!IncludeMacOS", "exclude": [ "**/EtoApp.1.MacOS/**/*" ] } ] }, @@ -202,7 +194,6 @@ { "path": "EtoApp.1.Mac/EtoApp.1.Mac.vbproj", "condition": "!Combined" }, { "path": "EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj", "condition": "!Combined && IncludeWinForms" }, { "path": "EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj", "condition": "!Combined" }, - { "path": "EtoApp.1.XamMac/EtoApp.1.XamMac.csproj", "condition": "!Combined && IncludeXamMac" }, { "path": "EtoApp.1.MacOS/EtoApp.1.MacOS.csproj", "condition": "!Combined && IncludeMacOS" } ], "guids": [ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1.sln b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1.sln index 3f5853c8f0..b1452dc7e8 100644 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1.sln +++ b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1.sln @@ -18,10 +18,6 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EtoApp.1.Mac", "EtoApp.1.Ma EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EtoApp.1.Wpf", "EtoApp.1.Wpf\EtoApp.1.Wpf.vbproj", "{7D9523D1-01EC-4E34-A559-03F332E64346}" EndProject -#if IncludeXamMac -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.XamMac", "EtoApp.1.XamMac\EtoApp.1.XamMac.csproj", "{05DB20E8-D401-4094-8096-88499C50E28A}" -EndProject -#endif #if IncludeMacOS Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EtoApp.1.MacOS", "EtoApp.1.MacOS\EtoApp.1.MacOS.csproj", "{D1C2E89F-8DF5-43F5-B07E-C91A5EDBF6C8}" EndProject @@ -56,12 +52,6 @@ Global {7D9523D1-01EC-4E34-A559-03F332E64346}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D9523D1-01EC-4E34-A559-03F332E64346}.Release|Any CPU.Build.0 = Release|Any CPU -#if IncludeXamMac - {05DB20E8-D401-4094-8096-88499C50E28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05DB20E8-D401-4094-8096-88499C50E28A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05DB20E8-D401-4094-8096-88499C50E28A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05DB20E8-D401-4094-8096-88499C50E28A}.Release|Any CPU.Build.0 = Release|Any CPU -#endif #if IncludeMacOS {D1C2E89F-8DF5-43F5-B07E-C91A5EDBF6C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1C2E89F-8DF5-43F5-B07E-C91A5EDBF6C8}.Debug|Any CPU.Build.0 = Debug|Any CPU diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj index 61fb92a55a..a753b25fac 100755 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj +++ b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj @@ -4,7 +4,7 @@ @@ -13,7 +13,6 @@ EtoApp._1 True - True True True True diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/Info.plist b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/Info.plist index b630d13bc6..63a252e61f 100644 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/Info.plist +++ b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/Info.plist @@ -9,7 +9,7 @@ CFBundleShortVersionString 1.0 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en NSHumanReadableCopyright diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/Info.plist b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/Info.plist index cf881cbdbc..e308f1740a 100644 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/Info.plist +++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/Info.plist @@ -9,7 +9,7 @@ CFBundleShortVersionString 1.0 LSMinimumSystemVersion - 10.14 + 10.15 CFBundleDevelopmentRegion en NSHumanReadableCopyright diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj index 7b975f6e76..85a3440ef0 100755 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj +++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.MacOS/EtoApp.1.MacOS.csproj @@ -3,7 +3,7 @@ net6.0-macos Exe EtoApp._1 - 10.14 + 10.15 osx-x64;osx-arm64 diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png deleted file mode 100644 index d0b5a8098e..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png deleted file mode 100644 index f4c8d29047..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png deleted file mode 100644 index ebb5a0fe4e..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png deleted file mode 100644 index 0986d31beb..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png deleted file mode 100644 index f4c8d29047..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png deleted file mode 100644 index a142c83fb1..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png deleted file mode 100644 index 0986d31beb..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png deleted file mode 100644 index 412d6ca9b4..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png deleted file mode 100644 index a142c83fb1..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png deleted file mode 100644 index e99022ae84..0000000000 Binary files a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png and /dev/null differ diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/Contents.json b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 6b28545295..0000000000 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images": [ - { - "filename": "AppIcon-16.png", - "size": "16x16", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-16@2x.png", - "size": "16x16", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32.png", - "size": "32x32", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-32@2x.png", - "size": "32x32", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128.png", - "size": "128x128", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-128@2x.png", - "size": "128x128", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256.png", - "size": "256x256", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-256@2x.png", - "size": "256x256", - "scale": "2x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512.png", - "size": "512x512", - "scale": "1x", - "idiom": "mac" - }, - { - "filename": "AppIcon-512@2x.png", - "size": "512x512", - "scale": "2x", - "idiom": "mac" - } - ], - "info": { - "version": 1, - "author": "xcode" - } -} \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/Contents.json b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/Contents.json deleted file mode 100644 index 4caf392f92..0000000000 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/EtoApp.1.XamMac.csproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/EtoApp.1.XamMac.csproj deleted file mode 100755 index 7195bf1325..0000000000 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/EtoApp.1.XamMac.csproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - Debug - AnyCPU - {05DB20E8-D401-4094-8096-88499C50E28A} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - EtoApp._1.XamMac - EtoApp.1.XamMac - v2.0 - Xamarin.Mac - Resources - - - true - portable - false - bin\Debug - DEBUG; - prompt - 4 - false - Mac Developer - false - false - false - true - true - HttpClientHandler - None - - - - - false - - - true - bin\Release - - - prompt - 4 - false - true - false - true - true - true - SdkOnly - HttpClientHandler - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {4A7EEA91-18CE-4C33-8501-76049670866D} - EtoApp.1 - - - - - 2.7.2-dev - - - - \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Info.plist b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Info.plist deleted file mode 100644 index 9048d56c9f..0000000000 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleName - EtoApp - CFBundleIdentifier - com.example.EtoApp - CFBundleShortVersionString - 1.0 - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.14 - CFBundleDevelopmentRegion - en - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleSignature - ???? - NSHumanReadableCopyright - - NSPrincipalClass - NSApplication - XSAppIconAssets - Assets.xcassets/AppIcon.appiconset - - diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs deleted file mode 100755 index fa89389543..0000000000 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.XamMac/Program.cs +++ /dev/null @@ -1,13 +0,0 @@ -using AppKit; -using Eto.Forms; - -namespace EtoApp._1.XamMac -{ - class Program - { - static void Main(string[] args) - { - new Application(Eto.Platforms.XamMac2).Run(new MainForm()); - } - } -} diff --git a/src/Eto.Forms.Templates/content/NuGet.Config b/src/Eto.Forms.Templates/content/NuGet.Config index 4dd135c012..b4c56e6491 100644 --- a/src/Eto.Forms.Templates/content/NuGet.Config +++ b/src/Eto.Forms.Templates/content/NuGet.Config @@ -2,7 +2,7 @@ diff --git a/src/Eto.Mac/Drawing/BitmapHandler.cs b/src/Eto.Mac/Drawing/BitmapHandler.cs index d08445b312..e6d3bd8318 100644 --- a/src/Eto.Mac/Drawing/BitmapHandler.cs +++ b/src/Eto.Mac/Drawing/BitmapHandler.cs @@ -330,7 +330,7 @@ protected void EnsureRep() return; // go through concrete representations as we might have a proxy (Big Sur) - // this is fixed with MonoMac, but not Xamarin.Mac. + // this is fixed with MonoMac, but not MacOS var representations = Control.Representations(); for (int i = 0; i < representations.Length; i++) { diff --git a/src/Eto.Mac/Drawing/FontFamilyHandler.cs b/src/Eto.Mac/Drawing/FontFamilyHandler.cs index a7334351a2..b0cc894920 100644 --- a/src/Eto.Mac/Drawing/FontFamilyHandler.cs +++ b/src/Eto.Mac/Drawing/FontFamilyHandler.cs @@ -12,7 +12,7 @@ public string LocalizedName { get { - // faceName cannot be null. Use this when it is fixed in xammac/monomac: + // faceName cannot be null. Use this when it is fixed in macos: // return NSFontManager.SharedFontManager.LocalizedNameForFamily(MacName, null); if (MacName == null) return Name; diff --git a/src/Eto.Mac/Drawing/FormattedTextHandler.cs b/src/Eto.Mac/Drawing/FormattedTextHandler.cs index 0c705f8404..954253a5d6 100644 --- a/src/Eto.Mac/Drawing/FormattedTextHandler.cs +++ b/src/Eto.Mac/Drawing/FormattedTextHandler.cs @@ -39,7 +39,7 @@ protected void ShowGlyphs(IntPtr glyphs, IntPtr positions, nuint glyphCount, Int var foregroundBrush = h.ForegroundBrush; if (foregroundBrush is SolidBrush) { - // attributes can be null, Xamarin.Mac doesn't allow that when calling base. ugh. + // attributes can be null, MacOS doesn't allow that when calling base. ugh. Messaging.void_objc_msgSendSuper_IntPtr_IntPtr_nuint_IntPtr_CGAffineTransform_IntPtr_IntPtr(SuperHandle, selShowCGGlyphs_Positions_Count_Font_Matrix_Attributes_InContext_Handle, glyphs, positions, glyphCount, font, textMatrix, attributes, graphicsContext); //base.ShowGlyphs(glyphs, positions, glyphCount, font, textMatrix, attributes, graphicsContext); } diff --git a/src/Eto.Mac/Drawing/IconFrameHandler.cs b/src/Eto.Mac/Drawing/IconFrameHandler.cs index b116fcea17..4f4e0e98d9 100644 --- a/src/Eto.Mac/Drawing/IconFrameHandler.cs +++ b/src/Eto.Mac/Drawing/IconFrameHandler.cs @@ -26,7 +26,7 @@ public NSBitmapImageRep Rep if (rep != null) return rep; - // fatal flaw in Xamarin.Mac/MonoMac here, so we can't use this constructor directly + // fatal flaw in MacOS/MonoMac here, so we can't use this constructor directly // see https://github.com/xamarin/xamarin-macios/issues/9478 var data = NSData.FromStream(Load()); var ptr = Messaging.IntPtr_objc_msgSend(s_bitmapImageRepClass, s_selAlloc_Handle); @@ -41,7 +41,7 @@ public NSBitmapImageRep Rep } } -#if MACOS_NET || ( XAMMAC && NET6_0_OR_GREATER ) +#if MACOS_NET || NET6_0_OR_GREATER // .NET 6 on ARM64 crashes when using the override in macos workload preview 11, remove this when fixed. [Export("CGImageForProposedRect:context:hints:")] public CGImage AsCGImage(IntPtr proposedDestRectPtr, NSGraphicsContext context, NSDictionary hints) @@ -133,10 +133,6 @@ public override bool DrawAtPoint(CGPoint point) public override bool DrawInRect(CGRect dstSpacePortionRect, CGRect srcSpacePortionRect, NSCompositingOperation op, nfloat requestedAlpha, bool respectContextIsFlipped, NSDictionary hints) { -#if XAMMAC - // bug in Xamarin.Mac, hints can't be null when calling base.. - hints = hints ?? new NSDictionary(); -#endif return Rep.DrawInRect(dstSpacePortionRect, srcSpacePortionRect, op, requestedAlpha, respectContextIsFlipped, hints); } diff --git a/src/Eto.Mac/Eto.Mac64.csproj b/src/Eto.Mac/Eto.Mac64.csproj index f1854bed12..e0185e8de0 100644 --- a/src/Eto.Mac/Eto.Mac64.csproj +++ b/src/Eto.Mac/Eto.Mac64.csproj @@ -23,9 +23,9 @@ Eto.Platform.Mac64 uses a modified version of the open source MonoMac for 64-bit This package creates an .app bundle to run your app on macOS, even on Windows or Linux. -By default, the mono or .NET Core runtime will be bundled in Release configuration so your app won't require extra dependencies. To bundle mono, it must be installed on the development machine. +By default, the .NET Core runtime will be bundled in Release configuration so your app won't require extra dependencies. -Use Eto.Platform.XamMac2 if you want to distribute your app to the Mac App Store, though it requires VS for Mac. +Use Eto.Platform.macOS if you want to distribute your app to the Mac App Store. You do not need to use any of the classes of this assembly (unless customizing the MonoMac functionality of the platform), and should just use the UI controls from the Eto assembly. diff --git a/src/Eto.Mac/Eto.XamMac2.csproj b/src/Eto.Mac/Eto.XamMac2.csproj deleted file mode 100644 index b32bb7f38c..0000000000 --- a/src/Eto.Mac/Eto.XamMac2.csproj +++ /dev/null @@ -1,77 +0,0 @@ - - - - True - net462;xamarinmac20 - $(TargetFrameworkOverride) - Eto.Mac - $(DefineConstants);OSX;DESKTOP;XAMMAC;XAMMAC2;UNIFIED - $(DefineConstants);USE_CFSTRING - true - $(DefaultItemExcludes);build\* - CA1416 - - - - - - - - - - - - - - - - - Eto.Platform.XamMac2 - Eto.Forms - Xamarin.Mac Platform - OS X Platform for the Eto.Forms UI Framework using Xamarin.Mac - cross platform gui ui framework desktop osx xamarin.mac mac eto.forms - -This is the Xamarin.Mac platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide an macOS interface for Mac users. - -When used in a desktop project, this package will automatically create a macOS application bundle to run on a Mac. - -You must build Xamarin.Mac projects on macOS using dotnet command line or Visual Studio for Mac. - -You do not need to use any of the classes of this assembly (unless customizing the Xamarin.Mac functionality of the platform), and should just use the UI controls from the Eto assembly. - - - - - - Forms\FixedMaskedTextProviderHandler.cs - - - Drawing\GradientHelper.cs - - - Forms\Cells\MutableCellEventArgs.cs - - - Drawing\BaseBitmapData.cs - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Eto.Mac/Forms/Controls/DropDownHandler.cs b/src/Eto.Mac/Forms/Controls/DropDownHandler.cs index ad59077b26..49fbc9bec9 100644 --- a/src/Eto.Mac/Forms/Controls/DropDownHandler.cs +++ b/src/Eto.Mac/Forms/Controls/DropDownHandler.cs @@ -167,9 +167,9 @@ public override void AddRange(IEnumerable items) var oldIndex = control.IndexOfSelectedItem; NSMenu menu = control.Menu; - // xamarin.mac 2 goes really slow when adding directly. See https://github.com/xamarin/xamarin-macios/issues/3488 + // MacOS goes really slow when adding directly. See https://github.com/xamarin/xamarin-macios/issues/3488 // also, this does improve performance normally, so let's keep the hack - // until Xamarin.Mac supports an NSMenu.AddRange() of some sort + // until MacOS supports an NSMenu.AddRange() of some sort var itemList = items.ToList(); for (int i = 0; i < itemList.Count; i++) { diff --git a/src/Eto.Mac/Forms/Controls/GridViewHandler.cs b/src/Eto.Mac/Forms/Controls/GridViewHandler.cs index 958a8f13e6..061cfa98bc 100644 --- a/src/Eto.Mac/Forms/Controls/GridViewHandler.cs +++ b/src/Eto.Mac/Forms/Controls/GridViewHandler.cs @@ -116,18 +116,6 @@ public override NSImage DragImageForRows(NSIndexSet dragRows, NSTableColumn[] ta } return base.DragImageForRows(dragRows, tableColumns, dragEvent, ref dragImageOffset); } -#elif XAMMAC2 - public override NSImage DragImageForRowsWithIndexestableColumnseventoffset(NSIndexSet dragRows, NSTableColumn[] tableColumns, NSEvent dragEvent, ref CGPoint dragImageOffset) - { - var dragInfo = Handler?.DragInfo; - var img = dragInfo?.DragImage; - if (img != null) - { - dragImageOffset = dragInfo.GetDragImageOffset(); - return img; - } - return base.DragImageForRowsWithIndexestableColumnseventoffset(dragRows, tableColumns, dragEvent, ref dragImageOffset); - } #else static readonly IntPtr selDragImageForRowsWithIndexes_TableColumns_Event_Offset_Handle = Selector.GetHandle("dragImageForRowsWithIndexes:tableColumns:event:offset:"); diff --git a/src/Eto.Mac/Forms/Controls/ScrollableHandler.cs b/src/Eto.Mac/Forms/Controls/ScrollableHandler.cs index d3ef89137b..300c7500cc 100644 --- a/src/Eto.Mac/Forms/Controls/ScrollableHandler.cs +++ b/src/Eto.Mac/Forms/Controls/ScrollableHandler.cs @@ -14,7 +14,7 @@ public class ScrollableHandler : MacPanel Application.Instance.AsyncInvoke(() => Control.Delegate = null); diff --git a/src/Eto.Mac/Forms/ScreenHandler.cs b/src/Eto.Mac/Forms/ScreenHandler.cs index 396e4e7ead..2c355000e2 100644 --- a/src/Eto.Mac/Forms/ScreenHandler.cs +++ b/src/Eto.Mac/Forms/ScreenHandler.cs @@ -72,7 +72,7 @@ public Image GetImage(RectangleF rect) var logicalRect = rect; logicalRect.Size *= Widget.LogicalPixelSize; var cgimagePtr = CGDisplayCreateImageForRect(id.UInt32Value, logicalRect.ToNS()); -#if XAMMAC || MACOS_NET +#if MACOS_NET var cgimage = Runtime.GetINativeObject(cgimagePtr, true); #else var cgimage = cgimagePtr == IntPtr.Zero ? null : new CGImage(cgimagePtr); diff --git a/src/Eto.Mac/Forms/ToolBar/DropDownToolItemHandler.cs b/src/Eto.Mac/Forms/ToolBar/DropDownToolItemHandler.cs index bdb72616c1..97f8ae9fe4 100644 --- a/src/Eto.Mac/Forms/ToolBar/DropDownToolItemHandler.cs +++ b/src/Eto.Mac/Forms/ToolBar/DropDownToolItemHandler.cs @@ -7,7 +7,7 @@ public class DropDownToolItemHandler : ToolItemHandler false; protected override bool UseAction => false; -#if MACOS || XAMMAC2 +#if MACOS static readonly IntPtr selInitWithItemIdentifier_Handle = Selector.GetHandle("initWithItemIdentifier:"); // constructor with identifier isn't available in the version of macOS workload we need yet.. diff --git a/src/Eto.Mac/Forms/ToolBar/ToolBarHandler.cs b/src/Eto.Mac/Forms/ToolBar/ToolBarHandler.cs index bff1abca7d..bba367bc8d 100644 --- a/src/Eto.Mac/Forms/ToolBar/ToolBarHandler.cs +++ b/src/Eto.Mac/Forms/ToolBar/ToolBarHandler.cs @@ -198,7 +198,7 @@ internal void ChangeIdentifier(ToolItem item) void OnControlItemsChanged() { -#if !XAMMAC2 +#if MAC64 // re-retrieve items so they aren't GC'd (only needed in MonoMac) var newitems = Control.Items; #endif diff --git a/src/Eto.Mac/MacExtensions.cs b/src/Eto.Mac/MacExtensions.cs index 135c04b12a..d73342c60b 100644 --- a/src/Eto.Mac/MacExtensions.cs +++ b/src/Eto.Mac/MacExtensions.cs @@ -1,7 +1,7 @@ namespace Eto.Mac { /// - /// These are extensions for missing methods in monomac/xamarin.mac, incorrectly bound, or bad performance. + /// These are extensions for missing methods in monomac, incorrectly bound, or bad performance. /// /// /// Once monomac/xam.mac supports these methods or are implemented properly, then remove from here. @@ -117,7 +117,7 @@ public static CGSize FrameSizeForContentSize(this NSScrollView scrollView, CGSiz { var hbarPtr = hbar ? classScroller_Handle : IntPtr.Zero; var vbarPtr = vbar ? classScroller_Handle : IntPtr.Zero; - // 10.7+, use Xamarin.Mac api when it supports null scroller class parameters + // 10.7+, use MacOS api when it supports null scroller class parameters return Messaging.CGSize_objc_msgSend_CGSize_IntPtr_IntPtr_UInt64_UInt64_Int64(scrollView.ClassHandle, selFrameSizeForContentSize_HorizontalScrollerClass_VerticalScrollerClass_BorderType_ControlSize_ScrollerStyle_Handle, size, hbarPtr, vbarPtr, (ulong)scrollView.BorderType, (ulong)scrollView.VerticalScroller.ControlSize, (long)scrollView.VerticalScroller.ScrollerStyle); } @@ -125,7 +125,7 @@ public static CGSize ContentSizeForFrame(this NSScrollView scrollView, CGSize si { var hbarPtr = hbar ? classScroller_Handle : IntPtr.Zero; var vbarPtr = vbar ? classScroller_Handle : IntPtr.Zero; - // 10.7+, use Xamarin.Mac api when it supports null scroller class parameters + // 10.7+, use MacOS api when it supports null scroller class parameters return Messaging.CGSize_objc_msgSend_CGSize_IntPtr_IntPtr_UInt64_UInt64_Int64(scrollView.ClassHandle, selContentSizeForFrameSize_HorizontalScrollerClass_VerticalScrollerClass_BorderType_ControlSize_ScrollerStyle_Handle, size, hbarPtr, vbarPtr, (ulong)scrollView.BorderType, (ulong)scrollView.VerticalScroller.ControlSize, (long)scrollView.VerticalScroller.ScrollerStyle); } diff --git a/src/Eto.Mac/MacHelpers.cs b/src/Eto.Mac/MacHelpers.cs index 81fc34efae..612f613b9a 100644 --- a/src/Eto.Mac/MacHelpers.cs +++ b/src/Eto.Mac/MacHelpers.cs @@ -6,10 +6,6 @@ namespace Eto.Forms public static class #if MACOS_NET MacOSHelpers -#elif XAMMAC2 - XamMac2Helpers -#elif XAMMAC - XamMacHelpers #elif Mac64 MonoMac64Helpers #elif MONOMAC diff --git a/src/Eto.Mac/NSImageExtensions.cs b/src/Eto.Mac/NSImageExtensions.cs index ba357f984f..955fc4d89f 100644 --- a/src/Eto.Mac/NSImageExtensions.cs +++ b/src/Eto.Mac/NSImageExtensions.cs @@ -18,7 +18,7 @@ public static NSImage Resize(this NSImage image, CGSize newsize, ImageInterpolat return newimage; } -#if XAMMAC || MACOS_NET +#if MACOS_NET static IntPtr selDrawInRect_FromRect_Operation_Fraction_RespectFlipped_Hints_Handle = Selector.GetHandle("drawInRect:fromRect:operation:fraction:respectFlipped:hints:"); #endif @@ -31,8 +31,8 @@ public static NSImageRep Resize(this NSImageRep image, CGSize newsize, ImageInte NSGraphicsContext.GlobalSaveGraphicsState(); NSGraphicsContext.CurrentContext = graphics; graphics.GraphicsPort.InterpolationQuality = interpolation.ToCG(); -#if XAMMAC || MACOS_NET - // Xamarin.Mac doesn't allow null for hints, remove this when it does. +#if MACOS_NET + // MacOS doesn't allow null for hints, remove this when it does. Messaging.bool_objc_msgSend_CGRect_CGRect_UIntPtr_nfloat_bool_IntPtr(image.Handle, selDrawInRect_FromRect_Operation_Fraction_RespectFlipped_Hints_Handle, new CGRect(CGPoint.Empty, newrep.Size), CGRect.Empty, (UIntPtr)(ulong)NSCompositingOperation.SourceOver, 1f, true, IntPtr.Zero); #else image.DrawInRect(new CGRect(CGPoint.Empty, newrep.Size), CGRect.Empty, NSCompositingOperation.SourceOver, 1f, true, null); diff --git a/src/Eto.Mac/Platform.cs b/src/Eto.Mac/Platform.cs index 2df670a948..94364ddbca 100644 --- a/src/Eto.Mac/Platform.cs +++ b/src/Eto.Mac/Platform.cs @@ -26,10 +26,6 @@ public class Platform : Eto.Platform #if MACOS_NET public override string ID { get { return "macOS"; } } -#elif XAMMAC2 - public override string ID { get { return "XamMac2"; } } -#elif XAMMAC1 - public override string ID { get { return "XamMac"; } } #elif Mac64 public override string ID { get { return "Mac64"; } } #else @@ -68,7 +64,7 @@ static Platform() { c.Styles.Add(null, sbh => { -#if XAMMAC2 +#if MACOS_NET sbh.Control.ControlSize = NSControlSize.Small; #else Messaging.void_objc_msgSend_IntPtr(sbh.Control.Handle, Selector.GetHandle("setControlSize:"), (IntPtr)NSControlSize.Small); diff --git a/src/Eto.Mac/build/BundleMono.targets b/src/Eto.Mac/build/BundleMono.targets index 44018561f1..2fa1717cf8 100644 --- a/src/Eto.Mac/build/BundleMono.targets +++ b/src/Eto.Mac/build/BundleMono.targets @@ -133,16 +133,11 @@ $(OutputContents)MonoBundle\ $(ReferenceFiles)Launcher64 - - $(ReferenceFiles)Xamarin.Mac.dll - \Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\x86_64\full\Xamarin.Mac.dll - - diff --git a/src/Eto.Mac/build/Mac.targets b/src/Eto.Mac/build/Mac.targets index 1198a31de9..135d316d16 100644 --- a/src/Eto.Mac/build/Mac.targets +++ b/src/Eto.Mac/build/Mac.targets @@ -22,7 +22,7 @@ - + True @@ -199,7 +199,6 @@ - @(ReferenceCopyLocalPaths->AnyHaveMetadataValue('Filename', 'Eto.XamMac2')) false true x86_64 diff --git a/src/Eto.Mac/build/README.txt b/src/Eto.Mac/build/README.txt index 09f2e01d54..cd0bf09beb 100644 --- a/src/Eto.Mac/build/README.txt +++ b/src/Eto.Mac/build/README.txt @@ -1,8 +1,7 @@ This package will create a macOS application that runs on Mac using Eto.Forms. -If you are using Visual Studio for Mac, you can use a Xamarin.Mac or net6.0-macos -project to embed the runtime with your app. +If you are using on a Mac, you can use a net6.0-macos project to embed the runtime with your app. This template creates an app that will require the user to install the mono runtime. diff --git a/src/Eto.sln b/src/Eto.sln index 02873e5cb4..5cfe259699 100644 --- a/src/Eto.sln +++ b/src/Eto.sln @@ -42,10 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Gtk", "Eto.Gtk\Eto.Gtk. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Direct2D", "Eto.Direct2D\Eto.Direct2D.csproj", "{3511ADDE-7CA8-4F7F-9721-AB48D3913760}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.XamMac2", "..\test\Eto.Test.Mac\Eto.Test.XamMac2.csproj", "{96C9D209-238D-4EBF-8391-F632A14921AD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac2", "Eto.Mac\Eto.XamMac2.csproj", "{6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Test.Direct2D", "..\test\Eto.Test.Direct2D\Eto.Test.Direct2D.csproj", "{7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Test.WinForms", "..\test\Eto.Test.WinForms\Eto.Test.WinForms.csproj", "{CF18B0BB-2C60-437F-8AA3-711ABAE11A91}" @@ -202,22 +198,6 @@ Global {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Mac.ActiveCfg = Release|Any CPU {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Windows.ActiveCfg = Release|Any CPU {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Windows.Build.0 = Release|Any CPU - {96C9D209-238D-4EBF-8391-F632A14921AD}.Debug|Linux.ActiveCfg = Debug|Any CPU - {96C9D209-238D-4EBF-8391-F632A14921AD}.Debug|Mac.ActiveCfg = Debug|Any CPU - {96C9D209-238D-4EBF-8391-F632A14921AD}.Debug|Mac.Build.0 = Debug|Any CPU - {96C9D209-238D-4EBF-8391-F632A14921AD}.Debug|Windows.ActiveCfg = Debug|Any CPU - {96C9D209-238D-4EBF-8391-F632A14921AD}.Release|Linux.ActiveCfg = Release|Any CPU - {96C9D209-238D-4EBF-8391-F632A14921AD}.Release|Mac.ActiveCfg = Release|Any CPU - {96C9D209-238D-4EBF-8391-F632A14921AD}.Release|Mac.Build.0 = Release|Any CPU - {96C9D209-238D-4EBF-8391-F632A14921AD}.Release|Windows.ActiveCfg = Release|Any CPU - {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Debug|Linux.ActiveCfg = Debug|Any CPU - {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Debug|Mac.ActiveCfg = Debug|Any CPU - {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Debug|Mac.Build.0 = Debug|Any CPU - {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Debug|Windows.ActiveCfg = Debug|Any CPU - {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Release|Linux.ActiveCfg = Release|Any CPU - {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Release|Mac.ActiveCfg = Release|Any CPU - {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Release|Mac.Build.0 = Release|Any CPU - {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Release|Windows.ActiveCfg = Release|Any CPU {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Debug|Linux.ActiveCfg = Debug|Any CPU {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Debug|Mac.ActiveCfg = Debug|Any CPU {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Debug|Windows.ActiveCfg = Debug|Any CPU @@ -303,17 +283,16 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {DD0C2B40-CA55-11E3-9C1A-0800200C9A66} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {063AF7E7-18BD-488F-85BF-53B6E3D75685} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} - {96C9D209-238D-4EBF-8391-F632A14921AD} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {CF18B0BB-2C60-437F-8AA3-711ABAE11A91} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {4C76B511-0849-4E5A-BF4B-C3365E103259} = {9A93A30F-7627-4F92-ACC4-226BDAD712FB} {CEB897E2-8040-44F5-B41E-DBA9144FEDB2} = {9A93A30F-7627-4F92-ACC4-226BDAD712FB} {5A16F4FA-C960-46A2-875E-C6CE556F0C36} = {9A93A30F-7627-4F92-ACC4-226BDAD712FB} + {A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FEDB7506-BD8C-41A7-AAA5-6D111D5EA6B8} diff --git a/src/Eto/Eto.csproj b/src/Eto/Eto.csproj index 76b2c4aa93..6d8b47ea4f 100644 --- a/src/Eto/Eto.csproj +++ b/src/Eto/Eto.csproj @@ -18,7 +18,7 @@ The goal of this framework is to expose a common API that can be used to build f For advanced scenarios, you can take advantage of each platform's capabilities by wrapping your common UI in a larger application, or even create your own high-level controls with a custom implementations per platform. -This framework currently supports creating Desktop applications that work across Windows Forms, WPF, MonoMac, Xamarin.Mac, and GTK#. +This framework currently supports creating Desktop applications that work across Windows Forms, WPF, MonoMac, MacOS, and GTK#. In order to run your Eto.Forms based application, you must also install one (or more) of the following packages: @@ -27,7 +27,7 @@ In order to run your Eto.Forms based application, you must also install one (or - Eto.Platform.Direct2D - Eto.Platform.Gtk - Eto.Platform.Mac64 -- Eto.Platform.XamMac2 +- Eto.Platform.MacOS To get more information about how to get started, read the wiki: @@ -39,7 +39,6 @@ https://github.com/picoe/Eto/wiki - diff --git a/src/Eto/Forms/MaskedTextProvider/NumericMaskedTextProvider.cs b/src/Eto/Forms/MaskedTextProvider/NumericMaskedTextProvider.cs index 0cc5a64d29..5cb5cdafe0 100644 --- a/src/Eto/Forms/MaskedTextProvider/NumericMaskedTextProvider.cs +++ b/src/Eto/Forms/MaskedTextProvider/NumericMaskedTextProvider.cs @@ -19,7 +19,7 @@ class Info // do all conversions with invariant culture static CultureInfo Inv => CultureInfo.InvariantCulture; - // use dictionary instead of reflection for Xamarin.Mac linking + // use dictionary instead of reflection for linking static readonly Dictionary numericTypes = new Dictionary { { typeof(decimal), new Info { Parse = s => decimal.TryParse(s, NumberStyles.Any, Inv, out var d) ? (object)d : null, AllowSign = true, AllowDecimal = true } }, diff --git a/src/Eto/Platform.cs b/src/Eto/Platform.cs index fc2aea8942..be2b012f8c 100644 --- a/src/Eto/Platform.cs +++ b/src/Eto/Platform.cs @@ -181,7 +181,7 @@ internal void TriggerWidgetCreated(WidgetCreatedEventArgs args) public abstract string ID { get; } /// - /// Gets a value indicating whether this platform is a mac based platform (MonoMac/XamMac) + /// Gets a value indicating whether this platform is a mac based platform (MonoMac/MacOS) /// /// true if this platform is mac; otherwise, false. public virtual bool IsMac { get { return false; } } @@ -292,7 +292,7 @@ public void LoadAssembly(string assemblyName) /// It will also be called for the same assembly with the prefix of the platform ID. /// /// For example, if MyControl was declared in MyControls.dll, then Eto will automatically also - /// load MyControls.Wpf.dll for the Wpf platform, and MyControls.XamMac2.dll for the XamMac2 platform, etc. + /// load MyControls.Wpf.dll for the Wpf platform, and MyControls.MacOS.dll for the MacOS platform, etc. /// /// Use and to register /// handlers with the platform when the assembly is loaded or perform other logic. @@ -387,8 +387,6 @@ public static Platform Detect detected = Get(Platforms.Mac64, true, errors); if (detected == null) detected = Get(Platforms.macOS, true, errors); - if (detected == null) - detected = Get(Platforms.XamMac2, true, errors); } else if (EtoEnvironment.Platform.IsWindows) { diff --git a/src/Eto/Platforms.cs b/src/Eto/Platforms.cs index ab9f0e984b..3ce0238b0f 100644 --- a/src/Eto/Platforms.cs +++ b/src/Eto/Platforms.cs @@ -22,10 +22,6 @@ public static class Platforms /// public static readonly string Mac64 = "Eto.Mac.Platform, Eto.Mac64"; /// - /// Type of the Xamarin.Mac v2 macOS platform on mono - /// - public static readonly string XamMac2 = "Eto.Mac.Platform, Eto.XamMac2"; - /// /// Type of the macOS platform on .NET 6.0.2xx+ SDK /// public static readonly string macOS = "Eto.Mac.Platform, Eto.macOS"; diff --git a/src/Eto/sdk/Sdk.targets b/src/Eto/sdk/Sdk.targets index f185be46d8..8cdc2bf70e 100755 --- a/src/Eto/sdk/Sdk.targets +++ b/src/Eto/sdk/Sdk.targets @@ -3,7 +3,6 @@ Windows - True True @@ -11,8 +10,7 @@ Wpf Windows - Mac64 - XamMac2 + Mac64 MacOS Gtk @@ -27,15 +25,13 @@ WinExe - 10.14 + 10.14 osx-x64;osx-arm64 $(TargetFramework)$(_TfmSuffix) - - xamarinmac20 @@ -46,10 +42,9 @@ Is there a better way? --> $(TargetFrameworks);$([System.Text.RegularExpressions.Regex]::Match($(_CurrentFrameworks), '(?<=;|^)?(net4\d+)(?=;|$)')) - $(TargetFrameworks);net5.0$(_TfmSuffix) - - $(TargetFrameworks);xamarinmac20 $(TargetFrameworks);net6.0$(_TfmSuffix) + $(TargetFrameworks);net7.0$(_TfmSuffix) + $(TargetFrameworks);net8.0$(_TfmSuffix) @@ -77,8 +72,6 @@ linux-x64 - - \ No newline at end of file diff --git a/test/Eto.Test.Android/Eto.Test.Android.csproj b/test/Eto.Test.Android/Eto.Test.Android.csproj index e49d909bd9..6186cb7c6f 100644 --- a/test/Eto.Test.Android/Eto.Test.Android.csproj +++ b/test/Eto.Test.Android/Eto.Test.Android.csproj @@ -1,6 +1,6 @@  - net6.0-android + net7.0-android 21 Exe enable diff --git a/test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj b/test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj index cace550451..2a7545c936 100644 --- a/test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj +++ b/test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj @@ -1,7 +1,7 @@  - net6.0-windows;net48 + net7.0-windows;net48 WinExe Properties ..\Eto.Test\Images\TestIcon.ico diff --git a/test/Eto.Test.Gtk/Eto.Test.Gtk.csproj b/test/Eto.Test.Gtk/Eto.Test.Gtk.csproj index 4dc883b8e2..cead3180f4 100644 --- a/test/Eto.Test.Gtk/Eto.Test.Gtk.csproj +++ b/test/Eto.Test.Gtk/Eto.Test.Gtk.csproj @@ -2,7 +2,7 @@ WinExe - net6.0;net48 + net7.0;net48 $(DefineConstants);CAIRO;GTK3 true diff --git a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj index b34c4238db..c070db5d22 100644 --- a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj +++ b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj @@ -5,7 +5,7 @@ - net6.0;net48 + net7.0;net48 WinExe osx-x64;osx-arm64 diff --git a/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj b/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj deleted file mode 100644 index 4b92999576..0000000000 --- a/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj +++ /dev/null @@ -1,66 +0,0 @@ - - - - True - Exe - net48;xamarinmac20 - Eto.Test.Mac - False - False - Mac Developer - 3rd Party Mac Developer Installer - --nowarn:2006 --nowarn:0176 - $(MonoBundlingExtraArgs) --registrar:dynamic - XAMMAC;XAMMAC2 - 10.15 - CA1416 - 10 - - - - SdkOnly - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PreserveNewest - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Eto.Test.Mac/Eto.Test.macOS.csproj b/test/Eto.Test.Mac/Eto.Test.macOS.csproj index 1c21124824..58e7b04767 100644 --- a/test/Eto.Test.Mac/Eto.Test.macOS.csproj +++ b/test/Eto.Test.Mac/Eto.Test.macOS.csproj @@ -2,7 +2,7 @@ Exe - net6.0-macos + net7.0-macos osx-x64;osx-arm64 Eto.Test.Mac False diff --git a/test/Eto.Test.Mac/UnitTests/ResourceTests.cs b/test/Eto.Test.Mac/UnitTests/ResourceTests.cs index c22798f9ef..1117154b64 100644 --- a/test/Eto.Test.Mac/UnitTests/ResourceTests.cs +++ b/test/Eto.Test.Mac/UnitTests/ResourceTests.cs @@ -24,11 +24,6 @@ public void BundleResourceShouldBeInResources() [Test] public void CopyToOutputShouldBeInExecutablePath() { - if (Platform.Instance.ID == "XamMac2") - { - Assert.Ignore("Xamarin.Mac projects do not copy these files"); - } - // getting the location of the assembly can be null when using mkbundle, so we use this instead. var path = EtoEnvironment.GetFolderPath(EtoSpecialFolder.EntryExecutable); diff --git a/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj b/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj index 3070f714c2..8f3ac53763 100644 --- a/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj +++ b/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj @@ -1,7 +1,7 @@  - net6.0-windows;net48 + net7.0-windows;net48 WinExe Properties ..\Eto.Test\Images\TestIcon.ico diff --git a/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj b/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj index 862a940f67..a19af1a4f2 100644 --- a/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj +++ b/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj @@ -1,7 +1,7 @@  - net6.0-windows;net48 + net7.0-windows;net48 WinExe Properties TestIcon.ico