-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add support for Apple Silicon with Mac64 target
- Build unified .app bundle from arm64 and x64 bundles. - Create a single file when creating unified .app bundle by default as this is the only supported way currently. - Report errors when notarization fails. Fixes picoe#1862 - Fix NUnit discovering tests when in single file bundle. - Sdk will now create unified bundles by default for Mac - Added SdkTest to test the sdk - Updated monomac to fix issues running on ARM64 as it does not use stret methods for larger struct return values.
- Loading branch information
Showing
18 changed files
with
591 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule monomac
updated
5 files
| +1 −1 | src/ObjCRuntime/NativeMethodBuilder.cs | |
| +41 −0 | src/ObjCRuntime/Runtime.cs | |
| +354 −0 | src/Stret.cs | |
| +24 −39 | src/generator.cs | |
| +1 −0 | src/generator.csproj |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>CFBundleName</key> | ||
| <string>SdkTest</string> | ||
| <key>CFBundleIdentifier</key> | ||
| <string>ca.picoe.SdkTest</string> | ||
| <key>CFBundleShortVersionString</key> | ||
| <string>1.0</string> | ||
| <key>LSMinimumSystemVersion</key> | ||
| <string>10.14</string> | ||
| <key>CFBundleDevelopmentRegion</key> | ||
| <string>en</string> | ||
| <key>NSHumanReadableCopyright</key> | ||
| <string></string> | ||
| <key>CFBundleIconFile</key> | ||
| <string>MacIcon.icns</string> | ||
| </dict> | ||
| </plist> |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| using System; | ||
| using Eto.Forms; | ||
| using Eto.Drawing; | ||
|
|
||
| namespace Sdk | ||
| { | ||
| public partial class MainForm : Form | ||
| { | ||
| public MainForm() | ||
| { | ||
| Title = "My Eto Form"; | ||
| MinimumSize = new Size(200, 200); | ||
|
|
||
| Content = new StackLayout | ||
| { | ||
| Padding = 10, | ||
| Items = | ||
| { | ||
| "Hello World!", | ||
| // add more controls here | ||
| } | ||
| }; | ||
|
|
||
| // create a few commands that can be used for the menu and toolbar | ||
| var clickMe = new Command { MenuText = "Click Me!", ToolBarText = "Click Me!" }; | ||
| clickMe.Executed += (sender, e) => MessageBox.Show(this, "I was clicked!"); | ||
|
|
||
| var quitCommand = new Command { MenuText = "Quit", Shortcut = Application.Instance.CommonModifier | Keys.Q }; | ||
| quitCommand.Executed += (sender, e) => Application.Instance.Quit(); | ||
|
|
||
| var aboutCommand = new Command { MenuText = "About..." }; | ||
| aboutCommand.Executed += (sender, e) => new AboutDialog().ShowDialog(this); | ||
|
|
||
| // create menu | ||
| Menu = new MenuBar | ||
| { | ||
| Items = | ||
| { | ||
| // File submenu | ||
| new SubMenuItem { Text = "&File", Items = { clickMe } }, | ||
| // new SubMenuItem { Text = "&Edit", Items = { /* commands/items */ } }, | ||
| // new SubMenuItem { Text = "&View", Items = { /* commands/items */ } }, | ||
| }, | ||
| ApplicationItems = | ||
| { | ||
| // application (OS X) or file menu (others) | ||
| new ButtonMenuItem { Text = "&Preferences..." }, | ||
| }, | ||
| QuitItem = quitCommand, | ||
| AboutItem = aboutCommand | ||
| }; | ||
|
|
||
| // create toolbar | ||
| ToolBar = new ToolBar { Items = { clickMe } }; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| using System; | ||
| using Eto.Forms; | ||
| using Eto.Drawing; | ||
|
|
||
| namespace Sdk | ||
| { | ||
| class Program | ||
| { | ||
| [STAThread] | ||
| static void Main(string[] args) | ||
| { | ||
| new Application(Eto.Platform.Detect).Run(new MainForm()); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <Project Sdk="Eto.Forms/2.6.1-dev"> | ||
|
|
||
| <!-- | ||
| Set the BuildPlatform property to the Eto platform you wish to build for. | ||
| The default is the platform you are building on. | ||
| Valid values: Wpf, Windows, Mac64, XamMac2, Gtk, Direct2D | ||
| --> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
|
|
||
| <!-- <EnableDmgBuild>True</EnableDmgBuild> --> | ||
| <!-- <EnableCompressionInSingleFile>True</EnableCompressionInSingleFile> --> | ||
| <!-- <EnableCodeSigning>True</EnableCodeSigning> --> | ||
| <!-- <EnableNotarization>True</EnableNotarization> --> | ||
| <!-- <PublishTrimmed>True</PublishTrimmed> --> | ||
| <!-- <MacBundleDotNet>False</MacBundleDotNet> --> | ||
| <!-- <PublishSingleFile>True</PublishSingleFile> --> | ||
| <!-- <IncludeAllContentForSelfExtract>False</IncludeAllContentForSelfExtract> --> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <configuration> | ||
| <config> | ||
| <add key="globalPackagesFolder" value="../../artifacts/packages" /> | ||
| </config> | ||
| <packageSources> | ||
| <clear /> | ||
| <add key="eto-dev" value="../../artifacts/nuget" /> | ||
| <add key="nuget" value="https://api.nuget.org/v3/index.json" /> | ||
| </packageSources> | ||
| </configuration> |
Oops, something went wrong.