Skip to content

Commit

Permalink
Bump Rocket.Surgery.Nuke from 0.14.3 to 0.15.0 (#456)
Browse files Browse the repository at this point in the history
* Bump Nuke.Common from 5.0.2 to 5.1.1

Bumps [Nuke.Common](https://github.com/nuke-build/nuke) from 5.0.2 to 5.1.1.
- [Release notes](https://github.com/nuke-build/nuke/releases)
- [Changelog](https://github.com/nuke-build/nuke/blob/develop/CHANGELOG.md)
- [Commits](nuke-build/nuke@5.0.2...5.1.1)

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Rocket.Surgery.Nuke from 0.14.3 to 0.15.0

Bumps [Rocket.Surgery.Nuke](https://github.com/RocketSurgeonsGuild/Nuke) from 0.14.3 to 0.15.0.
- [Release notes](https://github.com/RocketSurgeonsGuild/Nuke/releases)
- [Changelog](https://github.com/RocketSurgeonsGuild/Nuke/blob/master/GitReleaseManager.yaml)
- [Commits](RocketSurgeonsGuild/Nuke@v0.14.3...v0.15.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Updated nuke

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: David Driscoll <david.driscoll@gmail.com>
  • Loading branch information
dependabot[bot] and david-driscoll authored Apr 27, 2021
1 parent 29be0d8 commit df7b64e
Show file tree
Hide file tree
Showing 11 changed files with 240 additions and 72 deletions.
58 changes: 34 additions & 24 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,36 @@
{
"version": 1,
"isRoot": true,
"tools": {
"dotnet-outdated": {
"version": "2.11.0",
"commands": ["dotnet-outdated"]
},
"gitversion.tool": {
"version": "5.6.5",
"commands": ["dotnet-gitversion"]
},
"dotnet-reportgenerator-globaltool": {
"version": "4.8.5",
"commands": ["reportgenerator"]
},
"nuke.globaltool": {
"version": "5.0.2",
"commands": ["nuke"]
},
"codecov.tool": {
"version": "1.12.4",
"commands": ["codecov"]
}
"version": 1,
"isRoot": true,
"tools": {
"dotnet-outdated": {
"version": "2.11.0",
"commands": [
"dotnet-outdated"
]
},
"gitversion.tool": {
"version": "5.6.8",
"commands": [
"dotnet-gitversion"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "4.8.8",
"commands": [
"reportgenerator"
]
},
"nuke.globaltool": {
"version": "5.1.1",
"commands": [
"nuke"
]
},
"codecov.tool": {
"version": "1.13.0",
"commands": [
"codecov"
]
}
}
}
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ ModelManifest.xml
.nuget/
project.lock.json
*.nupkg
/.nuke/temp/
.automation/
/tools/*/
/tools/*.exe
Expand Down
1 change: 0 additions & 1 deletion .nuke

This file was deleted.

151 changes: 151 additions & 0 deletions .nuke/build.schema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Build Schema",
"$ref": "#/definitions/build",
"definitions": {
"build": {
"type": "object",
"properties": {
"Artifacts": {
"type": "string",
"description": "The directory where artifacts are to be dropped"
},
"Configuration": {
"type": "string",
"description": "Configuration to build",
"enum": [
"Debug",
"Release"
]
},
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
},
"Coverage": {
"type": "string",
"description": "The directory where coverage artifacts are to be dropped"
},
"Help": {
"type": "boolean",
"description": "Shows the help text for this build assembly"
},
"Host": {
"type": "string",
"description": "Host for execution. Default is 'automatic'",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI"
]
},
"LintFiles": {
"type": "array",
"description": "The files to lint, if not given lints all files",
"items": {
"type": "string"
}
},
"LintProfile": {
"type": "string",
"description": "The profile to use for linting"
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
},
"Plan": {
"type": "boolean",
"description": "Shows the execution plan (HTML)"
},
"Profile": {
"type": "array",
"description": "Defines the profiles to load",
"items": {
"type": "string"
}
},
"Root": {
"type": "string",
"description": "Root directory during build execution"
},
"Skip": {
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"type": "string",
"enum": [
"Build",
"BuildVersion",
"Clean",
"CoreBuild",
"CoreRestore",
"CoreTest",
"Default",
"DotnetToolRestore",
"Generate_Code_Coverage_Badges",
"Generate_Code_Coverage_Report",
"Generate_Code_Coverage_Report_Cobertura",
"Generate_Code_Coverage_Summary",
"GenerateReadme",
"Lint",
"Pack",
"Restore",
"Test",
"Trigger_Code_Coverage_Reports"
]
}
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"type": "string",
"enum": [
"Build",
"BuildVersion",
"Clean",
"CoreBuild",
"CoreRestore",
"CoreTest",
"Default",
"DotnetToolRestore",
"Generate_Code_Coverage_Badges",
"Generate_Code_Coverage_Report",
"Generate_Code_Coverage_Report_Cobertura",
"Generate_Code_Coverage_Summary",
"GenerateReadme",
"Lint",
"Pack",
"Restore",
"Test",
"Trigger_Code_Coverage_Reports"
]
}
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
]
}
}
}
}
}
4 changes: 4 additions & 0 deletions .nuke/parameters.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "./build.schema.json",
"Solution": "LaunchPad.sln"
}
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
</PropertyGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)/.tmp/packageicon.png" Condition="Exists('$(MSBuildThisFileDirectory)/.tmp/packageicon.png')" Pack="true" PackagePath="/images/" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)/.nuke/temp/packageicon.png" Condition="Exists('$(MSBuildThisFileDirectory)/.nuke/temp/packageicon.png')" Pack="true" PackagePath="/images/" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)/LICENSE" Pack="true" PackagePath="/" Visible="false"/>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<ItemGroup>
<PackageVersion Include="GitVersion.Tool" Version="5.6.8" />
<PackageVersion Include="JetBrains.ReSharper.GlobalTools" Version="2020.3.3" />
<PackageVersion Include="Nuke.Common" Version="5.0.2" />
<PackageVersion Include="Nuke.Common" Version="5.1.1" />
<PackageVersion Include="ReportGenerator" Version="4.8.8" />
<PackageVersion Include="Rocket.Surgery.Nuke" Version="0.14.3" />
<PackageVersion Include="Rocket.Surgery.Nuke" Version="0.15.0" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Newtonsoft.Json" Version="12.0.3" />
Expand Down
7 changes: 7 additions & 0 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
:; set -eo pipefail
:; SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
:; ${SCRIPT_DIR}/build.sh "$@"
:; exit $?

@ECHO OFF
powershell -ExecutionPolicy ByPass -NoProfile -File "%~dp0build.ps1" %*
41 changes: 21 additions & 20 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,25 @@ Param(
[string[]]$BuildArguments
)

Write-Output "Windows PowerShell $($Host.Version)"
Write-Output "PowerShell $($PSVersionTable.PSEdition) version $($PSVersionTable.PSVersion)"

Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference = "None"; trap { exit 1 }
Set-StrictMode -Version 2.0; $ErrorActionPreference = "Stop"; $ConfirmPreference = "None"; trap { Write-Error $_ -ErrorAction Continue; exit 1 }
$PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent

###########################################################################
# CONFIGURATION
###########################################################################

$BuildProjectFile = "$PSScriptRoot\.build\.build.csproj"
$TempDirectory = "$PSScriptRoot\\.tmp"
$TempDirectory = "$PSScriptRoot\\.nuke\temp"

$DotNetGlobalFile = "$PSScriptRoot\\global.json"
$DotNetInstallUrl = "https://github.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1"
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
$DotNetChannel = "Current"

$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
$env:DOTNET_MULTILEVEL_LOOKUP = 0

###########################################################################
# EXECUTION
Expand All @@ -32,37 +33,37 @@ function ExecSafe([scriptblock] $cmd) {
if ($LASTEXITCODE) { exit $LASTEXITCODE }
}

# If global.json exists, load expected version
if (Test-Path $DotNetGlobalFile) {
$DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)
if ($DotNetGlobal.PSObject.Properties["sdk"] -and $DotNetGlobal.sdk.PSObject.Properties["version"]) {
$DotNetVersion = $DotNetGlobal.sdk.version
}
}

# If dotnet is installed locally, and expected version is not set or installation matches the expected version
if ((Get-Command "dotnet" -ErrorAction SilentlyContinue) -ne $null -and `
(!(Test-Path variable:DotNetVersion) -or $(& dotnet --version) -eq $DotNetVersion)) {
# If dotnet CLI is installed globally and it matches requested version, use for execution
if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue) -and `
$(dotnet --version) -and $LASTEXITCODE -eq 0) {
$env:DOTNET_EXE = (Get-Command "dotnet").Path
}
else {
$DotNetDirectory = "$TempDirectory\dotnet-win"
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"

# Download install script
$DotNetInstallFile = "$TempDirectory\dotnet-install.ps1"
md -force $TempDirectory > $null
New-Item -ItemType Directory -Path $TempDirectory -Force | Out-Null
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
(New-Object System.Net.WebClient).DownloadFile($DotNetInstallUrl, $DotNetInstallFile)

# If global.json exists, load expected version
if (Test-Path $DotNetGlobalFile) {
$DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)
if ($DotNetGlobal.PSObject.Properties["sdk"] -and $DotNetGlobal.sdk.PSObject.Properties["version"]) {
$DotNetVersion = $DotNetGlobal.sdk.version
}
}

# Install by channel or version
$DotNetDirectory = "$TempDirectory\dotnet-win"
if (!(Test-Path variable:DotNetVersion)) {
ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
} else {
ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
}
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
}

Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"

ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false }
ExecSafe { & $env:DOTNET_EXE build $BuildProjectFile /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet }
ExecSafe { & $env:DOTNET_EXE run --project $BuildProjectFile --no-build -- $BuildArguments }
Loading

0 comments on commit df7b64e

Please sign in to comment.