Skip to content

Commit cedbf45

Browse files
dennisdoomendennisdoomen
committed
Bump all dependencies
1 parent fddf4cf commit cedbf45

File tree

12 files changed

+144
-129
lines changed

12 files changed

+144
-129
lines changed

‎.github/dependabot.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
day: "monday"
8+
time: "16:00"
9+
timezone: "Europe/Copenhagen"
10+
11+
- package-ecosystem: "nuget"
12+
directory: "/"
13+
schedule:
14+
interval: "weekly"
15+
day: "monday"
16+
time: "16:00"
17+
timezone: "Europe/Copenhagen"
18+
groups:
19+
xunit:
20+
patterns:
21+
- "xunit*"
22+
- "Verify*"
23+
nuke:
24+
patterns:
25+
- "Nuke*"
26+

‎.nuke/build.schema.json‎

Lines changed: 77 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,70 @@
11
{
22
"$schema": "http://json-schema.org/draft-04/schema#",
3-
"$ref": "#/definitions/build",
4-
"title": "Build Schema",
53
"definitions": {
6-
"build": {
7-
"type": "object",
4+
"Host": {
5+
"type": "string",
6+
"enum": [
7+
"AppVeyor",
8+
"AzurePipelines",
9+
"Bamboo",
10+
"Bitbucket",
11+
"Bitrise",
12+
"GitHubActions",
13+
"GitLab",
14+
"Jenkins",
15+
"Rider",
16+
"SpaceAutomation",
17+
"TeamCity",
18+
"Terminal",
19+
"TravisCI",
20+
"VisualStudio",
21+
"VSCode"
22+
]
23+
},
24+
"ExecutableTarget": {
25+
"type": "string",
26+
"enum": [
27+
"ApiChecks",
28+
"CalculateNugetVersion",
29+
"Clean",
30+
"CodeCoverage",
31+
"Compile",
32+
"Pack",
33+
"Push",
34+
"Restore",
35+
"UnitTests",
36+
"UnitTestsNetCore",
37+
"UnitTestsNetFramework"
38+
]
39+
},
40+
"Verbosity": {
41+
"type": "string",
42+
"description": "",
43+
"enum": [
44+
"Verbose",
45+
"Normal",
46+
"Minimal",
47+
"Quiet"
48+
]
49+
},
50+
"NukeBuild": {
851
"properties": {
952
"Continue": {
1053
"type": "boolean",
1154
"description": "Indicates to continue a previously failed build attempt"
1255
},
13-
"GenerateBinLog": {
14-
"type": "boolean",
15-
"description": "Use this parameter if you encounter build problems in any way, to generate a .binlog file which holds some useful information"
16-
},
1756
"Help": {
1857
"type": "boolean",
1958
"description": "Shows the help text for this build assembly"
2059
},
2160
"Host": {
22-
"type": "string",
2361
"description": "Host for execution. Default is 'automatic'",
24-
"enum": [
25-
"AppVeyor",
26-
"AzurePipelines",
27-
"Bamboo",
28-
"Bitbucket",
29-
"Bitrise",
30-
"GitHubActions",
31-
"GitLab",
32-
"Jenkins",
33-
"Rider",
34-
"SpaceAutomation",
35-
"TeamCity",
36-
"Terminal",
37-
"TravisCI",
38-
"VisualStudio",
39-
"VSCode"
40-
]
62+
"$ref": "#/definitions/Host"
4163
},
4264
"NoLogo": {
4365
"type": "boolean",
4466
"description": "Disables displaying the NUKE logo"
4567
},
46-
"NuGetApiKey": {
47-
"type": "string",
48-
"description": "The key to push to Nuget",
49-
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
50-
},
5168
"Partition": {
5269
"type": "string",
5370
"description": "Partition to use on CI"
@@ -71,57 +88,46 @@
7188
"type": "array",
7289
"description": "List of targets to be skipped. Empty list skips all dependencies",
7390
"items": {
74-
"type": "string",
75-
"enum": [
76-
"ApiChecks",
77-
"CalculateNugetVersion",
78-
"Clean",
79-
"CodeCoverage",
80-
"Compile",
81-
"Pack",
82-
"Push",
83-
"Restore",
84-
"UnitTests",
85-
"UnitTestsNetCore",
86-
"UnitTestsNetFramework"
87-
]
91+
"$ref": "#/definitions/ExecutableTarget"
8892
}
8993
},
90-
"Solution": {
91-
"type": "string",
92-
"description": "Path to a solution file that is automatically loaded"
93-
},
9494
"Target": {
9595
"type": "array",
9696
"description": "List of targets to be invoked. Default is '{default_target}'",
9797
"items": {
98-
"type": "string",
99-
"enum": [
100-
"ApiChecks",
101-
"CalculateNugetVersion",
102-
"Clean",
103-
"CodeCoverage",
104-
"Compile",
105-
"Pack",
106-
"Push",
107-
"Restore",
108-
"UnitTests",
109-
"UnitTestsNetCore",
110-
"UnitTestsNetFramework"
111-
]
98+
"$ref": "#/definitions/ExecutableTarget"
11299
}
113100
},
114101
"Verbosity": {
115-
"type": "string",
116102
"description": "Logging verbosity during build execution. Default is 'Normal'",
117-
"enum": [
118-
"Minimal",
119-
"Normal",
120-
"Quiet",
121-
"Verbose"
122-
]
103+
"$ref": "#/definitions/Verbosity"
104+
}
105+
}
106+
}
107+
},
108+
"allOf": [
109+
{
110+
"properties": {
111+
"GenerateBinLog": {
112+
"type": [
113+
"boolean",
114+
"null"
115+
],
116+
"description": "Use this parameter if you encounter build problems in any way, to generate a .binlog file which holds some useful information"
117+
},
118+
"NuGetApiKey": {
119+
"type": "string",
120+
"description": "The key to push to Nuget",
121+
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
122+
},
123+
"Solution": {
124+
"type": "string",
125+
"description": "Path to a solution file that is automatically loaded"
123126
}
124127
}
128+
},
129+
{
130+
"$ref": "#/definitions/NukeBuild"
125131
}
126-
}
132+
]
127133
}

‎Build/Build.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.Linq;
4-
using LibGit2Sharp;
53
using Nuke.Common;
64
using Nuke.Common.CI.GitHubActions;
75
using Nuke.Common.Execution;
@@ -12,10 +10,8 @@
1210
using Nuke.Common.Tools.GitVersion;
1311
using Nuke.Common.Tools.ReportGenerator;
1412
using Nuke.Common.Tools.Xunit;
13+
using Nuke.Common.Utilities;
1514
using Nuke.Common.Utilities.Collections;
16-
using Nuke.Components;
17-
using static Nuke.Common.IO.FileSystemTasks;
18-
using static Nuke.Common.IO.PathConstruction;
1915
using static Nuke.Common.Tools.DotNet.DotNetTasks;
2016
using static Nuke.Common.Tools.ReportGenerator.ReportGeneratorTasks;
2117
using static Nuke.Common.Tools.Xunit.XunitTasks;

‎Build/_build.csproj‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RootNamespace></RootNamespace>
66
<NoWarn>CS0649;CS0169</NoWarn>
77
<NukeRootDirectory>..\</NukeRootDirectory>
88
<NukeScriptDirectory>..\</NukeScriptDirectory>
9+
<NukeTelemetryVersion>1</NukeTelemetryVersion>
910
</PropertyGroup>
1011
<ItemGroup>
1112
<PackageDownload Include="GitVersion.Tool" Version="[5.12.0]" />
1213
<PackageDownload Include="ReportGenerator" Version="[5.1.23]" />
1314
<PackageDownload Include="xunit.runner.console" Version="[2.5.0]" />
14-
<PackageReference Include="LibGit2Sharp" Version="0.27.2" />
15-
<PackageReference Include="Nuke.Common" Version="7.0.6" />
16-
<PackageReference Include="Nuke.Components" Version="7.0.6" />
15+
<PackageReference Include="LibGit2Sharp" Version="0.31.0" />
16+
<PackageReference Include="Nuke.Common" Version="9.0.3" />
17+
<PackageReference Include="Nuke.Components" Version="9.0.3" />
1718
</ItemGroup>
1819
</Project>

‎Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
30-
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.4">
30+
<PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.8.5">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3333
</PackageReference>
34-
<PackageReference Include="Roslynator.Analyzers" Version="4.12.9">
34+
<PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>
38-
<PackageReference Include="Meziantou.Analyzer" Version="2.0.182">
38+
<PackageReference Include="Meziantou.Analyzer" Version="2.0.184">
3939
<PrivateAssets>all</PrivateAssets>
4040
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4141
</PackageReference>

‎Src/FluentAssertions.DataSets/FluentAssertions.DataSets.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<ItemGroup Label="Analyzers">
4141
<AdditionalFiles Include="BannedSymbols.txt" />
4242
<PackageReference Include="FluentAssertions" Version="8.0.0-alpha.1" />
43-
<PackageReference Include="JetBrains.Annotations" Version="2023.2.0" PrivateAssets="all" />
44-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
43+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="all" />
44+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4545
<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
4646
</ItemGroup>
4747

‎Tests/Approval.Tests/Approval.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
15+
<PackageReference Include="PublicApiGenerator" Version="11.3.0" />
1616
<PackageReference Include="Verify.DiffPlex" Version="3.1.2" />
17-
<PackageReference Include="Verify.Xunit" Version="28.0.0" />
17+
<PackageReference Include="Verify.Xunit" Version="28.7.1" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎Tests/FluentAssertions.DataSets.Specs/FluentAssertions.DataSets.Specs.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<ItemGroup>
2121
<PackageReference Include="xunit" Version="2.9.2" />
2222
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
23-
<PackageReference Include="coverlet.collector" Version="6.0.2" PrivateAssets="all">
23+
<PackageReference Include="coverlet.collector" Version="6.0.3" PrivateAssets="all">
2424
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2525
</PackageReference>
2626
</ItemGroup>

‎build.cmd‎

100644100755
File mode changed.

‎build.ps1‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
1414
###########################################################################
1515

1616
$BuildProjectFile = "$PSScriptRoot\build\_build.csproj"
17-
$TempDirectory = "$PSScriptRoot\.nuke\temp"
17+
$TempDirectory = "$PSScriptRoot\\.nuke\temp"
1818

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

23-
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
2423
$env:DOTNET_CLI_TELEMETRY_OPTOUT = 1
25-
$env:DOTNET_MULTILEVEL_LOOKUP = 0
26-
$env:DOTNET_ROLL_FORWARD = "Major"
27-
$env:NUKE_TELEMETRY_OPTOUT = 1
28-
$env:DOTNET_CLI_UI_LANGUAGE = "en-US"
24+
$env:DOTNET_NOLOGO = 1
2925

3026
###########################################################################
3127
# EXECUTION
@@ -36,18 +32,9 @@ function ExecSafe([scriptblock] $cmd) {
3632
if ($LASTEXITCODE) { exit $LASTEXITCODE }
3733
}
3834

39-
# Print environment variables
40-
# WARNING: Make sure that secrets are actually scrambled in build log
41-
# Get-Item -Path Env:* | Sort-Object -Property Name | ForEach-Object {"{0}={1}" -f $_.Name,$_.Value}
42-
43-
# Check if any dotnet is installed
44-
if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue)) {
45-
ExecSafe { & dotnet --info }
46-
}
47-
4835
# If dotnet CLI is installed globally and it matches requested version, use for execution
4936
if ($null -ne (Get-Command "dotnet" -ErrorAction SilentlyContinue) -and `
50-
$(dotnet --version) -and $LASTEXITCODE -eq 0) {
37+
$(dotnet --version) -and $LASTEXITCODE -eq 0) {
5138
$env:DOTNET_EXE = (Get-Command "dotnet").Path
5239
}
5340
else {
@@ -73,9 +60,15 @@ else {
7360
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
7461
}
7562
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
63+
$env:PATH = "$DotNetDirectory;$env:PATH"
7664
}
7765

78-
Write-Output "Microsoft (R) .NET Core SDK version $(& $env:DOTNET_EXE --version)"
66+
Write-Output "Microsoft (R) .NET SDK version $(& $env:DOTNET_EXE --version)"
67+
68+
if (Test-Path env:NUKE_ENTERPRISE_TOKEN) {
69+
& $env:DOTNET_EXE nuget remove source "nuke-enterprise" > $null
70+
& $env:DOTNET_EXE nuget add source "https://f.feedz.io/nuke/enterprise/nuget" --name "nuke-enterprise" --username "PAT" --password $env:NUKE_ENTERPRISE_TOKEN > $null
71+
}
7972

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

0 commit comments

Comments
 (0)