Skip to content

Commit f3e6be7

Browse files
committed
Revert "[Nuke] try to fix build."
This reverts commit f77d3f1.
1 parent f77d3f1 commit f3e6be7

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

Build/Nuke/global.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

build.ps1

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
1616
$BuildProjectFile = "$PSScriptRoot\Build\Nuke\NukeBuild.csproj"
1717
$TempDirectory = "$PSScriptRoot\\.tmp"
1818

19-
$DotNetGlobalFile = "PSScriptRoot\Build\Nuke\global.json"
19+
$DotNetGlobalFile = "$PSScriptRoot\\global.json"
2020
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
2121
$DotNetChannel = "Current"
2222

@@ -32,10 +32,6 @@ function ExecSafe([scriptblock] $cmd) {
3232
if ($LASTEXITCODE) { exit $LASTEXITCODE }
3333
}
3434

35-
36-
# Print environment variables
37-
Get-Item -Path Env:* | Sort-Object -Property Name | ForEach-Object {"{0}={1}" -f $_.Name,$_.Value}
38-
3935
# If global.json exists, load expected version
4036
if (Test-Path $DotNetGlobalFile) {
4137
$DotNetGlobal = $(Get-Content $DotNetGlobalFile | Out-String | ConvertFrom-Json)

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
1212
BUILD_PROJECT_FILE="$SCRIPT_DIR/Build/Nuke/NukeBuild.csproj"
1313
TEMP_DIRECTORY="$SCRIPT_DIR//.tmp"
1414

15-
DOTNET_GLOBAL_FILE="$SCRIPT_DIR/Build/Nuke/global.json"
15+
DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
1616
DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
1717
DOTNET_CHANNEL="Current"
1818

0 commit comments

Comments
 (0)