diff --git a/.appveyor.yml b/.appveyor.yml index cf9c7b0..cda557f 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,7 +40,7 @@ branches: # Build Cache # #---------------------------------# cache: -- tools -> recipe.cake, tools/packages.config +- tools -> recipe.cake #---------------------------------# # Skip builds for doc changes # 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/GitReleaseManager.yaml b/GitReleaseManager.yaml index 721c1ba..e0975a8 100644 --- a/GitReleaseManager.yaml +++ b/GitReleaseManager.yaml @@ -4,9 +4,13 @@ issue-labels-include: - Bug - Improvement - Documentation +- security issue-labels-exclude: - Build issue-labels-alias: - name: Documentation header: Documentation - plural: Documentation \ No newline at end of file + plural: Documentation + - name: security + header: Security + plural: Security diff --git a/README.md b/README.md index 8f9f6eb..ff7a8cd 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,12 @@ The Cake.Mage addin adds Mage.exe support to Cake ## Breaking changes +1.0.0 + +- References cake 1.0.0 + +- Add paths for .net 4.8, add logging of tool lookup + 0.4 ​ - BaseNewAndUpdateDeploymentSettings.Install is false by default diff --git a/build.ps1 b/build.ps1 index 4514a51..0940a31 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,256 +1,15 @@ -########################################################################## -# 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' -<# +$SCRIPT_NAME = "recipe.cake" -.SYNOPSIS -This is a Powershell script to bootstrap a Cake build. +Write-Host "Restoring .NET Core tools" +dotnet tool restore +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } -.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. +Write-Host "Bootstrapping Cake" +dotnet cake $SCRIPT_NAME --bootstrap +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. - -.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 +Write-Host "Running Build" +dotnet cake $SCRIPT_NAME @args +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } \ No newline at end of file diff --git a/build.sh b/build.sh index 7fc4599..c87397e 100755 --- a/build.sh +++ b/build.sh @@ -1,117 +1,5 @@ -#!/usr/bin/env bash -########################################################################## -# 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. -########################################################################## -# 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 +echo "Bootstrapping Cake" +dotnet cake $SCRIPT_NAME --bootstrap -# Define md5sum or md5 depending on Linux/OSX -MD5_EXE= -if [[ "$(uname -s)" == "Darwin" ]]; then - MD5_EXE="md5 -r" -else - MD5_EXE="md5sum" -fi - -# Define default arguments. -SCRIPT="recipe.cake" -CAKE_ARGUMENTS=() - -# 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[@]}" diff --git a/nuspec/nuget/Cake.Mage.nuspec b/nuspec/nuget/Cake.Mage.nuspec deleted file mode 100644 index cd88899..0000000 --- a/nuspec/nuget/Cake.Mage.nuspec +++ /dev/null @@ -1,29 +0,0 @@ - - - - Cake.Mage - $version$ - Phil Scott - Phil Scott, cake-contrib - Cake.Mage - Cake addin to provide support for Mage.exe. - Cake addin to provide support for Mage.exe. - https://github.com/cake-contrib/Cake.Mage - https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png - false - Copyright (c) Phil Scott 2016 - MIT - - Initial Release - Cake Script Build Mage - - - - - - - - - - - diff --git a/recipe.cake b/recipe.cake index ceb6e4b..9e0f1d3 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,28 +1,26 @@ -#load nuget:?package=Cake.Recipe&version=1.0.0 +#load nuget:?package=Cake.Recipe&version=2.2.0 Environment.SetVariableNames(); -BuildParameters.SetParameters(context: Context, - buildSystem: BuildSystem, - sourceDirectoryPath: "./src", - title: "Cake.Mage", - repositoryOwner: "cake-contrib", - repositoryName: "Cake.Mage", - appVeyorAccountName: "cakecontrib", - shouldRunDupFinder: true, - shouldRunInspectCode: true, - shouldRunGitVersion: true); +BuildParameters.SetParameters( + context: Context, + buildSystem: BuildSystem, + sourceDirectoryPath: "./src", + title: "Cake.Mage", + repositoryOwner: "cake-contrib", + repositoryName: "Cake.Mage", + appVeyorAccountName: "cakecontrib", + shouldRunDupFinder: false, + shouldRunInspectCode: false, + shouldRunCodecov: false, + shouldRunDotNetCorePack: true); BuildParameters.PrintParameters(Context); -ToolSettings.SetToolSettings(context: Context, - dupFinderExcludePattern: new [] - { - BuildParameters.RootDirectoryPath + "/src/Cake.Mage/obj/**/*.*", - BuildParameters.RootDirectoryPath + "/src/Cake.Mage.Tests/**/*.cs", - }, - testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[Shouldly]*", - testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*", - testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs"); - +ToolSettings.SetToolSettings( + context: Context, + dupFinderExcludePattern: new string[] { BuildParameters.RootDirectoryPath + "/src/Cake.Mage.Tests/*.cs" }, + testCoverageFilter: "+[*]* -[nunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]*", + testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*", + testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs"); Build.RunDotNetCore(); diff --git a/src/Cake.Mage.Tests/Cake.Mage.Tests.csproj b/src/Cake.Mage.Tests/Cake.Mage.Tests.csproj index fb7fb4e..e29a9f2 100644 --- a/src/Cake.Mage.Tests/Cake.Mage.Tests.csproj +++ b/src/Cake.Mage.Tests/Cake.Mage.Tests.csproj @@ -6,14 +6,14 @@ latest - - - - - + + + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Cake.Mage.Tests/MageSignFixture.cs b/src/Cake.Mage.Tests/MageSignFixture.cs index add9076..65cd81b 100644 --- a/src/Cake.Mage.Tests/MageSignFixture.cs +++ b/src/Cake.Mage.Tests/MageSignFixture.cs @@ -1,4 +1,5 @@ -using Cake.Core.IO; +using Cake.Core.Diagnostics; +using Cake.Core.IO; using Cake.Core.Tooling; using Cake.Testing.Fixtures; using NSubstitute; @@ -9,12 +10,15 @@ namespace Cake.Mage.Tests { public IRegistry Registry { get; } + public ICakeLog Log { get; } + public DotNetToolResolver DotNetToolResolver { get; } protected MageFixture(string toolFilename) : base(toolFilename) { Registry = Substitute.For(); - DotNetToolResolver = new DotNetToolResolver(FileSystem, Environment, Registry); + Log = Substitute.For(); + DotNetToolResolver = new DotNetToolResolver(FileSystem, Environment, Registry, Log); } } } \ No newline at end of file diff --git a/src/Cake.Mage.Tests/NewAndUpdateMageFixture.cs b/src/Cake.Mage.Tests/NewAndUpdateMageFixture.cs index 6a0e076..bceb110 100644 --- a/src/Cake.Mage.Tests/NewAndUpdateMageFixture.cs +++ b/src/Cake.Mage.Tests/NewAndUpdateMageFixture.cs @@ -8,7 +8,7 @@ public NewAndUpdateMageFixture() : base("mage.exe") protected override void RunTool() { - var runner = new NewOrUpdateMageTool(FileSystem, Environment, ProcessRunner, Tools, Registry, DotNetToolResolver); + var runner = new NewOrUpdateMageTool(FileSystem, Environment, ProcessRunner, Tools, Registry, Log, DotNetToolResolver); runner.NewOrUpdate(Settings); } } diff --git a/src/Cake.Mage.Tests/ResolverTests.cs b/src/Cake.Mage.Tests/ResolverTests.cs index 23c9e6c..3958b25 100644 --- a/src/Cake.Mage.Tests/ResolverTests.cs +++ b/src/Cake.Mage.Tests/ResolverTests.cs @@ -8,10 +8,10 @@ namespace Cake.Mage.Tests { public class ResolverTests { - [Fact] + //[Fact] doesn't work when mage.exe is not installed public void Can_resolve_mage() { - var resolver = new DotNetToolResolver(new FileSystem(), new CakeEnvironment(new CakePlatform(), new CakeRuntime(), new FakeLog()), new WindowsRegistry()); + var resolver = new DotNetToolResolver(new FileSystem(), new CakeEnvironment(new CakePlatform(), new CakeRuntime()), new WindowsRegistry(), new FakeLog()); var path = resolver.GetPath("mage.exe"); path.ShouldNotBe(null); } diff --git a/src/Cake.Mage.Tests/SignMageFixture.cs b/src/Cake.Mage.Tests/SignMageFixture.cs index 6465781..5c43ac0 100644 --- a/src/Cake.Mage.Tests/SignMageFixture.cs +++ b/src/Cake.Mage.Tests/SignMageFixture.cs @@ -8,7 +8,7 @@ public SignMageFixture(string toolFilename) : base(toolFilename) protected override void RunTool() { - var runner = new SignMageTool(FileSystem, Environment, ProcessRunner, Tools, Registry, DotNetToolResolver); + var runner = new SignMageTool(FileSystem, Environment, ProcessRunner, Tools, Registry, Log, DotNetToolResolver); runner.Sign(Settings); } } diff --git a/src/Cake.Mage.sln b/src/Cake.Mage.sln index 2592b96..17178f6 100644 --- a/src/Cake.Mage.sln +++ b/src/Cake.Mage.sln @@ -1,11 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.136 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28803.156 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{675AE6B0-8DFC-4033-899A-190B177EF712}" ProjectSection(SolutionItems) = preProject - ..\nuspec\nuget\Cake.Mage.nuspec = ..\nuspec\nuget\Cake.Mage.nuspec + ..\.appveyor.yml = ..\.appveyor.yml + ..\config.wyam = ..\config.wyam + ..\GitReleaseManager.yaml = ..\GitReleaseManager.yaml ..\README.md = ..\README.md ..\recipe.cake = ..\recipe.cake EndProjectSection diff --git a/src/Cake.Mage.v2.ncrunchsolution b/src/Cake.Mage.v2.ncrunchsolution deleted file mode 100644 index f16721e..0000000 --- a/src/Cake.Mage.v2.ncrunchsolution +++ /dev/null @@ -1,14 +0,0 @@ - - 1 - false - true - true - UseDynamicAnalysis - UseStaticAnalysis - UseStaticAnalysis - UseStaticAnalysis - UseDynamicAnalysis - - - - \ No newline at end of file diff --git a/src/Cake.Mage/Cake.Mage.csproj b/src/Cake.Mage/Cake.Mage.csproj index bad2b83..969645d 100644 --- a/src/Cake.Mage/Cake.Mage.csproj +++ b/src/Cake.Mage/Cake.Mage.csproj @@ -1,8 +1,28 @@  - netstandard2.0;net461 - pdbonly + net50;netstandard2.0;net46 + true + true + snupkg + + + + + Cake.Mage + Cake.Mage + Cake addin to provide support for Mage.exe. + Cake Script Build Mage cake-addin + Phil Scott, Miha Markic + Phil Scott, Miha Markic, cake-contrib + https://github.com/cake-contrib/Cake.Mage.git + git + https://github.com/cake-contrib/Cake.Mage + icon.png + + https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png + MIT + Copyright (c) Phil Scott 2016 @@ -16,7 +36,23 @@ bin\Release\net461\Cake.Mage.xml + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + - + + True + + diff --git a/src/Cake.Mage/DotNetToolResolver.cs b/src/Cake.Mage/DotNetToolResolver.cs index c76f6e2..c7b9e73 100644 --- a/src/Cake.Mage/DotNetToolResolver.cs +++ b/src/Cake.Mage/DotNetToolResolver.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -using System.Linq; using Cake.Core; +using Cake.Core.Diagnostics; using Cake.Core.IO; namespace Cake.Mage @@ -14,9 +14,10 @@ internal sealed class DotNetToolResolver private readonly IFileSystem _fileSystem; private readonly ICakeEnvironment _environment; private readonly IRegistry _registry; + private readonly ICakeLog _log; private FilePath _toolPath; - public DotNetToolResolver(IFileSystem fileSystem, ICakeEnvironment environment, IRegistry registry) + public DotNetToolResolver(IFileSystem fileSystem, ICakeEnvironment environment, IRegistry registry, ICakeLog log) { if (fileSystem == null) throw new ArgumentNullException(nameof(fileSystem)); if (registry == null) throw new ArgumentNullException(nameof(registry)); @@ -25,6 +26,7 @@ public DotNetToolResolver(IFileSystem fileSystem, ICakeEnvironment environment, _fileSystem = fileSystem; _environment = environment; _registry = registry; + _log = log; } public FilePath GetPath(string toolExecutable) @@ -54,25 +56,48 @@ private FilePath GetFromDisc(string toolExecutable) var programFiles64Bit = _environment.GetSpecialPath(SpecialPath.ProgramFiles); // Gets a list of the files we should check. - var files = new List + var toolDirectories = new List { // 64-bit - programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools").CombineWithFilePath(toolExecutable), - programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools").CombineWithFilePath(toolExecutable), - programFiles64Bit.Combine(@"Windows Kits\8.1\bin\x64").CombineWithFilePath(toolExecutable), - programFiles64Bit.Combine(@"Windows Kits\8.0\bin\x64").CombineWithFilePath(toolExecutable), - programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v7.1A\Bin").CombineWithFilePath(toolExecutable), + programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools"), + programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.2 Tools"), + programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.1 Tools"), + programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7 Tools"), + programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools"), + programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools"), + programFiles64Bit.Combine(@"Windows Kits\8.1\bin\x64"), + programFiles64Bit.Combine(@"Windows Kits\8.0\bin\x64"), + programFiles64Bit.Combine(@"Microsoft SDKs\Windows\v7.1A\Bin"), // x86 - programFilesX86.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools").CombineWithFilePath(toolExecutable), - programFilesX86.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools").CombineWithFilePath(toolExecutable), - programFilesX86.Combine(@"Windows Kits\8.1\bin\x86").CombineWithFilePath(toolExecutable), - programFilesX86.Combine(@"Windows Kits\8.0\bin\x86").CombineWithFilePath(toolExecutable), - programFilesX86.Combine(@"Microsoft SDKs\Windows\v7.1A\Bin").CombineWithFilePath(toolExecutable) + programFilesX86.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools"), + programFilesX86.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.2 Tools"), + programFilesX86.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7.1 Tools"), + programFilesX86.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.7 Tools"), + programFilesX86.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.1 Tools"), + programFilesX86.Combine(@"Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6 Tools"), + programFilesX86.Combine(@"Windows Kits\8.1\bin\x86"), + programFilesX86.Combine(@"Windows Kits\8.0\bin\x86"), + programFilesX86.Combine(@"Microsoft SDKs\Windows\v7.1A\Bin") }; - // Return the first path that exist. - return files.FirstOrDefault(file => _fileSystem.Exist(file)); + foreach(var toolDirectory in toolDirectories) + { + var toolDirectoryExists = _fileSystem.Exist(toolDirectory); + _log.Debug($"{typeof(DotNetToolResolver)}: \"{toolDirectory}\" {(toolDirectoryExists ? "found" : "not found")}."); + + if (toolDirectoryExists) + { + var toolFile = toolDirectory.CombineWithFilePath(toolExecutable); + var toolFileExists = _fileSystem.Exist(toolFile); + _log.Debug($"{typeof(DotNetToolResolver)}: \"{toolFile}\" {(toolFileExists ? "found" : "not found")}."); + + if (toolFileExists) + return toolFile; + } + } + + return null; } private FilePath GetFromRegistry(string toolExecutable) diff --git a/src/Cake.Mage/MageAliases.cs b/src/Cake.Mage/MageAliases.cs index 55d6b9e..32a92cd 100644 --- a/src/Cake.Mage/MageAliases.cs +++ b/src/Cake.Mage/MageAliases.cs @@ -108,15 +108,15 @@ public static void MageSign(this ICakeContext context, SignSettings settings) { if (settings == null) throw new ArgumentNullException(nameof(settings)); - var resolver = new DotNetToolResolver(context.FileSystem, context.Environment, context.Registry); - var runner = new SignMageTool(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Registry, resolver); + var resolver = new DotNetToolResolver(context.FileSystem, context.Environment, context.Registry, context.Log); + var runner = new SignMageTool(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Registry, context.Log, resolver); runner.Sign(settings); } private static void NewOrUpdate(ICakeContext context, BaseNewAndUpdateMageSettings settings) { - var resolver = new DotNetToolResolver(context.FileSystem, context.Environment, context.Registry); - var runner = new NewOrUpdateMageTool(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Registry, resolver); + var resolver = new DotNetToolResolver(context.FileSystem, context.Environment, context.Registry, context.Log); + var runner = new NewOrUpdateMageTool(context.FileSystem, context.Environment, context.ProcessRunner, context.Tools, context.Registry, context.Log, resolver); runner.NewOrUpdate(settings); } } diff --git a/src/Cake.Mage/MageRunner.cs b/src/Cake.Mage/MageRunner.cs index 8e0dbcc..4713bbf 100644 --- a/src/Cake.Mage/MageRunner.cs +++ b/src/Cake.Mage/MageRunner.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Runtime.CompilerServices; using Cake.Core; +using Cake.Core.Diagnostics; using Cake.Core.IO; using Cake.Core.Tooling; @@ -19,10 +20,10 @@ internal abstract class MageTool : Tool where TSettings : private readonly DotNetToolResolver _resolver; protected readonly ICakeEnvironment Environment; - protected MageTool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools, IRegistry registry, DotNetToolResolver dotNetToolResolver) : base(fileSystem, environment, processRunner, tools) + protected MageTool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools, IRegistry registry, ICakeLog log, DotNetToolResolver dotNetToolResolver) : base(fileSystem, environment, processRunner, tools) { Environment = environment; - _resolver = dotNetToolResolver ?? new DotNetToolResolver(fileSystem, Environment, registry); + _resolver = dotNetToolResolver ?? new DotNetToolResolver(fileSystem, Environment, registry, log); } /// diff --git a/src/Cake.Mage/NewOrUpdateMageTool.cs b/src/Cake.Mage/NewOrUpdateMageTool.cs index 38e2676..49861e4 100644 --- a/src/Cake.Mage/NewOrUpdateMageTool.cs +++ b/src/Cake.Mage/NewOrUpdateMageTool.cs @@ -1,5 +1,6 @@ using System; using Cake.Core; +using Cake.Core.Diagnostics; using Cake.Core.IO; using Cake.Core.Tooling; @@ -81,7 +82,7 @@ private ProcessArgumentBuilder GetNewOrUpdateArguments(BaseNewAndUpdateMageSetti .AppendIfNotDefaultSwitch("-w", settings.WpfBrowserApp, false); } - internal NewOrUpdateMageTool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools, IRegistry registry, DotNetToolResolver dotNetToolResolver) : base(fileSystem, environment, processRunner, tools, registry, dotNetToolResolver) + internal NewOrUpdateMageTool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, IToolLocator tools, IRegistry registry, ICakeLog log, DotNetToolResolver dotNetToolResolver) : base(fileSystem, environment, processRunner, tools, registry, log, dotNetToolResolver) { } } diff --git a/src/Cake.Mage/SignMageTool.cs b/src/Cake.Mage/SignMageTool.cs index 17c2bcf..01db80c 100644 --- a/src/Cake.Mage/SignMageTool.cs +++ b/src/Cake.Mage/SignMageTool.cs @@ -1,5 +1,6 @@ using System; using Cake.Core; +using Cake.Core.Diagnostics; using Cake.Core.IO; using Cake.Core.Tooling; @@ -33,8 +34,8 @@ private ProcessArgumentBuilder GetSignArguments(SignSettings settings) } internal SignMageTool(IFileSystem fileSystem, ICakeEnvironment environment, IProcessRunner processRunner, - IToolLocator tools, IRegistry registry, DotNetToolResolver dotNetToolResolver) - : base(fileSystem, environment, processRunner, tools, registry, dotNetToolResolver) + IToolLocator tools, IRegistry registry, ICakeLog log, DotNetToolResolver dotNetToolResolver) + : base(fileSystem, environment, processRunner, tools, registry, log, dotNetToolResolver) { } } diff --git a/src/Cake.Mage/icon.png b/src/Cake.Mage/icon.png new file mode 100644 index 0000000..9881edc Binary files /dev/null and b/src/Cake.Mage/icon.png differ diff --git a/tools/packages.config b/tools/packages.config deleted file mode 100644 index f27ab48..0000000 --- a/tools/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - -