From d0f226c5212ce34fa4991ab63ee4cc50c6055a82 Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Mon, 1 Jan 2018 23:36:47 -0800 Subject: [PATCH] Fix cross platform and CI build - Fix copying embedded assemblies - Update clickonce and turn off copy local for references --- Source/Pablo/Pablo.csproj | 8 +- Source/Pablo/packages.config | 1 - .../PabloDraw.Console.csproj | 28 ++-- Source/PabloDraw.Console/copyassemblies.cmd | 28 ---- Source/PabloDraw.Console/copyassemblies.sh | 24 --- Source/PabloDraw/PabloDraw.csproj | 140 ++++++++++++------ Source/PabloDraw/copyassemblies.cmd | 29 ---- Source/PabloDraw/copyassemblies.sh | 24 --- 8 files changed, 118 insertions(+), 164 deletions(-) delete mode 100644 Source/PabloDraw.Console/copyassemblies.cmd delete mode 100644 Source/PabloDraw.Console/copyassemblies.sh delete mode 100644 Source/PabloDraw/copyassemblies.cmd delete mode 100755 Source/PabloDraw/copyassemblies.sh diff --git a/Source/Pablo/Pablo.csproj b/Source/Pablo/Pablo.csproj index 11eab1d..5761e0d 100644 --- a/Source/Pablo/Pablo.csproj +++ b/Source/Pablo/Pablo.csproj @@ -69,10 +69,6 @@ false - - ..\packages\Mono.Nat.1.2.24.0\lib\net40\Mono.Nat.dll - True - @@ -760,6 +756,10 @@ {49BA1C69-6104-41AC-A5D8-B54FA9F696E8} Lidgren.Network + + {f5d74163-145f-47bf-83dc-d0e07249c6ca} + Mono.Nat + \ No newline at end of file diff --git a/Source/Pablo/packages.config b/Source/Pablo/packages.config index 9e5b3fa..c1aa491 100644 --- a/Source/Pablo/packages.config +++ b/Source/Pablo/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/Source/PabloDraw.Console/PabloDraw.Console.csproj b/Source/PabloDraw.Console/PabloDraw.Console.csproj index 89a0654..f075e02 100644 --- a/Source/PabloDraw.Console/PabloDraw.Console.csproj +++ b/Source/PabloDraw.Console/PabloDraw.Console.csproj @@ -86,13 +86,12 @@ - - {35EF0A4E-2A1A-492C-8BED-106774EA09F2} Eto - pcl + False {49BA1C69-6104-41AC-A5D8-B54FA9F696E8} @@ -112,21 +111,22 @@ {80915A80-CA54-11E3-9C1A-0800200C9A66} Eto.Gtk2 - net45 + False {9F51798A-354C-47A1-9207-4BB7D7FC7FC4} Eto.WinForms - net45 + False {3E7995E0-C9EB-11E3-9C1A-0800200C9A66} Eto.Mac - net45 + False @@ -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 - -