diff --git a/LICENSE.txt b/LICENSE.txt index e4101eab12..4c7fc1bc1b 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,7 +1,7 @@ The BSD-3 License. AUTHORS -Copyright © 2011-2018 Curtis Wensley. All Rights Reserved. +Copyright © 2011-2019 Curtis Wensley. All Rights Reserved. Copyright © 2012-2013 Vivek Jhaveri. All Rights Reserved. Redistribution and use in source and binary forms, with or without modification, are permitted diff --git a/addin-project.xml b/addin-project.xml deleted file mode 100644 index b876babc9e..0000000000 --- a/addin-project.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - artifacts/Addins/Release/XamarinStudio/Eto.Addin.XamarinStudio.dll - build/BuildXSAddin.targets - - diff --git a/appveyor.yml b/appveyor.yml index 03f05205e4..20f0326258 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,7 @@ version: 2.5.0.{build} image: Visual Studio 2017 install: -- cinst gtksharp -y -- ps: $DOTNET_SDK_VERSION = "3.0.100" +- ps: $DOTNET_SDK_VERSION = "3.1.100" - ps: Start-FileDownload "https://dot.net/v1/dotnet-install.ps1" - ps: "& ./dotnet-install.ps1 -Version $DOTNET_SDK_VERSION" - ps: $DOTNET_CLI_COMMAND = Get-Command -CommandType Application dotnet | Select-Object -First 1 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e397d1f016..973d9f3dce 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -30,11 +30,13 @@ jobs: - task: CopyFiles@2 displayName: Copy nupkg inputs: - contents: artifacts/nuget/$(build.configuration)/Eto.Platform.XamMac*.nupkg + contents: | + artifacts/nuget/$(build.configuration)/Eto.Platform.XamMac*.nupkg + artifacts/nuget/$(build.configuration)/Eto.Platform.Gtk2*.nupkg targetFolder: $(Build.ArtifactStagingDirectory) - task: PublishBuildArtifacts@1 - displayName: Publish XamMac nupkg + displayName: Publish nupkg inputs: pathtoPublish: $(Build.ArtifactStagingDirectory)/artifacts/nuget/$(build.configuration) artifactName: nuget @@ -72,8 +74,6 @@ jobs: vmImage: 'VS2017-Win2016' steps: - - script: cinst gtksharp -y - displayName: Install GTK# - powershell: | Write-Host "##vso[task.setvariable variable=DOTNET_SDK_VERSION]3.0.100" displayName: Set .NET Core SDK version to install diff --git a/build.cmd b/build.cmd index eac0df156c..e661f5304e 100644 --- a/build.cmd +++ b/build.cmd @@ -2,9 +2,9 @@ WHERE msbuild > nul IF %ERRORLEVEL% NEQ 0 ( -ECHO msbuild not found. Run in the Developer Command Prompt for VS 2017 +ECHO msbuild not found. Run in the Developer Command Prompt for VS 2019 pause ) set BUILD_DIR=%~dp0build -msbuild -t:Package -p:BuildVersion=%1 "%BUILD_DIR%\Build.proj" +msbuild -v:minimal -t:Package -p:BuildVersion=%1 "%BUILD_DIR%\Build.proj" diff --git a/build.sh b/build.sh index e58ec70286..5cbe2e6b8a 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ #!/bin/bash DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -msbuild /t:Package /p:BuildVersion=$1 $DIR/build/Build.proj +msbuild /v:minimal /t:Package /p:BuildVersion=$1 $DIR/build/Build.proj diff --git a/build/Build.proj b/build/Build.proj index 7acdcacff9..7ef1571961 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -1,14 +1,18 @@ + + Release Build + True + True - - + + False $(Branch.Substring(10)) @@ -18,12 +22,13 @@ - + 0.1.0.0 $(CurrentVersion) + $(Version) @@ -36,17 +41,17 @@ - - + + - - $(AddinDir)Eto.Forms.Templates\Eto.Forms.Templates.csproj - + @@ -98,8 +103,6 @@ - - @@ -162,36 +165,15 @@ - - - - - - - - - - - - - - - - - + + - - Configuration=$(Configuration);Platform=$(OSPlatform) - $(BuildProperties);AssemblyVersion=$(AssemblyVersion) @@ -203,30 +185,21 @@ --> - - - - - - + + - - - - - - + + - - - + + - + @@ -277,23 +250,15 @@ - - - - + + + - - + + - - - - - - - - + @@ -301,71 +266,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - release\$(AssemblyInformationalVersion) - $(AssemblyInformationalVersion) - $(AssemblyInformationalVersion)-alpha - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/BuildMacAddin.targets b/build/BuildMacAddin.targets deleted file mode 100644 index a9ada2731a..0000000000 --- a/build/BuildMacAddin.targets +++ /dev/null @@ -1,44 +0,0 @@ - - - - Release - XSRelease - 2.3.0 - - - - - - - - - - - - - $(BasePath)artifacts - $(MSBuildThisFileDirectory)packages.config - $(ArtifactsDir)Nuget\$(Configuration) - $(SourceDir)Addins\Eto.Addin.XamarinStudio.sln - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/Common.Build.props b/build/Common.Build.props index bbf832297a..71904bba54 100644 --- a/build/Common.Build.props +++ b/build/Common.Build.props @@ -3,23 +3,23 @@ - 2.5.0.0 - 2.5.0-dev - \Library\Frameworks\Xamarin.Mac.framework\Versions\Current $(XamarinMacPath)\lib\mono $(XamarinMacLibPath) true $(BasePath)artifacts\obj\$(OSPlatform)\$(MSBuildProjectName)\ - false - True + True True False PackageReference - $(DefaultItemExcludes);.DS_Store + $(DefaultItemExcludes);**\.DS_Store + + + False + \ No newline at end of file diff --git a/build/Common.Build.targets b/build/Common.Build.targets index 5328bfcfd4..b834d166b6 100644 --- a/build/Common.Build.targets +++ b/build/Common.Build.targets @@ -1,5 +1,6 @@ + @@ -55,9 +56,14 @@ - + - + + + $(AssemblySearchPaths);{GAC} + + + - - - - Properties\VersionInfo.cs - false - - - Properties\GlobalAssemblyInfo.cs - false - - - - - - - $([System.Version]::Parse($([System.String]::Copy('$(AssemblyVersion)').Replace('.*', ''))).ToString(2)) - $([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2000-01-01T00:00:00Z'))).TotalDays.ToString('0')) - $([MSBuild]::Divide($([System.DateTime]::Now.Subtract($([System.DateTime]::Today)).TotalSeconds), 2).ToString('0')) - $(AssemblyVersionMajorMinor).$(DaysSince2000).$(SecondsOfTodayHalved) - - + + + + $(Title) + + + + + - - - + + <_Parameter1>$(FileVersion) + - - + \ No newline at end of file diff --git a/build/Common.Mac.targets b/build/Common.Mac.targets new file mode 100644 index 0000000000..84b45b2d85 --- /dev/null +++ b/build/Common.Mac.targets @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/Common.props b/build/Common.props index a503949b89..95eb7610b3 100644 --- a/build/Common.props +++ b/build/Common.props @@ -8,24 +8,47 @@ \Library\Frameworks\Xamarin.Mac.framework\Versions\Current\ $(XamarinMacPath)lib\mono\ + $(XamarinMacPath)lib\msbuild\ $(XamarinMacLibPath) $(BasePath)artifacts\ - $(ArtifactsDir)core\$(Configuration)\net45\ - $(ArtifactsDir)core\$(Configuration)\netstandard1.0\ - $(ArtifactsDir)core\$(Configuration)\netstandard2.0\ - $(ArtifactsDir)core\$(Configuration)\modern\ $(BasePath)artifacts\obj\$(OSPlatform)\$(MSBuildProjectName)\ $(BasePath)src\ $(SourceDir) - $(ArtifactsDir)nuget\$(Configuration)\ + $(ArtifactsDir)nuget\$(Configuration)\ $(SourceDir)\Addins\ - "mdtool" - "/Applications/Xamarin Studio.app/Contents/MacOS/mdtool" - "c:\Program Files (x86)\Xamarin Studio\bin\mdtool.exe" - $(ArtifactsDir)obj - $(ArtifactsDir)obj\VersionInfo.props + + + + + + 2.5.0.0 + 2.5.0-dev + Picoe Software Solutions + (c) 2010-2019 by Curtis Wensley, 2012-2014 by Vivek Jhaveri and contributors + + $(InformationalVersion) + Eto-LICENSE.txt + false + + $([System.Version]::Parse($([System.String]::Copy('$(Version)').Replace('.*', ''))).ToString(2)) + $([System.DateTime]::Today.Subtract($([System.DateTime]::Parse('2000-01-01T00:00:00Z'))).TotalDays.ToString('0')) + $([MSBuild]::Divide($([System.DateTime]::Now.Subtract($([System.DateTime]::Today)).TotalSeconds), 2).ToString('0')) + $(AssemblyVersionMajorMinor).$(DaysSince2000).$(SecondsOfTodayHalved) + + https://github.com/picoe/Eto + git + $(PackageProjectUrl).git + + + + Eto-LICENSE.txt + PreserveNewest + + + + \ No newline at end of file diff --git a/build/MacTemplate/Launcher32 b/build/MacTemplate/Launcher32 deleted file mode 100755 index 121be00e30..0000000000 Binary files a/build/MacTemplate/Launcher32 and /dev/null differ diff --git a/build/NuGet.targets b/build/NuGet.targets deleted file mode 100644 index 83b860aecf..0000000000 --- a/build/NuGet.targets +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - $(MSBuildThisFileDirectory) - /usr/bin/mono - /usr/local/bin/mono - /Library/Frameworks/Mono.framework/Versions/Current/Commands/mono - mono - - /usr/lib/mono/msbuild/15.0/bin - - - - - - - - - - - - - Title=$(AssemblyTitle);Description=$(AssemblyDescription);Author=$(AssemblyCompany);Copyright=$(AssemblyCopyright);Id=$(AssemblyName) - -Version $(AssemblyInformationalVersion) - - - - - - $(NuGetToolsPath)nuget.exe - - "$(NuGetExePath)" - $(MonoExe) $(NuGetExePath) - - $(MSBuildThisFileDirectory)\nuget - - -RequireConsent - -NonInteractive - - - - - - - $(NugetOptions) -MSBuildPath $(MSBuildPath) - $(NuGetCommand) restore $(PackageSource) $(NonInteractiveSwitch) $(RequireConsentSwitch) $(NugetOptions) - - - - - - - - $(BasePath.TrimEnd('\')) - $(NupkgOutputDir.TrimEnd('\')) - $(NuGetCommand) pack "$(NuspecPath)" -BasePath "$(BasePath)" -Properties "Configuration=$(Configuration);Platform=$(Platform);$(NugetBuildProperties)" $(NonInteractiveSwitch) -OutputDirectory "$(NupkgOutputDir)" $(NugetBuildOptions) - - - - - - - Configuration=$(Configuration) - $(MSBuildPackProperties);PackageOutputPath=$(PackageOutputPath) - $(MSBuildPackProperties);NuspecAssemblyInformationalVersion=$(AssemblyInformationalVersion) - $(MSBuildPackProperties);NuspecAssemblyTitle=$(AssemblyTitle) - $(MSBuildPackProperties);NuspecAssemblyDescription=$(AssemblyDescription) - $(MSBuildPackProperties);NuspecAssemblyCopyright=$(AssemblyCopyright) - $(MSBuildPackProperties);NuspecAssemblyCompany=$(AssemblyCompany) - $(MSBuildPackProperties);NuspecAssemblyName=$(AssemblyName) - - - - - - - - - - - $(AssemblyName).$(AssemblyInformationalVersion).nupkg - $(NugetCommand) push $(NonInteractiveSwitch) "$(PackageOutputDir)\$(NupkgName)" -src "https://nuget.org" - - - - - diff --git a/build/Utilities.targets b/build/Utilities.targets index c3c1e326c7..fa2231c400 100644 --- a/build/Utilities.targets +++ b/build/Utilities.targets @@ -2,100 +2,6 @@ - - - - - - - - - - - - (this System.Reflection.Assembly ass) where T : Attribute - { - object[] attributes = ass.GetCustomAttributes(typeof(T), false); - if (attributes == null || attributes.Length == 0) - return null; - return attributes.OfType().SingleOrDefault(); - } -} - -public class GetAssemblyInfo : AppDomainIsolatedTask -{ - public string AssemblyFileName { get; set; } - - [Output] - public string AssemblyInformationalVersion { get; set; } - - [Output] - public string AssemblyTitle { get; set; } - - [Output] - public string AssemblyDescription { get; set; } - - [Output] - public string AssemblyCopyright { get; set; } - - [Output] - public string AssemblyCompany { get; set; } - - [Output] - public string AssemblyName { get; set; } - - - public override bool Execute() - { - try - { - AssemblyFileName = Path.GetFullPath(AssemblyFileName); - - Log.LogMessage("Getting assembly info...", null); - AssemblyInformationalVersion = FileVersionInfo.GetVersionInfo(AssemblyFileName).ProductVersion; - - var assembly = Assembly.LoadFrom(AssemblyFileName); - var informationalVersion = assembly.GetAssemblyAttribute(); - if (informationalVersion != null) - AssemblyInformationalVersion = informationalVersion.InformationalVersion; - var title = assembly.GetAssemblyAttribute(); - if (title != null) - AssemblyTitle = title.Title; - var description = assembly.GetAssemblyAttribute(); - if (description != null) - AssemblyDescription = description.Description; - var copyright = assembly.GetAssemblyAttribute(); - if (copyright != null) - AssemblyCopyright = copyright.Copyright; - var company = assembly.GetAssemblyAttribute(); - if (company != null) - AssemblyCompany = company.Company; - AssemblyName = assembly.GetName().Name; - return true; - } - catch (Exception ex) - { - Log.LogErrorFromException(ex); - return false; - } - } -} -]]> - - diff --git a/build/nuget.exe b/build/nuget.exe deleted file mode 100644 index d56c57880c..0000000000 Binary files a/build/nuget.exe and /dev/null differ diff --git a/build/nuspec/Eto.Forms.Sample/Eto.Forms.Sample.nuspec b/build/nuspec/Eto.Forms.Sample/Eto.Forms.Sample.nuspec deleted file mode 100644 index e3cb35b62c..0000000000 --- a/build/nuspec/Eto.Forms.Sample/Eto.Forms.Sample.nuspec +++ /dev/null @@ -1,39 +0,0 @@ - - - - Eto.Forms.Sample - $version$ - Eto.Forms - Sample Application - Curtis Wensley - Curtis Wensley - LICENSE.txt - https://github.com/picoe/Eto - false - Eto.Forms - Sample Cross Platform Application - -This sample application provides a starting point for your Eto.Forms application. - -Add this package to a blank console application, which will replace your Program.cs with the Eto.Forms startup code and include a MainForm.cs as a sample form to get you started. - -You will need to change the console application's output type to 'Windows Application' to suppress the console window from showing. - -In Xamarin Studio, set the compile target to 'Executable with GUI' and uncheck 'Run on external console' in Run > Build. - - Copyright 2018 by Curtis Wensley - cross platform gui framework desktop winforms wpf mac osx gtk eto.forms sample - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/nuspec/Eto.Forms.nuspec.props b/build/nuspec/Eto.Forms.nuspec.props deleted file mode 100644 index 6f2468e682..0000000000 --- a/build/nuspec/Eto.Forms.nuspec.props +++ /dev/null @@ -1,54 +0,0 @@ - - - - Eto.Forms - $(NuspecAssemblyInformationalVersion) - $(NuspecAssemblyTitle) - $(NuspecAssemblyCompany) - Eto-LICENSE.txt - https://github.com/picoe/Eto - git - $(PackageProjectUrl).git - false - Eto.Forms UI Framework - -Eto.Forms is a cross platform desktop user interface framework. - -This framework is built so that you can target multiple platforms with one UI codebase. - -The goal of this framework is to expose a common API that can be used to build functional applications that run across platforms using their native toolkit. This will make your applications look and work as if it were a native application on all platforms. - -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#. - -In order to run your Eto.Forms based application, you must also install one (or more) of the following packages: - -- Eto.Platform.Wpf -- Eto.Platform.Windows -- Eto.Platform.Direct2D -- Eto.Platform.Gtk -- Eto.Platform.Gtk2 -- Eto.Platform.Gtk3 -- Eto.Platform.Mac -- Eto.Platform.Mac64 -- Eto.Platform.XamMac * requires Visual Studio for Mac -- Eto.Platform.XamMac2 - -To get more information about how to get started, read the wiki: - -https://github.com/picoe/Eto/wiki - - $(NuspecAssemblyCopyright) - cross platform gui ui framework desktop winforms wpf mac osx gtk eto.forms - - - - build\ - - - true - $(PackageLicenseFile) - - - \ No newline at end of file diff --git a/build/nuspec/Eto.Platform.Direct2D.nuspec b/build/nuspec/Eto.Platform.Direct2D.nuspec deleted file mode 100644 index 685d38c967..0000000000 --- a/build/nuspec/Eto.Platform.Direct2D.nuspec +++ /dev/null @@ -1,38 +0,0 @@ - - - - Eto.Platform.Direct2D - $version$ - $title$ - $author$ - $author$ - LICENSE.txt - https://github.com/picoe/Eto - - false - $description$ - -This is the Direct2D platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide a WinForms interface with Direct2D drawing for your windows users. - -The Direct2D platform allows for increased performance when custom drawing by using the GPU. This does not affect the behaviour or performance of regular controls, which will use the Windows Forms platform. - -You do not need to use any of the classes of this assembly (unless customizing the functionality of the platform), and should just use the UI controls from the Eto assembly. - - $copyright$ - cross platform gui ui framework desktop wpf eto.forms - - - - - - - - - - - - - - diff --git a/build/nuspec/Eto.Platform.Gtk.nuspec.props b/build/nuspec/Eto.Platform.Gtk.nuspec.props deleted file mode 100644 index bf9b19e9e7..0000000000 --- a/build/nuspec/Eto.Platform.Gtk.nuspec.props +++ /dev/null @@ -1,32 +0,0 @@ - - - - Eto.Platform.Gtk - $(NuspecAssemblyInformationalVersion) - $(NuspecAssemblyTitle) - $(NuspecAssemblyCompany) - LICENSE.txt - https://github.com/picoe/Eto - git - $(PackageProjectUrl).git - false - $(NuspecAssemblyDescription) - -This is the GTK platform for Eto.Forms UI Framework. Currently this package is targetting Gtk 3.14 or newer. - -Include this along with your Eto.Forms application to provide a GTK interface, typically for Linux users. - -You do not need to use any of the classes of this assembly (unless customizing the GTK functionality of the platform), and should just use the UI controls from the Eto assembly. - -On Linux, mono framework 2.10 or higher and gtk-sharp2 are required. - - $(NuspecAssemblyCopyright) - cross platform gui ui framework desktop gtk eto.forms - - - - true - $(PackageLicenseFile) - - - \ No newline at end of file diff --git a/build/nuspec/Eto.Platform.Gtk2.nuspec b/build/nuspec/Eto.Platform.Gtk2.nuspec deleted file mode 100644 index 2799504ade..0000000000 --- a/build/nuspec/Eto.Platform.Gtk2.nuspec +++ /dev/null @@ -1,37 +0,0 @@ - - - - Eto.Platform.Gtk2 - $version$ - $title$ - $author$ - $author$ - LICENSE.txt - https://github.com/picoe/Eto - - false - $description$ - -This package is deprecated and should not be used in new projects, please use Eto.Platform.Gtk instead. - -This is the GTK2 platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide a GTK2 interface, typically for Linux users. - -You do not need to use any of the classes of this assembly (unless customizing the GTK functionality of the platform), and should just use the UI controls from the Eto assembly. - -On Linux, mono framework 2.10 or higher and gtk-sharp2 are required. - - $copyright$ - cross platform gui ui framework desktop gtk eto.forms - - - - - - - - - - - diff --git a/build/nuspec/Eto.Platform.Gtk3.nuspec b/build/nuspec/Eto.Platform.Gtk3.nuspec deleted file mode 100644 index b5a5079b19..0000000000 --- a/build/nuspec/Eto.Platform.Gtk3.nuspec +++ /dev/null @@ -1,37 +0,0 @@ - - - - Eto.Platform.Gtk3 - $version$ - $title$ - $author$ - $author$ - LICENSE.txt - https://github.com/picoe/Eto - - false - $description$ - -This package is deprecated and should not be used in new projects, please use Eto.Platform.Gtk instead. - -This is the GTK3 platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide a GTK3 interface, typically for Linux users. - -You do not need to use any of the classes of this assembly (unless customizing the GTK functionality of the platform), and should just use the UI controls from the Eto assembly. - -On Linux, mono framework 2.10 or higher and gtk-sharp2 are required. - - $copyright$ - cross platform gui ui framework desktop gtk eto.forms - - - - - - - - - - - diff --git a/build/nuspec/Eto.Platform.Mac.Template.nuspec b/build/nuspec/Eto.Platform.Mac.Template.nuspec deleted file mode 100644 index 5485cc76ca..0000000000 --- a/build/nuspec/Eto.Platform.Mac.Template.nuspec +++ /dev/null @@ -1,28 +0,0 @@ - - - - Eto.Platform.Mac.Template - $version$ - Eto.Forms - macOS Template (OBSOLETE) - Curtis Wensley - Curtis Wensley - LICENSE.txt - https://github.com/picoe/Eto - - false - Eto.Forms - macOS Template - -This package is obsolete in Eto.Forms 2.4. Please remove this package. - - Copyright 2018 by Curtis Wensley - cross platform gui ui framework desktop monomac osx mac eto.forms - - - - - - - - - - diff --git a/build/nuspec/Eto.Platform.Mac.nuspec b/build/nuspec/Eto.Platform.Mac.nuspec deleted file mode 100644 index 828806bfcd..0000000000 --- a/build/nuspec/Eto.Platform.Mac.nuspec +++ /dev/null @@ -1,44 +0,0 @@ - - - - Eto.Platform.Mac - $version$ - $title$ - $author$ - $author$ - LICENSE.txt - https://github.com/picoe/Eto - - false - $description$ - -This package is deprecated and should not be used in new projects, please use Eto.Platform.Mac64 or Eto.Platform.XamMac2 instead. - -This is the 32-bit MonoMac platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide a native interface for Mac users. - -Eto.Platform.Mac uses the open source MonoMac, which allows you to create macOS application bundles from any platform. However, it does require mono to be installed when running on macOS. - -Use Eto.Platform.XamMac2 if you want to bundle mono inside your .app, however it requires Visual Studio on a Mac. - -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. - - $copyright$ - cross platform gui ui framework desktop monomac osx mac eto.forms - - - - - - - - - - - - - - - - diff --git a/build/nuspec/Eto.Platform.Mac64.nuspec b/build/nuspec/Eto.Platform.Mac64.nuspec deleted file mode 100644 index ad20ff5073..0000000000 --- a/build/nuspec/Eto.Platform.Mac64.nuspec +++ /dev/null @@ -1,42 +0,0 @@ - - - - Eto.Platform.Mac64 - $version$ - $title$ - $author$ - $author$ - LICENSE.txt - https://github.com/picoe/Eto - - false - $description$ - -This is the 64-bit MonoMac platform for Eto.Forms UI Framework. - -Eto.Platform.Mac64 uses a modified version of the open source MonoMac for 64-bit, which allows you to create macOS application bundles from any platform. However, it does require mono to be installed when running on macOS. - -Use Eto.Platform.XamMac2 if you want to bundle mono inside your .app, however it requires Visual Studio on a Mac. - -You can create your own .app bundle to run your app on OS X, without an OS X machine. This is included as the MyApp.app folder. Read MyApp.app\Contents\MonoBundle\README.txt for instructions on next steps. - -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. - - $copyright$ - cross platform gui ui framework desktop monomac osx mac eto.forms - - - - - - - - - - - - - - - - diff --git a/build/nuspec/Eto.Platform.WinRT.nuspec b/build/nuspec/Eto.Platform.WinRT.nuspec deleted file mode 100644 index 98bc968b32..0000000000 --- a/build/nuspec/Eto.Platform.WinRT.nuspec +++ /dev/null @@ -1,38 +0,0 @@ - - - - Eto.Platform.WinRT - $version$ - $title$ - $author$ - $author$ - https://github.com/picoe/Eto/raw/master/LICENSE.txt - https://github.com/picoe/Eto - - false - $description$ - -This is the Windows 8 platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide a Windows 8 interface for your windows users. - -You do not need to use any of the classes of this assembly (unless customizing the functionality of the platform), and should just use the UI controls from the Eto assembly. - - $copyright$ - cross platform gui ui framework desktop wpf eto.forms - - - - - - - - - - - - - - - - diff --git a/build/nuspec/Eto.Platform.Windows.nuspec.props b/build/nuspec/Eto.Platform.Windows.nuspec.props deleted file mode 100644 index 7f3e22149a..0000000000 --- a/build/nuspec/Eto.Platform.Windows.nuspec.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - Eto.Platform.Windows - $(NuspecAssemblyInformationalVersion) - $(NuspecAssemblyTitle) - $(NuspecAssemblyCompany) - LICENSE.txt - https://github.com/picoe/Eto - git - $(PackageProjectUrl).git - false - $(NuspecAssemblyDescription) - -This is the Windows Forms platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide a Windows Forms interface for your windows users. - -You do not need to use any of the classes of this assembly (unless customizing the Windows Forms functionality of the platform), and should just use the UI controls from the Eto assembly. - - $(NuspecAssemblyCopyright) - cross platform gui ui framework desktop wpf eto.forms - - - - true - $(PackageLicenseFile) - - - \ No newline at end of file diff --git a/build/nuspec/Eto.Platform.Wpf.nuspec.props b/build/nuspec/Eto.Platform.Wpf.nuspec.props deleted file mode 100644 index bc5a8c45df..0000000000 --- a/build/nuspec/Eto.Platform.Wpf.nuspec.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - Eto.Platform.Wpf - $(NuspecAssemblyInformationalVersion) - Eto.Forms - WPF Platform - $(NuspecAssemblyCompany) - LICENSE.txt - https://github.com/picoe/Eto - git - $(PackageProjectUrl).git - false - WPF Platform for the Eto.Forms UI Framework - -This is the WPF platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide a WPF interface for your windows users. WPF is by default preferred over the Eto.Platform.Windows platform, so if both are included, WPF will be selected. - -You do not need to use any of the classes of this assembly (unless customizing the WPF functionality of the platform), and should just use the UI controls from the Eto assembly. - - $(NuspecAssemblyCopyright) - cross platform gui ui framework desktop wpf eto.forms - - - - true - $(PackageLicenseFile) - - - \ No newline at end of file diff --git a/build/nuspec/Eto.Platform.XamMac.nuspec b/build/nuspec/Eto.Platform.XamMac.nuspec deleted file mode 100644 index b71d49871f..0000000000 --- a/build/nuspec/Eto.Platform.XamMac.nuspec +++ /dev/null @@ -1,39 +0,0 @@ - - - - Eto.Platform.XamMac - $version$ - $title$ - $author$ - $author$ - https://github.com/picoe/Eto/raw/master/LICENSE.txt - https://github.com/picoe/Eto - - false - $description$ - -This package is deprecated and should not be used in new projects, please use Eto.Platform.XamMac2 instead. - -This is the Xamarin.Mac Classic platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide an OS X interface for Mac users. - -* Note: You should only use this package from an Xamarin.Mac project created with Visual Studio on OS X. Xamarin.Mac allows you to bundle mono inside your .app. - -Using Eto.Platform.Mac64 instead uses the open source MonoMac, which allows you to create macOS application bundles from any platform. However, it does require mono to be installed when running on macOS. - -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. - - $copyright$ - cross platform gui ui framework desktop osx xamarin.mac mac eto.forms - - - - - - - - - - - diff --git a/build/nuspec/Eto.Platform.XamMac2.nuspec b/build/nuspec/Eto.Platform.XamMac2.nuspec deleted file mode 100644 index de57972375..0000000000 --- a/build/nuspec/Eto.Platform.XamMac2.nuspec +++ /dev/null @@ -1,41 +0,0 @@ - - - - Eto.Platform.XamMac2 - $version$ - $title$ - $author$ - $author$ - https://github.com/picoe/Eto/raw/master/LICENSE.txt - https://github.com/picoe/Eto - - false - $description$ - -This is the Xamarin.Mac2 (unified) 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. However, it will require mono to be installed when running on macOS. - -In order to bundle mono with your application, you must create a Xamarin.Mac project using Visual Studio on 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. - - $copyright$ - cross platform gui ui framework desktop osx xamarin.mac mac eto.forms - - - - - - - - - - - - - - - diff --git a/build/nuspec/Eto.Platform.iOS.nuspec b/build/nuspec/Eto.Platform.iOS.nuspec deleted file mode 100644 index 2c6ca87019..0000000000 --- a/build/nuspec/Eto.Platform.iOS.nuspec +++ /dev/null @@ -1,33 +0,0 @@ - - - - Eto.Platform.iOS - $version$ - $title$ - $author$ - $author$ - https://github.com/picoe/Eto/raw/master/LICENSE.txt - https://github.com/picoe/Eto - - false - $description$ - -This is the iOS mobile platform for Eto.Forms UI Framework. - -Include this along with your Eto.Forms application to provide an iOS interface for iPhone/iPad/iPod touch users using Xamarin.iOS. - -You do not need to use any of the classes of this assembly (unless customizing the iOS functionality of the platform), and should just use the UI controls from the Eto assembly. - - $copyright$ - cross platform gui ui framework desktop ios eto.forms - - - - - - - - - - - diff --git a/build/nuspec/Eto.Serialization.Json.nuspec.props b/build/nuspec/Eto.Serialization.Json.nuspec.props deleted file mode 100644 index 20ca5260a8..0000000000 --- a/build/nuspec/Eto.Serialization.Json.nuspec.props +++ /dev/null @@ -1,33 +0,0 @@ - - - - Eto.Serialization.Json - $(NuspecAssemblyInformationalVersion) - $(NuspecAssemblyTitle) - $(NuspecAssemblyCompany) - LICENSE.txt - https://github.com/picoe/Eto - git - $(PackageProjectUrl).git - false - $(NuspecAssemblyDescription) - -Eto.Json allows you to load json UI definitions for the Eto.Forms framework - -To get more information about how to get started, read the wiki: - -https://github.com/picoe/Eto/wiki - - $(NuspecAssemblyCopyright) - cross platform gui ui framework desktop json eto.forms - - - - build\ - - - true - $(PackageLicenseFile) - - - \ No newline at end of file diff --git a/build/nuspec/Eto.Serialization.Xaml.nuspec.props b/build/nuspec/Eto.Serialization.Xaml.nuspec.props deleted file mode 100644 index 18dac86c8b..0000000000 --- a/build/nuspec/Eto.Serialization.Xaml.nuspec.props +++ /dev/null @@ -1,33 +0,0 @@ - - - - Eto.Serialization.Xaml - $(NuspecAssemblyInformationalVersion) - $(NuspecAssemblyTitle) - $(NuspecAssemblyCompany) - LICENSE.txt - https://github.com/picoe/Eto - git - $(PackageProjectUrl).git - false - $(NuspecAssemblyDescription) - -Eto.Xaml allows you to load xaml UI definitions for the Eto.Forms framework - -To get more information about how to get started, read the wiki: - -https://github.com/picoe/Eto/wiki - - $(NuspecAssemblyCopyright) - cross platform gui ui framework desktop xaml eto.forms - - - - build\ - - - true - $(PackageLicenseFile) - - - \ No newline at end of file diff --git a/build/nuspec/Mac.targets b/build/nuspec/Mac.targets deleted file mode 100644 index 652d0fdbab..0000000000 --- a/build/nuspec/Mac.targets +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/build/publish.cmd b/build/publish.cmd deleted file mode 100644 index 2cabc6f1f3..0000000000 --- a/build/publish.cmd +++ /dev/null @@ -1,16 +0,0 @@ -echo off - -SET /p ask=Are you sure you want to publish to nuget? -if "%ask%"=="y" goto dopublish -goto end - -:dopublish - -set MSBUILD=c:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe - -%MSBUILD% -t:Publish Build.proj - -:end - - -pause diff --git a/lib/MonoMac/MonoMac-License.txt b/lib/MonoMac/MonoMac-License.txt deleted file mode 100644 index c69cf76be8..0000000000 --- a/lib/MonoMac/MonoMac-License.txt +++ /dev/null @@ -1,217 +0,0 @@ -Dual licensed under either the Apache 2 license or the MIT X11 license - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, -and distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the -copyright owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other -entities that control, are controlled by, or are under common control -with that entity. For the purposes of this definition, "control" means -(i) the power, direct or indirect, to cause the direction or -management of such entity, whether by contract or otherwise, or (ii) -ownership of fifty percent (50%) or more of the outstanding shares, or -(iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, -including but not limited to software source code, documentation -source, and configuration files. - -"Object" form shall mean any form resulting from mechanical -transformation or translation of a Source form, including but not -limited to compiled object code, generated documentation, and -conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object -form, made available under the License, as indicated by a copyright -notice that is included in or attached to the work (an example is -provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object -form, that is based on (or derived from) the Work and for which the -editorial revisions, annotations, elaborations, or other modifications -represent, as a whole, an original work of authorship. For the -purposes of this License, Derivative Works shall not include works -that remain separable from, or merely link (or bind by name) to the -interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the -original version of the Work and any modifications or additions to -that Work or Derivative Works thereof, that is intentionally submitted -to Licensor for inclusion in the Work by the copyright owner or by an -individual or Legal Entity authorized to submit on behalf of the -copyright owner. For the purposes of this definition, "submitted" -means any form of electronic, verbal, or written communication sent to -the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control -systems, and issue tracking systems that are managed by, or on behalf -of, the Licensor for the purpose of discussing and improving the Work, -but excluding communication that is conspicuously marked or otherwise -designated in writing by the copyright owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity -on behalf of whom a Contribution has been received by Licensor and -subsequently incorporated within the Work. - -2. Grant of Copyright License. - -Subject to the terms and conditions of this License, each Contributor -hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, -royalty-free, irrevocable copyright license to reproduce, prepare -Derivative Works of, publicly display, publicly perform, sublicense, -and distribute the Work and such Derivative Works in Source or Object -form. - -3. Grant of Patent License. - -Subject to the terms and conditions of this License, each Contributor -hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, -royalty-free, irrevocable (except as stated in this section) patent -license to make, have made, use, offer to sell, sell, import, and -otherwise transfer the Work, where such license applies only to those -patent claims licensable by such Contributor that are necessarily -infringed by their Contribution(s) alone or by combination of their -Contribution(s) with the Work to which such Contribution(s) was -submitted. If You institute patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that -the Work or a Contribution incorporated within the Work constitutes -direct or contributory patent infringement, then any patent licenses -granted to You under this License for that Work shall terminate as of -the date such litigation is filed. - -4. Redistribution. - -You may reproduce and distribute copies of the Work or Derivative -Works thereof in any medium, with or without modifications, and in -Source or Object form, provided that You meet the following -conditions: - -You must give any other recipients of the Work or Derivative Works a -copy of this License; and You must cause any modified files to carry -prominent notices stating that You changed the files; and You must -retain, in the Source form of any Derivative Works that You -distribute, all copyright, patent, trademark, and attribution notices -from the Source form of the Work, excluding those notices that do not -pertain to any part of the Derivative Works; and If the Work includes -a "NOTICE" text file as part of its distribution, then any Derivative -Works that You distribute must include a readable copy of the -attribution notices contained within such NOTICE file, excluding those -notices that do not pertain to any part of the Derivative Works, in at -least one of the following places: within a NOTICE text file -distributed as part of the Derivative Works; within the Source form or -documentation, if provided along with the Derivative Works; or, within -a display generated by the Derivative Works, if and wherever such -third-party notices normally appear. The contents of the NOTICE file -are for informational purposes only and do not modify the License. You -may add Your own attribution notices within Derivative Works that You -distribute, alongside or as an addendum to the NOTICE text from the -Work, provided that such additional attribution notices cannot be -construed as modifying the License. You may add Your own copyright -statement to Your modifications and may provide additional or -different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works -as a whole, provided Your use, reproduction, and distribution of the -Work otherwise complies with the conditions stated in this License. - -5. Submission of Contributions. - -Unless You explicitly state otherwise, any Contribution intentionally -submitted for inclusion in the Work by You to the Licensor shall be -under the terms and conditions of this License, without any additional -terms or conditions. Notwithstanding the above, nothing herein shall -supersede or modify the terms of any separate license agreement you -may have executed with Licensor regarding such Contributions. - -6. Trademarks. - -This License does not grant permission to use the trade names, -trademarks, service marks, or product names of the Licensor, except as -required for reasonable and customary use in describing the origin of -the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. - -Unless required by applicable law or agreed to in writing, Licensor -provides the Work (and each Contributor provides its Contributions) on -an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either -express or implied, including, without limitation, any warranties or -conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR -A PARTICULAR PURPOSE. You are solely responsible for determining the -appropriateness of using or redistributing the Work and assume any -risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. - -In no event and under no legal theory, whether in tort (including -negligence), contract, or otherwise, unless required by applicable law -(such as deliberate and grossly negligent acts) or agreed to in -writing, shall any Contributor be liable to You for damages, including -any direct, indirect, special, incidental, or consequential damages of -any character arising as a result of this License or out of the use or -inability to use the Work (including but not limited to damages for -loss of goodwill, work stoppage, computer failure or malfunction, or -any and all other commercial damages or losses), even if such -Contributor has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. - -While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work - -To apply the Apache License to your work, attach the following -boilerplate notice, with the fields enclosed by brackets "[]" replaced -with your own identifying information. (Don't include the brackets!) -The text should be enclosed in the appropriate comment syntax for the -file format. We also recommend that a file or class name and -description of purpose be included on the same "printed page" as the -copyright notice for easier identification within third-party -archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/lib/MonoMac/MonoMac.dll b/lib/MonoMac/MonoMac.dll deleted file mode 100644 index b120b2b05f..0000000000 Binary files a/lib/MonoMac/MonoMac.dll and /dev/null differ diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index 6fbee29760..923fe25e88 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -1,8 +1,8 @@ + false - false + $(BasePath)artifacts\samples\ - \ No newline at end of file diff --git a/samples/MonoMac/EmbedEtoInMonoMac/AppDelegate.cs b/samples/MonoMac/EmbedEtoInMonoMac/AppDelegate.cs deleted file mode 100644 index bdf0404a03..0000000000 --- a/samples/MonoMac/EmbedEtoInMonoMac/AppDelegate.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using System.Drawing; -using MonoMac.Foundation; -using MonoMac.AppKit; -using MonoMac.ObjCRuntime; - -namespace EmbedEtoInMonoMac -{ - public partial class AppDelegate : NSApplicationDelegate - { - MainWindowController mainWindowController; - - public AppDelegate() - { - } - - public override void FinishedLaunching(NSObject notification) - { - mainWindowController = new MainWindowController(); - mainWindowController.Window.MakeKeyAndOrderFront(this); - } - } -} - diff --git a/samples/MonoMac/EmbedEtoInMonoMac/AppDelegate.designer.cs b/samples/MonoMac/EmbedEtoInMonoMac/AppDelegate.designer.cs deleted file mode 100644 index 60152bbd1d..0000000000 --- a/samples/MonoMac/EmbedEtoInMonoMac/AppDelegate.designer.cs +++ /dev/null @@ -1,10 +0,0 @@ - -namespace EmbedEtoInMonoMac -{ - // Should subclass MonoMac.AppKit.NSResponder - [MonoMac.Foundation.Register("AppDelegate")] - public partial class AppDelegate - { - } -} - diff --git a/samples/MonoMac/EmbedEtoInMonoMac/EmbedEtoInMonoMac.csproj b/samples/MonoMac/EmbedEtoInMonoMac/EmbedEtoInMonoMac.csproj deleted file mode 100644 index a093a77ab0..0000000000 --- a/samples/MonoMac/EmbedEtoInMonoMac/EmbedEtoInMonoMac.csproj +++ /dev/null @@ -1,113 +0,0 @@ - - - - Debug - AnyCPU - {948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {95B6E385-A0ED-4A49-99B5-19569156FCE6} - Exe - EmbedEtoInMonoMac - Resources - EmbedEtoInMonoMac - True - v4.6.1 - true - - - true - full - false - ..\..\..\artifacts\samples\Debug\net461 - DEBUG; - prompt - 4 - false - false - false - false - false - false - HttpClientHandler - None - None - - - full - true - ..\..\..\artifacts\samples\Release\net461 - prompt - 4 - false - SdkOnly - false - true - false - Developer ID Application - true - true - HttpClientHandler - None - - - full - true - ..\..\..\artifacts\samples\AppStore\net461 - prompt - 4 - false - SdkOnly - false - true - 3rd Party Mac Developer Installer - true - 3rd Party Mac Developer Application - true - true - HttpClientHandler - None - - - - - - - - - ..\..\..\lib\MonoMac\MonoMac.dll - - - - - - - - - - MainWindow.cs - - - - AppDelegate.cs - - - - - - - - - - - - - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66} - Eto.Mac - - - \ No newline at end of file diff --git a/samples/MonoMac/EmbedEtoInMonoMac/Info.plist b/samples/MonoMac/EmbedEtoInMonoMac/Info.plist deleted file mode 100644 index ae59791408..0000000000 --- a/samples/MonoMac/EmbedEtoInMonoMac/Info.plist +++ /dev/null @@ -1,20 +0,0 @@ - - - - - CFBundleDisplayName - EmbedEtoInMonoMac - CFBundleIdentifier - com.your-company.EmbedEtoInMonoMac - CFBundleName - EmbedEtoInMonoMac - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.6 - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/samples/MonoMac/EmbedEtoInMonoMac/MainMenu.xib b/samples/MonoMac/EmbedEtoInMonoMac/MainMenu.xib deleted file mode 100644 index bdd297a761..0000000000 --- a/samples/MonoMac/EmbedEtoInMonoMac/MainMenu.xib +++ /dev/null @@ -1,4074 +0,0 @@ - - - - 1060 - 10D573 - 762 - 1038.29 - 460.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 762 - - - YES - - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - YES - - - YES - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - EmbedEtoInMonoMac - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - MacCocoaApp - - YES - - - About EmbedEtoInMonoMac - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide EmbedEtoInMonoMac - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit EmbedEtoInMonoMac - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - File - - 1048576 - 2147483647 - - - submenuAction: - - File - - YES - - - New - n - 1048576 - 2147483647 - - - - - - Open… - o - 1048576 - 2147483647 - - - - - - Open Recent - - 1048576 - 2147483647 - - - submenuAction: - - Open Recent - - YES - - - Clear Menu - - 1048576 - 2147483647 - - - - - _NSRecentDocumentsMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Close - w - 1048576 - 2147483647 - - - - - - Save - s - 1048576 - 2147483647 - - - - - - Save As… - S - 1179648 - 2147483647 - - - - - - Revert to Saved - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Page Setup... - P - 1179648 - 2147483647 - - - - - - - Print… - p - 1048576 - 2147483647 - - - - - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - Edit - - YES - - - Undo - z - 1048576 - 2147483647 - - - - - - Redo - Z - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cut - x - 1048576 - 2147483647 - - - - - - Copy - c - 1048576 - 2147483647 - - - - - - Paste - v - 1048576 - 2147483647 - - - - - - Paste and Match Style - V - 1572864 - 2147483647 - - - - - - Delete - - 1048576 - 2147483647 - - - - - - Select All - a - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Find - - 1048576 - 2147483647 - - - submenuAction: - - Find - - YES - - - Find… - f - 1048576 - 2147483647 - - - 1 - - - - Find Next - g - 1048576 - 2147483647 - - - 2 - - - - Find Previous - G - 1179648 - 2147483647 - - - 3 - - - - Use Selection for Find - e - 1048576 - 2147483647 - - - 7 - - - - Jump to Selection - j - 1048576 - 2147483647 - - - - - - - - - Spelling and Grammar - - 1048576 - 2147483647 - - - submenuAction: - - Spelling and Grammar - - YES - - - Show Spelling and Grammar - : - 1048576 - 2147483647 - - - - - - Check Document Now - ; - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Check Spelling While Typing - - 1048576 - 2147483647 - - - - - - Check Grammar With Spelling - - 1048576 - 2147483647 - - - - - - Correct Spelling Automatically - - 2147483647 - - - - - - - - - Substitutions - - 1048576 - 2147483647 - - - submenuAction: - - Substitutions - - YES - - - Show Substitutions - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Smart Copy/Paste - f - 1048576 - 2147483647 - - - 1 - - - - Smart Quotes - g - 1048576 - 2147483647 - - - 2 - - - - Smart Dashes - - 2147483647 - - - - - - Smart Links - G - 1179648 - 2147483647 - - - 3 - - - - Text Replacement - - 2147483647 - - - - - - - - - Transformations - - 2147483647 - - - submenuAction: - - Transformations - - YES - - - Make Upper Case - - 2147483647 - - - - - - Make Lower Case - - 2147483647 - - - - - - Capitalize - - 2147483647 - - - - - - - - - Speech - - 1048576 - 2147483647 - - - submenuAction: - - Speech - - YES - - - Start Speaking - - 1048576 - 2147483647 - - - - - - Stop Speaking - - 1048576 - 2147483647 - - - - - - - - - - - - Format - - 2147483647 - - - submenuAction: - - Format - - YES - - - Font - - 2147483647 - - - submenuAction: - - Font - - YES - - - Show Fonts - t - 1048576 - 2147483647 - - - - - - Bold - b - 1048576 - 2147483647 - - - 2 - - - - Italic - i - 1048576 - 2147483647 - - - 1 - - - - Underline - u - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Bigger - + - 1048576 - 2147483647 - - - 3 - - - - Smaller - - - 1048576 - 2147483647 - - - 4 - - - - YES - YES - - - 2147483647 - - - - - - Kern - - 2147483647 - - - submenuAction: - - Kern - - YES - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Tighten - - 2147483647 - - - - - - Loosen - - 2147483647 - - - - - - - - - Ligature - - 2147483647 - - - submenuAction: - - Ligature - - YES - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Use All - - 2147483647 - - - - - - - - - Baseline - - 2147483647 - - - submenuAction: - - Baseline - - YES - - - Use Default - - 2147483647 - - - - - - Superscript - - 2147483647 - - - - - - Subscript - - 2147483647 - - - - - - Raise - - 2147483647 - - - - - - Lower - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Colors - C - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Copy Style - c - 1572864 - 2147483647 - - - - - - Paste Style - v - 1572864 - 2147483647 - - - - - _NSFontMenu - - - - - Text - - 2147483647 - - - submenuAction: - - Text - - YES - - - Align Left - { - 1048576 - 2147483647 - - - - - - Center - | - 1048576 - 2147483647 - - - - - - Justify - - 2147483647 - - - - - - Align Right - } - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Writing Direction - - 2147483647 - - - submenuAction: - - Writing Direction - - YES - - - YES - Paragraph - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - Selection - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Ruler - - 2147483647 - - - - - - Copy Ruler - c - 1310720 - 2147483647 - - - - - - Paste Ruler - v - 1310720 - 2147483647 - - - - - - - - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Show Toolbar - t - 1572864 - 2147483647 - - - - - - Customize Toolbar… - - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - EmbedEtoInMonoMac Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - NSFontManager - - - AppDelegate - - - - - YES - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - print: - - - - 86 - - - - runPageLayout: - - - - 87 - - - - clearRecentDocuments: - - - - 127 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - performClose: - - - - 193 - - - - toggleContinuousSpellChecking: - - - - 222 - - - - undo: - - - - 223 - - - - copy: - - - - 224 - - - - checkSpelling: - - - - 225 - - - - paste: - - - - 226 - - - - stopSpeaking: - - - - 227 - - - - cut: - - - - 228 - - - - showGuessPanel: - - - - 230 - - - - redo: - - - - 231 - - - - selectAll: - - - - 232 - - - - startSpeaking: - - - - 233 - - - - delete: - - - - 235 - - - - performZoom: - - - - 240 - - - - performFindPanelAction: - - - - 241 - - - - centerSelectionInVisibleArea: - - - - 245 - - - - toggleGrammarChecking: - - - - 347 - - - - toggleSmartInsertDelete: - - - - 355 - - - - toggleAutomaticQuoteSubstitution: - - - - 356 - - - - toggleAutomaticLinkDetection: - - - - 357 - - - - saveDocument: - - - - 362 - - - - saveDocumentAs: - - - - 363 - - - - revertDocumentToSaved: - - - - 364 - - - - runToolbarCustomizationPalette: - - - - 365 - - - - toggleToolbarShown: - - - - 366 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - newDocument: - - - - 373 - - - - openDocument: - - - - 374 - - - - addFontTrait: - - - - 421 - - - - addFontTrait: - - - - 422 - - - - modifyFont: - - - - 423 - - - - orderFrontFontPanel: - - - - 424 - - - - modifyFont: - - - - 425 - - - - raiseBaseline: - - - - 426 - - - - lowerBaseline: - - - - 427 - - - - copyFont: - - - - 428 - - - - subscript: - - - - 429 - - - - superscript: - - - - 430 - - - - tightenKerning: - - - - 431 - - - - underline: - - - - 432 - - - - orderFrontColorPanel: - - - - 433 - - - - useAllLigatures: - - - - 434 - - - - loosenKerning: - - - - 435 - - - - pasteFont: - - - - 436 - - - - unscript: - - - - 437 - - - - useStandardKerning: - - - - 438 - - - - useStandardLigatures: - - - - 439 - - - - turnOffLigatures: - - - - 440 - - - - turnOffKerning: - - - - 441 - - - - terminate: - - - - 449 - - - - toggleAutomaticSpellingCorrection: - - - - 456 - - - - orderFrontSubstitutionsPanel: - - - - 458 - - - - toggleAutomaticDashSubstitution: - - - - 461 - - - - toggleAutomaticTextReplacement: - - - - 463 - - - - uppercaseWord: - - - - 464 - - - - capitalizeWord: - - - - 467 - - - - lowercaseWord: - - - - 468 - - - - pasteAsPlainText: - - - - 486 - - - - performFindPanelAction: - - - - 487 - - - - performFindPanelAction: - - - - 488 - - - - performFindPanelAction: - - - - 489 - - - - showHelp: - - - - 493 - - - - alignCenter: - - - - 518 - - - - pasteRuler: - - - - 519 - - - - toggleRuler: - - - - 520 - - - - alignRight: - - - - 521 - - - - copyRuler: - - - - 522 - - - - alignJustified: - - - - 523 - - - - alignLeft: - - - - 524 - - - - makeBaseWritingDirectionNatural: - - - - 525 - - - - makeBaseWritingDirectionLeftToRight: - - - - 526 - - - - makeBaseWritingDirectionRightToLeft: - - - - 527 - - - - makeTextWritingDirectionNatural: - - - - 528 - - - - makeTextWritingDirectionLeftToRight: - - - - 529 - - - - makeTextWritingDirectionRightToLeft: - - - - 530 - - - - delegate - - - - 534 - - - - - YES - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 217 - - - YES - - - - - - 83 - - - YES - - - - - - 81 - - - YES - - - - - - - - - - - - - - - - 75 - - - - - 80 - - - - - 78 - - - - - 72 - - - - - 82 - - - - - 124 - - - YES - - - - - - 77 - - - - - 73 - - - - - 79 - - - - - 112 - - - - - 74 - - - - - 125 - - - YES - - - - - - 126 - - - - - 205 - - - YES - - - - - - - - - - - - - - - - - - - - 202 - - - - - 198 - - - - - 207 - - - - - 214 - - - - - 199 - - - - - 203 - - - - - 197 - - - - - 206 - - - - - 215 - - - - - 218 - - - YES - - - - - - 216 - - - YES - - - - - - 200 - - - YES - - - - - - - - - - - 219 - - - - - 201 - - - - - 204 - - - - - 220 - - - YES - - - - - - - - - - 213 - - - - - 210 - - - - - 221 - - - - - 208 - - - - - 209 - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - - 297 - - - - - 298 - - - - - 211 - - - YES - - - - - - 212 - - - YES - - - - - - - 195 - - - - - 196 - - - - - 346 - - - - - 348 - - - YES - - - - - - 349 - - - YES - - - - - - - - - - - - 350 - - - - - 351 - - - - - 354 - - - - - 375 - - - YES - - - - - - 376 - - - YES - - - - - - - 377 - - - YES - - - - - - 388 - - - YES - - - - - - - - - - - - - - - - - - - - - 389 - - - - - 390 - - - - - 391 - - - - - 392 - - - - - 393 - - - - - 394 - - - - - 395 - - - - - 396 - - - - - 397 - - - YES - - - - - - 398 - - - YES - - - - - - 399 - - - YES - - - - - - 400 - - - - - 401 - - - - - 402 - - - - - 403 - - - - - 404 - - - - - 405 - - - YES - - - - - - - - - - 406 - - - - - 407 - - - - - 408 - - - - - 409 - - - - - 410 - - - - - 411 - - - YES - - - - - - - - 412 - - - - - 413 - - - - - 414 - - - - - 415 - - - YES - - - - - - - - - 416 - - - - - 417 - - - - - 418 - - - - - 419 - - - - - 420 - - - - - 450 - - - YES - - - - - - 451 - - - YES - - - - - - - - 452 - - - - - 453 - - - - - 454 - - - - - 457 - - - - - 459 - - - - - 460 - - - - - 462 - - - - - 465 - - - - - 466 - - - - - 485 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 496 - - - YES - - - - - - 497 - - - YES - - - - - - - - - - - - - - - 498 - - - - - 499 - - - - - 500 - - - - - 501 - - - - - 502 - - - - - 503 - - - YES - - - - - - 504 - - - - - 505 - - - - - 506 - - - - - 507 - - - - - 508 - - - YES - - - - - - - - - - - - - - 509 - - - - - 510 - - - - - 511 - - - - - 512 - - - - - 513 - - - - - 514 - - - - - 515 - - - - - 516 - - - - - 517 - - - - - 533 - - - - - - - YES - - YES - -3.IBPluginDependency - 112.IBPluginDependency - 112.ImportedFromIB2 - 124.IBPluginDependency - 124.ImportedFromIB2 - 125.IBPluginDependency - 125.ImportedFromIB2 - 125.editorWindowContentRectSynchronizationRect - 126.IBPluginDependency - 126.ImportedFromIB2 - 129.IBPluginDependency - 129.ImportedFromIB2 - 130.IBPluginDependency - 130.ImportedFromIB2 - 130.editorWindowContentRectSynchronizationRect - 131.IBPluginDependency - 131.ImportedFromIB2 - 134.IBPluginDependency - 134.ImportedFromIB2 - 136.IBPluginDependency - 136.ImportedFromIB2 - 143.IBPluginDependency - 143.ImportedFromIB2 - 144.IBPluginDependency - 144.ImportedFromIB2 - 145.IBPluginDependency - 145.ImportedFromIB2 - 149.IBPluginDependency - 149.ImportedFromIB2 - 150.IBPluginDependency - 150.ImportedFromIB2 - 19.IBPluginDependency - 19.ImportedFromIB2 - 195.IBPluginDependency - 195.ImportedFromIB2 - 196.IBPluginDependency - 196.ImportedFromIB2 - 197.IBPluginDependency - 197.ImportedFromIB2 - 198.IBPluginDependency - 198.ImportedFromIB2 - 199.IBPluginDependency - 199.ImportedFromIB2 - 200.IBEditorWindowLastContentRect - 200.IBPluginDependency - 200.ImportedFromIB2 - 200.editorWindowContentRectSynchronizationRect - 201.IBPluginDependency - 201.ImportedFromIB2 - 202.IBPluginDependency - 202.ImportedFromIB2 - 203.IBPluginDependency - 203.ImportedFromIB2 - 204.IBPluginDependency - 204.ImportedFromIB2 - 205.IBEditorWindowLastContentRect - 205.IBPluginDependency - 205.ImportedFromIB2 - 205.editorWindowContentRectSynchronizationRect - 206.IBPluginDependency - 206.ImportedFromIB2 - 207.IBPluginDependency - 207.ImportedFromIB2 - 208.IBPluginDependency - 208.ImportedFromIB2 - 209.IBPluginDependency - 209.ImportedFromIB2 - 210.IBPluginDependency - 210.ImportedFromIB2 - 211.IBPluginDependency - 211.ImportedFromIB2 - 212.IBPluginDependency - 212.ImportedFromIB2 - 212.editorWindowContentRectSynchronizationRect - 213.IBPluginDependency - 213.ImportedFromIB2 - 214.IBPluginDependency - 214.ImportedFromIB2 - 215.IBPluginDependency - 215.ImportedFromIB2 - 216.IBPluginDependency - 216.ImportedFromIB2 - 217.IBPluginDependency - 217.ImportedFromIB2 - 218.IBPluginDependency - 218.ImportedFromIB2 - 219.IBPluginDependency - 219.ImportedFromIB2 - 220.IBEditorWindowLastContentRect - 220.IBPluginDependency - 220.ImportedFromIB2 - 220.editorWindowContentRectSynchronizationRect - 221.IBPluginDependency - 221.ImportedFromIB2 - 23.IBPluginDependency - 23.ImportedFromIB2 - 236.IBPluginDependency - 236.ImportedFromIB2 - 239.IBPluginDependency - 239.ImportedFromIB2 - 24.IBEditorWindowLastContentRect - 24.IBPluginDependency - 24.ImportedFromIB2 - 24.editorWindowContentRectSynchronizationRect - 29.IBEditorWindowLastContentRect - 29.IBPluginDependency - 29.ImportedFromIB2 - 29.WindowOrigin - 29.editorWindowContentRectSynchronizationRect - 295.IBPluginDependency - 296.IBEditorWindowLastContentRect - 296.IBPluginDependency - 296.editorWindowContentRectSynchronizationRect - 297.IBPluginDependency - 298.IBPluginDependency - 346.IBPluginDependency - 346.ImportedFromIB2 - 348.IBPluginDependency - 348.ImportedFromIB2 - 349.IBEditorWindowLastContentRect - 349.IBPluginDependency - 349.ImportedFromIB2 - 349.editorWindowContentRectSynchronizationRect - 350.IBPluginDependency - 350.ImportedFromIB2 - 351.IBPluginDependency - 351.ImportedFromIB2 - 354.IBPluginDependency - 354.ImportedFromIB2 - 375.IBPluginDependency - 376.IBEditorWindowLastContentRect - 376.IBPluginDependency - 377.IBPluginDependency - 388.IBEditorWindowLastContentRect - 388.IBPluginDependency - 389.IBPluginDependency - 390.IBPluginDependency - 391.IBPluginDependency - 392.IBPluginDependency - 393.IBPluginDependency - 394.IBPluginDependency - 395.IBPluginDependency - 396.IBPluginDependency - 397.IBPluginDependency - 398.IBPluginDependency - 399.IBPluginDependency - 400.IBPluginDependency - 401.IBPluginDependency - 402.IBPluginDependency - 403.IBPluginDependency - 404.IBPluginDependency - 405.IBPluginDependency - 406.IBPluginDependency - 407.IBPluginDependency - 408.IBPluginDependency - 409.IBPluginDependency - 410.IBPluginDependency - 411.IBPluginDependency - 412.IBPluginDependency - 413.IBPluginDependency - 414.IBPluginDependency - 415.IBPluginDependency - 416.IBPluginDependency - 417.IBPluginDependency - 418.IBPluginDependency - 419.IBPluginDependency - 450.IBPluginDependency - 451.IBEditorWindowLastContentRect - 451.IBPluginDependency - 452.IBPluginDependency - 453.IBPluginDependency - 454.IBPluginDependency - 457.IBPluginDependency - 459.IBPluginDependency - 460.IBPluginDependency - 462.IBPluginDependency - 465.IBPluginDependency - 466.IBPluginDependency - 485.IBPluginDependency - 490.IBPluginDependency - 491.IBEditorWindowLastContentRect - 491.IBPluginDependency - 492.IBPluginDependency - 496.IBPluginDependency - 497.IBEditorWindowLastContentRect - 497.IBPluginDependency - 498.IBPluginDependency - 499.IBPluginDependency - 5.IBPluginDependency - 5.ImportedFromIB2 - 500.IBPluginDependency - 501.IBPluginDependency - 502.IBPluginDependency - 503.IBPluginDependency - 504.IBPluginDependency - 505.IBPluginDependency - 506.IBPluginDependency - 507.IBPluginDependency - 508.IBEditorWindowLastContentRect - 508.IBPluginDependency - 509.IBPluginDependency - 510.IBPluginDependency - 511.IBPluginDependency - 512.IBPluginDependency - 513.IBPluginDependency - 514.IBPluginDependency - 515.IBPluginDependency - 516.IBPluginDependency - 517.IBPluginDependency - 56.IBPluginDependency - 56.ImportedFromIB2 - 57.IBEditorWindowLastContentRect - 57.IBPluginDependency - 57.ImportedFromIB2 - 57.editorWindowContentRectSynchronizationRect - 58.IBPluginDependency - 58.ImportedFromIB2 - 72.IBPluginDependency - 72.ImportedFromIB2 - 73.IBPluginDependency - 73.ImportedFromIB2 - 74.IBPluginDependency - 74.ImportedFromIB2 - 75.IBPluginDependency - 75.ImportedFromIB2 - 77.IBPluginDependency - 77.ImportedFromIB2 - 78.IBPluginDependency - 78.ImportedFromIB2 - 79.IBPluginDependency - 79.ImportedFromIB2 - 80.IBPluginDependency - 80.ImportedFromIB2 - 81.IBEditorWindowLastContentRect - 81.IBPluginDependency - 81.ImportedFromIB2 - 81.editorWindowContentRectSynchronizationRect - 82.IBPluginDependency - 82.ImportedFromIB2 - 83.IBPluginDependency - 83.ImportedFromIB2 - 92.IBPluginDependency - 92.ImportedFromIB2 - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{522, 812}, {146, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{436, 809}, {64, 6}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{753, 187}, {275, 113}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {275, 83}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{453, 408}, {254, 283}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{187, 434}, {243, 243}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {167, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{753, 217}, {238, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {241, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{613, 618}, {194, 73}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{525, 802}, {197, 73}} - {{346, 722}, {402, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {74, 862} - {{6, 978}, {478, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - {{563, 648}, {231, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - {{475, 832}, {234, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{746, 287}, {220, 133}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {215, 63}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - {{497, 648}, {83, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{580, 408}, {175, 283}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{753, 197}, {170, 63}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{684, 668}, {142, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{674, 260}, {204, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{878, 180}, {164, 173}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{355, 508}, {183, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{23, 794}, {245, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{411, 488}, {196, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 474}, {199, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - YES - - - YES - - - - - YES - - - YES - - - - 534 - - - - YES - - AppDelegate - NSResponder - - IBUserSource - - - - - - YES - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSBrowser - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSBrowser.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSDocument - NSObject - - YES - - YES - printDocument: - revertDocumentToSaved: - runPageLayout: - saveDocument: - saveDocumentAs: - saveDocumentTo: - - - YES - id - id - id - id - id - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSDocument.h - - - - NSDocument - - IBFrameworkSource - AppKit.framework/Headers/NSDocumentScripting.h - - - - NSDocumentController - NSObject - - YES - - YES - clearRecentDocuments: - newDocument: - openDocument: - saveAllDocuments: - - - YES - id - id - id - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSDocumentController.h - - - - NSFontManager - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMatrix - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSMatrix.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSMenuItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSMovieView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMovieView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSTableView - NSControl - - - - NSText - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSText.h - - - - NSTextView - NSText - - IBFrameworkSource - AppKit.framework/Headers/NSTextView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - ../MacCocoaApp.xcodeproj - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - diff --git a/samples/MonoMac/EmbedEtoInMonoMac/MainWindow.cs b/samples/MonoMac/EmbedEtoInMonoMac/MainWindow.cs deleted file mode 100644 index 9ef47a13c4..0000000000 --- a/samples/MonoMac/EmbedEtoInMonoMac/MainWindow.cs +++ /dev/null @@ -1,35 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using MonoMac.Foundation; -using MonoMac.AppKit; - -namespace EmbedEtoInMonoMac -{ - public partial class MainWindow : MonoMac.AppKit.NSWindow - { - #region Constructors - - // Called when created from unmanaged code - public MainWindow(IntPtr handle) : base(handle) - { - Initialize(); - } - - // Called when created directly from a XIB file - [Export("initWithCoder:")] - public MainWindow(NSCoder coder) : base(coder) - { - Initialize(); - } - - // Shared initialization code - void Initialize() - { - } - - #endregion - } -} - diff --git a/samples/MonoMac/EmbedEtoInMonoMac/MainWindow.designer.cs b/samples/MonoMac/EmbedEtoInMonoMac/MainWindow.designer.cs deleted file mode 100644 index eb9b60cb6c..0000000000 --- a/samples/MonoMac/EmbedEtoInMonoMac/MainWindow.designer.cs +++ /dev/null @@ -1,29 +0,0 @@ -// WARNING -// -// This file has been generated automatically by Xamarin Studio to store outlets and -// actions made in the UI designer. If it is removed, they will be lost. -// Manual changes to this file may not be handled correctly. -// -using MonoMac.Foundation; -using System.CodeDom.Compiler; - -namespace EmbedEtoInMonoMac -{ - [Register ("MainWindowController")] - partial class MainWindowController - { - - void ReleaseDesignerOutlets () - { - } - } - - [Register ("MainWindow")] - partial class MainWindow - { - - void ReleaseDesignerOutlets () - { - } - } -} diff --git a/samples/MonoMac/EmbedEtoInMonoMac/MainWindow.xib b/samples/MonoMac/EmbedEtoInMonoMac/MainWindow.xib deleted file mode 100644 index a21b4db2ee..0000000000 --- a/samples/MonoMac/EmbedEtoInMonoMac/MainWindow.xib +++ /dev/null @@ -1,154 +0,0 @@ - - - - 1090 - 13F34 - 6245 - 1265.21 - 698.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 6245 - - - NSCustomObject - NSView - NSWindowTemplate - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - MainWindowController - - - FirstResponder - - - NSApplication - - - 15 - 2 - {{131, 74}, {606, 354}} - 611844096 - Window - MainWindow - - - - - 256 - - {606, 354} - - - - - {{0, 0}, {1440, 878}} - {10000000000000, 10000000000000} - YES - - - - - - - window - - - - 6 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 2 - - - - - - - - 3 - - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{319, 371}, {606, 354}} - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 9 - - - - - MainWindow - NSWindow - - IBProjectSource - ../MainWindow.h - - - - MainWindowController - NSWindowController - - IBProjectSource - ../MainWindowController.h - - - - - 0 - IBCocoaFramework - NO - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - diff --git a/samples/MonoMac/EmbedEtoInMonoMac/MainWindowController.cs b/samples/MonoMac/EmbedEtoInMonoMac/MainWindowController.cs deleted file mode 100644 index 1533732e26..0000000000 --- a/samples/MonoMac/EmbedEtoInMonoMac/MainWindowController.cs +++ /dev/null @@ -1,66 +0,0 @@ - -using System; -using System.Collections.Generic; -using System.Linq; -using MonoMac.Foundation; -using MonoMac.AppKit; -using Eto.Forms; -using System.Drawing; - -namespace EmbedEtoInMonoMac -{ - public partial class MainWindowController : MonoMac.AppKit.NSWindowController - { - #region Constructors - - // Called when created from unmanaged code - public MainWindowController(IntPtr handle) : base(handle) - { - Initialize(); - } - - // Called when created directly from a XIB file - [Export("initWithCoder:")] - public MainWindowController(NSCoder coder) : base(coder) - { - Initialize(); - } - - // Call to load from the XIB/NIB file - public MainWindowController() : base("MainWindow") - { - Initialize(); - } - - // Shared initialization code - void Initialize() - { - } - - #endregion - - //strongly typed window accessor - public new MainWindow Window - { - get { return (MainWindow)base.Window; } - } - - - public override void AwakeFromNib() - { - base.AwakeFromNib(); - - // Get native view for the panel - // passing true so that we can embed, otherwise we just get a reference to the control - var nativeView = new MyEtoPanel().ToNative(true); - - nativeView.AutoresizingMask = NSViewResizingMask.MinYMargin; // anchor to top left - - // position control, keeping auto size of control - var contentFrame = Window.ContentView.Frame; - nativeView.SetFrameOrigin(new PointF(100, contentFrame.Height - nativeView.Frame.Height - 100)); - - Window.ContentView.AddSubview(nativeView); - } - } -} \ No newline at end of file diff --git a/samples/MonoMac/EmbedMonoMacInEto/Info.plist b/samples/MonoMac/EmbedMonoMacInEto/Info.plist deleted file mode 100644 index 3399fd2d77..0000000000 --- a/samples/MonoMac/EmbedMonoMacInEto/Info.plist +++ /dev/null @@ -1,18 +0,0 @@ - - - - - CFBundleDisplayName - EmbedMonoMacInEto - CFBundleIdentifier - com.your-company.EmbedMonoMacInEto - CFBundleName - EmbedMonoMacInEto - CFBundleVersion - 1 - LSMinimumSystemVersion - 10.6 - NSPrincipalClass - NSApplication - - diff --git a/samples/MonoMac/EmbedMonoMacInEto/MyNativeView.designer.cs b/samples/MonoMac/EmbedMonoMacInEto/MyNativeView.designer.cs deleted file mode 100644 index 203e002934..0000000000 --- a/samples/MonoMac/EmbedMonoMacInEto/MyNativeView.designer.cs +++ /dev/null @@ -1,17 +0,0 @@ - -namespace EmbedMonoMacInEto -{ - - // Should subclass MonoMac.AppKit.NSView - [MonoMac.Foundation.Register("MyNativeView")] - public partial class MyNativeView - { - } - - // Should subclass MonoMac.AppKit.NSViewController - [MonoMac.Foundation.Register("MyNativeViewController")] - public partial class MyNativeViewController - { - } -} - diff --git a/samples/MonoMac/EmbedMonoMacInEto/MyNativeView.xib b/samples/MonoMac/EmbedMonoMacInEto/MyNativeView.xib deleted file mode 100644 index fe398afcd9..0000000000 --- a/samples/MonoMac/EmbedMonoMacInEto/MyNativeView.xib +++ /dev/null @@ -1,385 +0,0 @@ - - - - 1090 - 13F34 - 6245 - 1265.21 - 698.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 6245 - - - NSComboBox - NSComboBoxCell - NSCustomObject - NSCustomView - NSTextField - NSTextFieldCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - MyNativeViewController - - - FirstResponder - - - NSApplication - - - - 268 - - - - 266 - {{45, 45}, {353, 26}} - - - _NS:9 - YES - - 342884417 - 272630784 - - - YES - 13 - 1044 - - _NS:9 - - YES - - 6 - System - textBackgroundColor - - 3 - MQA - - - - 6 - System - controlTextColor - - 3 - MAA - - - 5 - YES - - Item 1 - Item 2 - Item 3 - - - - - 274 - {13, 63} - - - _NS:29 - YES - NO - YES - - - 0 - 10 - 10 - 3.4028234663852886e+38 - - 67108928 - 2048 - - - YES - 11 - 3100 - - - 6 - System - headerColor - - - - 6 - System - headerTextColor - - - - - 337641536 - 268437504 - Item 3 - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - - 3 - YES - - - - 3 - 2 - - - 6 - System - gridColor - - 3 - MC41AA - - - 19 - tableViewAction: - -765427712 - - - - 1 - -1 - 0 - YES - 0 - 1 - - - NO - 1 - - - - 268 - {{43, 156}, {237, 17}} - - - - _NS:526 - {251, 750} - YES - - 68157504 - 272630784 - A Cocoa Label - - _NS:526 - - - 6 - System - controlColor - - - - - NO - 1 - - - - 266 - {{45, 103}, {350, 22}} - - - - _NS:9 - YES - - -1804599231 - 272630784 - - - _NS:9 - - YES - - - 6 - System - textColor - - - - NO - 1 - - - {420, 202} - - - - MyNativeView - - - - - - - view - - - - 17 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 4 - - - - - - - - - - 18 - - - - - - - - 19 - - - - - 20 - - - - - - - - 21 - - - - - 22 - - - - - - - - 23 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {302, 329} - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 23 - - - - - MyNativeView - NSView - - IBProjectSource - ../MyNativeView.h - - - - MyNativeViewController - NSViewController - - IBProjectSource - ../MyNativeViewController.h - - - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - - 0 - IBCocoaFramework - NO - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - diff --git a/samples/Samples.sln b/samples/Samples.sln index ce55188b91..af79eaa54b 100644 --- a/samples/Samples.sln +++ b/samples/Samples.sln @@ -3,21 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2026 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MonoMac", "MonoMac", "{F65C2B2B-BE0E-4AF5-B65B-3F770F8D54CF}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XamarinMac", "XamarinMac", "{F65C2B2B-BE0E-4AF5-B65B-3F770F8D54CF}" ProjectSection(MonoDevelopProperties) = preProject - BaseDirectory = MonoMac + BaseDirectory = XamarinMac EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbedEtoInMonoMac", "MonoMac\EmbedEtoInMonoMac\EmbedEtoInMonoMac.csproj", "{95B6E385-A0ED-4A49-99B5-19569156FCE6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbedMonoMacInEto", "MonoMac\EmbedMonoMacInEto\EmbedMonoMacInEto.csproj", "{86A6EB85-7A64-4E9A-9C72-121A904D8EAF}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Eto", "Eto", "{19A4EA01-CA9E-4390-B448-974152AB5706}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto", "..\src\Eto\Eto.csproj", "{35EF0A4E-2A1A-492C-8BED-106774EA09F2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Mac", "..\src\Eto.Mac\Eto.Mac.csproj", "{3E7995E0-C9EB-11E3-9C1A-0800200C9A66}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.WinForms", "..\src\Eto.WinForms\Eto.WinForms.csproj", "{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Wpf", "..\src\Eto.Wpf\Eto.Wpf.csproj", "{63137FA0-CA55-11E3-9C1A-0800200C9A66}" @@ -49,25 +43,37 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorials", "Tutorials", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FSharp", "FSharp", "{7F02CD51-CD4B-4927-AAF3-3B056D5413B3}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FS.Tutorial1.HelloWorld", "Tutorials\FSharp\Tutorial1\FS.Tutorial1.HelloWorld.fsproj", "{1364E3AE-8EA7-4A0C-88DD-5131A31F2B3F}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FS.Tutorial1.HelloWorld", "Tutorials\FSharp\Tutorial1\FS.Tutorial1.HelloWorld.fsproj", "{1364E3AE-8EA7-4A0C-88DD-5131A31F2B3F}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FS.Tutorial2.MenusAndToolbars", "Tutorials\FSharp\Tutorial2\FS.Tutorial2.MenusAndToolbars.fsproj", "{4A9DEB43-39B2-4AE6-98B2-7F0F73E449C4}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FS.Tutorial2.MenusAndToolbars", "Tutorials\FSharp\Tutorial2\FS.Tutorial2.MenusAndToolbars.fsproj", "{4A9DEB43-39B2-4AE6-98B2-7F0F73E449C4}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FS.Tutorial3.TableLayout", "Tutorials\FSharp\Tutorial3\FS.Tutorial3.TableLayout.fsproj", "{4A9DEB43-39B3-4AE6-98B2-7F0F73E449C4}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FS.Tutorial3.TableLayout", "Tutorials\FSharp\Tutorial3\FS.Tutorial3.TableLayout.fsproj", "{4A9DEB43-39B3-4AE6-98B2-7F0F73E449C4}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FS.Tutorial4.Binding", "Tutorials\FSharp\Tutorial4\FS.Tutorial4.Binding.fsproj", "{B7ED284C-EDAF-4F91-829A-04C297FA92B6}" +Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FS.Tutorial4.Binding", "Tutorials\FSharp\Tutorial4\FS.Tutorial4.Binding.fsproj", "{B7ED284C-EDAF-4F91-829A-04C297FA92B6}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Mac64", "..\src\Eto.Mac\Eto.Mac64.csproj", "{55DAB390-1CFC-11E4-8C21-0800200C9A66}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{C1F05813-B09E-4946-808C-42D46BF999A3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS.Tutorial1.HelloWorld", "Tutorials\CSharp\Tutorial1\CS.Tutorial1.HelloWorld.csproj", "{7BE9E187-3FC4-49D2-A322-F4651C3AE256}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CS.Tutorial1.HelloWorld", "Tutorials\CSharp\Tutorial1\CS.Tutorial1.HelloWorld.csproj", "{7BE9E187-3FC4-49D2-A322-F4651C3AE256}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CS.Tutorial2.MenusAndToolbars", "Tutorials\CSharp\Tutorial2\CS.Tutorial2.MenusAndToolbars.csproj", "{0844A0AD-778A-4DB3-8332-03AC50A17D05}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CS.Tutorial3.TableLayout", "Tutorials\CSharp\Tutorial3\CS.Tutorial3.TableLayout.csproj", "{D51732E0-1E93-11E3-8224-0800200C9A66}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS.Tutorial2.MenusAndToolbars", "Tutorials\CSharp\Tutorial2\CS.Tutorial2.MenusAndToolbars.csproj", "{0844A0AD-778A-4DB3-8332-03AC50A17D05}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CS.Tutorial4.Binding", "Tutorials\CSharp\Tutorial4\CS.Tutorial4.Binding.csproj", "{DDC8A290-2F20-11E4-8C21-0800200C9A66}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS.Tutorial3.TableLayout", "Tutorials\CSharp\Tutorial3\CS.Tutorial3.TableLayout.csproj", "{D51732E0-1E93-11E3-8224-0800200C9A66}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbedEtoInXamarinMac", "XamarinMac\EmbedEtoInXamarinMac\EmbedEtoInXamarinMac.csproj", "{BD58EE60-9197-4C28-87C7-85AA13E02332}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CS.Tutorial4.Binding", "Tutorials\CSharp\Tutorial4\CS.Tutorial4.Binding.csproj", "{DDC8A290-2F20-11E4-8C21-0800200C9A66}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EmbedXamarinMacInEto", "XamarinMac\EmbedXamarinMacInEto\EmbedXamarinMacInEto.csproj", "{41266591-508F-40B6-9360-AFECE6FBFC27}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{212A0614-C2B8-4BA8-9EA6-3CD26A5629D2}" + ProjectSection(SolutionItems) = preProject + Directory.Build.props = Directory.Build.props + 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 Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -79,30 +85,6 @@ Global Release|Windows = Release|Windows EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Debug|Linux.ActiveCfg = Debug|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Debug|Linux.Build.0 = Debug|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Debug|Mac.ActiveCfg = Debug|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Debug|Mac.Build.0 = Debug|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Debug|Windows.ActiveCfg = Debug|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Debug|Windows.Build.0 = Debug|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Release|Linux.ActiveCfg = Release|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Release|Linux.Build.0 = Release|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Release|Mac.ActiveCfg = Release|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Release|Mac.Build.0 = Release|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Release|Windows.ActiveCfg = Release|Any CPU - {95B6E385-A0ED-4A49-99B5-19569156FCE6}.Release|Windows.Build.0 = Release|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Debug|Linux.ActiveCfg = Debug|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Debug|Linux.Build.0 = Debug|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Debug|Mac.ActiveCfg = Debug|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Debug|Mac.Build.0 = Debug|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Debug|Windows.ActiveCfg = Debug|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Debug|Windows.Build.0 = Debug|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Release|Linux.ActiveCfg = Release|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Release|Linux.Build.0 = Release|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Release|Mac.ActiveCfg = Release|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Release|Mac.Build.0 = Release|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Release|Windows.ActiveCfg = Release|Any CPU - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF}.Release|Windows.Build.0 = Release|Any CPU {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Debug|Linux.ActiveCfg = Debug|Any CPU {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Debug|Linux.Build.0 = Debug|Any CPU {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Debug|Mac.ActiveCfg = Debug|Any CPU @@ -115,18 +97,6 @@ Global {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Release|Mac.Build.0 = Release|Any CPU {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Release|Windows.ActiveCfg = Release|Any CPU {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Release|Windows.Build.0 = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Linux.Build.0 = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Windows.Build.0 = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Linux.Build.0 = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU {9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Debug|Linux.ActiveCfg = Debug|Any CPU {9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Debug|Linux.Build.0 = Debug|Any CPU {9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Debug|Mac.ActiveCfg = Debug|Any CPU @@ -331,15 +301,36 @@ Global {DDC8A290-2F20-11E4-8C21-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU {DDC8A290-2F20-11E4-8C21-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU {DDC8A290-2F20-11E4-8C21-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU + {BD58EE60-9197-4C28-87C7-85AA13E02332}.Debug|Linux.ActiveCfg = Debug|Any CPU + {BD58EE60-9197-4C28-87C7-85AA13E02332}.Debug|Mac.ActiveCfg = Debug|Any CPU + {BD58EE60-9197-4C28-87C7-85AA13E02332}.Debug|Mac.Build.0 = Debug|Any CPU + {BD58EE60-9197-4C28-87C7-85AA13E02332}.Debug|Windows.ActiveCfg = Debug|Any CPU + {BD58EE60-9197-4C28-87C7-85AA13E02332}.Release|Linux.ActiveCfg = Release|Any CPU + {BD58EE60-9197-4C28-87C7-85AA13E02332}.Release|Mac.ActiveCfg = Release|Any CPU + {BD58EE60-9197-4C28-87C7-85AA13E02332}.Release|Mac.Build.0 = Release|Any CPU + {BD58EE60-9197-4C28-87C7-85AA13E02332}.Release|Windows.ActiveCfg = Release|Any CPU + {41266591-508F-40B6-9360-AFECE6FBFC27}.Debug|Linux.ActiveCfg = Debug|Any CPU + {41266591-508F-40B6-9360-AFECE6FBFC27}.Debug|Mac.ActiveCfg = Debug|Any CPU + {41266591-508F-40B6-9360-AFECE6FBFC27}.Debug|Mac.Build.0 = Debug|Any CPU + {41266591-508F-40B6-9360-AFECE6FBFC27}.Debug|Windows.ActiveCfg = Debug|Any CPU + {41266591-508F-40B6-9360-AFECE6FBFC27}.Release|Linux.ActiveCfg = Release|Any CPU + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {95B6E385-A0ED-4A49-99B5-19569156FCE6} = {F65C2B2B-BE0E-4AF5-B65B-3F770F8D54CF} - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF} = {F65C2B2B-BE0E-4AF5-B65B-3F770F8D54CF} {35EF0A4E-2A1A-492C-8BED-106774EA09F2} = {19A4EA01-CA9E-4390-B448-974152AB5706} - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66} = {19A4EA01-CA9E-4390-B448-974152AB5706} {9F51798A-354C-47A1-9207-4BB7D7FC7FC4} = {19A4EA01-CA9E-4390-B448-974152AB5706} {63137FA0-CA55-11E3-9C1A-0800200C9A66} = {19A4EA01-CA9E-4390-B448-974152AB5706} {80915A80-CA54-11E3-9C1A-0800200C9A66} = {19A4EA01-CA9E-4390-B448-974152AB5706} @@ -360,55 +351,11 @@ Global {0844A0AD-778A-4DB3-8332-03AC50A17D05} = {C1F05813-B09E-4946-808C-42D46BF999A3} {D51732E0-1E93-11E3-8224-0800200C9A66} = {C1F05813-B09E-4946-808C-42D46BF999A3} {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} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C5EE3ED5-BFCC-4709-9FC2-0053C18D5883} EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = Tutorials\Tutorial1\Tutorial1 - Hello World.csproj - Policies = $0 - $0.TextStylePolicy = $1 - $1.inheritsSet = null - $1.scope = text/x-csharp - $0.CSharpFormattingPolicy = $2 - $2.IndentSwitchBody = True - $2.AnonymousMethodBraceStyle = NextLine - $2.PropertyBraceStyle = NextLine - $2.PropertyGetBraceStyle = NextLine - $2.PropertySetBraceStyle = NextLine - $2.EventBraceStyle = NextLine - $2.EventAddBraceStyle = NextLine - $2.EventRemoveBraceStyle = NextLine - $2.StatementBraceStyle = NextLine - $2.ElseNewLinePlacement = NewLine - $2.CatchNewLinePlacement = NewLine - $2.FinallyNewLinePlacement = NewLine - $2.WhileNewLinePlacement = DoNotCare - $2.ArrayInitializerWrapping = DoNotChange - $2.ArrayInitializerBraceStyle = NextLine - $2.BeforeMethodDeclarationParentheses = False - $2.BeforeMethodCallParentheses = False - $2.BeforeConstructorDeclarationParentheses = False - $2.BeforeDelegateDeclarationParentheses = False - $2.NewParentheses = False - $2.SpacesBeforeBrackets = False - $2.scope = text/x-csharp - $2.IndentSwitchSection = False - $2.NewLinesForBracesInProperties = False - $2.NewLinesForBracesInAccessors = False - $2.NewLinesForBracesInAnonymousMethods = False - $2.NewLinesForBracesInControlBlocks = False - $2.NewLinesForBracesInAnonymousTypes = False - $2.NewLinesForBracesInObjectCollectionArrayInitializers = False - $2.NewLinesForBracesInLambdaExpressionBody = False - $2.NewLineForElse = False - $2.NewLineForCatch = False - $2.NewLineForFinally = False - $2.NewLineForMembersInObjectInit = False - $2.NewLineForMembersInAnonymousTypes = False - $2.NewLineForClausesInQuery = False - $2.SpacingAfterMethodDeclarationName = True - $2.SpaceAfterMethodCallName = True - $2.SpaceBeforeOpenSquareBracket = True - EndGlobalSection EndGlobal diff --git a/samples/Tutorials/CSharp/Tutorial1/CS.Tutorial1.HelloWorld.csproj b/samples/Tutorials/CSharp/Tutorial1/CS.Tutorial1.HelloWorld.csproj index 75d532639e..bf9e0760e7 100644 --- a/samples/Tutorials/CSharp/Tutorial1/CS.Tutorial1.HelloWorld.csproj +++ b/samples/Tutorials/CSharp/Tutorial1/CS.Tutorial1.HelloWorld.csproj @@ -3,10 +3,9 @@ WinExe net461 - ..\..\..\..\artifacts\samples\$(Configuration)\ Tutorial1 Tutorial1 - Hello World - True + True true @@ -19,7 +18,6 @@ - \ No newline at end of file diff --git a/samples/Tutorials/CSharp/Tutorial2/CS.Tutorial2.MenusAndToolbars.csproj b/samples/Tutorials/CSharp/Tutorial2/CS.Tutorial2.MenusAndToolbars.csproj index e2d6accef4..799504873d 100644 --- a/samples/Tutorials/CSharp/Tutorial2/CS.Tutorial2.MenusAndToolbars.csproj +++ b/samples/Tutorials/CSharp/Tutorial2/CS.Tutorial2.MenusAndToolbars.csproj @@ -3,9 +3,8 @@ WinExe net461 - ..\..\..\..\artifacts\samples\$(Configuration)\ Tutorial2 - True + True true @@ -18,7 +17,6 @@ - \ No newline at end of file diff --git a/samples/Tutorials/CSharp/Tutorial3/CS.Tutorial3.TableLayout.csproj b/samples/Tutorials/CSharp/Tutorial3/CS.Tutorial3.TableLayout.csproj index 3b75d4278f..2f1d701fe4 100644 --- a/samples/Tutorials/CSharp/Tutorial3/CS.Tutorial3.TableLayout.csproj +++ b/samples/Tutorials/CSharp/Tutorial3/CS.Tutorial3.TableLayout.csproj @@ -3,9 +3,8 @@ WinExe net461 - ..\..\..\..\artifacts\samples\$(Configuration)\ Tutorial3 - True + True true @@ -18,7 +17,6 @@ - \ No newline at end of file diff --git a/samples/Tutorials/CSharp/Tutorial4/CS.Tutorial4.Binding.csproj b/samples/Tutorials/CSharp/Tutorial4/CS.Tutorial4.Binding.csproj index a971dbad8e..6ca1c84e29 100644 --- a/samples/Tutorials/CSharp/Tutorial4/CS.Tutorial4.Binding.csproj +++ b/samples/Tutorials/CSharp/Tutorial4/CS.Tutorial4.Binding.csproj @@ -3,9 +3,8 @@ WinExe net461 - ..\..\..\..\artifacts\samples\$(Configuration)\ Tutorial4 - True + True true @@ -18,7 +17,6 @@ - \ No newline at end of file diff --git a/samples/Tutorials/FSharp/Tutorial1/FS.Tutorial1.HelloWorld.fsproj b/samples/Tutorials/FSharp/Tutorial1/FS.Tutorial1.HelloWorld.fsproj index b43a166549..d716aedd39 100644 --- a/samples/Tutorials/FSharp/Tutorial1/FS.Tutorial1.HelloWorld.fsproj +++ b/samples/Tutorials/FSharp/Tutorial1/FS.Tutorial1.HelloWorld.fsproj @@ -3,10 +3,9 @@ WinExe net461 - ..\..\..\..\artifacts\samples\$(Configuration)\ Tutorial1 Tutorial1 - Hello World - True + True true @@ -19,7 +18,6 @@ - diff --git a/samples/Tutorials/FSharp/Tutorial2/FS.Tutorial2.MenusAndToolbars.fsproj b/samples/Tutorials/FSharp/Tutorial2/FS.Tutorial2.MenusAndToolbars.fsproj index 6dc80bb3f0..0fa720424a 100644 --- a/samples/Tutorials/FSharp/Tutorial2/FS.Tutorial2.MenusAndToolbars.fsproj +++ b/samples/Tutorials/FSharp/Tutorial2/FS.Tutorial2.MenusAndToolbars.fsproj @@ -3,10 +3,9 @@ WinExe net461 - ..\..\..\..\artifacts\samples\$(Configuration)\ Tutorial2 Tutorial2 - Menus and Toolbars - True + True true @@ -19,7 +18,6 @@ - \ No newline at end of file diff --git a/samples/Tutorials/FSharp/Tutorial3/FS.Tutorial3.TableLayout.fsproj b/samples/Tutorials/FSharp/Tutorial3/FS.Tutorial3.TableLayout.fsproj index d4e0c63572..1b8919c60c 100644 --- a/samples/Tutorials/FSharp/Tutorial3/FS.Tutorial3.TableLayout.fsproj +++ b/samples/Tutorials/FSharp/Tutorial3/FS.Tutorial3.TableLayout.fsproj @@ -3,10 +3,9 @@ WinExe net461 - ..\..\..\..\artifacts\samples\$(Configuration)\ Tutorial3 Tutorial3 - Table Layout - True + True true @@ -19,7 +18,6 @@ - \ No newline at end of file diff --git a/samples/Tutorials/FSharp/Tutorial4/FS.Tutorial4.Binding.fsproj b/samples/Tutorials/FSharp/Tutorial4/FS.Tutorial4.Binding.fsproj index 67232ae4f1..4ba91fd4f0 100644 --- a/samples/Tutorials/FSharp/Tutorial4/FS.Tutorial4.Binding.fsproj +++ b/samples/Tutorials/FSharp/Tutorial4/FS.Tutorial4.Binding.fsproj @@ -3,10 +3,9 @@ WinExe net461 - ..\..\..\..\artifacts\samples\$(Configuration)\ Tutorial4 Tutorial4 - Binding - True + True true @@ -19,7 +18,6 @@ - \ No newline at end of file diff --git a/samples/WinForms/EmbedEtoInWinForms/EmbedEtoInWinForms.csproj b/samples/WinForms/EmbedEtoInWinForms/EmbedEtoInWinForms.csproj index 38576e52bb..6db33d725f 100644 --- a/samples/WinForms/EmbedEtoInWinForms/EmbedEtoInWinForms.csproj +++ b/samples/WinForms/EmbedEtoInWinForms/EmbedEtoInWinForms.csproj @@ -1,33 +1,21 @@ - - - - - true - + + true + $(TargetFrameworks);net461 $(TargetFrameworks);netcoreapp3.0 - - + + WinExe Properties - EmbedEtoInWinForms - EmbedEtoInWinForms - false - ..\..\..\artifacts\samples\$(Configuration)\ true - - - - true + true @@ -81,9 +69,7 @@ - - + + diff --git a/samples/WinForms/EmbedEtoInWinForms/Properties/AssemblyInfo.cs b/samples/WinForms/EmbedEtoInWinForms/Properties/AssemblyInfo.cs deleted file mode 100644 index fd5a86f31e..0000000000 --- a/samples/WinForms/EmbedEtoInWinForms/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("EmbedEtoInWinForms")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EmbedEtoInWinForms")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e7258e63-ea64-4659-95ee-6e0a93c4517f")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/samples/WinForms/EmbedWinFormsInEto/EmbedWinFormsInEto.csproj b/samples/WinForms/EmbedWinFormsInEto/EmbedWinFormsInEto.csproj index 19f4db272a..63352ab9e7 100644 --- a/samples/WinForms/EmbedWinFormsInEto/EmbedWinFormsInEto.csproj +++ b/samples/WinForms/EmbedWinFormsInEto/EmbedWinFormsInEto.csproj @@ -1,34 +1,22 @@ - - - - - true - + + true + $(TargetFrameworks);net461 $(TargetFrameworks);netcoreapp3.0 - - + + WinExe Properties - EmbedWinFormsInEto - EmbedWinFormsInEto true - false - ..\..\..\artifacts\samples\$(Configuration)\ true - - - - true + true @@ -56,9 +44,7 @@ - - + + diff --git a/samples/WinForms/EmbedWinFormsInEto/Properties/AssemblyInfo.cs b/samples/WinForms/EmbedWinFormsInEto/Properties/AssemblyInfo.cs deleted file mode 100644 index a76f599fda..0000000000 --- a/samples/WinForms/EmbedWinFormsInEto/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("EmbedWinFormsInEto")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Picoe Software Solutions Inc.")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("Curtis Wensley")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj b/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj index a3c17ddf9b..3e7867d41c 100644 --- a/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj +++ b/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj @@ -1,29 +1,18 @@ - - - true - - $(TargetFrameworks);net461 $(TargetFrameworks);netcoreapp3.0 - - + + WinExe Properties - EmbedEtoInWpf - EmbedEtoInWpf - false - ..\..\..\artifacts\samples\$(Configuration)\ - true + true true @@ -36,7 +25,6 @@ - 4.0 @@ -85,18 +73,12 @@ - - - - - - + + \ No newline at end of file diff --git a/samples/Wpf/EmbedEtoInWpf/Properties/AssemblyInfo.cs b/samples/Wpf/EmbedEtoInWpf/Properties/AssemblyInfo.cs index d3fdc04d78..27cf3851df 100644 --- a/samples/Wpf/EmbedEtoInWpf/Properties/AssemblyInfo.cs +++ b/samples/Wpf/EmbedEtoInWpf/Properties/AssemblyInfo.cs @@ -4,17 +4,6 @@ using System.Runtime.InteropServices; using System.Windows; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("EmbedEtoInWpf")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EmbedEtoInWpf")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -41,15 +30,3 @@ )] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj b/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj index 0433c61f70..c419f8c2f9 100644 --- a/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj +++ b/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj @@ -1,29 +1,18 @@ - - - true - - $(TargetFrameworks);net461 $(TargetFrameworks);netcoreapp3.0 - - + + WinExe Properties - EmbedWpfInEto - EmbedWpfInEto - false - ..\..\..\artifacts\samples\$(Configuration)\ - true + true true @@ -47,10 +36,6 @@ - - - - @@ -64,9 +49,7 @@ - - + + \ No newline at end of file diff --git a/samples/Wpf/EmbedWpfInEto/Properties/AssemblyInfo.cs b/samples/Wpf/EmbedWpfInEto/Properties/AssemblyInfo.cs deleted file mode 100644 index a159ef2860..0000000000 --- a/samples/Wpf/EmbedWpfInEto/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("EmbedWpfInEto")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("EmbedWpfInEto")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cc142bb6-30f8-48f4-80db-2dd6d5ce4c07")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/AppDelegate.cs b/samples/XamarinMac/EmbedEtoInXamarinMac/AppDelegate.cs new file mode 100644 index 0000000000..f9d996a0c9 --- /dev/null +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/AppDelegate.cs @@ -0,0 +1,23 @@ +using AppKit; +using Foundation; + +namespace EmbedEtoInXamarinMac +{ + [Register("AppDelegate")] + public class AppDelegate : NSApplicationDelegate + { + public AppDelegate() + { + } + + public override void DidFinishLaunching(NSNotification notification) + { + // Insert code here to initialize your application + } + + public override void WillTerminate(NSNotification notification) + { + // Insert code here to tear down your application + } + } +} diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png new file mode 100644 index 0000000000..d0b5a8098e Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png new file mode 100644 index 0000000000..f4c8d29047 Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png new file mode 100644 index 0000000000..ebb5a0fe4e Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png new file mode 100644 index 0000000000..0986d31beb Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png new file mode 100644 index 0000000000..f4c8d29047 Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png new file mode 100644 index 0000000000..a142c83fb1 Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png new file mode 100644 index 0000000000..0986d31beb Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png new file mode 100644 index 0000000000..412d6ca9b4 Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png new file mode 100644 index 0000000000..a142c83fb1 Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png new file mode 100644 index 0000000000..e99022ae84 Binary files /dev/null and b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png differ diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..6b28545295 --- /dev/null +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "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/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/Contents.json b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/Contents.json new file mode 100644 index 0000000000..4caf392f92 --- /dev/null +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj b/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj new file mode 100644 index 0000000000..509348dd5e --- /dev/null +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj @@ -0,0 +1,104 @@ + + + + Debug + AnyCPU + {BD58EE60-9197-4C28-87C7-85AA13E02332} + {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Exe + EmbedEtoInXamarinMac + EmbedEtoInXamarinMac + v4.6.1 + Resources + true + True + --nowarn:2006 --nowarn:5220 + + + true + full + false + ..\..\..\artifacts\samples\Debug\net461 + DEBUG; + prompt + 4 + false + Mac Developer + false + false + false + true + true + HttpClientHandler + None + + None + + + pdbonly + true + ..\..\..\artifacts\samples\Release\net461 + + prompt + 4 + false + false + false + true + true + true + None + HttpClientHandler + + None + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ViewController.cs + + + + + + + + + {35EF0A4E-2A1A-492C-8BED-106774EA09F2} + Eto + + + {6C147DFC-0EC3-4B94-8239-D0A47A035739} + Eto.XamMac2 + + + + \ No newline at end of file diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Entitlements.plist b/samples/XamarinMac/EmbedEtoInXamarinMac/Entitlements.plist new file mode 100644 index 0000000000..9ae599370b --- /dev/null +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Info.plist b/samples/XamarinMac/EmbedEtoInXamarinMac/Info.plist new file mode 100644 index 0000000000..f6f487b337 --- /dev/null +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/Info.plist @@ -0,0 +1,33 @@ + + + + + CFBundleName + EmbedEtoInXamarinMac + CFBundleIdentifier + ca.picoe.EmbedEtoInXamarinMac + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSMinimumSystemVersion + 10.10 + CFBundleDevelopmentRegion + en + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleSignature + ???? + NSHumanReadableCopyright + ${AuthorCopyright:HtmlEncode} + NSPrincipalClass + NSApplication + NSMainStoryboardFile + Main + XSAppIconAssets + Assets.xcassets/AppIcon.appiconset + + + diff --git a/samples/MonoMac/EmbedEtoInMonoMac/Program.cs b/samples/XamarinMac/EmbedEtoInXamarinMac/Main.cs similarity index 58% rename from samples/MonoMac/EmbedEtoInMonoMac/Program.cs rename to samples/XamarinMac/EmbedEtoInXamarinMac/Main.cs index 7ad5854650..eb4280084d 100644 --- a/samples/MonoMac/EmbedEtoInMonoMac/Program.cs +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/Main.cs @@ -1,12 +1,8 @@ -using System; -using System.Drawing; -using MonoMac.Foundation; -using MonoMac.AppKit; -using MonoMac.ObjCRuntime; +using AppKit; -namespace EmbedEtoInMonoMac +namespace EmbedEtoInXamarinMac { - static class Program + static class MainClass { static void Main(string[] args) { @@ -19,4 +15,3 @@ static void Main(string[] args) } } } - diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/Main.storyboard b/samples/XamarinMac/EmbedEtoInXamarinMac/Main.storyboard new file mode 100644 index 0000000000..e1e205c903 --- /dev/null +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/Main.storyboard @@ -0,0 +1,717 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/MonoMac/EmbedEtoInMonoMac/MyEtoPanel.cs b/samples/XamarinMac/EmbedEtoInXamarinMac/MyEtoPanel.cs similarity index 77% rename from samples/MonoMac/EmbedEtoInMonoMac/MyEtoPanel.cs rename to samples/XamarinMac/EmbedEtoInXamarinMac/MyEtoPanel.cs index dd5c37882a..da3ff4c9f7 100644 --- a/samples/MonoMac/EmbedEtoInMonoMac/MyEtoPanel.cs +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/MyEtoPanel.cs @@ -1,14 +1,14 @@ -using System; +using System; using Eto.Forms; using Eto.Drawing; -namespace EmbedEtoInMonoMac +namespace EmbedEtoInXamarinMac { /// /// Eto.Forms panel to embed in an existing MonoMac app /// /// - /// This is used in to add to the existing native app. + /// This is used in to add to the existing native app. /// public class MyEtoPanel : Panel { diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.cs b/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.cs new file mode 100644 index 0000000000..2b758d0364 --- /dev/null +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.cs @@ -0,0 +1,54 @@ +using System; + +using AppKit; +using CoreGraphics; +using Eto.Forms; +using Foundation; + +namespace EmbedEtoInXamarinMac +{ + public partial class ViewController : NSViewController + { + public ViewController(IntPtr handle) : base(handle) + { + } + + public override void AwakeFromNib() + { + base.AwakeFromNib(); + + // Get native view for the panel + // passing true so that we can embed, otherwise we just get a reference to the control + var nativeView = new MyEtoPanel().ToNative(true); + + nativeView.AutoresizingMask = NSViewResizingMask.MinYMargin; // anchor to top left + + // position control, keeping auto size of control + var contentFrame = View.Frame; + nativeView.SetFrameOrigin(new CGPoint(100, contentFrame.Height - nativeView.Frame.Height - 100)); + + this.View.AddSubview(nativeView); + + } + + public override void ViewDidLoad() + { + base.ViewDidLoad(); + + // Do any additional setup after loading the view. + } + + public override NSObject RepresentedObject + { + get + { + return base.RepresentedObject; + } + set + { + base.RepresentedObject = value; + // Update the view, if already loaded. + } + } + } +} diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.designer.cs b/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.designer.cs new file mode 100644 index 0000000000..ce0ce31e8d --- /dev/null +++ b/samples/XamarinMac/EmbedEtoInXamarinMac/ViewController.designer.cs @@ -0,0 +1,18 @@ +// WARNING +// +// This file has been generated automatically by Xamarin Studio to store outlets and +// actions made in the UI designer. If it is removed, they will be lost. +// Manual changes to this file may not be handled correctly. +// +using Foundation; + +namespace EmbedEtoInXamarinMac +{ + [Register("ViewController")] + partial class ViewController + { + void ReleaseDesignerOutlets() + { + } + } +} diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/AppDelegate.cs b/samples/XamarinMac/EmbedXamarinMacInEto/AppDelegate.cs new file mode 100644 index 0000000000..9d76743b40 --- /dev/null +++ b/samples/XamarinMac/EmbedXamarinMacInEto/AppDelegate.cs @@ -0,0 +1,23 @@ +using AppKit; +using Foundation; + +namespace EmbedXamarinMacInEto +{ + [Register("AppDelegate")] + public class AppDelegate : NSApplicationDelegate + { + public AppDelegate() + { + } + + public override void DidFinishLaunching(NSNotification notification) + { + // Insert code here to initialize your application + } + + public override void WillTerminate(NSNotification notification) + { + // Insert code here to tear down your application + } + } +} diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png new file mode 100644 index 0000000000..d0b5a8098e Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png new file mode 100644 index 0000000000..f4c8d29047 Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-128@2x.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png new file mode 100644 index 0000000000..ebb5a0fe4e Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png new file mode 100644 index 0000000000..0986d31beb Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-16@2x.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png new file mode 100644 index 0000000000..f4c8d29047 Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png new file mode 100644 index 0000000000..a142c83fb1 Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-256@2x.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png new file mode 100644 index 0000000000..0986d31beb Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png new file mode 100644 index 0000000000..412d6ca9b4 Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-32@2x.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png new file mode 100644 index 0000000000..a142c83fb1 Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png new file mode 100644 index 0000000000..e99022ae84 Binary files /dev/null and b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/AppIcon-512@2x.png differ diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..6b28545295 --- /dev/null +++ b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "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/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/Contents.json b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/Contents.json new file mode 100644 index 0000000000..4caf392f92 --- /dev/null +++ b/samples/XamarinMac/EmbedXamarinMacInEto/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/samples/MonoMac/EmbedMonoMacInEto/EmbedMonoMacInEto.csproj b/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj similarity index 51% rename from samples/MonoMac/EmbedMonoMacInEto/EmbedMonoMacInEto.csproj rename to samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj index fc3f4f9a9b..c7317c74ae 100644 --- a/samples/MonoMac/EmbedMonoMacInEto/EmbedMonoMacInEto.csproj +++ b/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj @@ -3,15 +3,16 @@ Debug AnyCPU - {948B3504-5B70-4649-8FE4-BDE1FB46EC69};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - {86A6EB85-7A64-4E9A-9C72-121A904D8EAF} + {41266591-508F-40B6-9360-AFECE6FBFC27} + {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} Exe - EmbedMonoMacInEto - Resources - EmbedMonoMacInEto - True + EmbedXamarinMacInEto + EmbedXamarinMacInEto v4.6.1 - true + Resources + true + True + --nowarn:2006 --nowarn:5220 true @@ -21,88 +22,87 @@ DEBUG; prompt 4 - false - false - false - false false + Mac Developer false + false + false + true + true HttpClientHandler None + None - full + pdbonly true ..\..\..\artifacts\samples\Release\net461 + prompt 4 - false - SdkOnly - false - true + false + false false - Developer ID Application - true - true - HttpClientHandler - None - - - full - true - ..\..\..\artifacts\samples\AppStore\net461 - prompt - 4 - false - SdkOnly - false true - 3rd Party Mac Developer Installer - true - 3rd Party Mac Developer Application - true - true + true + true + None HttpClientHandler + None - - - - - ..\..\..\lib\MonoMac\MonoMac.dll - + - + + + + + + + + + + + + - + - - - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66} - Eto.Mac - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - + + - - + + MyNativeView.cs + + MyNativeViewController.cs + + + + + {35EF0A4E-2A1A-492C-8BED-106774EA09F2} + Eto + + + {6C147DFC-0EC3-4B94-8239-D0A47A035739} + Eto.XamMac2 + + + \ No newline at end of file diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Entitlements.plist b/samples/XamarinMac/EmbedXamarinMacInEto/Entitlements.plist new file mode 100644 index 0000000000..9ae599370b --- /dev/null +++ b/samples/XamarinMac/EmbedXamarinMacInEto/Entitlements.plist @@ -0,0 +1,6 @@ + + + + + + diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/Info.plist b/samples/XamarinMac/EmbedXamarinMacInEto/Info.plist new file mode 100644 index 0000000000..7dfa9b772b --- /dev/null +++ b/samples/XamarinMac/EmbedXamarinMacInEto/Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleName + EmbedXamarinMacInEto + CFBundleIdentifier + ca.picoe.EmbedXamarinMacInEto + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSMinimumSystemVersion + 10.10 + CFBundleDevelopmentRegion + en + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleSignature + ???? + NSHumanReadableCopyright + ${AuthorCopyright:HtmlEncode} + NSPrincipalClass + NSApplication + XSAppIconAssets + Assets.xcassets/AppIcon.appiconset + + diff --git a/samples/MonoMac/EmbedMonoMacInEto/Program.cs b/samples/XamarinMac/EmbedXamarinMacInEto/Main.cs similarity index 65% rename from samples/MonoMac/EmbedMonoMacInEto/Program.cs rename to samples/XamarinMac/EmbedXamarinMacInEto/Main.cs index 8f24d4b772..79f74f3d01 100644 --- a/samples/MonoMac/EmbedMonoMacInEto/Program.cs +++ b/samples/XamarinMac/EmbedXamarinMacInEto/Main.cs @@ -1,9 +1,10 @@ -using System; +using System; +using AppKit; using Eto.Forms; -namespace EmbedMonoMacInEto +namespace EmbedXamarinMacInEto { - static class Program + static class MainClass { [STAThread] public static void Main(string[] args) diff --git a/samples/MonoMac/EmbedMonoMacInEto/MainForm.cs b/samples/XamarinMac/EmbedXamarinMacInEto/MainForm.cs similarity index 91% rename from samples/MonoMac/EmbedMonoMacInEto/MainForm.cs rename to samples/XamarinMac/EmbedXamarinMacInEto/MainForm.cs index 030ff6f3ae..3cda2d61bc 100644 --- a/samples/MonoMac/EmbedMonoMacInEto/MainForm.cs +++ b/samples/XamarinMac/EmbedXamarinMacInEto/MainForm.cs @@ -1,8 +1,8 @@ -using System; -using Eto.Forms; +using System; using Eto.Drawing; +using Eto.Forms; -namespace EmbedMonoMacInEto +namespace EmbedXamarinMacInEto { public class MainForm : Form { @@ -27,4 +27,3 @@ public MainForm() } } } - diff --git a/samples/MonoMac/EmbedMonoMacInEto/MyNativeView.cs b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.cs similarity index 75% rename from samples/MonoMac/EmbedMonoMacInEto/MyNativeView.cs rename to samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.cs index ba9ed03c8c..6815beed72 100644 --- a/samples/MonoMac/EmbedMonoMacInEto/MyNativeView.cs +++ b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.cs @@ -1,13 +1,12 @@ - using System; using System.Collections.Generic; using System.Linq; -using MonoMac.Foundation; -using MonoMac.AppKit; +using Foundation; +using AppKit; -namespace EmbedMonoMacInEto +namespace EmbedXamarinMacInEto { - public partial class MyNativeView : MonoMac.AppKit.NSView + public partial class MyNativeView : AppKit.NSView { #region Constructors @@ -16,14 +15,14 @@ public MyNativeView(IntPtr handle) : base(handle) { Initialize(); } - + // Called when created directly from a XIB file [Export("initWithCoder:")] public MyNativeView(NSCoder coder) : base(coder) { Initialize(); } - + // Shared initialization code void Initialize() { @@ -32,4 +31,3 @@ void Initialize() #endregion } } - diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.designer.cs b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.designer.cs new file mode 100644 index 0000000000..1317b08cf3 --- /dev/null +++ b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.designer.cs @@ -0,0 +1,9 @@ +namespace EmbedXamarinMacInEto +{ + + // Should subclass AppKit.NSView + [Foundation.Register("MyNativeView")] + public partial class MyNativeView + { + } +} diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.xib b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.xib new file mode 100644 index 0000000000..974bb2fed2 --- /dev/null +++ b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeView.xib @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/samples/MonoMac/EmbedMonoMacInEto/MyNativeViewController.cs b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.cs similarity index 78% rename from samples/MonoMac/EmbedMonoMacInEto/MyNativeViewController.cs rename to samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.cs index b3d59a1993..f68a643947 100644 --- a/samples/MonoMac/EmbedMonoMacInEto/MyNativeViewController.cs +++ b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.cs @@ -1,13 +1,12 @@ - using System; using System.Collections.Generic; using System.Linq; -using MonoMac.Foundation; -using MonoMac.AppKit; +using Foundation; +using AppKit; -namespace EmbedMonoMacInEto +namespace EmbedXamarinMacInEto { - public partial class MyNativeViewController : MonoMac.AppKit.NSViewController + public partial class MyNativeViewController : AppKit.NSViewController { #region Constructors @@ -16,25 +15,31 @@ public MyNativeViewController(IntPtr handle) : base(handle) { Initialize(); } - + // Called when created directly from a XIB file [Export("initWithCoder:")] public MyNativeViewController(NSCoder coder) : base(coder) { Initialize(); } - + // Call to load from the XIB/NIB file public MyNativeViewController() : base("MyNativeView", NSBundle.MainBundle) { Initialize(); } - + // Shared initialization code void Initialize() { } + public override void AwakeFromNib() + { + base.AwakeFromNib(); + + } + #endregion //strongly typed view accessor @@ -47,4 +52,3 @@ void Initialize() } } } - diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.designer.cs b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.designer.cs new file mode 100644 index 0000000000..3c8c0eaa7c --- /dev/null +++ b/samples/XamarinMac/EmbedXamarinMacInEto/MyNativeViewController.designer.cs @@ -0,0 +1,9 @@ +namespace EmbedXamarinMacInEto +{ + + // Should subclass AppKit.NSViewController + [Foundation.Register("MyNativeViewController")] + public partial class MyNativeViewController + { + } +} diff --git a/src/Addins/Eto.Forms.Templates/Eto.Forms.Templates.csproj b/src/Addins/Eto.Forms.Templates/Eto.Forms.Templates.csproj index 5597be16c2..81d4100c09 100644 --- a/src/Addins/Eto.Forms.Templates/Eto.Forms.Templates.csproj +++ b/src/Addins/Eto.Forms.Templates/Eto.Forms.Templates.csproj @@ -9,8 +9,6 @@ cross-platform;gui;ui-framework;desktop;winforms;wpf;mac;osx;gtk;eto;eto.forms;dotnet-new netstandard1.0 - ..\..\..\artifacts\addin\$(Configuration)\ - ..\..\..\artifacts\nuget\$(Configuration)\ content false @@ -20,6 +18,9 @@ False False True + False + False + True diff --git a/src/Directory.Build.props b/src/Directory.Build.props index c046b80d13..9e7d9c2ef0 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,4 +1,7 @@ + + $(BasePath)artifacts\core\ + \ No newline at end of file diff --git a/src/Eto.Direct2D/Eto.Direct2D.csproj b/src/Eto.Direct2D/Eto.Direct2D.csproj index 65553dbb0a..4e8d3cb091 100644 --- a/src/Eto.Direct2D/Eto.Direct2D.csproj +++ b/src/Eto.Direct2D/Eto.Direct2D.csproj @@ -1,99 +1,64 @@ - - + + - Debug - AnyCPU - {330EF9FD-5947-4AC9-9796-950C7633695F} - Library - Properties - Eto.Direct2D - 512 - true - - v4.5 - Eto.Direct2D + true + + + $(TargetFrameworks);net45 + $(TargetFrameworks);netcoreapp3.0 - - true - full - false - ..\..\artifacts\core\Debug\net45\ - DEBUG;TRACE;WINFORMS - prompt - 4 - false - true + + + + + + Library + True + $(DefineConstants);WINFORMS + true - - true - ..\..\artifacts\core\Release\net45\ - TRACE;WINFORMS - prompt - 4 - false - true + + + Eto.Platform.Direct2D + Eto.Forms - Windows Forms / Direct2D Platform + Windows Forms / Direct2D Platform for the Eto.Forms UI Framework + + cross platform gui ui framework desktop wpf eto.forms + +This is the Direct2D platform for Eto.Forms UI Framework. + +Include this along with your Eto.Forms application to provide a WinForms interface with Direct2D drawing for your windows users. + +The Direct2D platform allows for increased performance when custom drawing by using the GPU. This does not affect the behaviour or performance of regular controls, which will use the Windows Forms platform. + +You do not need to use any of the classes of this assembly (unless customizing the functionality of the platform), and should just use the UI controls from the Eto assembly. + - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - Drawing\SplineHelper.cs - - - - + - - {9F51798A-354C-47A1-9207-4BB7D7FC7FC4} - Eto.WinForms - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - + + + - - 4.0.1 - - - 4.0.1 - + + + + + + \ No newline at end of file diff --git a/src/Eto.Direct2D/Properties/AssemblyInfo.cs b/src/Eto.Direct2D/Properties/AssemblyInfo.cs deleted file mode 100644 index d74accb872..0000000000 --- a/src/Eto.Direct2D/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle("Eto.Forms - Windows Forms / Direct2D Platform")] -[assembly: AssemblyDescription("Windows Forms / Direct2D Platform for the Eto.Forms UI Framework")] diff --git a/src/Eto.Forms.Sample/Eto.Forms.Sample.csproj b/src/Eto.Forms.Sample/Eto.Forms.Sample.csproj new file mode 100644 index 0000000000..519b872ddb --- /dev/null +++ b/src/Eto.Forms.Sample/Eto.Forms.Sample.csproj @@ -0,0 +1,54 @@ + + + net461;netcoreapp3.0 + + false + + True + True + False + False + False + False + True + False + False + + + + Eto.Forms.Sample + Eto.Forms - Sample Application + cross platform gui framework desktop winforms wpf mac osx gtk eto.forms sample + +This sample application provides a starting point for your Eto.Forms application. + +Add this package to a blank console application, which will replace your Program.cs with the Eto.Forms startup code and include a MainForm.cs as a sample form to get you started. + +You will need to change the console application's output type to 'Windows Application' to suppress the console window from showing. + +In VS For Mac, set the compile target to 'Executable with GUI' and uncheck 'Run on external console' in Run > Build. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/nuspec/Eto.Forms.Sample/README.txt b/src/Eto.Forms.Sample/README.txt similarity index 80% rename from build/nuspec/Eto.Forms.Sample/README.txt rename to src/Eto.Forms.Sample/README.txt index bd4418e6bd..d5ff51428a 100644 --- a/build/nuspec/Eto.Forms.Sample/README.txt +++ b/src/Eto.Forms.Sample/README.txt @@ -7,7 +7,10 @@ Here's a breakdown of what's included: MainForm.cs - Contains your main form Program.cs - Your startup code -MyApp.app - A template for packaging your app for Mac users + +The build output will include an .app bundle (folder) to distribute to your Mac users. +If you install mono, the .app bundle will also include the mono runtime so your Mac users +won't have to install anything to run your application. This framework can be used to build applications that run across multiple platforms using their native toolkit using a single UI codebase. This will make your applications look and diff --git a/build/nuspec/Eto.Forms.Sample/MainForm.cs.pp b/src/Eto.Forms.Sample/content/MainForm.cs.pp similarity index 100% rename from build/nuspec/Eto.Forms.Sample/MainForm.cs.pp rename to src/Eto.Forms.Sample/content/MainForm.cs.pp diff --git a/build/nuspec/Eto.Forms.Sample/Program.cs.pp b/src/Eto.Forms.Sample/content/Program.cs.pp similarity index 100% rename from build/nuspec/Eto.Forms.Sample/Program.cs.pp rename to src/Eto.Forms.Sample/content/Program.cs.pp diff --git a/src/Eto.Forms.Sample/lib/net461/_._ b/src/Eto.Forms.Sample/lib/net461/_._ new file mode 100644 index 0000000000..7566c14481 --- /dev/null +++ b/src/Eto.Forms.Sample/lib/net461/_._ @@ -0,0 +1 @@ +. \ No newline at end of file diff --git a/src/Eto.Forms.Sample/lib/netcoreapp3.0/_._ b/src/Eto.Forms.Sample/lib/netcoreapp3.0/_._ new file mode 100644 index 0000000000..7566c14481 --- /dev/null +++ b/src/Eto.Forms.Sample/lib/netcoreapp3.0/_._ @@ -0,0 +1 @@ +. \ No newline at end of file diff --git a/src/Eto.Gtk/Eto.Gtk.csproj b/src/Eto.Gtk/Eto.Gtk.csproj index 7e8b091a03..73dd9e5b63 100644 --- a/src/Eto.Gtk/Eto.Gtk.csproj +++ b/src/Eto.Gtk/Eto.Gtk.csproj @@ -2,19 +2,24 @@ netstandard2.0 - false True Eto.GtkSharp + $(DefineConstants);GTK3;GTKCORE - - - TRACE;PCL;GTK3;DEBUG;NETSTANDARD2_0;GTKCORE - ..\..\artifacts\core\Debug\ - - - TRACE;PCL;GTK3;RELEASE;NETSTANDARD2_0;GTKCORE - - ..\..\artifacts\core\Release\ + + Eto.Platform.Gtk + Eto.Forms - GTK+3 Platform + cross platform gui ui framework desktop gtk eto.forms + GTK+3 Platform for the Eto.Forms UI Framework + +This is the GTK platform for Eto.Forms UI Framework. Currently this package is targetting Gtk 3.14 or newer. + +Include this along with your Eto.Forms application to provide a GTK interface, typically for Linux users. + +You do not need to use any of the classes of this assembly (unless customizing the GTK functionality of the platform), and should just use the UI controls from the Eto assembly. + +On Linux, mono framework 2.10 or higher and gtk-sharp2 are required. + @@ -23,12 +28,6 @@ - - - - - - Conversions.cs diff --git a/src/Eto.Gtk/Eto.Gtk2.csproj b/src/Eto.Gtk/Eto.Gtk2.csproj index 07c5ee170f..7c6ecacd0e 100644 --- a/src/Eto.Gtk/Eto.Gtk2.csproj +++ b/src/Eto.Gtk/Eto.Gtk2.csproj @@ -1,68 +1,54 @@ - - + + - Debug - AnyCPU - {80915A80-CA54-11E3-9C1A-0800200C9A66} - Library + net45 + True Eto.GtkSharp - v4.5 - Eto.Gtk2 + $(DefineConstants);CAIRO;GTK2 + true true + - 512 - True - prompt - 4 - CAIRO;TRACE;GTK2 - True - - - ..\..\artifacts\core\Debug\net45\ - CAIRO;DEBUG;TRACE;GTK2 - false - false - full - - - ..\..\artifacts\core\Release\net45\ - true - true - pdbonly + Eto.Platform.Gtk2 + Eto.Forms - GTK#2 Platform + GTK#2 Platform for the Eto.Forms UI Framework + cross platform gui ui framework desktop gtk eto.forms + +This package is deprecated and should not be used in new projects, please use Eto.Platform.Gtk instead. + +This is the GTK2 platform for Eto.Forms UI Framework. + +Include this along with your Eto.Forms application to provide a GTK2 interface, typically for Linux users. + +You do not need to use any of the classes of this assembly (unless customizing the GTK functionality of the platform), and should just use the UI controls from the Eto assembly. + +On Linux, mono-complete 4.6 or higher and gtk-sharp2 packages are required. + + - - System - + - - - ..\..\lib\webkit-sharp\webkit-sharp.dll - False - + + - gdk-sharp 2.0 gtk-sharp-2.0 - gtk-sharp 2.0 gtk-sharp-2.0 - glib-sharp 2.0 glib-sharp-2.0 - pango-sharp 2.0 gtk-sharp-2.0 - atk-sharp 2.0 gtk-sharp-2.0 @@ -71,243 +57,38 @@ Conversions.cs - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - Code - - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - Drawing\SplineHelper.cs - - - - - - Code - - - - - - Code - - - - Code - - - - - PlatformDetect.cs - - - - - Code - - - Code - - - Forms\FixedMaskedTextProviderHandler.cs - - - - Drawing\BaseBitmapData.cs - - - - - - - - - NativeMethods.tt - - - - - - - - - - EtoControls.tt - - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - + - + TextTemplatingFileGenerator NativeMethods.cs - + TextTemplatingFileGenerator EtoControls.cs + + + NativeMethods.tt + + + EtoControls.tt + + diff --git a/src/Eto.Gtk/Eto.Gtk3.csproj b/src/Eto.Gtk/Eto.Gtk3.csproj index 11d785fd88..f190b9faa6 100644 --- a/src/Eto.Gtk/Eto.Gtk3.csproj +++ b/src/Eto.Gtk/Eto.Gtk3.csproj @@ -1,311 +1,107 @@ - - - + + - Debug - AnyCPU - {543B2F90-CA56-11E3-9C1A-0800200C9A66} - Library - Eto.Gtk3 - v4.5 - Eto.Gtk3 + net45 + True + Eto.GtkSharp + $(DefineConstants);CAIRO;GTK3 true + - 512 - True - prompt - 4 - CAIRO;TRACE;GTK3 - True - - - ..\..\artifacts\core\Debug\net45\ - CAIRO;DEBUG;TRACE;GTK3 - false - full - - - ..\..\artifacts\core\Release\net45\ - true - true - pdbonly + Eto.Platform.Gtk3 + Eto.Forms - GTK#3 Platform + GTK#3 Platform for the Eto.Forms UI Framework + cross platform gui ui framework desktop gtk eto.forms + +This package is deprecated and should not be used in new projects, please use Eto.Platform.Gtk instead. + +This is the GTK3 platform for Eto.Forms UI Framework. + +Include this along with your Eto.Forms application to provide a GTK3 interface, typically for Linux users. + +You do not need to use any of the classes of this assembly (unless customizing the GTK functionality of the platform), and should just use the UI controls from the Eto assembly. + +On Linux, mono framework 4.6 or higher and gtk-sharp3 are required. + + - atk-sharp 3.0 ..\..\lib\GtkSharp3\atk-sharp.dll False - cairo-sharp 3.0 ..\..\lib\GtkSharp3\cairo-sharp.dll False - gdk-sharp 3.0 ..\..\lib\GtkSharp3\gdk-sharp.dll False - gio-sharp 3.0 ..\..\lib\GtkSharp3\gio-sharp.dll False - glib-sharp 3.0 ..\..\lib\GtkSharp3\glib-sharp.dll False - gtk-sharp 3.0 ..\..\lib\GtkSharp3\gtk-sharp.dll False - pango-sharp 3.0 ..\..\lib\GtkSharp3\pango-sharp.dll False + Conversions.cs - - - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - Code - - - Code - - - - - - - - - - - - - - - - - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - Drawing\SplineHelper.cs - - - - - - - - - - - - Code - - - - - PlatformDetect.cs - - - - - - - - Forms\FixedMaskedTextProviderHandler.cs - - - - - Drawing\BaseBitmapData.cs - - - - - - - - - - - NativeMethods.tt - - - - - - - - - - - - - EtoControls.tt - - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - + - + TextTemplatingFileGenerator NativeMethods.cs - + TextTemplatingFileGenerator EtoControls.cs + + + NativeMethods.tt + + + EtoControls.tt + + diff --git a/src/Eto.Gtk/EtoWebView.cs b/src/Eto.Gtk/EtoWebView.cs index 1530155d40..b3176a15a9 100644 --- a/src/Eto.Gtk/EtoWebView.cs +++ b/src/Eto.Gtk/EtoWebView.cs @@ -1,3 +1,4 @@ +#if GTK2 using System; using WebKit; using GLib; @@ -101,3 +102,4 @@ protected virtual bool OnNewWindowPolicyDecisionRequested (WebFrame frame, Netwo } } +#endif \ No newline at end of file diff --git a/src/Eto.Gtk/Forms/ColorDialogHandler.cs b/src/Eto.Gtk/Forms/ColorDialogHandler.cs index 8932b05cc4..283914d3d3 100644 --- a/src/Eto.Gtk/Forms/ColorDialogHandler.cs +++ b/src/Eto.Gtk/Forms/ColorDialogHandler.cs @@ -1,3 +1,4 @@ +#if GTKCORE using System; using Eto.Drawing; using Eto.Forms; @@ -46,3 +47,4 @@ public DialogResult ShowDialog(Window parent) } } } +#endif \ No newline at end of file diff --git a/src/Eto.Gtk/Forms/ColorDialogHandlerOld.cs b/src/Eto.Gtk/Forms/ColorDialogHandlerOld.cs index 437c973779..e9e9c4d666 100644 --- a/src/Eto.Gtk/Forms/ColorDialogHandlerOld.cs +++ b/src/Eto.Gtk/Forms/ColorDialogHandlerOld.cs @@ -1,3 +1,4 @@ +#if !GTKCORE using System; using Eto.Drawing; using Eto.Forms; @@ -52,3 +53,4 @@ public DialogResult ShowDialog(Window parent) } } +#endif \ No newline at end of file diff --git a/src/Eto.Gtk/Forms/Controls/SpinnerHandler.cs b/src/Eto.Gtk/Forms/Controls/SpinnerHandler.cs index ce5346867a..e75c581762 100644 --- a/src/Eto.Gtk/Forms/Controls/SpinnerHandler.cs +++ b/src/Eto.Gtk/Forms/Controls/SpinnerHandler.cs @@ -1,3 +1,4 @@ +#if GTK3 using System; using Eto.Forms; @@ -47,3 +48,4 @@ public override bool Enabled } } +#endif \ No newline at end of file diff --git a/src/Eto.Gtk/Forms/Controls/WebKit2WebViewHandler.cs b/src/Eto.Gtk/Forms/Controls/WebKit2WebViewHandler.cs index 50448d0a42..79a40f9215 100644 --- a/src/Eto.Gtk/Forms/Controls/WebKit2WebViewHandler.cs +++ b/src/Eto.Gtk/Forms/Controls/WebKit2WebViewHandler.cs @@ -1,4 +1,5 @@ -using System; +#if GTKCORE || GTK3 +using System; using System.Runtime.InteropServices; using Eto.Forms; @@ -233,3 +234,4 @@ public void ShowPrintDialog() } } } +#endif \ No newline at end of file diff --git a/src/Eto.Gtk/Forms/Controls/WebViewHandler.cs b/src/Eto.Gtk/Forms/Controls/WebViewHandler.cs index a9031db5c4..ee22b109ac 100644 --- a/src/Eto.Gtk/Forms/Controls/WebViewHandler.cs +++ b/src/Eto.Gtk/Forms/Controls/WebViewHandler.cs @@ -1,3 +1,4 @@ +#if GTK2 using System; using System.Globalization; using System.Threading; @@ -266,3 +267,4 @@ public bool BrowserContextMenuEnabled } } } +#endif \ No newline at end of file diff --git a/src/Eto.Gtk/Forms/FontDialogHandler.cs b/src/Eto.Gtk/Forms/FontDialogHandler.cs index b4994ccd1c..386e59b7ab 100644 --- a/src/Eto.Gtk/Forms/FontDialogHandler.cs +++ b/src/Eto.Gtk/Forms/FontDialogHandler.cs @@ -1,4 +1,5 @@ -using System; +#if GTKCORE +using System; using System.Text; using Eto.Drawing; using Eto.Forms; @@ -59,3 +60,4 @@ public DialogResult ShowDialog(Window parent) } } } +#endif \ No newline at end of file diff --git a/src/Eto.Gtk/Forms/FontDialogHandlerOld.cs b/src/Eto.Gtk/Forms/FontDialogHandlerOld.cs index ee27f5dfa5..7e3d244ebe 100644 --- a/src/Eto.Gtk/Forms/FontDialogHandlerOld.cs +++ b/src/Eto.Gtk/Forms/FontDialogHandlerOld.cs @@ -1,3 +1,4 @@ +#if !GTKCORE using System; using System.Text; using Eto.Drawing; @@ -58,3 +59,4 @@ public DialogResult ShowDialog(Window parent) } } } +#endif \ No newline at end of file diff --git a/src/Eto.Gtk/Forms/OpenWithDialogHandler.cs b/src/Eto.Gtk/Forms/OpenWithDialogHandler.cs index 7cece663cc..7d53aededb 100644 --- a/src/Eto.Gtk/Forms/OpenWithDialogHandler.cs +++ b/src/Eto.Gtk/Forms/OpenWithDialogHandler.cs @@ -1,4 +1,5 @@ -using System; +#if GTK3 +using System; using System.Diagnostics; using Eto.Forms; @@ -30,3 +31,4 @@ public DialogResult ShowDialog(Window parent) } } } +#endif diff --git a/src/Eto.Gtk/Platform.cs b/src/Eto.Gtk/Platform.cs index e5d26738ba..4445a49dda 100644 --- a/src/Eto.Gtk/Platform.cs +++ b/src/Eto.Gtk/Platform.cs @@ -200,7 +200,6 @@ public static void AddTo(Eto.Platform p) p.Add(() => new AboutDialogHandler()); p.Add(() => new ApplicationHandler()); p.Add(() => new ClipboardHandler()); - p.Add(() => new ColorDialogHandler()); p.Add(() => new CursorHandler()); p.Add(() => new DialogHandler()); p.Add(() => new FormHandler()); @@ -236,7 +235,6 @@ public static void AddTo(Eto.Platform p) p.Add(() => new SpinnerHandler()); p.Add(() => new OpenWithDialogHandler()); #else - p.Add(() => new ColorDialogHandler()); p.Add(() => new ThemedSpinnerHandler()); #endif } diff --git a/src/Eto.Gtk/Properties/AssemblyInfo.cs b/src/Eto.Gtk/Properties/AssemblyInfo.cs deleted file mode 100644 index 2991b49bd7..0000000000 --- a/src/Eto.Gtk/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System.Reflection; - -#if GTK2 -[assembly: AssemblyTitle("Eto.Forms - GTK2 Platform")] -[assembly: AssemblyDescription("GTK2 Platform for the Eto.Forms UI Framework")] -#else -[assembly: AssemblyTitle("Eto.Forms - GTK3 Platform")] -[assembly: AssemblyDescription("GTK3 Platform for the Eto.Forms UI Framework")] -#endif \ No newline at end of file diff --git a/src/Eto.Mac/Eto.Mac.csproj b/src/Eto.Mac/Eto.Mac.csproj deleted file mode 100644 index dff3ef262a..0000000000 --- a/src/Eto.Mac/Eto.Mac.csproj +++ /dev/null @@ -1,251 +0,0 @@ - - - - Debug - AnyCPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66} - Library - Eto.Mac - v4.5 - Eto.Mac - - - $(DefineConstants);OSX;DESKTOP;MONOMAC - false - true - - - full - ..\..\artifacts\core\Debug\net45\ - DEBUG;OSX;DESKTOP;MONOMAC - prompt - 4 - false - false - true - - - pdbonly - true - ..\..\artifacts\core\Release\net45\ - prompt - 4 - true - false - OSX;DESKTOP;MONOMAC - true - - - - ..\..\lib\MonoMac\MonoMac.dll - - - - - - - - - - - - - - - - - Code - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - PlatformDetect.cs - - - - - - - - - - - - Forms\FixedMaskedTextProviderHandler.cs - - - - - Drawing\GradientHelper.cs - - - - - - Forms\Cells\MutableCellEventArgs.cs - - - Drawing\BaseBitmapData.cs - - - - - - - - - - - - - - - - - - - - - - - - MonoMac-License.txt - PreserveNewest - false - - - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - \ No newline at end of file diff --git a/src/Eto.Mac/Eto.Mac64.csproj b/src/Eto.Mac/Eto.Mac64.csproj index 417dd3b6e0..553fbbce2b 100644 --- a/src/Eto.Mac/Eto.Mac64.csproj +++ b/src/Eto.Mac/Eto.Mac64.csproj @@ -1,250 +1,64 @@ - - + + - Debug - AnyCPU - {55DAB390-1CFC-11E4-8C21-0800200C9A66} - Library + net45 Eto.Mac - v4.5 - Eto.Mac64 - - $(DefineConstants);OSX;DESKTOP;MONOMAC;Mac64 - false true + build\* - - full - ..\..\artifacts\core\Debug\net45\ - DEBUG;OSX;DESKTOP;MONOMAC;Mac64 - prompt - 4 - false - false - true - - - pdbonly - true - ..\..\artifacts\core\Release\net45\ - prompt - 4 - true - false - OSX;DESKTOP;MONOMAC;Mac64 - true + + Eto.Platform.Mac64 + Eto.Forms - MonoMac 64-bit Platform + OS X Platform for the Eto.Forms UI Framework using the open-source MonoMac with 64-bit mono + cross platform gui ui framework desktop monomac osx mac eto.forms + +This is the 64-bit MonoMac platform for Eto.Forms UI Framework. + +Eto.Platform.Mac64 uses a modified version of the open source MonoMac for 64-bit, which allows you to create macOS application bundles from any platform. However, it does require mono to be installed when running on macOS. + +Use Eto.Platform.XamMac2 if you want to bundle mono inside your .app, however it requires Visual Studio on a Mac. + +You can create your own .app bundle to run your app on OS X, without an OS X machine. This is included as the MyApp.app folder. Read MyApp.app\Contents\MonoBundle\README.txt for instructions on next steps. + +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. + - - ..\..\lib\MonoMac64\MonoMac.dll - - - - + - - - - - - - - - - - - - Code - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - PlatformDetect.cs - - - - - - - - Forms\FixedMaskedTextProviderHandler.cs - - Drawing\GradientHelper.cs - - - Forms\Cells\MutableCellEventArgs.cs Drawing\BaseBitmapData.cs - - - - - - - - - - - - - - - - - - - + - + + + + + MonoMac-License.txt PreserveNewest - - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - + + + + + + \ No newline at end of file diff --git a/src/Eto.Mac/Eto.XamMac.csproj b/src/Eto.Mac/Eto.XamMac.csproj deleted file mode 100644 index 5b393e0b93..0000000000 --- a/src/Eto.Mac/Eto.XamMac.csproj +++ /dev/null @@ -1,262 +0,0 @@ - - - - Debug - AnyCPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66} - Library - Eto.Mac - v4.5 - Eto.XamMac - - - full - false - ..\..\artifacts\core\Debug\net45\ - DEBUG;OSX;DESKTOP;XAMMAC;XAMMAC1;SDCOMPAT - prompt - 4 - false - False - True - True - false - false - false - false - false - false - false - HttpClientHandler - Default - None - None - - - pdbonly - true - ..\..\artifacts\core\Release\net45\ - prompt - 4 - true - false - true - OSX;DESKTOP;XAMMAC;XAMMAC1;SDCOMPAT - True - false - false - false - false - false - false - false - HttpClientHandler - Default - None - None - - - - - - - - - - - - - - - - - - Code - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - PlatformDetect.cs - - - - - - - - - - - - - Forms\FixedMaskedTextProviderHandler.cs - - - - - Drawing\GradientHelper.cs - - - - - - Forms\Cells\MutableCellEventArgs.cs - - - Drawing\BaseBitmapData.cs - - - - - - - - - - - - - - - - - - - - - - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - diff --git a/src/Eto.Mac/Eto.XamMac2-modern.csproj b/src/Eto.Mac/Eto.XamMac2-modern.csproj deleted file mode 100644 index 49c0ebacf9..0000000000 --- a/src/Eto.Mac/Eto.XamMac2-modern.csproj +++ /dev/null @@ -1,256 +0,0 @@ - - - - Debug - AnyCPU - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Eto.Mac - Eto.XamMac2 - Xamarin.Mac - v2.0 - - - full - false - ..\..\artifacts\core\Debug\modern\ - DEBUG;OSX;DESKTOP;XAMMAC;XAMMAC2;UNIFIED - prompt - 4 - false - False - True - True - false - false - false - false - false - false - false - None - - - pdbonly - true - ..\..\artifacts\core\Release\modern\ - prompt - 4 - true - false - true - OSX;DESKTOP;XAMMAC;XAMMAC2;UNIFIED - True - false - false - false - false - false - false - false - None - - - - - - - - - - - - - - - - - Code - - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PlatformDetect.cs - - - - - - - - - - - - - Forms\FixedMaskedTextProviderHandler.cs - - - - - Drawing\GradientHelper.cs - - - - - - Forms\Cells\MutableCellEventArgs.cs - - - Drawing\BaseBitmapData.cs - - - - - - - - - - - - - - - - - - - - - - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - \ No newline at end of file diff --git a/src/Eto.Mac/Eto.XamMac2-net45.csproj b/src/Eto.Mac/Eto.XamMac2-net45.csproj deleted file mode 100644 index 594f2fa78a..0000000000 --- a/src/Eto.Mac/Eto.XamMac2-net45.csproj +++ /dev/null @@ -1,270 +0,0 @@ - - - - Debug - AnyCPU - {856E8C70-2702-11E4-8C21-0800200C9A66} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Eto.Mac - Eto.XamMac2 - v4.5 - true - - - - $(MSBuildProgramFiles32)Microsoft Visual Studio\2017\Professional\ - $(VSINSTALLDIR)Common7\IDE\ReferenceAssemblies\Microsoft\Framework\Xamarin.Mac\v2.0\ - $(XamarinMacReferenceAssemblies) - - - full - false - ..\..\artifacts\core\Debug\net45\ - DEBUG;OSX;DESKTOP;XAMMAC;XAMMAC2;UNIFIED - prompt - 4 - false - False - True - True - false - false - false - false - false - false - false - None - - - pdbonly - true - ..\..\artifacts\core\Release\net45\ - prompt - 4 - true - false - true - OSX;DESKTOP;XAMMAC;XAMMAC2;UNIFIED - True - false - false - false - false - false - false - false - None - - - - - - - - - - - - - - - - - Code - - - Code - - - - - Code - - - Code - - - Code - - - Code - - - Code - - - Code - - - - - - - - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - PlatformDetect.cs - - - - - - - - - - - - - Forms\FixedMaskedTextProviderHandler.cs - - - - - Drawing\GradientHelper.cs - - - - - - Forms\Cells\MutableCellEventArgs.cs - - - Drawing\BaseBitmapData.cs - - - - - - - - - - - - - - - - - - - - - - - - $(XamarinMacReferenceAssemblies) - - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - \ No newline at end of file diff --git a/src/Eto.Mac/Eto.XamMac2.csproj b/src/Eto.Mac/Eto.XamMac2.csproj new file mode 100644 index 0000000000..af14d95dab --- /dev/null +++ b/src/Eto.Mac/Eto.XamMac2.csproj @@ -0,0 +1,77 @@ + + + + {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + net45;xamarinmac20 + Eto.Mac + $(DefineConstants);OSX;DESKTOP;XAMMAC;XAMMAC2;UNIFIED + true + build\* + $(XamarinMacTargetsPath)Xamarin.Mac.CSharp.targets + false + None + True + + + + Eto.Platform.XamMac2 + Eto.Forms - Xamarin.Mac (unified) Platform + OS X Platform for the Eto.Forms UI Framework using 64-bit Xamarin.Mac v2.0 (unified) + cross platform gui ui framework desktop osx xamarin.mac mac eto.forms + +This is the Xamarin.Mac2 (unified) 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. However, it will require mono to be installed when running on macOS. + +In order to bundle mono with your application, you must create a Xamarin.Mac project using Visual Studio on 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. + + + + + Xamarin.Mac + v2.0 + false + + + true + + + + + + + + + + PlatformDetect.cs + + + 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/Properties/AssemblyInfo.cs b/src/Eto.Mac/Properties/AssemblyInfo.cs deleted file mode 100644 index 0795b816ee..0000000000 --- a/src/Eto.Mac/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.Reflection; - -#if XAMMAC2 -[assembly: AssemblyTitle("Eto.Forms - Xamarin.Mac (unified) Platform")] -[assembly: AssemblyDescription("OS X Platform for the Eto.Forms UI Framework using 64-bit Xamarin.Mac v2.0 (unified)")] -#elif XAMMAC -[assembly: AssemblyTitle("Eto.Forms - Xamarin.Mac (classic) Platform")] -[assembly: AssemblyDescription("OS X Platform for the Eto.Forms UI Framework using Xamarin.Mac v1.0 (classic)")] -#elif Mac64 -[assembly: AssemblyTitle("Eto.Forms - MonoMac 64-bit Platform")] -[assembly: AssemblyDescription("OS X Platform for the Eto.Forms UI Framework using the open-source MonoMac with 64-bit mono")] -#else -[assembly: AssemblyTitle("Eto.Forms - MonoMac Platform")] -[assembly: AssemblyDescription("OS X Platform for the Eto.Forms UI Framework using the open-source MonoMac")] -#endif - diff --git a/build/MacTemplate/Icon.icns b/src/Eto.Mac/build/Icon.icns similarity index 100% rename from build/MacTemplate/Icon.icns rename to src/Eto.Mac/build/Icon.icns diff --git a/build/MacTemplate/Info.plist b/src/Eto.Mac/build/Info.plist similarity index 100% rename from build/MacTemplate/Info.plist rename to src/Eto.Mac/build/Info.plist diff --git a/build/MacTemplate/Launcher64 b/src/Eto.Mac/build/Launcher64 similarity index 100% rename from build/MacTemplate/Launcher64 rename to src/Eto.Mac/build/Launcher64 diff --git a/src/Eto.Mac/build/Mac.props b/src/Eto.Mac/build/Mac.props new file mode 100644 index 0000000000..68dd16aa63 --- /dev/null +++ b/src/Eto.Mac/build/Mac.props @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build/MacTemplate/MacTemplate.targets b/src/Eto.Mac/build/Mac.targets similarity index 92% rename from build/MacTemplate/MacTemplate.targets rename to src/Eto.Mac/build/Mac.targets index a71d748539..2b19b5af56 100644 --- a/build/MacTemplate/MacTemplate.targets +++ b/src/Eto.Mac/build/Mac.targets @@ -11,7 +11,8 @@ - True + + True $(MSBuildProjectName) @@ -35,7 +36,10 @@ False - mono-5.12.0-osx-10.7-x64 + mono-6.4.0-osx-10.9-x64 + + + http://download.mono-project.com/runtimes/raw/ @@ -74,12 +78,10 @@ $(OutputContents)\MacOS\$(LauncherFile) @(ReferenceCopyLocalPaths->AnyHaveMetadataValue('Filename', 'Eto.XamMac2')) - @(ReferenceCopyLocalPaths->AnyHaveMetadataValue('Filename', 'Eto.Mac')) @(ReferenceCopyLocalPaths->AnyHaveMetadataValue('Filename', 'Eto.Mac64')) $(HasXamMac) true - x86_64 - i386 + x86_64 $(MSBuildThisFileDirectory) $(OutputContents)\Info.plist @@ -88,7 +90,6 @@ - @@ -122,16 +123,22 @@ - + - + + + $(MkBundleArgs) --target-server "$(MacBundleTargetServer)" + $(MkBundleArgs) --fetch-target $(MacBundleTarget) + + + $(MkBundleArgs) --cross $(MacBundleTarget) $(MkBundleArgs) --sdk "$(MonoPath)" @@ -141,13 +148,11 @@ $(MkBundleArgs) -o "$(LauncherFileWithPath)" "$(TargetPath)" $(MkBundleArgs) "$(TargetDir)Eto.XamMac2.dll" $(MkBundleArgs) "$(TargetDir)Eto.Mac64.dll" - $(MkBundleArgs) "$(TargetDir)Eto.Mac.dll" - - + @@ -155,14 +160,13 @@ - + $(ReferenceFiles)Launcher64 - $(ReferenceFiles)Launcher32 $(ReferenceFiles)Xamarin.Mac.dll \Library\Frameworks\Xamarin.Mac.framework\Versions\Current\lib\x86_64\full\Xamarin.Mac.dll @@ -201,7 +205,6 @@ and %(Extension) != '.mdb' ) ) - and (($(HasXamMac) != 'True' and $(Has32Bit) == 'True') or %(Filename) != 'Eto.Mac') and (($(HasXamMac) != 'True' and $(Has64Bit) == 'True') or %(Filename) != 'Eto.Mac64') and ($(HasXamMac) == 'True' or %(Filename) != 'Eto.XamMac2') " /> @@ -241,7 +244,6 @@ - @@ -345,7 +347,7 @@ AddStringProperty("NSPrincipalClass", "NSApplication"); AddStringProperty("CFBundleName", MacBundleName); AddStringProperty("CFBundleExecutable", LauncherFile, true); - AddStringProperty("LSMinimumSystemVersion", "10.7"); + AddStringProperty("LSMinimumSystemVersion", "10.9"); if (!string.IsNullOrEmpty(MonoMinimumVersion)) { AddStringProperty("MonoMinimumVersion", MonoMinimumVersion); } diff --git a/build/MacTemplate/README.txt b/src/Eto.Mac/build/README.txt similarity index 100% rename from build/MacTemplate/README.txt rename to src/Eto.Mac/build/README.txt diff --git a/build/MacTemplate/RunConfiguration.Default.targets b/src/Eto.Mac/build/RunConfiguration.Default.targets similarity index 100% rename from build/MacTemplate/RunConfiguration.Default.targets rename to src/Eto.Mac/build/RunConfiguration.Default.targets diff --git a/build/MacTemplate/RunConfiguration.Mac.targets b/src/Eto.Mac/build/RunConfiguration.Mac.targets similarity index 100% rename from build/MacTemplate/RunConfiguration.Mac.targets rename to src/Eto.Mac/build/RunConfiguration.Mac.targets diff --git a/src/Eto.Serialization.Json/Eto.Serialization.Json-pcl.csproj b/src/Eto.Serialization.Json/Eto.Serialization.Json-pcl.csproj deleted file mode 100644 index 61aeda8219..0000000000 --- a/src/Eto.Serialization.Json/Eto.Serialization.Json-pcl.csproj +++ /dev/null @@ -1,64 +0,0 @@ - - - - Debug - AnyCPU - {CC6339A8-E217-4D5F-89F1-A2506CBBFC47} - {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Eto.Serialization.Json - Eto.Serialization.Json - v4.5 - Profile259 - - - true - full - false - TRACE;DEBUG;PCL - ..\..\artifacts\core\Debug\portable-net45+win8+wpa81+wp8 - prompt - 4 - - - true - TRACE;PCL - ..\..\artifacts\core\Release\portable-net45+win8+wpa81+wp8 - prompt - 4 - - - - - - - - - - - - - - - - - - - - - TypeHelper.cs - - - - - 10.0.3 - - - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - - \ No newline at end of file diff --git a/src/Eto.Serialization.Json/Eto.Serialization.Json.csproj b/src/Eto.Serialization.Json/Eto.Serialization.Json.csproj index d2b2637f09..18b55a0105 100644 --- a/src/Eto.Serialization.Json/Eto.Serialization.Json.csproj +++ b/src/Eto.Serialization.Json/Eto.Serialization.Json.csproj @@ -1,25 +1,31 @@  - netstandard1.0 - + netstandard1.0;netstandard2.0 + $(DefineConstants);PCL - - - TRACE;DEBUG;PCL - ..\..\artifacts\core\Debug\ - - - TRACE;PCL - ..\..\artifacts\core\Release\ + + + Eto.Forms Json serializer + Eto.Forms Json serializer + cross platform gui ui framework desktop json eto.forms + +Eto.Json allows you to load json UI definitions for the Eto.Forms framework + +To get more information about how to get started, read the wiki: + +https://github.com/picoe/Eto/wiki + + + + - + + diff --git a/build/nuspec/Eto.Serialization.Json.targets b/src/Eto.Serialization.Json/Eto.Serialization.Json.targets similarity index 100% rename from build/nuspec/Eto.Serialization.Json.targets rename to src/Eto.Serialization.Json/Eto.Serialization.Json.targets diff --git a/src/Eto.Serialization.Json/EtoContractResolver.cs b/src/Eto.Serialization.Json/EtoContractResolver.cs index 0b9ee82d08..ef12a93529 100644 --- a/src/Eto.Serialization.Json/EtoContractResolver.cs +++ b/src/Eto.Serialization.Json/EtoContractResolver.cs @@ -65,14 +65,14 @@ protected override IList CreateProperties(Type type, MemberSeriali var prop = CreateProperty(propertyInfo, memberSerialization); prop.PropertyName = "$name"; prop.PropertyType = typeof(NameConverter.Info); - prop.MemberConverter = new NameConverter(); + prop.Converter = new NameConverter(); prop.ValueProvider = new NameConverter.ValueProvider(); list.Add(prop); prop = CreateProperty(propertyInfo, memberSerialization); prop.PropertyName = "ID"; prop.PropertyType = typeof(NameConverter.Info); - prop.MemberConverter = new NameConverter(); + prop.Converter = new NameConverter(); prop.ValueProvider = new NameConverter.ValueProvider(); list.Add(prop); } diff --git a/src/Eto.Serialization.Json/Properties/AssemblyInfo.cs b/src/Eto.Serialization.Json/Properties/AssemblyInfo.cs deleted file mode 100644 index 468f69274d..0000000000 --- a/src/Eto.Serialization.Json/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle("Eto.Forms Json serializer")] -[assembly: AssemblyDescription("Eto.Forms Json serializer")] \ No newline at end of file diff --git a/src/Eto.Serialization.Xaml/Eto.Serialization.Xaml.csproj b/src/Eto.Serialization.Xaml/Eto.Serialization.Xaml.csproj index efa17c0681..8a8835829e 100644 --- a/src/Eto.Serialization.Xaml/Eto.Serialization.Xaml.csproj +++ b/src/Eto.Serialization.Xaml/Eto.Serialization.Xaml.csproj @@ -1,28 +1,35 @@ - netstandard1.0 - + netstandard1.0;netstandard2.0 + $(DefineConstants);PCL;PORTABLE - - - TRACE;DEBUG;PCL;PORTABLE - ..\..\artifacts\core\Debug\ - - - TRACE;PCL;PORTABLE - ..\..\artifacts\core\Release\ + + + Eto.Forms Xaml serializer + Eto.Forms Xaml serializer + cross platform gui ui framework desktop xaml eto.forms + +Eto.Xaml allows you to load xaml UI definitions for the Eto.Forms framework + +To get more information about how to get started, read the wiki: + +https://github.com/picoe/Eto/wiki + + + + + + diff --git a/build/nuspec/Eto.Serialization.Xaml.targets b/src/Eto.Serialization.Xaml/Eto.Serialization.Xaml.targets similarity index 100% rename from build/nuspec/Eto.Serialization.Xaml.targets rename to src/Eto.Serialization.Xaml/Eto.Serialization.Xaml.targets diff --git a/src/Eto.Serialization.Xaml/Properties/AssemblyInfo.cs b/src/Eto.Serialization.Xaml/Properties/AssemblyInfo.cs index 5baebb853d..aef381eea8 100644 --- a/src/Eto.Serialization.Xaml/Properties/AssemblyInfo.cs +++ b/src/Eto.Serialization.Xaml/Properties/AssemblyInfo.cs @@ -7,9 +7,6 @@ using System.Windows.Markup; #endif -[assembly: AssemblyTitle("Eto.Forms Xaml serializer")] -[assembly: AssemblyDescription("Eto.Forms Xaml serializer")] - //#if !PCL [assembly: XmlnsDefinition(Eto.Serialization.Xaml.EtoXamlSchemaContext.EtoFormsNamespace, "Eto.Serialization.Xaml.Extensions")] [assembly: XmlnsDefinition(Eto.Serialization.Xaml.EtoXamlSchemaContext.EtoFormsNamespace, "Eto.Forms", AssemblyName="Eto")] diff --git a/src/Eto.WinForms/Eto.WinForms.csproj b/src/Eto.WinForms/Eto.WinForms.csproj index 184341693b..bd7010da24 100644 --- a/src/Eto.WinForms/Eto.WinForms.csproj +++ b/src/Eto.WinForms/Eto.WinForms.csproj @@ -1,63 +1,52 @@  - - - - true - - - false - + + true + $(TargetFrameworks);net45 $(TargetFrameworks);netcoreapp3.0 - - + + Library - Eto.WinForms - Eto.WinForms - true True - false $(DefineConstants);WINFORMS - ..\..\artifacts\core\$(Configuration)\ - false NU1701;MSB4011;$(NoWarn) - true + true + + + Eto.Platform.Windows + Eto.Forms - Windows Forms Platform + Windows Forms Platform for the Eto.Forms UI Framework + cross platform gui ui framework desktop wpf eto.forms + +This is the Windows Forms platform for Eto.Forms UI Framework. - +Include this along with your Eto.Forms application to provide a Windows Forms interface for your windows users. + +You do not need to use any of the classes of this assembly (unless customizing the Windows Forms functionality of the platform), and should just use the UI controls from the Eto assembly. + + Microsoft.WindowsAPICodePack;Microsoft.WindowsAPICodePack.Shell;Interop.SHDocVw Eto.WinForms.CustomControls.Assemblies - - false - false - full - true - True pdbonly - - ..\..\lib\SHDocVw\Interop.SHDocVw.dll - False - False - + @@ -109,12 +98,6 @@ - - - - - - @@ -124,17 +107,10 @@ - - 1.1.0 - compile - none - contentfiles;analyzers;build;compile - + - - + + \ No newline at end of file diff --git a/src/Eto.WinForms/Properties/AssemblyInfo.cs b/src/Eto.WinForms/Properties/AssemblyInfo.cs deleted file mode 100644 index 8d42d586dd..0000000000 --- a/src/Eto.WinForms/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,5 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly: AssemblyTitle("Eto.Forms - Windows Forms Platform")] -[assembly: AssemblyDescription("Windows Forms Platform for the Eto.Forms UI Framework")] diff --git a/src/Eto.Wpf/Eto.Wpf.csproj b/src/Eto.Wpf/Eto.Wpf.csproj index ddcf8717ee..f2dbc25024 100644 --- a/src/Eto.Wpf/Eto.Wpf.csproj +++ b/src/Eto.Wpf/Eto.Wpf.csproj @@ -1,23 +1,15 @@ - - - - - true - - - false - + + true + $(TargetFrameworks);net45 $(TargetFrameworks);netcoreapp3.0 - - + + Library @@ -26,32 +18,36 @@ true False true - false $(DefineConstants);WPF - ..\..\artifacts\core\$(Configuration)\ - true - true + true + true NU1701;MSB4011;$(NoWarn) + + + Eto.Platform.Wpf + Eto.Forms - WPF Platform + WPF Platform for the Eto.Forms UI Framework + cross platform gui ui framework desktop wpf eto.forms + +This is the WPF platform for Eto.Forms UI Framework. + +Include this along with your Eto.Forms application to provide a WPF interface for your windows users. WPF is by default preferred over the Eto.Platform.Windows platform, so if both are included, WPF will be selected. - +You do not need to use any of the classes of this assembly (unless customizing the WPF functionality of the platform), and should just use the UI controls from the Eto assembly. + + Microsoft.WindowsAPICodePack;Microsoft.WindowsAPICodePack.Shell;Xceed.Wpf.Toolkit;Interop.SHDocVw Eto.Wpf.CustomControls.Assemblies - - false - false - full - true - True pdbonly @@ -195,23 +191,19 @@ - - 3.2.0 + compile none contentfiles;analyzers;build;compile - - 1.1.0 + compile none contentfiles;analyzers;build;compile - - + + \ No newline at end of file diff --git a/src/Eto.Wpf/Properties/AssemblyInfo.cs b/src/Eto.Wpf/Properties/AssemblyInfo.cs index ea4ec970c8..2ff896d0ba 100644 --- a/src/Eto.Wpf/Properties/AssemblyInfo.cs +++ b/src/Eto.Wpf/Properties/AssemblyInfo.cs @@ -1,9 +1,6 @@ using System.Reflection; using System.Windows; -[assembly: AssemblyTitle("Eto.Forms - WPF Platform")] -[assembly: AssemblyDescription("WPF Platform for the Eto.Forms UI Framework")] - [assembly: ThemeInfo ( ResourceDictionaryLocation.SourceAssembly, ResourceDictionaryLocation.SourceAssembly diff --git a/src/Eto.sln b/src/Eto.sln index f3ddb913d0..930518338e 100644 --- a/src/Eto.sln +++ b/src/Eto.sln @@ -3,60 +3,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2020 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Wpf", "..\test\Eto.Test.Wpf\Eto.Test.Wpf.csproj", "{DD0C2B40-CA55-11E3-9C1A-0800200C9A66}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Mac64", "..\test\Eto.Test.Mac\Eto.Test.Mac64.csproj", "{B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Gtk", "..\test\Eto.Test.Gtk\Eto.Test.Gtk.csproj", "{063AF7E7-18BD-488F-85BF-53B6E3D75685}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto", "Eto\Eto.csproj", "{35EF0A4E-2A1A-492C-8BED-106774EA09F2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Serialization.Json", "Eto.Serialization.Json\Eto.Serialization.Json.csproj", "{3F8178EF-0710-43F7-92E2-130B9BE2212D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Direct2D", "Eto.Direct2D\Eto.Direct2D.csproj", "{330EF9FD-5947-4AC9-9796-950C7633695F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.WinForms", "Eto.WinForms\Eto.WinForms.csproj", "{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Mac", "Eto.Mac\Eto.Mac.csproj", "{3E7995E0-C9EB-11E3-9C1A-0800200C9A66}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Gtk2", "Eto.Gtk\Eto.Gtk2.csproj", "{80915A80-CA54-11E3-9C1A-0800200C9A66}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Wpf", "Eto.Wpf\Eto.Wpf.csproj", "{63137FA0-CA55-11E3-9C1A-0800200C9A66}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Gtk3", "Eto.Gtk\Eto.Gtk3.csproj", "{543B2F90-CA56-11E3-9C1A-0800200C9A66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac", "Eto.Mac\Eto.XamMac.csproj", "{BF405A10-C9EB-11E3-9C1A-0800200C9A66}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test", "..\test\Eto.Test\Eto.Test.csproj", "{EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Gtk2", "..\test\Eto.Test.Gtk2\Eto.Test.Gtk2.csproj", "{CC33FE70-CA54-11E3-9C1A-0800200C9A66}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Gtk3", "..\test\Eto.Test.Gtk3\Eto.Test.Gtk3.csproj", "{D70E9E90-CA54-11E3-9C1A-0800200C9A66}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.WinForms", "..\test\Eto.Test.WinForms\Eto.Test.WinForms.csproj", "{CF18B0BB-2C60-437F-8AA3-711ABAE11A91}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Wpf", "..\test\Eto.Test.Wpf\Eto.Test.Wpf.csproj", "{DD0C2B40-CA55-11E3-9C1A-0800200C9A66}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Mac", "..\test\Eto.Test.Mac\Eto.Test.Mac.csproj", "{A4267C50-C9EB-11E3-9C1A-0800200C9A66}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.XamMac", "..\test\Eto.Test.Mac\Eto.Test.XamMac.csproj", "{9CEE7E60-C9EB-11E3-9C1A-0800200C9A66}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Direct2D", "..\test\Eto.Test.Direct2D\Eto.Test.Direct2D.csproj", "{74328428-C412-4BC3-BD0C-E1DBC43FB479}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.XamMac2-net461", "..\test\Eto.Test.Mac\Eto.Test.XamMac2-net461.csproj", "{689E4C20-2702-11E4-8C21-0800200C9A66}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Mac64", "..\test\Eto.Test.Mac\Eto.Test.Mac64.csproj", "{B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.XamMac2-modern", "..\test\Eto.Test.Mac\Eto.Test.XamMac2-modern.csproj", "{A2DD2180-297D-11E5-A2CB-0800200C9A66}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Mac64", "Eto.Mac\Eto.Mac64.csproj", "{55DAB390-1CFC-11E4-8C21-0800200C9A66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac2-net45", "Eto.Mac\Eto.XamMac2-net45.csproj", "{856E8C70-2702-11E4-8C21-0800200C9A66}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac2-modern", "Eto.Mac\Eto.XamMac2-modern.csproj", "{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Serialization.Xaml", "Eto.Serialization.Xaml\Eto.Serialization.Xaml.csproj", "{E381E8CA-0DE1-4792-88F9-AC1529E911DF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{95227DFB-FD41-4709-BB54-3EA94C89C9C1}" ProjectSection(SolutionItems) = preProject ..\build\Build.proj = ..\build\Build.proj - NuGet.Config = NuGet.Config ..\build\Utilities.targets = ..\build\Utilities.targets ..\.editorconfig = ..\.editorconfig ..\build\Common.props = ..\build\Common.props @@ -64,20 +39,37 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{95227DFB ..\build\Common.Build.targets = ..\build\Common.Build.targets ..\appveyor.yml = ..\appveyor.yml ..\azure-pipelines.yml = ..\azure-pipelines.yml + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + ..\build\Common.Mac.targets = ..\build\Common.Mac.targets EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Gtk", "Eto.Gtk\Eto.Gtk.csproj", "{659873CA-9949-4353-B0AA-E0589D045584}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Gtk", "..\test\Eto.Test.Gtk\Eto.Test.Gtk.csproj", "{063AF7E7-18BD-488F-85BF-53B6E3D75685}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Direct2D", "Eto.Direct2D\Eto.Direct2D.csproj", "{3511ADDE-7CA8-4F7F-9721-AB48D3913760}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Gtk2", "..\test\Eto.Test.Gtk\Eto.Test.Gtk2.csproj", "{E3832AF1-FCBA-4575-8FB1-7168949150D8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Gtk3", "..\test\Eto.Test.Gtk\Eto.Test.Gtk3.csproj", "{B45F3211-6C33-43B9-A492-1495FB149636}" +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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Forms.Sample", "Eto.Forms.Sample\Eto.Forms.Sample.csproj", "{D34D3F47-2E1B-4A36-87D0-C77969C7EA90}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.Direct2D", "..\test\Eto.Test.Direct2D\Eto.Test.Direct2D.csproj", "{7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.WinForms", "..\test\Eto.Test.WinForms\Eto.Test.WinForms.csproj", "{159CD819-F461-4308-8608-B4CC6F636A1F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Linux = Debug|Linux - Debug|Mac = Debug|Mac Debug|Windows = Debug|Windows - Release|Linux = Release|Linux - Release|Mac = Release|Mac + Debug|Mac = Debug|Mac + Debug|Linux = Debug|Linux Release|Windows = Release|Windows + Release|Mac = Release|Mac + Release|Linux = Release|Linux EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {35EF0A4E-2A1A-492C-8BED-106774EA09F2}.Debug|Linux.ActiveCfg = Debug|Any CPU @@ -104,18 +96,6 @@ Global {3F8178EF-0710-43F7-92E2-130B9BE2212D}.Release|Mac.Build.0 = Release|Any CPU {3F8178EF-0710-43F7-92E2-130B9BE2212D}.Release|Windows.ActiveCfg = Release|Any CPU {3F8178EF-0710-43F7-92E2-130B9BE2212D}.Release|Windows.Build.0 = Release|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Debug|Linux.ActiveCfg = Debug|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Debug|Linux.Build.0 = Debug|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Debug|Mac.ActiveCfg = Debug|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Debug|Mac.Build.0 = Debug|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Debug|Windows.ActiveCfg = Debug|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Debug|Windows.Build.0 = Debug|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Release|Linux.ActiveCfg = Release|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Release|Linux.Build.0 = Release|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Release|Mac.ActiveCfg = Release|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Release|Mac.Build.0 = Release|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Release|Windows.ActiveCfg = Release|Any CPU - {330EF9FD-5947-4AC9-9796-950C7633695F}.Release|Windows.Build.0 = Release|Any CPU {9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Debug|Linux.ActiveCfg = Debug|Any CPU {9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Debug|Linux.Build.0 = Debug|Any CPU {9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Debug|Mac.ActiveCfg = Debug|Any CPU @@ -128,30 +108,16 @@ Global {9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Release|Mac.Build.0 = Release|Any CPU {9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Release|Windows.ActiveCfg = Release|Any CPU {9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Release|Windows.Build.0 = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Linux.Build.0 = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Debug|Windows.Build.0 = Debug|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Linux.Build.0 = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU - {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Linux.Build.0 = Debug|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Windows.Build.0 = Debug|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Linux.Build.0 = Release|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU {80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU - {80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU {63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU {63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU {63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU @@ -172,14 +138,6 @@ Global {543B2F90-CA56-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU {543B2F90-CA56-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU {543B2F90-CA56-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}.Debug|Linux.ActiveCfg = Debug|Any CPU {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}.Debug|Linux.Build.0 = Debug|Any CPU {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}.Debug|Mac.ActiveCfg = Debug|Any CPU @@ -192,42 +150,6 @@ Global {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}.Release|Mac.Build.0 = Release|Any CPU {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}.Release|Windows.ActiveCfg = Release|Any CPU {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}.Release|Windows.Build.0 = Release|Any CPU - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Debug|Linux.Build.0 = Debug|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Debug|Windows.Build.0 = Debug|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Release|Linux.Build.0 = Release|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|x86 - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Debug|Linux.Build.0 = Debug|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Debug|Windows.Build.0 = Debug|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Release|Linux.Build.0 = Release|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Debug|Linux.ActiveCfg = Debug|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Debug|Linux.Build.0 = Debug|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Debug|Mac.ActiveCfg = Debug|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Debug|Mac.Build.0 = Debug|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Debug|Windows.ActiveCfg = Debug|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Debug|Windows.Build.0 = Debug|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Release|Linux.ActiveCfg = Release|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Release|Linux.Build.0 = Release|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Release|Mac.ActiveCfg = Release|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Release|Mac.Build.0 = Release|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Release|Windows.ActiveCfg = Release|Any CPU - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91}.Release|Windows.Build.0 = Release|Any CPU {DD0C2B40-CA55-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU {DD0C2B40-CA55-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU {DD0C2B40-CA55-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU @@ -236,46 +158,6 @@ Global {DD0C2B40-CA55-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU {DD0C2B40-CA55-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU {DD0C2B40-CA55-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Debug|Linux.Build.0 = Debug|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Debug|Windows.Build.0 = Debug|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Release|Linux.Build.0 = Release|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU - {A4267C50-C9EB-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Debug|Linux.ActiveCfg = Debug|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Debug|Linux.Build.0 = Debug|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Debug|Mac.ActiveCfg = Debug|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Debug|Mac.Build.0 = Debug|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Debug|Windows.ActiveCfg = Debug|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Debug|Windows.Build.0 = Debug|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Release|Linux.ActiveCfg = Release|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Release|Linux.Build.0 = Release|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Release|Mac.ActiveCfg = Release|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Release|Mac.Build.0 = Release|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Release|Windows.ActiveCfg = Release|Any CPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479}.Release|Windows.Build.0 = Release|Any CPU - {689E4C20-2702-11E4-8C21-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {689E4C20-2702-11E4-8C21-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {689E4C20-2702-11E4-8C21-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {689E4C20-2702-11E4-8C21-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {689E4C20-2702-11E4-8C21-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {689E4C20-2702-11E4-8C21-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {689E4C20-2702-11E4-8C21-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {689E4C20-2702-11E4-8C21-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU {B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689}.Debug|Linux.ActiveCfg = Debug|Any CPU {B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689}.Debug|Linux.Build.0 = Debug|Any CPU {B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689}.Debug|Mac.ActiveCfg = Debug|Any CPU @@ -288,14 +170,6 @@ Global {B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689}.Release|Mac.Build.0 = Release|Any CPU {B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689}.Release|Windows.ActiveCfg = Release|Any CPU {B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689}.Release|Windows.Build.0 = Release|Any CPU - {A2DD2180-297D-11E5-A2CB-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {A2DD2180-297D-11E5-A2CB-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {A2DD2180-297D-11E5-A2CB-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {A2DD2180-297D-11E5-A2CB-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {A2DD2180-297D-11E5-A2CB-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {A2DD2180-297D-11E5-A2CB-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {A2DD2180-297D-11E5-A2CB-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {A2DD2180-297D-11E5-A2CB-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU {55DAB390-1CFC-11E4-8C21-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU {55DAB390-1CFC-11E4-8C21-0800200C9A66}.Debug|Linux.Build.0 = Debug|Any CPU {55DAB390-1CFC-11E4-8C21-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU @@ -308,22 +182,6 @@ Global {55DAB390-1CFC-11E4-8C21-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU {55DAB390-1CFC-11E4-8C21-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU {55DAB390-1CFC-11E4-8C21-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU - {856E8C70-2702-11E4-8C21-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {856E8C70-2702-11E4-8C21-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {856E8C70-2702-11E4-8C21-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {856E8C70-2702-11E4-8C21-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {856E8C70-2702-11E4-8C21-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {856E8C70-2702-11E4-8C21-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {856E8C70-2702-11E4-8C21-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {856E8C70-2702-11E4-8C21-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU {E381E8CA-0DE1-4792-88F9-AC1529E911DF}.Debug|Linux.ActiveCfg = Debug|Any CPU {E381E8CA-0DE1-4792-88F9-AC1529E911DF}.Debug|Linux.Build.0 = Debug|Any CPU {E381E8CA-0DE1-4792-88F9-AC1529E911DF}.Debug|Mac.ActiveCfg = Debug|Any CPU @@ -360,29 +218,91 @@ Global {063AF7E7-18BD-488F-85BF-53B6E3D75685}.Release|Mac.Build.0 = Release|Any CPU {063AF7E7-18BD-488F-85BF-53B6E3D75685}.Release|Windows.ActiveCfg = Release|Any CPU {063AF7E7-18BD-488F-85BF-53B6E3D75685}.Release|Windows.Build.0 = Release|Any CPU + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Debug|Windows.ActiveCfg = Debug|Any CPU + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Debug|Windows.Build.0 = Debug|Any CPU + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Debug|Mac.ActiveCfg = Debug|Any CPU + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Debug|Mac.Build.0 = Debug|Any CPU + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Debug|Linux.ActiveCfg = Debug|Any CPU + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Debug|Linux.Build.0 = Debug|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 + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Mac.ActiveCfg = Release|Any CPU + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Mac.Build.0 = Release|Any CPU + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Linux.ActiveCfg = Release|Any CPU + {3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Linux.Build.0 = Release|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Windows.ActiveCfg = Debug|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Mac.ActiveCfg = Debug|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Mac.Build.0 = Debug|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Linux.ActiveCfg = Debug|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Linux.Build.0 = Debug|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Windows.ActiveCfg = Release|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Mac.ActiveCfg = Release|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Mac.Build.0 = Release|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Linux.ActiveCfg = Release|Any CPU + {E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Linux.Build.0 = Release|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Windows.ActiveCfg = Debug|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Windows.Build.0 = Debug|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Mac.ActiveCfg = Debug|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Mac.Build.0 = Debug|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Linux.ActiveCfg = Debug|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Linux.Build.0 = Debug|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Release|Windows.ActiveCfg = Release|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Release|Windows.Build.0 = Release|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Release|Mac.ActiveCfg = Release|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Release|Mac.Build.0 = Release|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Release|Linux.ActiveCfg = Release|Any CPU + {B45F3211-6C33-43B9-A492-1495FB149636}.Release|Linux.Build.0 = Release|Any CPU + {96C9D209-238D-4EBF-8391-F632A14921AD}.Debug|Windows.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|Linux.ActiveCfg = Debug|Any CPU + {96C9D209-238D-4EBF-8391-F632A14921AD}.Release|Windows.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|Linux.ActiveCfg = Release|Any CPU + {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Debug|Windows.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|Linux.ActiveCfg = Debug|Any CPU + {6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}.Release|Windows.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|Linux.ActiveCfg = Release|Any CPU + {D34D3F47-2E1B-4A36-87D0-C77969C7EA90}.Debug|Windows.ActiveCfg = Debug|Any CPU + {D34D3F47-2E1B-4A36-87D0-C77969C7EA90}.Debug|Mac.ActiveCfg = Debug|Any CPU + {D34D3F47-2E1B-4A36-87D0-C77969C7EA90}.Debug|Linux.ActiveCfg = Debug|Any CPU + {D34D3F47-2E1B-4A36-87D0-C77969C7EA90}.Release|Windows.ActiveCfg = Release|Any CPU + {D34D3F47-2E1B-4A36-87D0-C77969C7EA90}.Release|Mac.ActiveCfg = Release|Any CPU + {D34D3F47-2E1B-4A36-87D0-C77969C7EA90}.Release|Linux.ActiveCfg = Release|Any CPU + {D34D3F47-2E1B-4A36-87D0-C77969C7EA90}.Debug|Mac.Build.0 = Debug|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Debug|Windows.ActiveCfg = Debug|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Debug|Windows.Build.0 = Debug|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Debug|Mac.ActiveCfg = Debug|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Debug|Mac.Build.0 = Debug|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Debug|Linux.ActiveCfg = Debug|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Debug|Linux.Build.0 = Debug|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Release|Windows.ActiveCfg = Release|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Release|Windows.Build.0 = Release|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Release|Mac.ActiveCfg = Release|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Release|Mac.Build.0 = Release|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Release|Linux.ActiveCfg = Release|Any CPU + {7EBEA53F-6CDC-4DB8-8042-1B048C3502CF}.Release|Linux.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} - {CC33FE70-CA54-11E3-9C1A-0800200C9A66} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} - {D70E9E90-CA54-11E3-9C1A-0800200C9A66} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} - {CF18B0BB-2C60-437F-8AA3-711ABAE11A91} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {DD0C2B40-CA55-11E3-9C1A-0800200C9A66} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} - {A4267C50-C9EB-11E3-9C1A-0800200C9A66} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} - {74328428-C412-4BC3-BD0C-E1DBC43FB479} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} - {689E4C20-2702-11E4-8C21-0800200C9A66} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} - {A2DD2180-297D-11E5-A2CB-0800200C9A66} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} {063AF7E7-18BD-488F-85BF-53B6E3D75685} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} + {E3832AF1-FCBA-4575-8FB1-7168949150D8} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} + {B45F3211-6C33-43B9-A492-1495FB149636} = {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} + {159CD819-F461-4308-8608-B4CC6F636A1F} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FEDB7506-BD8C-41A7-AAA5-6D111D5EA6B8} EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - Policies = $0 - $0.TextStylePolicy = $3 - EndGlobalSection EndGlobal diff --git a/build/nuspec/Eto.Forms.targets b/src/Eto/Eto.Forms.targets similarity index 100% rename from build/nuspec/Eto.Forms.targets rename to src/Eto/Eto.Forms.targets diff --git a/src/Eto/Eto.csproj b/src/Eto/Eto.csproj index 2550648676..3d6875f7d4 100644 --- a/src/Eto/Eto.csproj +++ b/src/Eto/Eto.csproj @@ -2,29 +2,53 @@ netstandard1.0 true + true + PCL - - - TRACE;DEBUG;PCL - ..\..\artifacts\core\Debug\ - - - TRACE;PCL - true - ..\..\artifacts\core\Release\ + + Eto.Forms + Eto.Forms + Eto.Forms UI Framework + cross platform gui ui framework desktop winforms wpf mac osx gtk eto.forms + +Eto.Forms is a cross platform desktop user interface framework. + +This framework is built so that you can target multiple platforms with one UI codebase. + +The goal of this framework is to expose a common API that can be used to build functional applications that run across platforms using their native toolkit. This will make your applications look and work as if it were a native application on all platforms. + +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#. + +In order to run your Eto.Forms based application, you must also install one (or more) of the following packages: + +- Eto.Platform.Wpf +- Eto.Platform.Windows +- Eto.Platform.Direct2D +- Eto.Platform.Gtk +- Eto.Platform.Gtk2 +- Eto.Platform.Gtk3 +- Eto.Platform.Mac64 +- Eto.Platform.XamMac2 + +To get more information about how to get started, read the wiki: + +https://github.com/picoe/Eto/wiki + - - Eto-LICENSE.txt - PreserveNewest - + - + + + + \ No newline at end of file diff --git a/src/Eto/Properties/AssemblyInfo.cs b/src/Eto/Properties/AssemblyInfo.cs index 4607abac35..15b134402a 100644 --- a/src/Eto/Properties/AssemblyInfo.cs +++ b/src/Eto/Properties/AssemblyInfo.cs @@ -1,8 +1,6 @@ using System.Reflection; using System; -[assembly: AssemblyTitle ("Eto.Forms")] -[assembly: AssemblyDescription ("Eto.Forms UI Framework")] [assembly: CLSCompliant(true)] #if !PCL [assembly: System.Runtime.InteropServices.ComVisible(false)] diff --git a/src/NuGet.Config b/src/NuGet.Config deleted file mode 100644 index e864c754a4..0000000000 --- a/src/NuGet.Config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/test/Directory.Build.props b/test/Directory.Build.props index c046b80d13..fd8a5270b9 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,4 +1,8 @@ + + False + $(BasePath)artifacts\test\ + \ No newline at end of file diff --git a/test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj b/test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj index aeb3a84e36..c652e26e4c 100644 --- a/test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj +++ b/test/Eto.Test.Direct2D/Eto.Test.Direct2D.csproj @@ -1,39 +1,31 @@  - - + + + + true + + + $(TargetFrameworks);net461 + $(TargetFrameworks);netcoreapp3.0 + + + + + - Debug - AnyCPU - {74328428-C412-4BC3-BD0C-E1DBC43FB479} WinExe - Eto.Test.Direct2D - Eto.Test.Direct2D + Properties ..\Eto.Test\Images\TestIcon.ico + true true - v4.6.1 - + true + - 512 - True - prompt - 4 - - - ..\..\artifacts\test\Debug\net461\ - DEBUG;TRACE - full - false - false + Eto Test for Direct2D - - ..\..\artifacts\test\Release\net461\ - TRACE - true - pdbonly - false - - + + @@ -44,37 +36,15 @@ + - - - - - - - - - {9F51798A-354C-47A1-9207-4BB7D7FC7FC4} - Eto.WinForms - - - {330EF9FD-5947-4AC9-9796-950C7633695F} - Eto.Direct2D - - - {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1} - Eto.Test - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - + + + + - - + + + + \ No newline at end of file diff --git a/test/Eto.Test.Direct2D/Properties/AssemblyInfo.cs b/test/Eto.Test.Direct2D/Properties/AssemblyInfo.cs deleted file mode 100644 index 16d860ddf0..0000000000 --- a/test/Eto.Test.Direct2D/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle ("Eto Test for WinForms")] -[assembly: AssemblyDescription ("")] diff --git a/test/Eto.Test.Gtk/Eto.Test.Gtk2.csproj b/test/Eto.Test.Gtk/Eto.Test.Gtk2.csproj new file mode 100644 index 0000000000..4b77ca5aad --- /dev/null +++ b/test/Eto.Test.Gtk/Eto.Test.Gtk2.csproj @@ -0,0 +1,50 @@ + + + + net461 + WinExe + $(DefineConstants);GTK2 + true + true + x86 + + + + + + + + + 2.0 + gtk-sharp-2.0 + + + 2.0 + gtk-sharp-2.0 + + + 2.0 + glib-sharp-2.0 + + + 2.0 + gtk-sharp-2.0 + + + 2.0 + gtk-sharp-2.0 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Eto.Test.Gtk/Eto.Test.Gtk3.csproj b/test/Eto.Test.Gtk/Eto.Test.Gtk3.csproj new file mode 100644 index 0000000000..2106b00e25 --- /dev/null +++ b/test/Eto.Test.Gtk/Eto.Test.Gtk3.csproj @@ -0,0 +1,61 @@ + + + + net461 + WinExe + $(DefineConstants);GTK3 + true + true + + + + + + + 3.0 + ..\..\lib\GtkSharp3\atk-sharp.dll + False + + + 3.0 + ..\..\lib\GtkSharp3\cairo-sharp.dll + False + + + 3.0 + ..\..\lib\GtkSharp3\gdk-sharp.dll + False + + + 3.0 + ..\..\lib\GtkSharp3\gio-sharp.dll + False + + + 3.0 + ..\..\lib\GtkSharp3\glib-sharp.dll + False + + + 3.0 + ..\..\lib\GtkSharp3\gtk-sharp.dll + False + + + 3.0 + ..\..\lib\GtkSharp3\pango-sharp.dll + False + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Eto.Test.Gtk/Properties/AssemblyInfo.cs b/test/Eto.Test.Gtk/Properties/AssemblyInfo.cs deleted file mode 100644 index f5f5a0f95b..0000000000 --- a/test/Eto.Test.Gtk/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle ("Eto Test for GTK")] -[assembly: AssemblyDescription ("")] diff --git a/test/Eto.Test.Gtk2/Eto.Test.Gtk2.csproj b/test/Eto.Test.Gtk2/Eto.Test.Gtk2.csproj deleted file mode 100644 index 3e37382fe3..0000000000 --- a/test/Eto.Test.Gtk2/Eto.Test.Gtk2.csproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Debug - x86 - {CC33FE70-CA54-11E3-9C1A-0800200C9A66} - WinExe - Eto.Test.Gtk2 - ..\Eto.Test\Images\TestIcon.ico - v4.6.1 - Eto.Test.Gtk2 - true - true - - - 512 - True - prompt - 4 - - - ..\..\artifacts\test\Debug\net461\ - DEBUG;TRACE - full - x86 - False - - - - - - - - ..\..\artifacts\test\Release\net461\ - TRACE - true - pdbonly - x86 - - - app.manifest - - - - - - - - - - - - - - - - - - - {80915A80-CA54-11E3-9C1A-0800200C9A66} - Eto.Gtk2 - - - {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1} - Eto.Test - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - - - - - - - 3.11.0 - - - \ No newline at end of file diff --git a/test/Eto.Test.Gtk2/Properties/AssemblyInfo.cs b/test/Eto.Test.Gtk2/Properties/AssemblyInfo.cs deleted file mode 100644 index f5f5a0f95b..0000000000 --- a/test/Eto.Test.Gtk2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle ("Eto Test for GTK")] -[assembly: AssemblyDescription ("")] diff --git a/test/Eto.Test.Gtk2/Startup.cs b/test/Eto.Test.Gtk2/Startup.cs deleted file mode 100644 index 0bd091810c..0000000000 --- a/test/Eto.Test.Gtk2/Startup.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Eto.Test; -using System.Diagnostics; - -namespace Eto.Test.Gtk2 -{ - class Startup - { - //[STAThread] - static void Main(string[] args) - { - var platform = new Eto.GtkSharp.Platform(); - - var app = new TestApplication(platform); - app.TestAssemblies.Add(typeof(Startup).Assembly); - app.Run(); - } - } -} - diff --git a/test/Eto.Test.Gtk2/app.config b/test/Eto.Test.Gtk2/app.config deleted file mode 100644 index d28129a19e..0000000000 --- a/test/Eto.Test.Gtk2/app.config +++ /dev/null @@ -1,302 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Eto.Test.Gtk2/app.manifest b/test/Eto.Test.Gtk2/app.manifest deleted file mode 100644 index 14a525d630..0000000000 --- a/test/Eto.Test.Gtk2/app.manifest +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - false - - - - - - diff --git a/test/Eto.Test.Gtk3/Eto.Test.Gtk3.csproj b/test/Eto.Test.Gtk3/Eto.Test.Gtk3.csproj deleted file mode 100644 index 20943f3e1a..0000000000 --- a/test/Eto.Test.Gtk3/Eto.Test.Gtk3.csproj +++ /dev/null @@ -1,75 +0,0 @@ - - - - - Debug - AnyCPU - {D70E9E90-CA54-11E3-9C1A-0800200C9A66} - WinExe - Eto.Test.Gtk3 - v4.6.1 - Eto.Test.Gtk3 - true - true - - - 512 - True - prompt - 4 - - - full - false - ..\..\artifacts\test\Debug\net461\ - DEBUG; - false - - - pdbonly - true - ..\..\artifacts\test\Release\net461\ - false - - - - - - - - - - - - {543B2F90-CA56-11E3-9C1A-0800200C9A66} - Eto.Gtk3 - - - {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1} - Eto.Test - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - - - - - - - - - - - - - - - - - 3.11.0 - - - \ No newline at end of file diff --git a/test/Eto.Test.Gtk3/Properties/AssemblyInfo.cs b/test/Eto.Test.Gtk3/Properties/AssemblyInfo.cs deleted file mode 100644 index a30e214fa8..0000000000 --- a/test/Eto.Test.Gtk3/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle ("Eto Test for GTK3")] -[assembly: AssemblyDescription ("")] diff --git a/test/Eto.Test.Gtk3/Startup.cs b/test/Eto.Test.Gtk3/Startup.cs deleted file mode 100644 index 52f0a2fbb1..0000000000 --- a/test/Eto.Test.Gtk3/Startup.cs +++ /dev/null @@ -1,20 +0,0 @@ -using Eto; -using Eto.Test; -using System.Diagnostics; - -namespace Eto.Test.Gtk3 -{ - class Startup - { - //[STAThread] - static void Main(string[] args) - { - var generator = new Eto.GtkSharp.Platform(); - - var app = new TestApplication(generator); - app.TestAssemblies.Add(typeof(Startup).Assembly); - app.Run(); - } - } -} - diff --git a/test/Eto.Test.Gtk3/app.config b/test/Eto.Test.Gtk3/app.config deleted file mode 100644 index aec259689e..0000000000 --- a/test/Eto.Test.Gtk3/app.config +++ /dev/null @@ -1,310 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Eto.Test.Mac/Eto.Test.Mac.csproj b/test/Eto.Test.Mac/Eto.Test.Mac.csproj deleted file mode 100644 index 72a2650403..0000000000 --- a/test/Eto.Test.Mac/Eto.Test.Mac.csproj +++ /dev/null @@ -1,38 +0,0 @@ - - - net461 - WinExe - True - - - ..\..\artifacts\test\Debug\ - - - ..\..\artifacts\test\Release\ - - - - - - ..\..\lib\MonoMac\MonoMac.dll - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj index bef11f2246..5ac7c62b10 100644 --- a/test/Eto.Test.Mac/Eto.Test.Mac64.csproj +++ b/test/Eto.Test.Mac/Eto.Test.Mac64.csproj @@ -2,13 +2,7 @@ net461 WinExe - True - - - ..\..\artifacts\test\Debug\ - - - ..\..\artifacts\test\Release\ + True @@ -30,7 +24,6 @@ - diff --git a/test/Eto.Test.Mac/Eto.Test.XamMac.csproj b/test/Eto.Test.Mac/Eto.Test.XamMac.csproj deleted file mode 100644 index 9200295bb1..0000000000 --- a/test/Eto.Test.Mac/Eto.Test.XamMac.csproj +++ /dev/null @@ -1,138 +0,0 @@ - - - - - Debug - AnyCPU - {9CEE7E60-C9EB-11E3-9C1A-0800200C9A66} - {42C0BBD9-55CE-4FC1-8D90-A7348ABAFB23};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - Eto.Test.Mac - 14/12/2012 1:15:16 AM - v4.6.1 - Eto.Test.XamMac - True - true - - - 512 - True - prompt - 4 - - - ..\..\artifacts\test\Debug\net461\ - SDCOMPAT;DEBUG - full - False - False - False - False - false - Mac Developer - 3rd Party Mac Developer Installer - true - false - false - HttpClientHandler - Default - None - None - - - ..\..\artifacts\test\Release\net461\ - full - True - False - False - False - True - True - Mac Developer - Developer ID Installer - SdkOnly - false - false - SDCOMPAT - HttpClientHandler - Default - None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {BF405A10-C9EB-11E3-9C1A-0800200C9A66} - Eto.XamMac - - - {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1} - Eto.Test - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - {3F8178EF-0710-43F7-92E2-130B9BE2212D} - Eto.Serialization.Json - - - - - diff --git a/test/Eto.Test.Mac/Eto.Test.XamMac2-modern.csproj b/test/Eto.Test.Mac/Eto.Test.XamMac2-modern.csproj deleted file mode 100644 index 152628a4fa..0000000000 --- a/test/Eto.Test.Mac/Eto.Test.XamMac2-modern.csproj +++ /dev/null @@ -1,105 +0,0 @@ - - - - Debug - AnyCPU - {A2DD2180-297D-11E5-A2CB-0800200C9A66} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - Eto.Test.Mac - 14/12/2012 1:15:16 AM - Eto.Test.XamMac2 - Xamarin.Mac - v2.0 - true - - - 512 - True - prompt - 4 - - - ..\..\artifacts\test\Debug\modern\ - DEBUG;XAMMAC2 - full - False - False - False - False - true - Mac Developer - 3rd Party Mac Developer Installer - true - x86_64 - false - false - None - - - ..\..\artifacts\test\Release\modern\ - full - True - False - false - False - True - True - Mac Developer - Developer ID Installer - x86_64 - XAMMAC2 - false - SdkOnly - false - None - - - - - - - - - - - - - - - - - - - - - - - {BD6ED8F0-297C-11E5-A2CB-0800200C9A66} - Eto.XamMac2-modern - - - {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1} - Eto.Test - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - {3F8178EF-0710-43F7-92E2-130B9BE2212D} - Eto.Serialization.Json - - - - - 3.11.0 - - - - - - - - - \ No newline at end of file diff --git a/test/Eto.Test.Mac/Eto.Test.XamMac2-net461.csproj b/test/Eto.Test.Mac/Eto.Test.XamMac2-net461.csproj deleted file mode 100644 index 747f52186e..0000000000 --- a/test/Eto.Test.Mac/Eto.Test.XamMac2-net461.csproj +++ /dev/null @@ -1,97 +0,0 @@ - - - - - Debug - AnyCPU - {689E4C20-2702-11E4-8C21-0800200C9A66} - {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Exe - Eto.Test.Mac - 14/12/2012 1:15:16 AM - Eto.Test.XamMac2 - true - v4.6.1 - - - 512 - True - prompt - 4 - - - ..\..\artifacts\test\Debug\net461 - DEBUG;XAMMAC2 - full - False - False - False - False - true - Mac Developer - 3rd Party Mac Developer Installer - true - x86_64 - false - false - true - None - - - ..\..\artifacts\test\Release\net461 - full - True - False - false - False - True - True - Mac Developer - Developer ID Installer - x86_64 - XAMMAC2 - false - None - false - None - - - - - - - - - - - - - - - - - - - - - - - {EB9C0A22-6644-46E4-948C-F7C95E1F8CE1} - Eto.Test - - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} - Eto - - - {856E8C70-2702-11E4-8C21-0800200C9A66} - Eto.XamMac2-net45 - - - - - 3.11.0 - - - - \ No newline at end of file diff --git a/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj b/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj new file mode 100644 index 0000000000..0814ca05a1 --- /dev/null +++ b/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj @@ -0,0 +1,53 @@ + + + + {A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + Exe + net461;xamarinmac20 + Eto.Test.Mac + $(DefineConstants);XAMMAC2 + $(XamarinMacTargetsPath)Xamarin.Mac.CSharp.targets + False + False + True + None + Mac Developer + 3rd Party Mac Developer Installer + True + --nowarn:2006 --nowarn:5220 + + + + Xamarin.Mac + v2.0 + Platform + false + + + true + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Eto.Test.Mac/packages.config b/test/Eto.Test.Mac/packages.config deleted file mode 100644 index 0842defbba..0000000000 --- a/test/Eto.Test.Mac/packages.config +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj b/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj index 8859d2dc87..09de5eaf82 100644 --- a/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj +++ b/test/Eto.Test.WinForms/Eto.Test.WinForms.csproj @@ -1,35 +1,22 @@ - - - - - true - - - false - + + true + $(TargetFrameworks);net461 $(TargetFrameworks);netcoreapp3.0 - - + + WinExe Properties - Eto.Test.WinForms - Eto.Test.WinForms ..\Eto.Test\Images\TestIcon.ico true - true true - false - ..\..\artifacts\test\$(Configuration)\ @@ -70,17 +57,14 @@ - - 3.11.0 + - - + + \ No newline at end of file diff --git a/test/Eto.Test.WinForms/Properties/AssemblyInfo.cs b/test/Eto.Test.WinForms/Properties/AssemblyInfo.cs deleted file mode 100644 index 16d860ddf0..0000000000 --- a/test/Eto.Test.WinForms/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle ("Eto Test for WinForms")] -[assembly: AssemblyDescription ("")] diff --git a/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj b/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj index f68f793c77..b034d97705 100644 --- a/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj +++ b/test/Eto.Test.Wpf/Eto.Test.Wpf.csproj @@ -1,37 +1,24 @@ - - - - - true - - - false - + + true + $(TargetFrameworks);net461 $(TargetFrameworks);netcoreapp3.0 - - + + WinExe Properties - Eto.Test.Wpf TestIcon.ico - true - Eto.Test.Wpf true false - false - ..\..\artifacts\test\$(Configuration)\ - true - true + true + true @@ -60,32 +47,29 @@ - - - + + + - + Designer - + Designer - - 3.11.0 + - - + + \ No newline at end of file diff --git a/test/Eto.Test.Wpf/Properties/AssemblyInfo.cs b/test/Eto.Test.Wpf/Properties/AssemblyInfo.cs index 1eb9a11f4d..13a57e7076 100644 --- a/test/Eto.Test.Wpf/Properties/AssemblyInfo.cs +++ b/test/Eto.Test.Wpf/Properties/AssemblyInfo.cs @@ -1,9 +1,6 @@ using System.Reflection; using System.Windows; -[assembly: AssemblyTitle ("Eto Test for WPF")] -[assembly: AssemblyDescription ("")] - [assembly: ThemeInfo ( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, diff --git a/test/Eto.Test/Eto.Test.csproj b/test/Eto.Test/Eto.Test.csproj index 152b4cf254..a8cd0a9a15 100644 --- a/test/Eto.Test/Eto.Test.csproj +++ b/test/Eto.Test/Eto.Test.csproj @@ -2,15 +2,14 @@ netstandard2.0 true + $(DefineConstants);PCL - - TRACE;DEBUG;PCL;PORTABLE - ..\..\artifacts\test\Debug\ - - - TRACE;PCL;PORTABLE - ..\..\artifacts\test\Release\ + + + Eto Test Application + An example application and Unit Tests for Eto.Forms. + Helper.cs diff --git a/test/Eto.Test/Properties/AssemblyInfo.cs b/test/Eto.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 94eb1ef141..0000000000 --- a/test/Eto.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle ("Eto Test Application")] -[assembly: AssemblyDescription ("An example application for Eto.Forms.")] \ No newline at end of file