diff --git a/.nuke/.gitignore b/.fallout/.gitignore similarity index 100% rename from .nuke/.gitignore rename to .fallout/.gitignore diff --git a/.nuke/build.schema.json b/.fallout/build.schema.json similarity index 98% rename from .nuke/build.schema.json rename to .fallout/build.schema.json index 83fef7a..2a93259 100644 --- a/.nuke/build.schema.json +++ b/.fallout/build.schema.json @@ -48,7 +48,7 @@ "Quiet" ] }, - "NukeBuild": { + "FalloutBuild": { "properties": { "Continue": { "type": "boolean", @@ -138,7 +138,7 @@ } }, { - "$ref": "#/definitions/NukeBuild" + "$ref": "#/definitions/FalloutBuild" } ] } diff --git a/.nuke/parameters.json b/.fallout/parameters.json similarity index 100% rename from .nuke/parameters.json rename to .fallout/parameters.json diff --git a/.packageguard/cache.bin b/.packageguard/cache.bin index 0745243..7bfac18 100644 Binary files a/.packageguard/cache.bin and b/.packageguard/cache.bin differ diff --git a/Build/Build.cs b/Build/Build.cs index ab566fe..91c671b 100644 --- a/Build/Build.cs +++ b/Build/Build.cs @@ -1,21 +1,21 @@ using System; using System.Linq; -using Nuke.Common; -using Nuke.Common.CI.GitHubActions; -using Nuke.Common.IO; -using Nuke.Common.ProjectModel; -using Nuke.Common.Tooling; -using Nuke.Common.Tools.Coverlet; -using Nuke.Common.Tools.DotNet; -using Nuke.Common.Tools.GitVersion; -using Nuke.Common.Tools.ReportGenerator; -using Nuke.Common.Utilities; -using Nuke.Common.Utilities.Collections; -using static Nuke.Common.Tools.DotNet.DotNetTasks; -using static Nuke.Common.Tools.ReportGenerator.ReportGeneratorTasks; +using Fallout.Common; +using Fallout.Common.CI.GitHubActions; +using Fallout.Common.IO; +using Fallout.Common.ProjectModel; +using Fallout.Common.Tooling; +using Fallout.Common.Tools.Coverlet; +using Fallout.Common.Tools.DotNet; +using Fallout.Common.Tools.GitVersion; +using Fallout.Common.Tools.ReportGenerator; +using Fallout.Common.Utilities; +using Fallout.Common.Utilities.Collections; +using static Fallout.Common.Tools.DotNet.DotNetTasks; +using static Fallout.Common.Tools.ReportGenerator.ReportGeneratorTasks; using static Serilog.Log; -class Build : NukeBuild +class Build : FalloutBuild { /// Support plugins are available for: /// - JetBrains ReSharper https://nuke.build/resharper @@ -48,7 +48,7 @@ class Build : NukeBuild [Solution(GenerateProjects = true)] readonly Solution Solution; - [GitVersion(Framework = "net8.0", NoFetch = true, NoCache = true)] + [GitVersion(Framework = "net10.0", NoFetch = true, NoCache = true)] readonly GitVersion GitVersion; AbsolutePath ArtifactsDirectory => RootDirectory / "Artifacts"; @@ -114,7 +114,7 @@ class Build : NukeBuild .DependsOn(Compile) .Executes(() => { - InspectCode($"Mockly.sln -o={ArtifactsDirectory / "CodeIssues.sarif"} --no-build"); + InspectCode($"Mockly.sln -o={ArtifactsDirectory / "CodeIssues.sarif"} --no-build --dotnetcoresdk=10.0.300"); }); Target RunTests => _ => _ diff --git a/Build/Configuration.cs b/Build/Configuration.cs index 78049f7..fe274ae 100644 --- a/Build/Configuration.cs +++ b/Build/Configuration.cs @@ -1,5 +1,5 @@ using System.ComponentModel; -using Nuke.Common.Tooling; +using Fallout.Common.Tooling; [TypeConverter(typeof(TypeConverter))] public class Configuration : Enumeration diff --git a/Build/_build.csproj b/Build/_build.csproj index 1a90d6f..e7ca7f5 100644 --- a/Build/_build.csproj +++ b/Build/_build.csproj @@ -2,22 +2,22 @@ Exe - net8.0 + net10.0 CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006 - .. - .. - 1 + .. + .. + 1 false - - + + - - + + diff --git a/Directory.Build.props b/Directory.Build.props index 0236a73..f5ad880 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -39,7 +39,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Mockly.Specs/Mockly.Specs.csproj b/Mockly.Specs/Mockly.Specs.csproj index 1a5dd04..508a41a 100644 --- a/Mockly.Specs/Mockly.Specs.csproj +++ b/Mockly.Specs/Mockly.Specs.csproj @@ -18,7 +18,7 @@ - + diff --git a/build.ps1 b/build.ps1 index 4634dc0..27eeef1 100644 --- a/build.ps1 +++ b/build.ps1 @@ -14,7 +14,7 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent ########################################################################### $BuildProjectFile = "$PSScriptRoot\build\_build.csproj" -$TempDirectory = "$PSScriptRoot\\.nuke\temp" +$TempDirectory = "$PSScriptRoot\\.fallout\temp" $DotNetGlobalFile = "$PSScriptRoot\\global.json" $DotNetInstallUrl = "https://dot.net/v1/dotnet-install.ps1" diff --git a/build.sh b/build.sh index fdff0c6..a3dad0d 100644 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd) ########################################################################### BUILD_PROJECT_FILE="$SCRIPT_DIR/build/_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" diff --git a/global.json b/global.json index 368a14e..62d63c9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "10.0.300", "rollForward": "latestMajor" } }