Skip to content

Commit ec9c169

Browse files
authored
Update Nuke to 9.0.4 (#56)
* Update Dependencies * nuke-owned updates * set octoversion framework to net8 to see if it helps
1 parent 073ada0 commit ec9c169

File tree

6 files changed

+35
-30
lines changed

6 files changed

+35
-30
lines changed

.nuke/build.schema.json

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"properties": {
4-
"AutoDetectBranch": {
5-
"type": "boolean",
6-
"description": "Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI"
7-
},
8-
"OCTOVERSION_CurrentBranch": {
9-
"type": "string",
10-
"description": "Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable OCTOVERSION_CurrentBranch"
11-
},
12-
"Solution": {
13-
"type": "string",
14-
"description": "Path to a solution file that is automatically loaded"
15-
},
16-
"where": {
17-
"type": "string",
18-
"description": "Test filter expression"
19-
}
20-
},
213
"definitions": {
224
"Host": {
235
"type": "string",
@@ -118,5 +100,29 @@
118100
}
119101
}
120102
},
121-
"$ref": "#/definitions/NukeBuild"
103+
"allOf": [
104+
{
105+
"properties": {
106+
"AutoDetectBranch": {
107+
"type": "boolean",
108+
"description": "Whether to auto-detect the branch name - this is okay for a local build, but should not be used under CI"
109+
},
110+
"OCTOVERSION_CurrentBranch": {
111+
"type": "string",
112+
"description": "Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable OCTOVERSION_CurrentBranch"
113+
},
114+
"Solution": {
115+
"type": "string",
116+
"description": "Path to a solution file that is automatically loaded"
117+
},
118+
"where": {
119+
"type": "string",
120+
"description": "Test filter expression"
121+
}
122+
}
123+
},
124+
{
125+
"$ref": "#/definitions/NukeBuild"
126+
}
127+
]
122128
}

build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@ $DotNetGlobalFile = "$PSScriptRoot\\global.json"
2020
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
2121
$DotNetChannel = "STS"
2222

23-
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
2423
$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
25-
$env:DOTNET_MULTILEVEL_LOOKUP = 0
24+
$env:DOTNET_NOLOGO = 1
2625

2726
###########################################################################
2827
# EXECUTION
@@ -61,6 +60,7 @@ else {
6160
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
6261
}
6362
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
63+
$env:PATH = "$DotNetDirectory;$env:PATH"
6464
}
6565

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

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
1717
DOTNET_CHANNEL="STS"
1818

1919
export DOTNET_CLI_TELEMETRY_OPTOUT=1
20-
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
21-
export DOTNET_MULTILEVEL_LOOKUP=0
20+
export DOTNET_NOLOGO=1
2221

2322
###########################################################################
2423
# EXECUTION
@@ -54,6 +53,7 @@ else
5453
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "$DOTNET_VERSION" --no-path
5554
fi
5655
export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
56+
export PATH="$DOTNET_DIRECTORY:$PATH"
5757
fi
5858

5959
echo "Microsoft (R) .NET SDK version $("$DOTNET_EXE" --version)"

build/Build.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using Nuke.Common.Tools.OctoVersion;
1010
using Nuke.Common.Utilities.Collections;
1111
using Serilog;
12-
using static Nuke.Common.IO.FileSystemTasks;
1312
using static Nuke.Common.Tools.DotNet.DotNetTasks;
1413

1514
[ShutdownDotNetAfterServerBuild]
@@ -27,7 +26,7 @@ class Build : NukeBuild
2726
[Parameter("Branch name for OctoVersion to use to calculate the version number. Can be set via the environment variable " + CiBranchNameEnvVariable + ".", Name = CiBranchNameEnvVariable)]
2827
string BranchName { get; set; }
2928

30-
[OctoVersion(BranchMember = nameof(BranchName), AutoDetectBranchMember = nameof(AutoDetectBranch), Framework = "net6.0")]
29+
[OctoVersion(BranchMember = nameof(BranchName), AutoDetectBranchMember = nameof(AutoDetectBranch), Framework = "net8.0")]
3130
public OctoVersionInfo OctoVersionInfo;
3231

3332
[Parameter("Test filter expression", Name = "where")] readonly string TestFilter = string.Empty;

build/_build.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Nuke.Common" Version="8.1.2" />
14+
<PackageReference Include="Nuke.Common" Version="9.0.4" />
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageDownload Include="Octopus.OctoVersion.Tool" Version="[1.0.0]" />
18+
<PackageDownload Include="Octopus.OctoVersion.Tool" Version="[1.0.9]" />
1919
</ItemGroup>
2020

2121
</Project>

source/Octodiff.Tests/Octodiff.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
23-
<PackageReference Include="NUnit" Version="4.2.2" />
22+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
23+
<PackageReference Include="NUnit" Version="4.3.2" />
2424
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
2525
</ItemGroup>
2626

@@ -40,6 +40,6 @@
4040
</ItemGroup>
4141

4242
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
43-
<PackageReference Include="System.IO.Packaging" Version="8.0.1" />
43+
<PackageReference Include="System.IO.Packaging" Version="9.0.1" />
4444
</ItemGroup>
4545
</Project>

0 commit comments

Comments
 (0)