From 5c984059152f18fedb8b7dcdeac37eddc5b0551c Mon Sep 17 00:00:00 2001 From: Etienne Baudoux Date: Sun, 7 Apr 2024 15:54:14 -0700 Subject: [PATCH] Fixed mac build --- .github/workflows/ci.yml | 4 ++-- .nuke/build.schema.json | 2 -- src/build/Build.cs | 25 +++---------------------- src/build/_build.csproj | 3 ++- 4 files changed, 7 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a035f1fcc4..714d6ed6c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,8 +50,8 @@ jobs: - name: 'Run: RunTests' run: ./build.cmd RunTests macos-latest: - name: macos-latest - runs-on: macos-latest + name: macos-14 + runs-on: macos-14 timeout-minutes: 30 steps: - uses: actions/checkout@v3 diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index fe11dc4721..46b10a48b5 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -84,7 +84,6 @@ "Compile", "CompileGenerators", "GenerateSdkNuGet", - "PreliminaryCheck", "PublishApp", "Restore", "RunTests", @@ -102,7 +101,6 @@ "Compile", "CompileGenerators", "GenerateSdkNuGet", - "PreliminaryCheck", "PublishApp", "Restore", "RunTests", diff --git a/src/build/Build.cs b/src/build/Build.cs index 81f5f760ca..706d677157 100644 --- a/src/build/Build.cs +++ b/src/build/Build.cs @@ -17,7 +17,6 @@ using static RestoreTask; using Project = Nuke.Common.ProjectModel.Project; -#pragma warning disable IDE1006 // Naming Styles [GitHubActions( name: "ci", GitHubActionsImage.WindowsLatest, @@ -49,30 +48,13 @@ class Build : NukeBuild [Solution(SuppressBuildProjectCheck = true)] readonly Solution? LinuxSolution; - Target PreliminaryCheck => _ => _ - .Before(Clean) - .Executes(() => - { - if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 0, 0)) - { - Assert.Fail("To build Windows app, you need to run on Windows 10 or later."); - return; - } - - Log.Information("Preliminary checks are successful."); - }); - Target Clean => _ => _ - .DependsOn(PreliminaryCheck) .Executes(() => { - if (!Debugger.IsAttached) - { - RootDirectory + RootDirectory .GlobDirectories("bin", "obj", "packages", "publish") .ForEach(path => path.CreateOrCleanDirectory()); - Log.Information("Cleaned bin, obj, packages and publish folders."); - } + Log.Information("Cleaned bin, obj, packages and publish folders."); }); Target Restore => _ => _ @@ -134,7 +116,7 @@ class Build : NukeBuild } DotNetBuild(s => s - .SetProjectFile(solution.Path) + .SetProjectFile(solution) .SetConfiguration(Configuration) .SetVerbosity(DotNetVerbosity.quiet)); }); @@ -403,5 +385,4 @@ IEnumerable GetDotnetParametersForMacOSApp() throw new NotSupportedException(); } } -#pragma warning restore IDE1006 // Naming Styles } diff --git a/src/build/_build.csproj b/src/build/_build.csproj index ef862c72b6..960f81079d 100644 --- a/src/build/_build.csproj +++ b/src/build/_build.csproj @@ -5,10 +5,11 @@ Exe $(NetCore) - CS0649;CS0169 + CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006 ..\.. ..\.. 1 + false false