From 91e739d07e59c1377c5e424d3375aa430af5bdfa Mon Sep 17 00:00:00 2001 From: borrillis Date: Sat, 18 May 2019 22:14:41 -0400 Subject: [PATCH 1/5] First try at OSX build --- build.cake | 41 +++++++++++------- build.ps1 | 26 ++++++++--- src/.DS_Store | Bin 0 -> 6148 bytes src/Directory.Build.props | 2 +- .../SharpInputSystem.Android.csproj | 4 +- .../SharpInputSystem.SWF.csproj | 1 - ...arpInputSystem.Test.Console.DirectX.csproj | 6 --- .../SharpInputSystem.Test.Console.SWF.csproj | 5 --- .../SharpInputSystem.Test.Console.X11.csproj | 5 --- ...harpInputSystem.Test.OpenGL.Android.csproj | 6 +-- .../SharpInputSystem.X11.csproj | 1 - src/SharpInputSystem.sln | 37 +++++++++++++++- src/SharpInputSystem/.DS_Store | Bin 0 -> 6148 bytes src/global.json | 1 + 14 files changed, 85 insertions(+), 50 deletions(-) create mode 100644 src/.DS_Store create mode 100644 src/SharpInputSystem/.DS_Store diff --git a/build.cake b/build.cake index dab9c69f..8d7ed14c 100644 --- a/build.cake +++ b/build.cake @@ -1,10 +1,11 @@ #tool nuget:?package=NUnit.ConsoleRunner&version=3.4.0 #tool nuget:?package=GitReleaseNotes.Portable&version=0.7.1 #tool nuget:?package=Wyam&version=2.1.1 +#tool nuget:https://www.nuget.org/api/v2?package=JetBrains.ReSharper.CommandLineTools&version=2018.1.0 + #addin nuget:?package=Cake.Wyam&version=2.1.1 #load nuget:https://www.nuget.org/api/v2?package=Cake.Wyam.Recipe&version=0.6.0 - ////////////////////////////////////////////////////////////////////// // ARGUMENTS ////////////////////////////////////////////////////////////////////// @@ -86,20 +87,22 @@ Task("Build-Product") .IsDependentOn("Restore") .Does(() => { - if(IsRunningOnWindows()) - { - // Use MSBuild - MSBuild(solutionFile, settings => - settings.SetConfiguration(configuration)); - } - else - { - // Use XBuild - XBuild(solutionFile, settings => - settings.SetConfiguration(configuration)); - } + MSBuild(solutionFile, settings => + settings.SetConfiguration(configuration)); }); +Task("InspectCode") + .Description("Inspect the code using Resharper's rule set") + .Does(() => +{ + var settings = new InspectCodeSettings() { + SolutionWideAnalysis = true, + OutputFile = $"{artifactsDirectory}/inspectcode.xml", + ThrowExceptionOnFindingViolations = true + }; + InspectCode(solutionFile, settings); +}); + Task("Test") .IsDependentOn("Build") .Does(() => @@ -113,7 +116,9 @@ Task("Package") .IsDependentOn("Test") .Does(() => { - GenerateReleaseNotes(); + if (!configuration.Contains("OSX")) { + GenerateReleaseNotes(); + } MSBuild(solutionFile, settings => commonSettings(settings) @@ -125,7 +130,7 @@ Task("Package") private void GenerateReleaseNotes() { var releaseNotesExitCode = StartProcess( - @"tools\GitReleaseNotes.Portable.0.7.1\tools\gitreleasenotes.exe", + @"tools\GitReleaseNotes.Portable.0.7.1\tools\GitReleaseNotes.exe", new ProcessSettings { Arguments = ". /o BuildArtifacts/releasenotes.md" }); if (string.IsNullOrEmpty(System.IO.File.ReadAllText("./BuildArtifacts/releasenotes.md"))) System.IO.File.WriteAllText("./BuildArtifacts/releasenotes.md", "No issues closed since last release"); @@ -153,6 +158,12 @@ Task("Build") .IsDependentOn("Build-Product") .IsDependentOn("Build-Documentation"); +Task("Validate") + .Description("Validate code quality using Resharper CLI. tools.") + //.IsDependentOn("Analyse-Dependencies") + //.IsDependentOn("DupFinder") + .IsDependentOn("InspectCode"); + ////////////////////////////////////////////////////////////////////// // EXECUTION ////////////////////////////////////////////////////////////////////// diff --git a/build.ps1 b/build.ps1 index 5e010fd9..fb3a3fa9 100644 --- a/build.ps1 +++ b/build.ps1 @@ -155,8 +155,17 @@ if (!(Test-Path $NUGET_EXE)) { } } -# Save nuget.exe path to environment to be available to child processed -$ENV:NUGET_EXE = $NUGET_EXE +if ($PSVersionTable.PSEdition -eq "Core" -and $PSVersionTable.Platform -ne "Win32NT") +{ + $CMD = "mono " +} +else +{ + $CMD = "" +} + +# Save nuget.exe path to environment to be available to child processes +$ENV:NUGET_EXE = $NUGET_CMD # Restore tools from NuGet? if(-Not $SkipToolPackageRestore.IsPresent) { @@ -173,7 +182,8 @@ if(-Not $SkipToolPackageRestore.IsPresent) { } Write-Verbose -Message "Restoring tools from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" + Write-Verbose -Message "$CMD`"$NUGET_CMD`"" + $NuGetOutput = Invoke-Expression "&$CMD`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" if ($LASTEXITCODE -ne 0) { Throw "An error occurred while restoring NuGet tools." @@ -193,7 +203,7 @@ if (Test-Path $ADDINS_PACKAGES_CONFIG) { Set-Location $ADDINS_DIR Write-Verbose -Message "Restoring addins from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" + $NuGetOutput = Invoke-Expression "&$CMD`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" if ($LASTEXITCODE -ne 0) { Throw "An error occurred while restoring NuGet addins." @@ -210,7 +220,7 @@ if (Test-Path $MODULES_PACKAGES_CONFIG) { Set-Location $MODULES_DIR Write-Verbose -Message "Restoring modules from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" + $NuGetOutput = Invoke-Expression "&$CMD`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" if ($LASTEXITCODE -ne 0) { Throw "An error occurred while restoring NuGet modules." @@ -229,13 +239,15 @@ if (!(Test-Path $CAKE_EXE)) { # Build Cake arguments $cakeArguments = @("$Script"); if ($Target) { $cakeArguments += "-target=$Target" } -if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } +if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } else { if ($IsMacOS) {$cakeArguments += "-configuration=OSX_Release"}} if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" } if ($ShowDescription) { $cakeArguments += "-showdescription" } if ($DryRun) { $cakeArguments += "-dryrun" } + $cakeArguments += $ScriptArgs # Start Cake Write-Host "Running build script..." -&$CAKE_EXE $cakeArguments +&$CMD $CAKE_EXE $cakeArguments +Write-Verbose -Message ($CakeOutput | out-string) exit $LASTEXITCODE \ No newline at end of file diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0eb9cae377b2fd2ee2c255e0ef13dbcc557c9c40 GIT binary patch literal 6148 zcmeHKyH3ME5S)b+k!W0|ye~lF4~{4lsr>^yj094^5g`SgyZkn@4jfb5ZFd1Q0H$~tBM-d7*lNkkOIYOJxuGuGJRb(DQPpxg#69&m#fGQapO z-mqbvdpvcUyVY&que8MMr(~Stk`K|bT#rX|`{d)#kkM2i6-WhAfmGl>DZrksHa&C9 zH5Et&Qh`qe^!rfgiZyU>v`+^Y8v%$DhRt|wvjnkdfLH?uM@DGkRH9QQMhtN}<0bNH z;Na+Vh@H$jak9jOB6d3C#nK_wG1pWe6*yGj)VGcH|10`8^Zy|!cd0-s@TU}z$)a7% z`AX4SM=z(nw$QKXAI4lu=VGmxXswtVZN;;_yrS2 - + All diff --git a/src/SharpInputSystem.Android/SharpInputSystem.Android.csproj b/src/SharpInputSystem.Android/SharpInputSystem.Android.csproj index 2c6241bd..31eddffb 100644 --- a/src/SharpInputSystem.Android/SharpInputSystem.Android.csproj +++ b/src/SharpInputSystem.Android/SharpInputSystem.Android.csproj @@ -5,7 +5,7 @@ - fasle + false $(PackageId).Android $(Product).Android $(AssemblyTitle) for Android @@ -17,8 +17,6 @@ - {8476c51c-0028-4b79-b9a7-a666e11400cb} - SharpInputSystem.Core \ No newline at end of file diff --git a/src/SharpInputSystem.SWF/SharpInputSystem.SWF.csproj b/src/SharpInputSystem.SWF/SharpInputSystem.SWF.csproj index 6b514193..a48e6605 100644 --- a/src/SharpInputSystem.SWF/SharpInputSystem.SWF.csproj +++ b/src/SharpInputSystem.SWF/SharpInputSystem.SWF.csproj @@ -2,7 +2,6 @@ net462 - v4.6.2 diff --git a/src/SharpInputSystem.Test.Console.DirectX/SharpInputSystem.Test.Console.DirectX.csproj b/src/SharpInputSystem.Test.Console.DirectX/SharpInputSystem.Test.Console.DirectX.csproj index b9e564c0..717578f6 100644 --- a/src/SharpInputSystem.Test.Console.DirectX/SharpInputSystem.Test.Console.DirectX.csproj +++ b/src/SharpInputSystem.Test.Console.DirectX/SharpInputSystem.Test.Console.DirectX.csproj @@ -2,8 +2,6 @@ net462 - v4.6.2 - SharpInputSystem.Test.Console $(AssemblyTitle).Test.Console.DirectX $(Product).Test.Console.DirectX @@ -25,12 +23,8 @@ - {26bd5281-c74c-4bdb-9e9e-6e66d99fac31} - SharpInputSystem.DirectX - {8476C51C-0028-4B79-B9A7-A666E11400CB} - SharpInputSystem.Core diff --git a/src/SharpInputSystem.Test.Console.SWF/SharpInputSystem.Test.Console.SWF.csproj b/src/SharpInputSystem.Test.Console.SWF/SharpInputSystem.Test.Console.SWF.csproj index 79ce156c..d60b148b 100644 --- a/src/SharpInputSystem.Test.Console.SWF/SharpInputSystem.Test.Console.SWF.csproj +++ b/src/SharpInputSystem.Test.Console.SWF/SharpInputSystem.Test.Console.SWF.csproj @@ -2,8 +2,6 @@ net462 - v4.6.2 - SharpInputSystem.Test.Console $(AssemblyTitle).Test.Console.SWF $(Product).Test.Console.SWF @@ -25,11 +23,8 @@ - SharpInputSystem.SWF - {8476C51C-0028-4B79-B9A7-A666E11400CB} - SharpInputSystem.Core diff --git a/src/SharpInputSystem.Test.Console.X11/SharpInputSystem.Test.Console.X11.csproj b/src/SharpInputSystem.Test.Console.X11/SharpInputSystem.Test.Console.X11.csproj index 3a2d7ace..96e2a454 100644 --- a/src/SharpInputSystem.Test.Console.X11/SharpInputSystem.Test.Console.X11.csproj +++ b/src/SharpInputSystem.Test.Console.X11/SharpInputSystem.Test.Console.X11.csproj @@ -2,8 +2,6 @@ net462 - v4.6.2 - SharpInputSystem.Test.Console $(AssemblyTitle).Test.Console.X11 $(Product).Test.Console.X11 @@ -25,11 +23,8 @@ - SharpInputSystem.X11 - {8476C51C-0028-4B79-B9A7-A666E11400CB} - SharpInputSystem.Core diff --git a/src/SharpInputSystem.Test.OpenGL.Android/SharpInputSystem.Test.OpenGL.Android.csproj b/src/SharpInputSystem.Test.OpenGL.Android/SharpInputSystem.Test.OpenGL.Android.csproj index 4867846b..513053e7 100644 --- a/src/SharpInputSystem.Test.OpenGL.Android/SharpInputSystem.Test.OpenGL.Android.csproj +++ b/src/SharpInputSystem.Test.OpenGL.Android/SharpInputSystem.Test.OpenGL.Android.csproj @@ -1,7 +1,7 @@  - {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + {FAE04EC0-301F-11D3-BF4B-00C04F79EFBC};{9A19103F-16F7-4668-BE54-9A1E7A4F7556} MonoAndroid81 SharpInputSystem.Test.OpenGL.Android @@ -62,12 +62,8 @@ - {864535de-7e55-4073-99a4-4447c09c5077} - SharpInputSystem.Android - {8476c51c-0028-4b79-b9a7-a666e11400cb} - SharpInputSystem.Core diff --git a/src/SharpInputSystem.X11/SharpInputSystem.X11.csproj b/src/SharpInputSystem.X11/SharpInputSystem.X11.csproj index a0645bdf..be11b044 100644 --- a/src/SharpInputSystem.X11/SharpInputSystem.X11.csproj +++ b/src/SharpInputSystem.X11/SharpInputSystem.X11.csproj @@ -2,7 +2,6 @@ net462 - v4.6.2 diff --git a/src/SharpInputSystem.sln b/src/SharpInputSystem.sln index 9cd5c3ea..5bf5286f 100644 --- a/src/SharpInputSystem.sln +++ b/src/SharpInputSystem.sln @@ -28,7 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "X11", "X11", "{862A5AF7-237 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "iOS", "iOS", "{8008225F-37A8-4D01-805C-4E6BC1002378}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpInputSystem.Core", "SharpInputSystem\SharpInputSystem.Core.csproj", "{8476C51C-0028-4B79-B9A7-A666E11400CB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharpInputSystem.Core", "SharpInputSystem\SharpInputSystem.Core.csproj", "{8476C51C-0028-4B79-B9A7-A666E11400CB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpInputSystem.Android", "SharpInputSystem.Android\SharpInputSystem.Android.csproj", "{864535DE-7E55-4073-99A4-4447C09C5077}" EndProject @@ -43,6 +43,8 @@ Global AppStore|Any CPU = AppStore|Any CPU Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + OSX_Debug|Any CPU = OSX_Debug|Any CPU + OSX_Release|Any CPU = OSX_Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU @@ -53,6 +55,8 @@ Global {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Debug|Any CPU.Build.0 = Debug|Any CPU {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Release|Any CPU.ActiveCfg = Release|Any CPU {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Release|Any CPU.Build.0 = Release|Any CPU + {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -61,6 +65,10 @@ Global {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Debug|Any CPU.Build.0 = Debug|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Release|Any CPU.ActiveCfg = Release|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Release|Any CPU.Build.0 = Release|Any CPU + {D12FE049-DFB1-476A-A726-CEABA59C93B4}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D12FE049-DFB1-476A-A726-CEABA59C93B4}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU + {D12FE049-DFB1-476A-A726-CEABA59C93B4}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU + {D12FE049-DFB1-476A-A726-CEABA59C93B4}.OSX_Release|Any CPU.Build.0 = Release|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -69,6 +77,10 @@ Global {E7611F78-E15A-4CFA-A491-86459129C7D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.Release|Any CPU.Build.0 = Release|Any CPU + {E7611F78-E15A-4CFA-A491-86459129C7D8}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E7611F78-E15A-4CFA-A491-86459129C7D8}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU + {E7611F78-E15A-4CFA-A491-86459129C7D8}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU + {E7611F78-E15A-4CFA-A491-86459129C7D8}.OSX_Release|Any CPU.Build.0 = Release|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -77,6 +89,8 @@ Global {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Debug|Any CPU.Build.0 = Debug|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Release|Any CPU.ActiveCfg = Release|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Release|Any CPU.Build.0 = Release|Any CPU + {414B57C9-4B95-4503-AD7B-99426D6FC47D}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {414B57C9-4B95-4503-AD7B-99426D6FC47D}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -85,6 +99,10 @@ Global {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Debug|Any CPU.Build.0 = Debug|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Release|Any CPU.ActiveCfg = Release|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Release|Any CPU.Build.0 = Release|Any CPU + {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU + {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU + {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.OSX_Release|Any CPU.Build.0 = Release|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -93,6 +111,10 @@ Global {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Debug|Any CPU.Build.0 = Debug|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Release|Any CPU.Build.0 = Release|Any CPU + {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU + {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU + {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.OSX_Release|Any CPU.Build.0 = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.AppStore|Any CPU.ActiveCfg = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -100,6 +122,8 @@ Global {332CB19D-024C-4C01-900E-3B706AB895D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.Release|Any CPU.Build.0 = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.Release|Any CPU.Deploy.0 = Release|Any CPU + {332CB19D-024C-4C01-900E-3B706AB895D6}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {332CB19D-024C-4C01-900E-3B706AB895D6}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -108,6 +132,10 @@ Global {8476C51C-0028-4B79-B9A7-A666E11400CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.Release|Any CPU.ActiveCfg = Release|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.Release|Any CPU.Build.0 = Release|Any CPU + {8476C51C-0028-4B79-B9A7-A666E11400CB}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8476C51C-0028-4B79-B9A7-A666E11400CB}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU + {8476C51C-0028-4B79-B9A7-A666E11400CB}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU + {8476C51C-0028-4B79-B9A7-A666E11400CB}.OSX_Release|Any CPU.Build.0 = Release|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -116,6 +144,8 @@ Global {864535DE-7E55-4073-99A4-4447C09C5077}.Debug|Any CPU.Build.0 = Debug|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.Release|Any CPU.ActiveCfg = Release|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.Release|Any CPU.Build.0 = Release|Any CPU + {864535DE-7E55-4073-99A4-4447C09C5077}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {864535DE-7E55-4073-99A4-4447C09C5077}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -143,4 +173,9 @@ Global {188D41FB-7DDB-4D30-BC1F-89CE39DEA4E4} = {A9D8B99F-AC1A-4086-A19C-D8FA4E30602E} {332CB19D-024C-4C01-900E-3B706AB895D6} = {A9D8B99F-AC1A-4086-A19C-D8FA4E30602E} EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + Policies = $0 + $0.DotNetNamingPolicy = $1 + $1.DirectoryNamespaceAssociation = PrefixedHierarchical + EndGlobalSection EndGlobal diff --git a/src/SharpInputSystem/.DS_Store b/src/SharpInputSystem/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..ee640fe8e711e362f7d53b420688ddb466fe4ccd GIT binary patch literal 6148 zcmeH~JqiLr422W55Nx)zoW=uqgF*BJUO-kGL9`J2Il3=DEVx>W$O|NICY!MASL{qg zL^qGqTBH+^IowoM7DlGnPox|-TTqg^zI56w5LO))TycF}?jOsfk636Q{uz%=%qo&P)dr}=->!Yv7qz@HJ& z*>=C(;G^KmuPS@B|t# B5o7=W literal 0 HcmV?d00001 diff --git a/src/global.json b/src/global.json index 9e0b6253..3c653e58 100644 --- a/src/global.json +++ b/src/global.json @@ -1,4 +1,5 @@ { + "sdk":{"version":"2.2.105"}, "msbuild-sdks": { "MSBuild.Sdk.Extras": "1.6.65" } From 6b408dfa6cb5c6343404dc596569ac10dc18e26b Mon Sep 17 00:00:00 2001 From: borrillis Date: Mon, 20 May 2019 12:19:02 -0400 Subject: [PATCH 2/5] Fixed builds on linux --- README.md | 2 +- appveyor.yml | 8 ++-- build.cake | 63 ++++++++++++-------------- build.core.cake | 98 ---------------------------------------- build.ps1 | 30 ++++++++---- config.wyam | 2 +- src/SharpInputSystem.sln | 64 ++++++++++++++------------ 7 files changed, 90 insertions(+), 177 deletions(-) delete mode 100644 build.core.cake diff --git a/README.md b/README.md index 554e5f78..6d8bdc74 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ The system is written using C# and supports the following API's : - OpenGL - DirectX -- Windows Forms +- Windows Forms - UWP - Xamarin (Android, iOS and Mac) - .NET Standard 2.0 diff --git a/appveyor.yml b/appveyor.yml index 3f5ae004..b7491668 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,13 +25,13 @@ matrix: fast_finish: true artifacts: -- path: 'BuildArtifacts\*.nupkg' +- path: 'artifacts\*.nupkg' name: Nuget Packages -- path: 'BuildArtifacts\*.md' +- path: 'artifacts\*.md' name: Release Notes -- path: 'BuildArtifacts\Documentation' +- path: 'artifacts\Documentation' name: Api Documentation -- path: 'BuildArtifacts\samples' +- path: 'artifacts\samples' name: Samples deploy: diff --git a/build.cake b/build.cake index 8d7ed14c..2ee7afcc 100644 --- a/build.cake +++ b/build.cake @@ -36,13 +36,9 @@ var buildNumber = EnvironmentVariable("BuildNumber") != null ? int.Parse(EnvironmentVariable("BuildNumber")) : 0; // Define directories. -var artifactsDirectory = MakeAbsolute(Directory("./BuildArtifacts")); +var artifactsDirectory = MakeAbsolute(Directory("./artifacts")); var solutionFile = "./src/SharpInputSystem.sln"; -Func commonSettings = settings => settings - .SetConfiguration(configuration) - .WithProperty("PackageOutputPath", artifactsDirectory.FullPath); - Environment.SetVariableNames(); BuildParameters.SetParameters(context: Context, @@ -55,7 +51,7 @@ BuildParameters.SetParameters(context: Context, wyamRecipe: "Docs", wyamTheme: "Samson", wyamSourceFiles: MakeAbsolute(Directory("./")).FullPath + "/**/{!bin,!obj,!packages,!*.Tests,}/**/*.cs", - wyamPublishDirectoryPath: MakeAbsolute(Directory("./BuildArtifacts/gh-pages")), + wyamPublishDirectoryPath: Directory($"{artifactsDirectory}/gh-pages"), webLinkRoot: "/sharpinputsystem", webBaseEditUrl: "https://github.com/axiom3d/sharpinputsystem/tree/master/", shouldPublishDocumentation: true, @@ -71,24 +67,28 @@ Task("Clean") .Does(() => { CleanDirectory(artifactsDirectory); - MSBuild(solutionFile, - settings => commonSettings(settings) - .WithTarget("Clean")); + DotNetCoreClean(solutionFile, new DotNetCoreCleanSettings { + Configuration = configuration + }); }); Task("Restore") .IsDependentOn("Clean") .Does(() => { - NuGetRestore(solutionFile); + DotNetCoreRestore(solutionFile, new DotNetCoreRestoreSettings { + + }); }); Task("Build-Product") .IsDependentOn("Restore") .Does(() => { - MSBuild(solutionFile, settings => - settings.SetConfiguration(configuration)); + DotNetCoreBuild(solutionFile, new DotNetCoreBuildSettings { + Configuration = configuration, + NoRestore = true + }); }); Task("InspectCode") @@ -107,8 +107,8 @@ Task("Test") .IsDependentOn("Build") .Does(() => { - NUnit3("./src/**/bin/" + configuration + "/*.Tests.dll", new NUnit3Settings { - NoResults = true + DotNetCoreTest(solutionFile, new DotNetCoreTestSettings { + Configuration = configuration }); }); @@ -116,27 +116,23 @@ Task("Package") .IsDependentOn("Test") .Does(() => { - if (!configuration.Contains("OSX")) { - GenerateReleaseNotes(); - } - - MSBuild(solutionFile, - settings => commonSettings(settings) - .WithTarget("Pack") - .WithProperty("NoBuild","true") - .WithProperty("IncludeSymbols","true")); + DotNetCorePack(solutionFile, new DotNetCorePackSettings { + Configuration = configuration, + OutputDirectory = artifactsDirectory.FullPath + }); }); -private void GenerateReleaseNotes() -{ - var releaseNotesExitCode = StartProcess( - @"tools\GitReleaseNotes.Portable.0.7.1\tools\GitReleaseNotes.exe", - new ProcessSettings { Arguments = ". /o BuildArtifacts/releasenotes.md" }); - if (string.IsNullOrEmpty(System.IO.File.ReadAllText("./BuildArtifacts/releasenotes.md"))) - System.IO.File.WriteAllText("./BuildArtifacts/releasenotes.md", "No issues closed since last release"); +Task("GenerateReleaseNotes") + .Does(() => + { + var releaseNotesExitCode = StartProcess( + @"tools\GitReleaseNotes.Portable.0.7.1\tools\GitReleaseNotes.exe", + new ProcessSettings { Arguments = $". /o ./artifacts/releasenotes.md" }); + if (string.IsNullOrEmpty(System.IO.File.ReadAllText($"{artifactsDirectory}/releasenotes.md"))) + System.IO.File.WriteAllText($"{artifactsDirectory}/releasenotes.md", "No issues closed since last release"); - if (releaseNotesExitCode != 0) throw new Exception("Failed to generate release notes"); -} + if (releaseNotesExitCode != 0) throw new Exception("Failed to generate release notes"); + }); ////////////////////////////////////////////////////////////////////// // TASK TARGETS @@ -146,6 +142,7 @@ BuildParameters.Tasks.CleanDocumentationTask .IsDependentOn("Clean"); BuildParameters.Tasks.AppVeyorTask + .IsDependentOn("GenerateReleaseNotes") .IsDependentOn("Package"); BuildParameters.Tasks.BuildDocumentationTask @@ -156,7 +153,7 @@ BuildParameters.Tasks.PreviewDocumentationTask Task("Build") .IsDependentOn("Build-Product") - .IsDependentOn("Build-Documentation"); + /* .IsDependentOn("Build-Documentation") */; Task("Validate") .Description("Validate code quality using Resharper CLI. tools.") diff --git a/build.core.cake b/build.core.cake deleted file mode 100644 index 9c3ebdde..00000000 --- a/build.core.cake +++ /dev/null @@ -1,98 +0,0 @@ -// Target - The task you want to start. Runs the Default task if not specified. -var target = Argument("Target", "Default"); -// Configuration - The build configuration (Debug/Release) to use. -// 1. If command line parameter parameter passed, use that. -// 2. Otherwise if an Environment variable exists, use that. -var configuration = - HasArgument("Configuration") ? Argument("Configuration") : - EnvironmentVariable("Configuration") != null ? EnvironmentVariable("Configuration") : "Release"; -// The build number to use in the version number of the built NuGet packages. -// There are multiple ways this value can be passed, this is a common pattern. -// 1. If command line parameter parameter passed, use that. -// 2. Otherwise if running on AppVeyor, get it's build number. -// 3. Otherwise if running on Travis CI, get it's build number. -// 4. Otherwise if an Environment variable exists, use that. -// 5. Otherwise default the build number to 0. -var buildNumber = - HasArgument("BuildNumber") ? Argument("BuildNumber") : - AppVeyor.IsRunningOnAppVeyor ? AppVeyor.Environment.Build.Number : - TravisCI.IsRunningOnTravisCI ? TravisCI.Environment.Build.BuildNumber : - EnvironmentVariable("BuildNumber") != null ? int.Parse(EnvironmentVariable("BuildNumber")) : 0; -// A directory path to an Artifacts directory. -var artifactsDirectory = Directory("./Artifacts"); -// Deletes the contents of the Artifacts folder if it should contain anything from a previous build. -Task("Clean") - .Does(() => - { - CleanDirectory(artifactsDirectory); - }); -// Run dotnet restore to restore all package references. -Task("Restore") - .IsDependentOn("Clean") - .Does(() => - { - DotNetCoreRestore(); - }); -// Find all csproj projects and build them using the build configuration specified as an argument. - Task("Build") - .IsDependentOn("Restore") - .Does(() => - { - var projects = GetFiles("./**/*.csproj"); - foreach(var project in projects) - { - DotNetCoreBuild( - project.GetDirectory().FullPath, - new DotNetCoreBuildSettings() - { - Configuration = configuration - }); - } - }); -// Look under a 'Tests' folder and run dotnet test against all of those projects. -// Then drop the XML test results file in the Artifacts folder at the root. -Task("Test") - .IsDependentOn("Build") - .Does(() => - { - var projects = GetFiles("./Tests/**/*.csproj"); - foreach(var project in projects) - { - DotNetCoreTest( - project.GetDirectory().FullPath, - new DotNetCoreTestSettings() - { - ArgumentCustomization = args => args - .Append("-xml") - .Append(artifactsDirectory.Path.CombineWithFilePath(project.GetFilenameWithoutExtension()).FullPath + ".xml"), - Configuration = configuration, - NoBuild = true - }); - } - }); -// Run dotnet pack to produce NuGet packages from our projects. Versions the package -// using the build number argument on the script which is used as the revision number -// (Last number in 1.0.0.0). The packages are dropped in the Artifacts directory. -Task("Pack") - .IsDependentOn("Test") - .Does(() => - { - var revision = buildNumber.ToString("D4"); - foreach (var project in GetFiles("./Source/**/*.csproj")) - { - DotNetCorePack( - project.GetDirectory().FullPath, - new DotNetCorePackSettings() - { - Configuration = configuration, - OutputDirectory = artifactsDirectory, - VersionSuffix = revision - }); - } - }); -// The default task to run if none is explicitly specified. In this case, we want -// to run everything starting from Clean, all the way up to Pack. -Task("Default") - .IsDependentOn("Pack"); -// Executes the task specified in the target argument. -RunTarget(target); \ No newline at end of file diff --git a/build.ps1 b/build.ps1 index fb3a3fa9..cbca2cfd 100644 --- a/build.ps1 +++ b/build.ps1 @@ -55,15 +55,17 @@ Param( # PowerShell will not set this by default (until maybe .NET 4.6.x). This # will typically produce a message for PowerShell v2 (just an info # message though) -try { - # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) - # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't - # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is - # installed (.NET 4.5 is an in-place upgrade). - [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 - } catch { - Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' - } +if ($PSVersionTable.PSEdition -ne "Core") { + try { + # Set TLS 1.2 (3072), then TLS 1.1 (768), then TLS 1.0 (192), finally SSL 3.0 (48) + # Use integers because the enumeration values for TLS 1.2 and TLS 1.1 won't + # exist in .NET 4.0, even though they are addressable if .NET 4.5+ is + # installed (.NET 4.5 is an in-place upgrade). + [System.Net.ServicePointManager]::SecurityProtocol = 3072 -bor 768 -bor 192 -bor 48 + } catch { + Write-Output 'Unable to set PowerShell to use TLS 1.2 and TLS 1.1 due to old .NET Framework installed. If you see underlying connection closed or trust errors, you may need to upgrade to .NET Framework 4.5+ and PowerShell v3' + } +} [Reflection.Assembly]::LoadWithPartialName("System.Security") | Out-Null function MD5HashFile([string] $filePath) @@ -116,6 +118,14 @@ $PACKAGES_CONFIG_MD5 = Join-Path $TOOLS_DIR "packages.config.md5sum" $ADDINS_PACKAGES_CONFIG = Join-Path $ADDINS_DIR "packages.config" $MODULES_PACKAGES_CONFIG = Join-Path $MODULES_DIR "packages.config" +# https://stackoverflow.com/questions/44770702/build-nuget-package-on-linux-that-targets-net-framework +$MSBUILD_FRAMEWORKPATHOVERRIDE="/usr/lib/mono/4.6.2-api/" + +if (($PSVersionTable.PSEdition -eq "Core" -and $PSVersionTable.Platform -ne "Win32NT") -and !(Test-Path($MSBUILD_FRAMEWORKPATHOVERRIDE))) { + Throw "Mono version 5+ required to build on non-Windows platforms" +} +$env:FrameworkPathOverride = $MSBUILD_FRAMEWORKPATHOVERRIDE + # Make sure tools folder exists if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { Write-Verbose -Message "Creating tools directory..." @@ -157,7 +167,7 @@ if (!(Test-Path $NUGET_EXE)) { if ($PSVersionTable.PSEdition -eq "Core" -and $PSVersionTable.Platform -ne "Win32NT") { - $CMD = "mono " + $CMD = "mono " } else { diff --git a/config.wyam b/config.wyam index 663219ea..5db916fc 100644 --- a/config.wyam +++ b/config.wyam @@ -14,7 +14,7 @@ Settings["BaseSiteSearchUrl"] = "https://www.google.com/search"; Settings["BaseCreateIssueUrl"] = "https://github.com/axiom3d/sharpinputsystem/issues/new?title=Issue%20with%20"; FileSystem.InputPaths.Add("./doc"); -FileSystem.OutputPath = "./BuildArtifacts/Documentation"; +FileSystem.OutputPath = "./artifacts/Documentation"; // Add any pipeline customizations here diff --git a/src/SharpInputSystem.sln b/src/SharpInputSystem.sln index 5bf5286f..6a890087 100644 --- a/src/SharpInputSystem.sln +++ b/src/SharpInputSystem.sln @@ -43,8 +43,8 @@ Global AppStore|Any CPU = AppStore|Any CPU Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU - OSX_Debug|Any CPU = OSX_Debug|Any CPU - OSX_Release|Any CPU = OSX_Release|Any CPU + Linux_Debug|Any CPU = Linux_Debug|Any CPU + Linux_Release|Any CPU = Linux_Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU @@ -55,8 +55,10 @@ Global {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Debug|Any CPU.Build.0 = Debug|Any CPU {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Release|Any CPU.ActiveCfg = Release|Any CPU {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Release|Any CPU.Build.0 = Release|Any CPU - {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU + {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU + {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU + {26BD5281-C74C-4BDB-9E9E-6E66D99FAC31}.Linux_Release|Any CPU.Build.0 = Release|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -65,10 +67,10 @@ Global {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Debug|Any CPU.Build.0 = Debug|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Release|Any CPU.ActiveCfg = Release|Any CPU {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Release|Any CPU.Build.0 = Release|Any CPU - {D12FE049-DFB1-476A-A726-CEABA59C93B4}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D12FE049-DFB1-476A-A726-CEABA59C93B4}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {D12FE049-DFB1-476A-A726-CEABA59C93B4}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {D12FE049-DFB1-476A-A726-CEABA59C93B4}.OSX_Release|Any CPU.Build.0 = Release|Any CPU + {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU + {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU + {D12FE049-DFB1-476A-A726-CEABA59C93B4}.Linux_Release|Any CPU.Build.0 = Release|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -77,10 +79,10 @@ Global {E7611F78-E15A-4CFA-A491-86459129C7D8}.Debug|Any CPU.Build.0 = Debug|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {E7611F78-E15A-4CFA-A491-86459129C7D8}.Release|Any CPU.Build.0 = Release|Any CPU - {E7611F78-E15A-4CFA-A491-86459129C7D8}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7611F78-E15A-4CFA-A491-86459129C7D8}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {E7611F78-E15A-4CFA-A491-86459129C7D8}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {E7611F78-E15A-4CFA-A491-86459129C7D8}.OSX_Release|Any CPU.Build.0 = Release|Any CPU + {E7611F78-E15A-4CFA-A491-86459129C7D8}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E7611F78-E15A-4CFA-A491-86459129C7D8}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU + {E7611F78-E15A-4CFA-A491-86459129C7D8}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU + {E7611F78-E15A-4CFA-A491-86459129C7D8}.Linux_Release|Any CPU.Build.0 = Release|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -89,8 +91,10 @@ Global {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Debug|Any CPU.Build.0 = Debug|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Release|Any CPU.ActiveCfg = Release|Any CPU {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Release|Any CPU.Build.0 = Release|Any CPU - {414B57C9-4B95-4503-AD7B-99426D6FC47D}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {414B57C9-4B95-4503-AD7B-99426D6FC47D}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU + {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU + {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU + {414B57C9-4B95-4503-AD7B-99426D6FC47D}.Linux_Release|Any CPU.Build.0 = Release|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -99,10 +103,10 @@ Global {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Debug|Any CPU.Build.0 = Debug|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Release|Any CPU.ActiveCfg = Release|Any CPU {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Release|Any CPU.Build.0 = Release|Any CPU - {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.OSX_Release|Any CPU.Build.0 = Release|Any CPU + {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU + {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU + {3CC3BE20-4B0B-48A6-8771-8C0684B59208}.Linux_Release|Any CPU.Build.0 = Release|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -111,10 +115,10 @@ Global {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Debug|Any CPU.Build.0 = Debug|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Release|Any CPU.ActiveCfg = Release|Any CPU {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Release|Any CPU.Build.0 = Release|Any CPU - {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.OSX_Release|Any CPU.Build.0 = Release|Any CPU + {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU + {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU + {29045D60-94B4-4574-BDCB-E06D0CA26BFA}.Linux_Release|Any CPU.Build.0 = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.AppStore|Any CPU.ActiveCfg = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU @@ -122,8 +126,8 @@ Global {332CB19D-024C-4C01-900E-3B706AB895D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.Release|Any CPU.Build.0 = Release|Any CPU {332CB19D-024C-4C01-900E-3B706AB895D6}.Release|Any CPU.Deploy.0 = Release|Any CPU - {332CB19D-024C-4C01-900E-3B706AB895D6}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {332CB19D-024C-4C01-900E-3B706AB895D6}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU + {332CB19D-024C-4C01-900E-3B706AB895D6}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {332CB19D-024C-4C01-900E-3B706AB895D6}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -132,10 +136,10 @@ Global {8476C51C-0028-4B79-B9A7-A666E11400CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.Release|Any CPU.ActiveCfg = Release|Any CPU {8476C51C-0028-4B79-B9A7-A666E11400CB}.Release|Any CPU.Build.0 = Release|Any CPU - {8476C51C-0028-4B79-B9A7-A666E11400CB}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8476C51C-0028-4B79-B9A7-A666E11400CB}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU - {8476C51C-0028-4B79-B9A7-A666E11400CB}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU - {8476C51C-0028-4B79-B9A7-A666E11400CB}.OSX_Release|Any CPU.Build.0 = Release|Any CPU + {8476C51C-0028-4B79-B9A7-A666E11400CB}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8476C51C-0028-4B79-B9A7-A666E11400CB}.Linux_Debug|Any CPU.Build.0 = Debug|Any CPU + {8476C51C-0028-4B79-B9A7-A666E11400CB}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU + {8476C51C-0028-4B79-B9A7-A666E11400CB}.Linux_Release|Any CPU.Build.0 = Release|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -144,8 +148,8 @@ Global {864535DE-7E55-4073-99A4-4447C09C5077}.Debug|Any CPU.Build.0 = Debug|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.Release|Any CPU.ActiveCfg = Release|Any CPU {864535DE-7E55-4073-99A4-4447C09C5077}.Release|Any CPU.Build.0 = Release|Any CPU - {864535DE-7E55-4073-99A4-4447C09C5077}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {864535DE-7E55-4073-99A4-4447C09C5077}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU + {864535DE-7E55-4073-99A4-4447C09C5077}.Linux_Debug|Any CPU.ActiveCfg = Debug|Any CPU + {864535DE-7E55-4073-99A4-4447C09C5077}.Linux_Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 3c6c676d99d8354ff2ba588dd6511e9fb35163f2 Mon Sep 17 00:00:00 2001 From: borrillis Date: Wed, 29 May 2019 08:26:09 -0400 Subject: [PATCH 3/5] Add flag for Linux OS, reset to DotNet builds --- build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index cbca2cfd..c98fe1c7 100644 --- a/build.ps1 +++ b/build.ps1 @@ -249,7 +249,7 @@ if (!(Test-Path $CAKE_EXE)) { # Build Cake arguments $cakeArguments = @("$Script"); if ($Target) { $cakeArguments += "-target=$Target" } -if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } else { if ($IsMacOS) {$cakeArguments += "-configuration=OSX_Release"}} +if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } else { if ($IsMacOS -or $IsLinux) {$cakeArguments += "-configuration=OSX_Release"}} if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" } if ($ShowDescription) { $cakeArguments += "-showdescription" } if ($DryRun) { $cakeArguments += "-dryrun" } From 4788361aefe03b5aee7d79b03680991802836c29 Mon Sep 17 00:00:00 2001 From: borrillis Date: Wed, 29 May 2019 08:41:49 -0400 Subject: [PATCH 4/5] Re-enable Documentationbuild and change Configuration name --- build.cake | 2 +- build.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.cake b/build.cake index 2ee7afcc..29f345f3 100644 --- a/build.cake +++ b/build.cake @@ -153,7 +153,7 @@ BuildParameters.Tasks.PreviewDocumentationTask Task("Build") .IsDependentOn("Build-Product") - /* .IsDependentOn("Build-Documentation") */; + .IsDependentOn("Build-Documentation"); Task("Validate") .Description("Validate code quality using Resharper CLI. tools.") diff --git a/build.ps1 b/build.ps1 index c98fe1c7..24595ab7 100644 --- a/build.ps1 +++ b/build.ps1 @@ -249,7 +249,7 @@ if (!(Test-Path $CAKE_EXE)) { # Build Cake arguments $cakeArguments = @("$Script"); if ($Target) { $cakeArguments += "-target=$Target" } -if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } else { if ($IsMacOS -or $IsLinux) {$cakeArguments += "-configuration=OSX_Release"}} +if ($Configuration) { $cakeArguments += "-configuration=$Configuration" } else { if ($IsMacOS -or $IsLinux) {$cakeArguments += "-configuration=Linux_Release"}} if ($Verbosity) { $cakeArguments += "-verbosity=$Verbosity" } if ($ShowDescription) { $cakeArguments += "-showdescription" } if ($DryRun) { $cakeArguments += "-dryrun" } From 798f90380952bd0ce41b5a1835dc477dd8ed6a56 Mon Sep 17 00:00:00 2001 From: borrillis Date: Wed, 29 May 2019 09:38:01 -0400 Subject: [PATCH 5/5] Call cake in os agnostic manner. --- build.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.ps1 b/build.ps1 index 24595ab7..37277dac 100644 --- a/build.ps1 +++ b/build.ps1 @@ -258,6 +258,7 @@ $cakeArguments += $ScriptArgs # Start Cake Write-Host "Running build script..." -&$CMD $CAKE_EXE $cakeArguments +Invoke-Expression "$CMD`"$CAKE_EXE`" $cakeArguments" + Write-Verbose -Message ($CakeOutput | out-string) exit $LASTEXITCODE \ No newline at end of file