diff --git a/.appveyor.yml b/.appveyor.yml index cf9c7b0..7d2aff7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,13 +1,13 @@ #---------------------------------# # Build Image # #---------------------------------# -image: Visual Studio 2017 +image: Visual Studio 2019 #---------------------------------# # Build Script # #---------------------------------# build_script: - - ps: .\build.ps1 -Target AppVeyor + - ps: .\build.ps1 --target=CI #---------------------------------# # Tests @@ -40,11 +40,11 @@ branches: # Build Cache # #---------------------------------# cache: -- tools -> recipe.cake, tools/packages.config +- tools -> recipe.cake #---------------------------------# # Skip builds for doc changes # #---------------------------------# skip_commits: # Regex for matching commit message - message: /(doc).*/ + message: /\(doc\).*/ diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json new file mode 100644 index 0000000..727dfd7 --- /dev/null +++ b/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "cake.tool": { + "version": "0.38.5", + "commands": [ + "dotnet-cake" + ] + } + } +} \ No newline at end of file diff --git a/.editorconfig b/.editorconfig index 1172014..6118314 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,9 @@ end_of_line = CRLF indent_style = space indent_size = 4 +[*.sh] +end_of_line = LF + [*.cs] indent_style = space indent_size = 4 diff --git a/.gitattributes b/.gitattributes index 9244db0..ffc85a1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,10 @@ # Declare files that will always have CRLF line endings on checkout. *.sln text eol=crlf +# Declare files that should always be converted to LF regardless of platform +*.sh text eol=lf +*.dotsettings text eol=lf + # Denote all files that are truly binary and should not be modified. *.png binary *.jpg binary diff --git a/.gitignore b/.gitignore index fd66c90..3b91575 100644 --- a/.gitignore +++ b/.gitignore @@ -2,13 +2,18 @@ bin/ obj/ packages/ Components/ -tools/** -!tools/packages.config +tools/ nupkg/ *.userprefs *.suo .nugetapikey xtc-api-key xtc-email +.vs +.idea +*.user + +#Cake +.cake/ +tools/** BuildArtifacts/ -.vs/ \ No newline at end of file diff --git a/GitReleaseManager.yaml b/GitReleaseManager.yaml index e0975a8..591a325 100644 --- a/GitReleaseManager.yaml +++ b/GitReleaseManager.yaml @@ -1,12 +1,14 @@ issue-labels-include: - Breaking change -- Feature - Bug +- Feature +- Enhancement - Improvement - Documentation - security issue-labels-exclude: - Build +- Internal / Refactoring issue-labels-alias: - name: Documentation header: Documentation @@ -14,3 +16,33 @@ issue-labels-alias: - name: security header: Security plural: Security +create: + include-footer: true + footer-heading: Where to get it + footer-content: > + You can download this release from + [nuget](https://nuget.org/packages/Cake.Xamarin/{milestone}), + or you can just reference it in a cake build script + with `#addin nuget:?package=Cake.Xamarin&version={milestone}`. + footer-includes-milestone: true + milestone-replace-text: "{milestone}" + include-sha-section: true + sha-section-heading: "SHA256 Hashes of the release artifacts" + sha-section-line-format: "- `{1}\t{0}`" +export: + include-created-date-in-title: true + created-date-string-format: yyyy-MM-dd + perform-regex-removal: true + regex-text: '[\r\n]*### Where to get it[\r\n]*You can .*`\.[\r\n]*' + multiline-regex: true +close: + use-issue-comments: true + issue-comment: |- + :tada: This issue has been resolved in version {milestone} :tada: + + The release is available on: + + - [GitHub Release](https://github.com/{owner}/{repository}/releases/tag/{milestone}) + - [NuGet Package](https://www.nuget.org/packages/{repository}/{milestone}) + + Your **[GitReleaseManager](https://github.com/GitTools/GitReleaseManager)** bot :package::rocket: \ No newline at end of file diff --git a/build.cmd b/build.cmd new file mode 100644 index 0000000..6a3a528 --- /dev/null +++ b/build.cmd @@ -0,0 +1,14 @@ +@echo on +@cd %~dp0 + +set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 +set DOTNET_CLI_TELEMETRY_OPTOUT=1 +set DOTNET_NOLOGO=1 + +dotnet tool restore +@if %ERRORLEVEL% neq 0 goto :eof + +dotnet cake recipe.cake --bootstrap +@if %ERRORLEVEL% neq 0 goto :eof + +dotnet cake recipe.cake %* diff --git a/build.ps1 b/build.ps1 index 4514a51..210aea2 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,256 +1,16 @@ -########################################################################## -# This is the Cake bootstrapper script for PowerShell. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## +$ErrorActionPreference = 'Stop' -<# +Set-Location -LiteralPath $PSScriptRoot -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. +$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1' +$env:DOTNET_CLI_TELEMETRY_OPTOUT = '1' +$env:DOTNET_NOLOGO = '1' -.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. +dotnet tool restore +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } -.PARAMETER Script -The build script to execute. -.PARAMETER Target -The build script target to run. -.PARAMETER Configuration -The build configuration to use. -.PARAMETER Verbosity -Specifies the amount of information to be displayed. -.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. +dotnet cake recipe.cake --bootstrap +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } -.LINK -https://cakebuild.net - -#> - -[CmdletBinding()] -Param( - [string]$Script = "recipe.cake", - [string]$Target, - [string]$Configuration, - [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")] - [string]$Verbosity, - [switch]$ShowDescription, - [Alias("WhatIf", "Noop")] - [switch]$DryRun, - [switch]$SkipToolPackageRestore, - [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)] - [string[]]$ScriptArgs -) - -# 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) -{ - if ([string]::IsNullOrEmpty($filePath) -or !(Test-Path $filePath -PathType Leaf)) - { - return $null - } - - [System.IO.Stream] $file = $null; - [System.Security.Cryptography.MD5] $md5 = $null; - try - { - $md5 = [System.Security.Cryptography.MD5]::Create() - $file = [System.IO.File]::OpenRead($filePath) - return [System.BitConverter]::ToString($md5.ComputeHash($file)) - } - finally - { - if ($file -ne $null) - { - $file.Dispose() - } - } -} - -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 -} - -$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" - -# 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 -} - -# Make sure that packages.config exist. -if (!(Test-Path $PACKAGES_CONFIG)) { - Write-Verbose -Message "Downloading packages.config..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile("https://cakebuild.net/download/bootstrapper/packages", $PACKAGES_CONFIG) - } catch { - Throw "Could not download packages.config." - } -} - -# Try find NuGet.exe in path if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Trying to find nuget.exe in PATH..." - $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_ -PathType Container) } - $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1 - if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) { - Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)." - $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName - } -} - -# Try download NuGet.exe if not exists -if (!(Test-Path $NUGET_EXE)) { - Write-Verbose -Message "Downloading NuGet.exe..." - try { - $wc = GetProxyEnabledWebClient - $wc.DownloadFile($NUGET_URL, $NUGET_EXE) - } catch { - Throw "Could not download NuGet.exe." - } -} - -# Save nuget.exe path to environment to be available to child processed -$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) { - Push-Location - Set-Location $TOOLS_DIR - - # Check for changes in packages.config and remove installed tools if true. - [string] $md5Hash = MD5HashFile $PACKAGES_CONFIG - if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or - ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) { - Write-Verbose -Message "Missing or changed package.config hash..." - Get-ChildItem -Exclude packages.config,nuget.exe,Cake.Bakery | - Remove-Item -Recurse - } - - Write-Verbose -Message "Restoring tools from NuGet..." - - $NuGetOutput = Invoke-Expression "& $env:NUGET_EXE_INVOCATION install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`"" - - if ($LASTEXITCODE -ne 0) { - Throw "An error occurred while restoring NuGet tools." - } - else - { - $md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII" - } - 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 -} - -# Make sure that Cake has been installed. -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 Cake arguments -$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_INVOCATION $($cakeArguments -join " ")" -exit $LASTEXITCODE +dotnet cake recipe.cake @args +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } diff --git a/build.sh b/build.sh index 7fc4599..034798e 100755 --- a/build.sh +++ b/build.sh @@ -1,117 +1,14 @@ #!/usr/bin/env bash +set -euox pipefail -########################################################################## -# This is the Cake bootstrapper script for Linux and OS X. -# This file was downloaded from https://github.com/cake-build/resources -# Feel free to change this file to fit your needs. -########################################################################## +cd "$(dirname "${BASH_SOURCE[0]}")" -# Define directories. -SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -TOOLS_DIR=$SCRIPT_DIR/tools -ADDINS_DIR=$TOOLS_DIR/Addins -MODULES_DIR=$TOOLS_DIR/Modules -NUGET_EXE=$TOOLS_DIR/nuget.exe -CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe -PACKAGES_CONFIG=$TOOLS_DIR/packages.config -PACKAGES_CONFIG_MD5=$TOOLS_DIR/packages.config.md5sum -ADDINS_PACKAGES_CONFIG=$ADDINS_DIR/packages.config -MODULES_PACKAGES_CONFIG=$MODULES_DIR/packages.config +export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 +export DOTNET_CLI_TELEMETRY_OPTOUT=1 +export DOTNET_NOLOGO=1 -# Define md5sum or md5 depending on Linux/OSX -MD5_EXE= -if [[ "$(uname -s)" == "Darwin" ]]; then - MD5_EXE="md5 -r" -else - MD5_EXE="md5sum" -fi +dotnet tool restore -# Define default arguments. -SCRIPT="recipe.cake" -CAKE_ARGUMENTS=() +dotnet cake recipe.cake --bootstrap -# Parse arguments. -for i in "$@"; do - case $1 in - -s|--script) SCRIPT="$2"; shift ;; - --) shift; CAKE_ARGUMENTS+=("$@"); break ;; - *) CAKE_ARGUMENTS+=("$1") ;; - esac - shift -done - -# Make sure the tools folder exist. -if [ ! -d "$TOOLS_DIR" ]; then - mkdir "$TOOLS_DIR" -fi - -# Make sure that packages.config exist. -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 occurred while downloading packages.config." - exit 1 - fi -fi - -# Download NuGet if it does not exist. -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 occurred while downloading nuget.exe." - exit 1 - fi -fi - -# Restore tools from NuGet. -pushd "$TOOLS_DIR" >/dev/null -if [ ! -f "$PACKAGES_CONFIG_MD5" ] || [ "$( cat "$PACKAGES_CONFIG_MD5" | sed 's/\r$//' )" != "$( $MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' )" ]; then - find . -type d ! -name . ! -name 'Cake.Bakery' | xargs rm -rf -fi - -mono "$NUGET_EXE" install -ExcludeVersion -if [ $? -ne 0 ]; then - echo "Could not restore NuGet tools." - exit 1 -fi - -$MD5_EXE "$PACKAGES_CONFIG" | awk '{ print $1 }' >| "$PACKAGES_CONFIG_MD5" - -popd >/dev/null - -# Restore addins from NuGet. -if [ -f "$ADDINS_PACKAGES_CONFIG" ]; then - pushd "$ADDINS_DIR" >/dev/null - - mono "$NUGET_EXE" install -ExcludeVersion - if [ $? -ne 0 ]; then - echo "Could not restore NuGet addins." - exit 1 - fi - - popd >/dev/null -fi - -# Restore modules from NuGet. -if [ -f "$MODULES_PACKAGES_CONFIG" ]; then - pushd "$MODULES_DIR" >/dev/null - - mono "$NUGET_EXE" install -ExcludeVersion - if [ $? -ne 0 ]; then - echo "Could not restore NuGet modules." - exit 1 - fi - - popd >/dev/null -fi - -# Make sure that Cake has been installed. -if [ ! -f "$CAKE_EXE" ]; then - echo "Could not find Cake.exe at '$CAKE_EXE'." - exit 1 -fi - -# Start Cake -exec mono "$CAKE_EXE" $SCRIPT "${CAKE_ARGUMENTS[@]}" +dotnet cake recipe.cake "$@" diff --git a/cake.config b/cake.config new file mode 100644 index 0000000..3652797 --- /dev/null +++ b/cake.config @@ -0,0 +1,12 @@ +[Nuget] +Source=https://api.nuget.org/v3/index.json +UseInProcessClient=true +LoadDependencies=false + +[Paths] +Tools=./tools +Addins=./tools/addins +Modules=./tools/modules + +[Settings] +SkipVerification=false diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..b22c596 --- /dev/null +++ b/nuget.config @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/recipe.cake b/recipe.cake index 7b3f3bb..9d087a1 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,4 +1,4 @@ -#load nuget:?package=Cake.Recipe&version=1.0.0 +#load nuget:?package=Cake.Recipe&version=2.2.1 Environment.SetVariableNames(); @@ -13,9 +13,7 @@ BuildParameters.SetParameters(context: Context, shouldRunInspectCode: false, shouldRunDupFinder: false, shouldRunCodecov: false, - shouldPostToSlack: false, - shouldRunIntegrationTests: false, - shouldRunGitVersion: true); + shouldRunIntegrationTests: false); BuildParameters.PrintParameters(Context); diff --git a/src/Cake.Xamarin.Tests/Cake.Xamarin.Tests.csproj b/src/Cake.Xamarin.Tests/Cake.Xamarin.Tests.csproj index 42de3f1..add4f36 100644 --- a/src/Cake.Xamarin.Tests/Cake.Xamarin.Tests.csproj +++ b/src/Cake.Xamarin.Tests/Cake.Xamarin.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp2.0 + net5.0 @@ -11,13 +11,16 @@ - - - - - + + + + + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/src/Cake.Xamarin.Tests/Fakes/FakeCakeArguments.cs b/src/Cake.Xamarin.Tests/Fakes/FakeCakeArguments.cs index 1485018..590e660 100644 --- a/src/Cake.Xamarin.Tests/Fakes/FakeCakeArguments.cs +++ b/src/Cake.Xamarin.Tests/Fakes/FakeCakeArguments.cs @@ -1,69 +1,72 @@ using System; using Cake.Core; using System.Collections.Generic; +using System.Linq; namespace Cake.Xamarin.Fakes { internal sealed class FakeCakeArguments : ICakeArguments { - private readonly Dictionary _arguments; + private readonly Dictionary> _arguments; - /// - /// Gets the arguments. - /// - /// The arguments. - public IReadOnlyDictionary Arguments - { - get { return _arguments; } - } + /// + /// Gets the arguments. + /// + /// The arguments. + public IReadOnlyDictionary> Arguments => _arguments; - /// - /// Initializes a new instance of the class. - /// - public FakeCakeArguments() - { - _arguments = new Dictionary(StringComparer.OrdinalIgnoreCase); - } + /// + /// Initializes a new instance of the class. + /// + public FakeCakeArguments() + { + _arguments = new Dictionary>(StringComparer.OrdinalIgnoreCase); + } - /// - /// Initializes the argument list. - /// - /// The arguments. - public void SetArguments(IDictionary arguments) - { - if (arguments == null) - { - throw new ArgumentNullException("arguments"); - } - _arguments.Clear(); - foreach (var argument in arguments) - { - _arguments.Add(argument.Key, argument.Value); - } - } + /// + /// Initializes the argument list. + /// + /// The arguments. + public void SetArguments(IDictionary> arguments) + { + if (arguments == null) + { + throw new ArgumentNullException(nameof(arguments)); + } + _arguments.Clear(); + foreach (var argument in arguments) + { + _arguments.Add(argument.Key, argument.Value); + } + } - /// - /// Determines whether or not the specified argument exist. - /// - /// The argument name. - /// - /// true if the argument exist; otherwise false. - /// - public bool HasArgument(string name) - { - return _arguments.ContainsKey(name); - } + /// + /// Determines whether or not the specified argument exist. + /// + /// The argument name. + /// + /// true if the argument exist; otherwise false. + /// + public bool HasArgument(string name) + { + return _arguments.ContainsKey(name); + } - /// - /// Gets an argument. - /// - /// The argument name. - /// The argument value. - public string GetArgument(string name) - { - return _arguments.ContainsKey(name) - ? _arguments[name] : null; - } - } + public ICollection GetArguments(string name) + { + _arguments.TryGetValue(name, out var arguments); + return arguments ?? (ICollection)Array.Empty(); + } + + /// + /// Gets an argument. + /// + /// The argument name. + /// The argument value. + public string GetArgument(string name) + { + return GetArguments(name).LastOrDefault(); + } + } } diff --git a/src/Cake.Xamarin.Tests/Fakes/FakeCakeContext.cs b/src/Cake.Xamarin.Tests/Fakes/FakeCakeContext.cs index 03757ce..370d658 100755 --- a/src/Cake.Xamarin.Tests/Fakes/FakeCakeContext.cs +++ b/src/Cake.Xamarin.Tests/Fakes/FakeCakeContext.cs @@ -7,51 +7,55 @@ namespace Cake.Xamarin.Fakes { - public class FakeCakeContext - { - ICakeContext context; - FakeCakeLog log; - DirectoryPath testsDir; - - public FakeCakeContext() - { - testsDir = new DirectoryPath(System.IO.Path.GetFullPath(AppContext.BaseDirectory)); - - log = new FakeCakeLog(); - var fileSystem = new FileSystem(); - var environment = new CakeEnvironment(new CakePlatform(), new CakeRuntime(), log); - var globber = new Globber(fileSystem, environment); - var args = new FakeCakeArguments(); - var registry = new WindowsRegistry(); - var toolRepo = new ToolRepository(environment); - var config = new FakeConfiguration(); - var toolResolutionStrategy = new ToolResolutionStrategy(fileSystem, environment, globber, config); - var toolLocator = new ToolLocator(environment, toolRepo, toolResolutionStrategy); - var processRunner = new ProcessRunner(fileSystem, environment, log, toolLocator, config); - var data = Substitute.For(); - context = new CakeContext(fileSystem, environment, globber, log, args, processRunner, registry, toolLocator, data, config); - context.Environment.WorkingDirectory = testsDir; - } - - public DirectoryPath WorkingDirectory - { - get { return testsDir; } - } - - public ICakeContext CakeContext - { - get { return context; } - } - - public string GetLogs() - { - return string.Join(Environment.NewLine, log.Messages); - } - - public void DumpLogs() - { - foreach (var m in log.Messages) - Console.WriteLine(m); - } - } + public class FakeCakeContext + { + readonly ICakeContext context; + readonly FakeLog log; + readonly DirectoryPath testsDir; + + public FakeCakeContext() + { + testsDir = new DirectoryPath( + System.IO.Path.GetFullPath(AppContext.BaseDirectory)); + + var fileSystem = new FileSystem(); + log = new FakeLog(); + var environment = new CakeEnvironment(new CakePlatform(), new CakeRuntime()); + var globber = new Globber(fileSystem, environment); + + var args = new FakeCakeArguments(); + var registry = new WindowsRegistry(); + + var toolRepository = new ToolRepository(environment); + var config = new FakeConfiguration(); + var toolResolutionStrategy = new ToolResolutionStrategy(fileSystem, environment, globber, config, log); + IToolLocator tools = new ToolLocator(environment, toolRepository, toolResolutionStrategy); + var processRunner = new ProcessRunner(fileSystem, environment, log, tools, config); + + var dataService = Substitute.For(); + context = new CakeContext(fileSystem, environment, globber, log, args, processRunner, registry, tools, dataService, config); + context.Environment.WorkingDirectory = testsDir; + } + + public DirectoryPath WorkingDirectory + { + get { return testsDir; } + } + + public ICakeContext CakeContext + { + get { return context; } + } + + public string GetLogs() + { + return string.Join(Environment.NewLine, log.Messages); + } + + public void DumpLogs() + { + foreach (var m in log.Messages) + Console.WriteLine(m); + } + } } \ No newline at end of file diff --git a/src/Cake.Xamarin.Tests/Fakes/FakeLog.cs b/src/Cake.Xamarin.Tests/Fakes/FakeLog.cs index 25897bc..582e211 100644 --- a/src/Cake.Xamarin.Tests/Fakes/FakeLog.cs +++ b/src/Cake.Xamarin.Tests/Fakes/FakeLog.cs @@ -4,56 +4,51 @@ namespace Cake.Xamarin.Fakes { - /// - /// Implementation of a that saves all messages written to it. - /// - public sealed class FakeCakeLog : ICakeLog - { - private readonly List _messages; + /// + /// Implementation of a that saves all messages written to it. + /// + public sealed class FakeLog : ICakeLog + { + private readonly List _messages; - /// - /// Gets the messages. - /// - /// The messages. - public List Messages - { - get { return _messages; } - } + /// + /// Gets the messages. + /// + /// The messages. + public List Messages + { + get { return _messages; } + } - /// - /// Initializes a new instance of the class. - /// - public FakeCakeLog() - { - _messages = new List(); - } + /// + /// Initializes a new instance of the class. + /// + public FakeLog() + { + _messages = new List(); + } - /// - /// Gets the verbosity. - /// - /// The verbosity. - public Verbosity Verbosity - { - get { return Verbosity.Diagnostic; } - set { } - } + /// + /// Gets the verbosity. + /// + /// The verbosity. + public Verbosity Verbosity + { + get { return Verbosity.Diagnostic; } + set { } + } - Verbosity ICakeLog.Verbosity - { - get; set; - } = Verbosity.Diagnostic; - - /// - /// Writes the text representation of the specified array of objects to the - /// log using the specified verbosity, log level and format information. - /// - /// The verbosity. - /// The log level. - /// A composite format string. - /// An array of objects to write using format. - public void Write(Verbosity verbosity, LogLevel level, string format, params object[] args) - { - _messages.Add(string.Format(format, args)); - } - } + /// + /// Writes the text representation of the specified array of objects to the + /// log using the specified verbosity, log level and format information. + /// + /// The verbosity. + /// The log level. + /// A composite format string. + /// An array of objects to write using format. + public void Write(Verbosity verbosity, LogLevel level, string format, params object[] args) + { + _messages.Add(string.Format(format, args)); + } + } } \ No newline at end of file diff --git a/src/Cake.Xamarin/Cake.Xamarin.csproj b/src/Cake.Xamarin/Cake.Xamarin.csproj index 4f6a29e..8c1504a 100644 --- a/src/Cake.Xamarin/Cake.Xamarin.csproj +++ b/src/Cake.Xamarin/Cake.Xamarin.csproj @@ -18,19 +18,19 @@ Cake.Xamarin Xamarin addon for cake build. Cake Build addon for Xamarin. - Cake Script Build Xamarin + Cake Script Build Xamarin cake-addin Redth Redth, cake-contrib https://github.com/cake-contrib/Cake.Xamarin Apache-2.0 https://github.com/cake-contrib/Cake.Xamarin.git git - https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png + https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/addin/cake-contrib-addin-medium.png - - + + diff --git a/src/Cake.Xamarin/TestCloudRunner.cs b/src/Cake.Xamarin/TestCloudRunner.cs index fe4003d..4662460 100644 --- a/src/Cake.Xamarin/TestCloudRunner.cs +++ b/src/Cake.Xamarin/TestCloudRunner.cs @@ -1,19 +1,17 @@ -using System; +using Cake.Core; using Cake.Core.IO; -using Cake.Core.Utilities; -using Cake.Core; -using System.Collections.Generic; using Cake.Core.Tooling; +using System.Collections.Generic; namespace Cake.Xamarin { /// /// Test cloud settings. /// - public class TestCloudSettings : Cake.Core.Tooling.ToolSettings + public class TestCloudSettings : ToolSettings { /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// public TestCloudSettings () : base () { @@ -100,7 +98,7 @@ public TestCloudSettings () : base () public string KeystoreAliasPassword { get; set; } } - internal class TestCloudRunner : Cake.Core.Tooling.Tool + internal class TestCloudRunner : Tool { readonly ICakeEnvironment _cakeEnvironment; diff --git a/src/Cake.Xamarin/XamarinComponentRunner.cs b/src/Cake.Xamarin/XamarinComponentRunner.cs index aff6f10..146c2ad 100644 --- a/src/Cake.Xamarin/XamarinComponentRunner.cs +++ b/src/Cake.Xamarin/XamarinComponentRunner.cs @@ -1,12 +1,11 @@ -using System.Collections.Generic; using Cake.Core; using Cake.Core.IO; using Cake.Core.Tooling; -using Cake.Core.Utilities; +using System.Collections.Generic; namespace Cake.Xamarin -{ - internal class XamarinComponentRunner : Cake.Core.Tooling.Tool +{ + internal class XamarinComponentRunner : Tool { readonly ICakeEnvironment _cakeEnvironment; diff --git a/tools/packages.config b/tools/packages.config deleted file mode 100644 index 107b716..0000000 --- a/tools/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file