Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .nuke/build.schema.json → .fallout/build.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"Quiet"
]
},
"NukeBuild": {
"FalloutBuild": {
"properties": {
"Continue": {
"type": "boolean",
Expand Down Expand Up @@ -135,7 +135,7 @@
}
},
{
"$ref": "#/definitions/NukeBuild"
"$ref": "#/definitions/FalloutBuild"
}
]
}
File renamed without changes.
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<PackageVersion Include="aweXpect.Mockolate" Version="3.1.0"/>
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Nuke.Common" Version="10.1.0"/>
<PackageVersion Include="Nuke.Components" Version="10.1.0"/>
<PackageVersion Include="Fallout.Common" Version="10.3.49"/>
<PackageVersion Include="Fallout.Components" Version="10.3.49"/>
<PackageVersion Include="LibGit2Sharp" Version="0.31.0"/>
<PackageVersion Include="SharpCompress" Version="0.49.1"/>
</ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions Pipeline/Build.ApiChecks.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Nuke.Common;
using Nuke.Common.ProjectModel;
using Nuke.Common.Tooling;
using Nuke.Common.Tools.DotNet;
using static Nuke.Common.Tools.DotNet.DotNetTasks;
using Fallout.Common;
using Fallout.Common.ProjectModel;
using Fallout.Common.Tooling;
using Fallout.Common.Tools.DotNet;
using static Fallout.Common.Tools.DotNet.DotNetTasks;

// ReSharper disable AllUnderscoreLocalParameterName

Expand Down
4 changes: 2 additions & 2 deletions Pipeline/Build.CodeAnalysis.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Nuke.Common;
using Nuke.Common.Tools.SonarScanner;
using Fallout.Common;
using Fallout.Common.Tools.SonarScanner;

// ReSharper disable AllUnderscoreLocalParameterName

Expand Down
8 changes: 4 additions & 4 deletions Pipeline/Build.CodeCoverage.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Nuke.Common;
using Nuke.Common.Tooling;
using Nuke.Common.Tools.ReportGenerator;
using static Nuke.Common.Tools.ReportGenerator.ReportGeneratorTasks;
using Fallout.Common;
using Fallout.Common.Tooling;
using Fallout.Common.Tools.ReportGenerator;
using static Fallout.Common.Tools.ReportGenerator.ReportGeneratorTasks;

// ReSharper disable AllUnderscoreLocalParameterName

Expand Down
14 changes: 7 additions & 7 deletions Pipeline/Build.Compile.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System;
using System.Linq;
using Nuke.Common;
using Nuke.Common.IO;
using Nuke.Common.Tools.DotNet;
using Nuke.Common.Tools.GitVersion;
using Nuke.Common.Utilities;
using Nuke.Common.Utilities.Collections;
using Fallout.Common;
using Fallout.Common.IO;
using Fallout.Common.Tools.DotNet;
using Fallout.Common.Tools.GitVersion;
using Fallout.Common.Utilities;
using Fallout.Common.Utilities.Collections;
using Serilog;
using static Nuke.Common.Tools.DotNet.DotNetTasks;
using static Fallout.Common.Tools.DotNet.DotNetTasks;

// ReSharper disable AllUnderscoreLocalParameterName

Expand Down
10 changes: 5 additions & 5 deletions Pipeline/Build.Pack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
using System.IO;
using System.Linq;
using System.Text;
using Nuke.Common;
using Nuke.Common.IO;
using Nuke.Common.ProjectModel;
using Nuke.Common.Utilities;
using Nuke.Common.Utilities.Collections;
using Fallout.Common;
using Fallout.Common.IO;
using Fallout.Common.ProjectModel;
using Fallout.Common.Utilities;
using Fallout.Common.Utilities.Collections;
using static Serilog.Log;

// ReSharper disable AllUnderscoreLocalParameterName
Expand Down
14 changes: 7 additions & 7 deletions Pipeline/Build.UnitTest.cs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System.IO;
using System.Linq;
using Nuke.Common;
using Nuke.Common.IO;
using Nuke.Common.ProjectModel;
using Nuke.Common.Tooling;
using Nuke.Common.Tools.DotNet;
using Nuke.Common.Tools.NUnit;
using static Nuke.Common.Tools.DotNet.DotNetTasks;
using Fallout.Common;
using Fallout.Common.IO;
using Fallout.Common.ProjectModel;
using Fallout.Common.Tooling;
using Fallout.Common.Tools.DotNet;
using Fallout.Common.Tools.NUnit;
using static Fallout.Common.Tools.DotNet.DotNetTasks;

// ReSharper disable AllUnderscoreLocalParameterName

Expand Down
12 changes: 6 additions & 6 deletions Pipeline/Build.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Nuke.Common;
using Nuke.Common.CI.GitHubActions;
using Nuke.Common.IO;
using Nuke.Common.ProjectModel;
using Nuke.Common.Tools.GitVersion;
using Fallout.Common;
using Fallout.Common.CI.GitHubActions;
using Fallout.Common.IO;
using Fallout.Common.ProjectModel;
using Fallout.Common.Tools.GitVersion;

namespace Build;

Expand All @@ -12,7 +12,7 @@ namespace Build;
AutoGenerate = false,
ImportSecrets = [nameof(GithubToken),]
)]
partial class Build : NukeBuild
partial class Build : FalloutBuild
{
[Parameter("Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
Expand Down
10 changes: 5 additions & 5 deletions Pipeline/Build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
<TargetFramework>net10.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
<NukeScriptDirectory>..</NukeScriptDirectory>
<NukeTelemetryVersion>1</NukeTelemetryVersion>
<FalloutRootDirectory>..</FalloutRootDirectory>
<FalloutScriptDirectory>..</FalloutScriptDirectory>
<FalloutTelemetryVersion>1</FalloutTelemetryVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="LibGit2Sharp" />
<PackageReference Include="Nuke.Common" />
<PackageReference Include="Nuke.Components" />
<PackageReference Include="Fallout.Common" />
<PackageReference Include="Fallout.Components" />
<PackageReference Include="SharpCompress" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions Pipeline/BuildExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using Nuke.Common.CI.GitHubActions;
using Nuke.Common.Tools.GitVersion;
using Nuke.Common.Tools.SonarScanner;
using System;
using Fallout.Common.CI.GitHubActions;
using Fallout.Common.Tools.GitVersion;
using Fallout.Common.Tools.SonarScanner;
using Serilog;

namespace Build;
Expand Down
2 changes: 1 addition & 1 deletion Pipeline/Configuration.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.ComponentModel;
using System.Linq;
using Nuke.Common.Tooling;
using Fallout.Common.Tooling;

[TypeConverter(typeof(TypeConverter<Configuration>))]
public class Configuration : Enumeration
Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
###########################################################################

$BuildProjectFile = "$PSScriptRoot\Pipeline\Build.csproj"
$TempDirectory = "$PSScriptRoot\\.nuke\temp"
$TempDirectory = "$PSScriptRoot\\.fallout\temp"

$DotNetGlobalFile = "$PSScriptRoot\\global.json"
$DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1"
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)
###########################################################################

BUILD_PROJECT_FILE="$SCRIPT_DIR/Pipeline/Build.csproj"
TEMP_DIRECTORY="$SCRIPT_DIR//.nuke/temp"
TEMP_DIRECTORY="$SCRIPT_DIR//.fallout/temp"

DOTNET_GLOBAL_FILE="$SCRIPT_DIR//global.json"
DOTNET_INSTALL_URL="https://dot.net/v1/dotnet-install.sh"
Expand Down
Loading