diff --git a/Source/Libs/GtkSharp/GtkSharp.targets b/Source/Libs/GtkSharp/GtkSharp.targets index 584761cb3..73d013aca 100644 --- a/Source/Libs/GtkSharp/GtkSharp.targets +++ b/Source/Libs/GtkSharp/GtkSharp.targets @@ -1,8 +1,8 @@ - https://github.com/GtkSharp/Dependencies/raw/master/gtk-3.24.20.zip - $(LOCALAPPDATA)\Gtk\3.24.20 + https://github.com/GtkSharp/Dependencies/raw/master/gtk-3.24.24.zip + $(LOCALAPPDATA)\Gtk\3.24.24 diff --git a/Source/Libs/Shared/GLibrary.cs b/Source/Libs/Shared/GLibrary.cs index e02b21398..62f810f55 100644 --- a/Source/Libs/Shared/GLibrary.cs +++ b/Source/Libs/Shared/GLibrary.cs @@ -42,7 +42,7 @@ class GLibrary if (ret == IntPtr.Zero) { - SetDllDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Gtk", "3.24.20")); + SetDllDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Gtk", "3.24.24")); ret = FuncLoader.LoadLibrary(_libraryDefinitions[library][0]); } } diff --git a/Source/Samples/Samples.csproj b/Source/Samples/Samples.csproj index 5c9986a95..a9a1f5291 100644 --- a/Source/Samples/Samples.csproj +++ b/Source/Samples/Samples.csproj @@ -1,7 +1,7 @@ WinExe - netcoreapp3.1 + net5.0 false ..\..\BuildOutput\Samples @@ -10,7 +10,9 @@ %(Filename)%(Extension) - + + Testpic + diff --git a/Source/Samples/Sections/Widgets/ImageSection.cs b/Source/Samples/Sections/Widgets/ImageSection.cs index 8cb2d01c7..d54da9425 100644 --- a/Source/Samples/Sections/Widgets/ImageSection.cs +++ b/Source/Samples/Sections/Widgets/ImageSection.cs @@ -21,29 +21,9 @@ namespace Samples public (string, Widget) CreateContainer() { - Stream GetResourceStream(Assembly assembly, string name) - { - var resources = assembly.GetManifestResourceNames(); - var resourceName = resources.SingleOrDefault(str => str == name); - - // try harder: - if (resourceName == default) { - resourceName = resources.SingleOrDefault(str => str.EndsWith(name)); - } - - if (resourceName == default) - return default; - var stream = assembly.GetManifestResourceStream(resourceName); - return stream; - } - Pixbuf image = default; - using (var stream = GetResourceStream(typeof(ImageSection).Assembly, "Testpic.png")) { - image = new Pixbuf(stream); - } - + var image = new Pixbuf(typeof(ImageSection).Assembly, "Testpic"); var container = new ImageBox(image); - return ($"{nameof(ImageBox)}:", container); } } diff --git a/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json index 9f4a98439..214691dda 100644 --- a/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json +++ b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/.template.config/template.json @@ -18,8 +18,8 @@ "symbols": { "targetframework": { "type": "parameter", - "defaultValue": "netcoreapp2.0", - "replaces": "netcoreapp2.0" + "defaultValue": "net5.0", + "replaces": "net5.0" } }, "primaryOutputs": [ diff --git a/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj index 68d9201a0..841977aa2 100644 --- a/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj +++ b/Source/Templates/GtkSharp.Template.CSharp/content/GtkSharp.Application.CSharp/GtkNamespace.csproj @@ -2,7 +2,7 @@ WinExe - netcoreapp3.1 + net5.0 diff --git a/Source/Templates/GtkSharp.Template.FSharp/content/GtkSharp.Application.FSharp/.template.config/template.json b/Source/Templates/GtkSharp.Template.FSharp/content/GtkSharp.Application.FSharp/.template.config/template.json index dd7d589a9..019d38558 100644 --- a/Source/Templates/GtkSharp.Template.FSharp/content/GtkSharp.Application.FSharp/.template.config/template.json +++ b/Source/Templates/GtkSharp.Template.FSharp/content/GtkSharp.Application.FSharp/.template.config/template.json @@ -18,8 +18,8 @@ "symbols": { "targetframework": { "type": "parameter", - "defaultValue": "netcoreapp2.0", - "replaces": "netcoreapp2.0" + "defaultValue": "net5.0", + "replaces": "net5.0" } }, "primaryOutputs": [ diff --git a/Source/Templates/GtkSharp.Template.FSharp/content/GtkSharp.Application.FSharp/GtkNamespace.fsproj b/Source/Templates/GtkSharp.Template.FSharp/content/GtkSharp.Application.FSharp/GtkNamespace.fsproj index eaba991e2..b4506fadf 100644 --- a/Source/Templates/GtkSharp.Template.FSharp/content/GtkSharp.Application.FSharp/GtkNamespace.fsproj +++ b/Source/Templates/GtkSharp.Template.FSharp/content/GtkSharp.Application.FSharp/GtkNamespace.fsproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net5.0 diff --git a/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json index bee173d46..51f775308 100644 --- a/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json +++ b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/.template.config/template.json @@ -18,8 +18,8 @@ "symbols": { "targetframework": { "type": "parameter", - "defaultValue": "netcoreapp2.0", - "replaces": "netcoreapp2.0" + "defaultValue": "net5.0", + "replaces": "net5.0" } }, "primaryOutputs": [ diff --git a/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/GtkNamespace.vbproj b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/GtkNamespace.vbproj index 68d9201a0..841977aa2 100644 --- a/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/GtkNamespace.vbproj +++ b/Source/Templates/GtkSharp.Template.VBNet/content/GtkSharp.Application.VBNet/GtkNamespace.vbproj @@ -2,7 +2,7 @@ WinExe - netcoreapp3.1 + net5.0 diff --git a/Source/Tools/GapiCodegen/GapiCodegen.csproj b/Source/Tools/GapiCodegen/GapiCodegen.csproj index 75abe931c..653fe5d27 100644 --- a/Source/Tools/GapiCodegen/GapiCodegen.csproj +++ b/Source/Tools/GapiCodegen/GapiCodegen.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.0 + net5.0 ..\..\..\BuildOutput\Tools false diff --git a/Source/Tools/GapiFixup/GapiFixup.csproj b/Source/Tools/GapiFixup/GapiFixup.csproj index bc0b29609..713576357 100644 --- a/Source/Tools/GapiFixup/GapiFixup.csproj +++ b/Source/Tools/GapiFixup/GapiFixup.csproj @@ -1,7 +1,7 @@ Exe - netcoreapp2.0 + net5.0 ..\..\..\BuildOutput\Tools false diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 78b98a171..54555b8bd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,5 @@ variables: - versionbase: 3.22.25 + versionbase: 3.24.24 increment: $[counter(variables['versionbase'], 1)] version: $(versionbase).$(increment) @@ -16,9 +16,6 @@ steps: - script: echo "##vso[build.updatebuildnumber]$(version)" displayName: 'Set Build Number' - - script: sudo apt install -y monodevelop - displayName: 'Install MonoDevelop' - - script: ./build.sh --BuildTarget=FullBuild --BuildVersion=$(version) displayName: 'CAKE Script' @@ -42,10 +39,3 @@ steps: pathtoPublish: BuildOutput/Samples artifactName: Samples publishLocation: container - - - task: PublishBuildArtifacts@1 - displayName: Publish MonoDevelop Addin - inputs: - pathtoPublish: BuildOutput/Addins/MonoDevelop/MonoDevelop.GtkSharp.Addin_$(version).mpack - artifactName: MonoDevelop Addin - publishLocation: container \ No newline at end of file diff --git a/build.cake b/build.cake index 4b9bb2f60..34a6352b4 100644 --- a/build.cake +++ b/build.cake @@ -1,12 +1,12 @@ #load CakeScripts\GAssembly.cake #load CakeScripts\Settings.cake -#addin "Cake.FileHelpers&version=3.2.0" -#addin "Cake.Incubator&version=5.0.1" +#addin "Cake.FileHelpers&version=4.0.0" +#addin "Cake.Incubator&version=6.0.0" // VARS Settings.Cake = Context; -Settings.Version = Argument("BuildVersion", "3.22.24.30"); +Settings.Version = Argument("BuildVersion", "3.24.24.1"); Settings.BuildTarget = Argument("BuildTarget", "Default"); Settings.Assembly = Argument("Assembly", ""); var configuration = Argument("Configuration", "Release"); @@ -63,7 +63,10 @@ Task("FullClean") .IsDependentOn("Clean") .Does(() => { - DeleteDirectory("BuildOutput", true); + DeleteDirectory("BuildOutput", new DeleteDirectorySettings { + Recursive = true, + Force = true + }); }); Task("Build") @@ -136,35 +139,6 @@ Task("PackageTemplates") NuGetPack("Source/Templates/GtkSharp.Template.VBNet/GtkSharp.Template.VBNet.nuspec", settings); }); -Task("PackageAddin") - .IsDependentOn("PackageTemplates") - .Does(() => -{ - // Copy the current version nuget templates - CopyFile( - "BuildOutput/NugetPackages/GtkSharp.Template.CSharp." + Settings.Version + ".nupkg", - "Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/GtkSharp.Template.CSharp.nupkg" - ); - CopyFile( - "BuildOutput/NugetPackages/GtkSharp.Template.FSharp." + Settings.Version + ".nupkg", - "Source/Addins/MonoDevelop.GtkSharp.Addin/Templates/GtkSharp.Template.FSharp.nupkg" - ); - - // Generate version code info - var versionline = "[assembly: Mono.Addins.Addin(\"MonoDevelop.GtkSharp.Addin\", Version = \"" + Settings.Version + "\")]"; - FileWriteText("Source/Addins/MonoDevelop.GtkSharp.Addin/Properties/AddinInfo.Version.cs", versionline); - - // Build MonoDevelop addin - var msbuildsettings = new MSBuildSettings - { - Configuration = configuration, - }; - msbuildsettings = msbuildsettings.WithProperty("Version", Settings.Version); - msbuildsettings = msbuildsettings.WithTarget("PackageAddin"); - - MSBuild("Source/Addins/MonoDevelop.GtkSharp.Addin/MonoDevelop.GtkSharp.Addin.sln", msbuildsettings); -}); - // TASK TARGETS Task("Default") @@ -172,8 +146,7 @@ Task("Default") Task("FullBuild") .IsDependentOn("PackageNuGet") - .IsDependentOn("PackageTemplates") - .IsDependentOn("PackageAddin"); + .IsDependentOn("PackageTemplates"); // EXECUTION diff --git a/build.ps1 b/build.ps1 index ad6e59947..2ce2dd795 100644 --- a/build.ps1 +++ b/build.ps1 @@ -5,14 +5,11 @@ ########################################################################## <# - .SYNOPSIS This is a Powershell script to bootstrap a Cake build. - .DESCRIPTION This Powershell script will download NuGet if missing, restore NuGet tools (including Cake) and execute your Cake build script with the parameters you provide. - .PARAMETER Script The build script to execute. .PARAMETER Target @@ -21,40 +18,55 @@ The build script target to run. The build configuration to use. .PARAMETER Verbosity Specifies the amount of information to be displayed. -.PARAMETER Experimental -Tells Cake to use the latest Roslyn release. -.PARAMETER WhatIf -Performs a dry run of the build script. -No tasks will be executed. -.PARAMETER Mono -Tells Cake to use the Mono scripting engine. +.PARAMETER ShowDescription +Shows description about tasks. +.PARAMETER DryRun +Performs a dry run. .PARAMETER SkipToolPackageRestore Skips restoring of packages. .PARAMETER ScriptArgs Remaining arguments are added here. - .LINK https://cakebuild.net - #> [CmdletBinding()] Param( - [string]$Script = "build.cake", - [string]$Target = "Default", - [ValidateSet("Release", "Debug")] - [string]$Configuration = "Release", + [string]$Script, + [string]$Target, + [string]$Configuration, [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity = "Verbose", - [switch]$Experimental, - [Alias("DryRun","Noop")] - [switch]$WhatIf, - [switch]$Mono, + [string]$Verbosity, + [switch]$ShowDescription, + [Alias("WhatIf", "Noop")] + [switch]$DryRun, [switch]$SkipToolPackageRestore, [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] [string[]]$ScriptArgs ) +# This is an automatic variable in PowerShell Core, but not in Windows PowerShell 5.x +if (-not (Test-Path variable:global:IsCoreCLR)) { + $IsCoreCLR = $false +} + +# Attempt to set highest encryption available for SecurityProtocol. +# 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). + # PowerShell Core already has support for TLS 1.2 so we can skip this if running in that. + if (-not $IsCoreCLR) { + [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) { @@ -80,49 +92,52 @@ function MD5HashFile([string] $filePath) } } +function GetProxyEnabledWebClient +{ + $wc = New-Object System.Net.WebClient + $proxy = [System.Net.WebRequest]::GetSystemWebProxy() + $proxy.Credentials = [System.Net.CredentialCache]::DefaultCredentials + $wc.Proxy = $proxy + return $wc +} + Write-Host "Preparing to run build script..." if(!$PSScriptRoot){ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent } +if(!$Script){ + $Script = Join-Path $PSScriptRoot "build.cake" +} $TOOLS_DIR = Join-Path $PSScriptRoot "tools" +$ADDINS_DIR = Join-Path $TOOLS_DIR "Addins" +$MODULES_DIR = Join-Path $TOOLS_DIR "Modules" $NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe" $CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe" $NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe" $PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config" $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" -# Should we use mono? -$UseMono = ""; -if($Mono.IsPresent) { - Write-Verbose -Message "Using the Mono based scripting engine." - $UseMono = "-mono" -} - -# Should we use the new Roslyn? -$UseExperimental = ""; -if($Experimental.IsPresent -and !($Mono.IsPresent)) { - Write-Verbose -Message "Using experimental version of Roslyn." - $UseExperimental = "-experimental" -} - -# Is this a dry run? -$UseDryRun = ""; -if($WhatIf.IsPresent) { - $UseDryRun = "-dryrun" -} +$env:CAKE_PATHS_TOOLS = $TOOLS_DIR +$env:CAKE_PATHS_ADDINS = $ADDINS_DIR +$env:CAKE_PATHS_MODULES = $MODULES_DIR # Make sure tools folder exists if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) { Write-Verbose -Message "Creating tools directory..." - New-Item -Path $TOOLS_DIR -Type directory | out-null + New-Item -Path $TOOLS_DIR -Type Directory | Out-Null } # Make sure that packages.config exist. if (!(Test-Path $PACKAGES_CONFIG)) { Write-Verbose -Message "Downloading packages.config..." - try { (New-Object System.Net.WebClient).DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) } catch { + try { + $wc = GetProxyEnabledWebClient + $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) + } catch { Throw "Could not download packages.config." } } @@ -142,14 +157,26 @@ if (!(Test-Path $NUGET_EXE)) { if (!(Test-Path $NUGET_EXE)) { Write-Verbose -Message "Downloading NuGet.exe..." try { - (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE) + $wc = GetProxyEnabledWebClient + $wc.DownloadFile($NUGET_URL, $NUGET_EXE) } catch { Throw "Could not download NuGet.exe." } } +# These are automatic variables in PowerShell Core, but not in Windows PowerShell 5.x +if (-not (Test-Path variable:global:ismacos)) { + $IsLinux = $false + $IsMacOS = $false +} + # Save nuget.exe path to environment to be available to child processed -$ENV:NUGET_EXE = $NUGET_EXE +$env:NUGET_EXE = $NUGET_EXE +$env:NUGET_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { + "mono `"$NUGET_EXE`"" +} else { + "`"$NUGET_EXE`"" +} # Restore tools from NuGet? if(-Not $SkipToolPackageRestore.IsPresent) { @@ -157,24 +184,61 @@ if(-Not $SkipToolPackageRestore.IsPresent) { Set-Location $TOOLS_DIR # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile($PACKAGES_CONFIG) + [string] $md5Hash = MD5HashFile $PACKAGES_CONFIG if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { + ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { Write-Verbose -Message "Missing or changed package.config hash..." - Remove-Item * -Recurse -Exclude packages.config,nuget.exe + Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery | + Remove-Item -Recurse -Force } Write-Verbose -Message "Restoring tools from NuGet..." - $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" + + $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" if ($LASTEXITCODE -ne 0) { - Throw "An error occured while restoring NuGet tools." + Throw "An error occurred while restoring NuGet tools." } else { $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" } - Write-Verbose -Message ($NuGetOutput | out-string) + Write-Verbose -Message ($NuGetOutput | Out-String) + + Pop-Location +} + +# Restore addins from NuGet +if (Test-Path $ADDINS_PACKAGES_CONFIG) { + Push-Location + Set-Location $ADDINS_DIR + + Write-Verbose -Message "Restoring addins from NuGet..." + $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$ADDINS_DIR`"" + + if ($LASTEXITCODE -ne 0) { + Throw "An error occurred while restoring NuGet addins." + } + + Write-Verbose -Message ($NuGetOutput | Out-String) + + Pop-Location +} + +# Restore modules from NuGet +if (Test-Path $MODULES_PACKAGES_CONFIG) { + Push-Location + Set-Location $MODULES_DIR + + Write-Verbose -Message "Restoring modules from NuGet..." + $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$MODULES_DIR`"" + + if ($LASTEXITCODE -ne 0) { + Throw "An error occurred while restoring NuGet modules." + } + + Write-Verbose -Message ($NuGetOutput | Out-String) + Pop-Location } @@ -183,7 +247,23 @@ if (!(Test-Path $CAKE_EXE)) { Throw "Could not find Cake.exe at $CAKE_EXE" } +$CAKE_EXE_INVOCATION = if ($IsLinux -or $IsMacOS) { + "mono `"$CAKE_EXE`"" +} else { + "`"$CAKE_EXE`"" +} + + # Build an array (not a string) of Cake arguments to be joined later +$cakeArguments = @() +if ($Script) { $cakeArguments += "`"$Script`"" } +if ($Target) { $cakeArguments += "--target=`"$Target`"" } +if ($Configuration) { $cakeArguments += "--configuration=$Configuration" } +if ($Verbosity) { $cakeArguments += "--verbosity=$Verbosity" } +if ($ShowDescription) { $cakeArguments += "--showdescription" } +if ($DryRun) { $cakeArguments += "--dryrun" } +$cakeArguments += $ScriptArgs + # Start Cake Write-Host "Running build script..." -Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs" -exit $LASTEXITCODE \ No newline at end of file +Invoke-Expression "& $CAKE_EXE_INVOCATION $($cakeArguments -join " ")" +exit $LASTEXITCODE diff --git a/build.sh b/build.sh index 0e42a0a1e..14392d4ed 100755 --- a/build.sh +++ b/build.sh @@ -56,7 +56,7 @@ if [ ! -f "$TOOLS_DIR/packages.config" ]; then echo "Downloading packages.config..." curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages if [ $? -ne 0 ]; then - echo "An error occured while downloading packages.config." + echo "An error occurred while downloading packages.config." exit 1 fi fi @@ -66,7 +66,7 @@ if [ ! -f "$NUGET_EXE" ]; then echo "Downloading NuGet..." curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe if [ $? -ne 0 ]; then - echo "An error occured while downloading nuget.exe." + echo "An error occurred while downloading nuget.exe." exit 1 fi fi @@ -97,5 +97,5 @@ fi if $SHOW_VERSION; then exec mono "$CAKE_EXE" -version else - exec mono "$CAKE_EXE" $SCRIPT -verbosity=$VERBOSITY -configuration=$CONFIGURATION -target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}" + exec mono "$CAKE_EXE" $SCRIPT --verbosity=$VERBOSITY --configuration=$CONFIGURATION --target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}" fi \ No newline at end of file diff --git a/tools/packages.config b/tools/packages.config index cedcc6ab5..2a0374690 100644 --- a/tools/packages.config +++ b/tools/packages.config @@ -1,4 +1,4 @@ - +