From 2dee954dc7472f85b81c0ee5265b42e644d016f1 Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Mon, 1 Jan 2018 23:31:20 -0800 Subject: [PATCH 1/2] - Use newer Xamarin.Mac vs XamMac to provide 64-bit support on macOS - Fix build for windows under CI --- Source/Pablo Desktop.sln | 52 +-- .../PabloDraw.Console.csproj | 34 +- Source/PabloDraw.Mac/AppDelegate.cs | 4 +- .../Assets.xcassets/Contents.json | 6 + Source/PabloDraw.Mac/PabloDraw.Mac.csproj | 321 ++++++------------ Source/PabloDraw.Mac/Startup.cs | 2 +- Source/PabloDraw.Mac/packages.config | 5 - 7 files changed, 151 insertions(+), 273 deletions(-) create mode 100644 Source/PabloDraw.Mac/Assets.xcassets/Contents.json delete mode 100644 Source/PabloDraw.Mac/packages.config diff --git a/Source/Pablo Desktop.sln b/Source/Pablo Desktop.sln index 4a9de23..9f7d483 100644 --- a/Source/Pablo Desktop.sln +++ b/Source/Pablo Desktop.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PabloDraw", "PabloDraw\Pabl EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Nat", "..\Libraries\Mono.Nat\src\Mono.Nat\Mono.Nat.csproj", "{F5D74163-145F-47BF-83DC-D0E07249C6CA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PabloDraw.Mac", "PabloDraw.Mac\PabloDraw.Mac.csproj", "{90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PabloDraw.Console", "PabloDraw.Console\PabloDraw.Console.csproj", "{0457895A-719B-47E9-84F3-356B2A1F8D3C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Eto", "Eto", "{C8B59D00-6086-492E-9112-3DA8E5025FBB}" @@ -29,8 +27,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.WinForms - net45", "..\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Wpf - net45", "..\Libraries\Eto\Source\Eto.Wpf\Eto.Wpf - net45.csproj", "{63137FA0-CA55-11E3-9C1A-0800200C9A66}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac - net45", "..\Libraries\Eto\Source\Eto.Mac\Eto.XamMac - net45.csproj", "{BF405A10-C9EB-11E3-9C1A-0800200C9A66}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{88CCB819-8E11-429C-94D7-D5A27A671129}" ProjectSection(SolutionItems) = preProject Pablo Desktop.sln = Pablo Desktop.sln @@ -41,6 +37,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network", "..\Libra EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac2 - net45", "..\Libraries\Eto\Source\Eto.Mac\Eto.XamMac2 - net45.csproj", "{856E8C70-2702-11E4-8C21-0800200C9A66}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PabloDraw.Mac", "PabloDraw.Mac\PabloDraw.Mac.csproj", "{5590729F-3176-4A91-94E3-54F75DA2EB9D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Mac - net45", "..\Libraries\Eto\Source\Eto.Mac\Eto.Mac - net45.csproj", "{3E7995E0-C9EB-11E3-9C1A-0800200C9A66}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Mac App Store|Any CPU = Mac App Store|Any CPU @@ -99,16 +99,6 @@ Global {F5D74163-145F-47BF-83DC-D0E07249C6CA}.Win Debug|Any CPU.Build.0 = Debug|Any CPU {F5D74163-145F-47BF-83DC-D0E07249C6CA}.Win Release|Any CPU.ActiveCfg = Release|Any CPU {F5D74163-145F-47BF-83DC-D0E07249C6CA}.Win Release|Any CPU.Build.0 = Release|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Mac App Store|Any CPU.ActiveCfg = Release-MAS|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Mac App Store|Any CPU.Build.0 = Release-MAS|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Mac Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Mac Debug|Any CPU.Build.0 = Debug|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Mac Developer|Any CPU.ActiveCfg = Release|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Mac Developer|Any CPU.Build.0 = Release|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Mac Release|Any CPU.ActiveCfg = Release|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Mac Release|Any CPU.Build.0 = Release|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Win Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90B2D03E-7B1D-4C1F-8ADB-664F980C2A32}.Win Release|Any CPU.ActiveCfg = Release|Any CPU {0457895A-719B-47E9-84F3-356B2A1F8D3C}.Mac App Store|Any CPU.ActiveCfg = Release|Any CPU {0457895A-719B-47E9-84F3-356B2A1F8D3C}.Mac App Store|Any CPU.Build.0 = Release|Any CPU {0457895A-719B-47E9-84F3-356B2A1F8D3C}.Mac Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -193,16 +183,6 @@ Global {63137FA0-CA55-11E3-9C1A-0800200C9A66}.Win Debug|Any CPU.Build.0 = Debug|Any CPU {63137FA0-CA55-11E3-9C1A-0800200C9A66}.Win Release|Any CPU.ActiveCfg = Release|Any CPU {63137FA0-CA55-11E3-9C1A-0800200C9A66}.Win Release|Any CPU.Build.0 = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Mac App Store|Any CPU.ActiveCfg = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Mac App Store|Any CPU.Build.0 = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Mac Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Mac Debug|Any CPU.Build.0 = Debug|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Mac Developer|Any CPU.ActiveCfg = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Mac Developer|Any CPU.Build.0 = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Mac Release|Any CPU.ActiveCfg = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Mac Release|Any CPU.Build.0 = Release|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Win Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF405A10-C9EB-11E3-9C1A-0800200C9A66}.Win Release|Any CPU.ActiveCfg = Release|Any CPU {49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Mac App Store|Any CPU.ActiveCfg = Release|Any CPU {49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Mac App Store|Any CPU.Build.0 = Release|Any CPU {49BA1C69-6104-41AC-A5D8-B54FA9F696E8}.Mac Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -225,6 +205,28 @@ Global {856E8C70-2702-11E4-8C21-0800200C9A66}.Mac Release|Any CPU.Build.0 = Release|Any CPU {856E8C70-2702-11E4-8C21-0800200C9A66}.Win Debug|Any CPU.ActiveCfg = Debug|Any CPU {856E8C70-2702-11E4-8C21-0800200C9A66}.Win Release|Any CPU.ActiveCfg = Release|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Mac App Store|Any CPU.ActiveCfg = Release|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Mac App Store|Any CPU.Build.0 = Release|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Mac Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Mac Debug|Any CPU.Build.0 = Debug|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Mac Developer|Any CPU.ActiveCfg = Release|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Mac Developer|Any CPU.Build.0 = Release|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Mac Release|Any CPU.ActiveCfg = Release|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Mac Release|Any CPU.Build.0 = Release|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Win Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5590729F-3176-4A91-94E3-54F75DA2EB9D}.Win Release|Any CPU.ActiveCfg = Release|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Mac App Store|Any CPU.ActiveCfg = Release|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Mac App Store|Any CPU.Build.0 = Release|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Mac Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Mac Debug|Any CPU.Build.0 = Debug|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Mac Developer|Any CPU.ActiveCfg = Release|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Mac Developer|Any CPU.Build.0 = Release|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Mac Release|Any CPU.ActiveCfg = Release|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Mac Release|Any CPU.Build.0 = Release|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Win Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Win Debug|Any CPU.Build.0 = Debug|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Win Release|Any CPU.ActiveCfg = Release|Any CPU + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66}.Win Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -236,8 +238,8 @@ Global {543B2F90-CA56-11E3-9C1A-0800200C9A66} = {C8B59D00-6086-492E-9112-3DA8E5025FBB} {9F51798A-354C-47A1-9207-4BB7D7FC7FC4} = {C8B59D00-6086-492E-9112-3DA8E5025FBB} {63137FA0-CA55-11E3-9C1A-0800200C9A66} = {C8B59D00-6086-492E-9112-3DA8E5025FBB} - {BF405A10-C9EB-11E3-9C1A-0800200C9A66} = {C8B59D00-6086-492E-9112-3DA8E5025FBB} {856E8C70-2702-11E4-8C21-0800200C9A66} = {C8B59D00-6086-492E-9112-3DA8E5025FBB} + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66} = {C8B59D00-6086-492E-9112-3DA8E5025FBB} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8F8DD3BA-3F1A-4B83-87FD-07C1D69CB86C} diff --git a/Source/PabloDraw.Console/PabloDraw.Console.csproj b/Source/PabloDraw.Console/PabloDraw.Console.csproj index 31e3d68..89a0654 100644 --- a/Source/PabloDraw.Console/PabloDraw.Console.csproj +++ b/Source/PabloDraw.Console/PabloDraw.Console.csproj @@ -40,15 +40,6 @@ prompt 4 true - - - - BeforeBuild - ./copyassemblies.sh ${ProjectConfigName} ${ProjectDir}/Assemblies - ${ProjectDir} - - - --convert /Users/curtis/Downloads/mirage/VD-FLIP.ans --out /Users/curtis/Downloads/mirage/VD-FLIP.txt false @@ -60,19 +51,6 @@ 4 true --platform mac --server --adminpw hello - - - - BeforeBuild - ./copyassemblies.sh ${ProjectConfigName} ${ProjectDir}/Assemblies - ${ProjectDir} - - - AfterBuild - cp ${TargetFile} /Users/curtis/Projects/Pablo/Pablo.Gallery/src/Pablo.Gallery/Util/PabloDraw.Console.exe - - - none false @@ -131,6 +109,18 @@ Pablo False + + {80915A80-CA54-11E3-9C1A-0800200C9A66} + Eto.Gtk2 - net45 + + + {9F51798A-354C-47A1-9207-4BB7D7FC7FC4} + Eto.WinForms - net45 + + + {3E7995E0-C9EB-11E3-9C1A-0800200C9A66} + Eto.Mac - net45 + @@ -160,20 +160,24 @@ Assemblies\MonoMac.dll - + Assemblies\SharpCompress.dll - + Assemblies\Newtonsoft.Json.dll - - cd $(ProjectDir) -copyassemblies.cmd $(ConfigurationName) Assemblies - cd $(ProjectDir) -./copyassemblies.sh $(ConfigurationName) Assemblies - + + + + + + + + + + \ No newline at end of file diff --git a/Source/PabloDraw.Console/copyassemblies.cmd b/Source/PabloDraw.Console/copyassemblies.cmd deleted file mode 100644 index b0aedcd..0000000 --- a/Source/PabloDraw.Console/copyassemblies.cmd +++ /dev/null @@ -1,28 +0,0 @@ - -set BASEDIR=..\.. -set SOLUTIONDIR=.. - - -echo Destination: %2 - -call :CopyBase "%~1" "%~2" Libraries\Eto BuildOutput\net45 Eto*.* - -call :CopyBase "%~1" "%~2" Libraries\lidgren Lidgren.Network\bin Lidgren.Network.* -call :CopyBase "%~1" "%~2" Libraries\Mono.Nat\src Mono.Nat\bin Mono.Nat.* -call :CopyFile "%~1" "%~2" Pablo Pablo.dll - - -goto :eof - - -:CopyBase - -echo Copying: %~4 -copy "%BASEDIR%\%~3\%~4\%~1\%~5" "%~2" -goto :eof - -:CopyFile - -echo Copying: %~4 -copy "%SOLUTIONDIR%\%~3\bin\%~1\%~4" "%~2" -goto :eof diff --git a/Source/PabloDraw.Console/copyassemblies.sh b/Source/PabloDraw.Console/copyassemblies.sh deleted file mode 100644 index 09eb805..0000000 --- a/Source/PabloDraw.Console/copyassemblies.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -BASEDIR=../.. -SOLUTIONDIR=.. - -function CopyBase { - echo Copying: $5 - rm $2/$5 - cp $BASEDIR/$3/$4/$1/$5 $2 -} -function CopyFile { - echo Copying: $4 - rm $2/$4 - cp $SOLUTIONDIR/$3/bin/$1/$4 $2 -} - -echo Destination: $2 - -mkdir -p $2 -CopyBase $1 $2 Libraries/Eto BuildOutput/net45 Eto*.dll -CopyBase $1 $2 Libraries/lidgren Lidgren.Network/bin Lidgren.Network.* -CopyBase $1 $2 Libraries/Mono.Nat/src Mono.Nat/bin Mono.Nat.* -CopyFile $1 $2 Pablo Pablo.dll - diff --git a/Source/PabloDraw/PabloDraw.csproj b/Source/PabloDraw/PabloDraw.csproj index 4760329..6cf65db 100644 --- a/Source/PabloDraw/PabloDraw.csproj +++ b/Source/PabloDraw/PabloDraw.csproj @@ -61,19 +61,6 @@ False 4 pdbonly - - - - BeforeBuild - ./copyassemblies.sh ${ProjectConfigName} ${ProjectDir}/Assemblies - ${ProjectDir} - - - AfterBuild - cp -Rf ${TargetDir}/PabloDraw.exe ${SolutionDir}/../Releases/3.2 - - - @@ -97,15 +84,6 @@ False 4 full - - - - BeforeBuild - ./copyassemblies.sh ${ProjectConfigName} ${ProjectDir}/Assemblies - ${ProjectDir} - - - @@ -141,6 +119,9 @@ Properties\app.manifest + + false + System @@ -151,13 +132,6 @@ - - cd $(ProjectDir) -copyassemblies.cmd $(ConfigurationName) Assemblies - cd $(ProjectDir) -./copyassemblies.sh $(ConfigurationName) Assemblies - rem del $(TargetDir)\Eto.dll - Properties\GlobalAssemblyInfo.cs @@ -171,9 +145,9 @@ copyassemblies.cmd $(ConfigurationName) Assemblies - + False - Microsoft .NET Framework 4 %28x86 and x64%29 + Microsoft .NET Framework 4.5.2 %28x86 and x64%29 true @@ -186,11 +160,6 @@ copyassemblies.cmd $(ConfigurationName) Assemblies .NET Framework 3.5 SP1 false - - False - Windows Installer 4.5 - true - @@ -198,10 +167,10 @@ copyassemblies.cmd $(ConfigurationName) Assemblies - + Assemblies\Newtonsoft.Json.dll - + Assemblies\SharpCompress.dll @@ -209,8 +178,6 @@ copyassemblies.cmd $(ConfigurationName) Assemblies - - @@ -235,7 +202,17 @@ copyassemblies.cmd $(ConfigurationName) Assemblies True Assembly - + + False + + + + + Exclude + True + Assembly + + False @@ -245,7 +222,27 @@ copyassemblies.cmd $(ConfigurationName) Assemblies True Assembly - + + False + + + + + Exclude + True + Assembly + + + False + + + + + Exclude + True + Assembly + + False @@ -365,6 +362,36 @@ copyassemblies.cmd $(ConfigurationName) Assemblies True Assembly + + False + + + + + Exclude + True + Assembly + + + False + + + + + Exclude + True + Assembly + + + False + + + + + Exclude + True + Assembly + @@ -428,37 +455,66 @@ copyassemblies.cmd $(ConfigurationName) Assemblies {330EF9FD-5947-4AC9-9796-950C7633695F} Eto.Direct2D - net45 + False {80915A80-CA54-11E3-9C1A-0800200C9A66} Eto.Gtk2 - net45 + False {543B2F90-CA56-11E3-9C1A-0800200C9A66} Eto.Gtk3 - net45 + False {9F51798A-354C-47A1-9207-4BB7D7FC7FC4} Eto.WinForms - net45 + False {63137fa0-ca55-11e3-9c1a-0800200c9a66} Eto.Wpf - net45 + False {35EF0A4E-2A1A-492C-8BED-106774EA09F2} Eto - pcl + False {35DBE6BB-B46D-4AE9-8156-FBFC6EC2BB69} Pablo + False {3FAACC7E-D156-4599-B0D1-6177AD78E8B1} Pablo.Interface + False + + + {F5D74163-145F-47BF-83DC-D0E07249C6CA} + Mono.Nat + False + + + {49BA1C69-6104-41AC-A5D8-B54FA9F696E8} + Lidgren.Network + False + + + + + + + + + + + \ No newline at end of file diff --git a/Source/PabloDraw/copyassemblies.cmd b/Source/PabloDraw/copyassemblies.cmd deleted file mode 100644 index 2b6f24a..0000000 --- a/Source/PabloDraw/copyassemblies.cmd +++ /dev/null @@ -1,29 +0,0 @@ - -set BASEDIR=..\.. -set SOLUTIONDIR=.. - - -echo Destination: %2 - -call :CopyBase "%~1" "%~2" Libraries\Eto BuildOutput\net45 Eto*.* - -call :CopyBase "%~1" "%~2" Libraries\lidgren Lidgren.Network\bin Lidgren.Network.* -call :CopyBase "%~1" "%~2" Libraries\Mono.Nat\src Mono.Nat\bin Mono.Nat.* -call :CopyFile "%~1" "%~2" Pablo Pablo.dll -call :CopyFile "%~1" "%~2" Pablo.Interface Pablo.Interface.dll - - -goto :eof - - -:CopyBase - -echo Copying: %~4 -copy "%BASEDIR%\%~3\%~4\%~1\%~5" "%~2" -goto :eof - -:CopyFile - -echo Copying: %~4 -copy "%SOLUTIONDIR%\%~3\bin\%~1\%~4" "%~2" -goto :eof diff --git a/Source/PabloDraw/copyassemblies.sh b/Source/PabloDraw/copyassemblies.sh deleted file mode 100755 index 4969dda..0000000 --- a/Source/PabloDraw/copyassemblies.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -BASEDIR=../.. -SOLUTIONDIR=.. - -function CopyBase { - echo Copying: $5 - cp $BASEDIR/$3/$4/$1/$5 $2 -} -function CopyFile { - echo Copying: $4 - cp $SOLUTIONDIR/$3/bin/$1/$4 $2 -} - -echo Destination: $2 - -mkdir -p $2 -CopyBase $1 $2 Libraries/Eto BuildOutput/net45 "Eto*.dll" -CopyBase $1 $2 Libraries/lidgren Lidgren.Network/bin "Lidgren.Network.*" -CopyBase $1 $2 Libraries/Mono.Nat/src Mono.Nat/bin "Mono.Nat.*" -CopyFile $1 $2 Pablo Pablo.dll -CopyFile $1 $2 Pablo.Interface Pablo.Interface.dll - -