diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 8eba8f4..0c21490 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -36,7 +36,8 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 9.x + 9.0.1xx + dotnet-quality: 'daily' - name: 'Cache: .nuke/temp, ~/.nuget/packages' uses: actions/cache@v4 with: @@ -55,7 +56,8 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 9.x + 9.0.1xx + dotnet-quality: 'daily' - name: 'Cache: .nuke/temp, ~/.nuget/packages' uses: actions/cache@v4 with: @@ -74,7 +76,8 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: | - 9.x + 9.0.1xx + dotnet-quality: 'daily' - name: 'Cache: .nuke/temp, ~/.nuget/packages' uses: actions/cache@v4 with: diff --git a/build/Build.cs b/build/Build.cs index 943d788..db0c3bc 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -26,7 +26,8 @@ OnPushBranches = [MainBranch, DevelopBranch], PublishArtifacts = false // FetchDepth = 0 // fetch full history - , SetupDotnetVersions = ["9.x",] + , SetupDotnetVersions = ["9.0.1xx",] + , SetupDotnetQuality = DotnetVersionQuality.Daily , InvokedTargets = [ nameof(ITest.Test), nameof(IUseLinters.InstallLinters), @@ -84,11 +85,13 @@ public T From() //From().Linter, ]; + AbsolutePath ToolsManifestPath => RootDirectory / ".config" / "dotnet-tools.json"; + // csharpier-ignore public Target RestoreTools => _ => _ .Before(it => it.Restore) .DependentFor(it => it.InstallLinters) - .Executes(() => DotNetToolRestore()) + .Executes(() => DotNetToolRestore(it => it.SetToolManifest(ToolsManifestPath))) ; public SolutionFolder SrcFolder => CurrentSolution.GetSolutionFolder("src"); diff --git a/build/_build.csproj b/build/_build.csproj index 97a71ea..82bc74e 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -15,9 +15,9 @@ - - - + + + diff --git a/global.json b/global.json index 2bc13e8..49cfff7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.100", + "version": "9.0.102", "rollForward": "latestMinor" } } diff --git a/src/Visp.Compiler/CoreParser.fs b/src/Visp.Compiler/CoreParser.fs index a49d5c8..a9c844e 100644 --- a/src/Visp.Compiler/CoreParser.fs +++ b/src/Visp.Compiler/CoreParser.fs @@ -24,8 +24,6 @@ type ParserOptions = { ParserOptions.Default with ReturnLast = false } - - module CoreParser = open Visp.Compiler.Syntax open System.Collections.Generic diff --git a/tests/PrettyPrinter.UnitTests/PrettyPrinter.UnitTests.fsproj b/tests/PrettyPrinter.UnitTests/PrettyPrinter.UnitTests.fsproj index 084bfb4..1f2c6f9 100644 --- a/tests/PrettyPrinter.UnitTests/PrettyPrinter.UnitTests.fsproj +++ b/tests/PrettyPrinter.UnitTests/PrettyPrinter.UnitTests.fsproj @@ -22,7 +22,7 @@ all - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Visp.Compiler.UnitTests/Visp.Compiler.UnitTests.fsproj b/tests/Visp.Compiler.UnitTests/Visp.Compiler.UnitTests.fsproj index bab2f5e..c9fab43 100644 --- a/tests/Visp.Compiler.UnitTests/Visp.Compiler.UnitTests.fsproj +++ b/tests/Visp.Compiler.UnitTests/Visp.Compiler.UnitTests.fsproj @@ -19,7 +19,7 @@ all - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Visp.ExecutionTests/Visp.ExecutionTests.fsproj b/tests/Visp.ExecutionTests/Visp.ExecutionTests.fsproj index 7d7597d..63c2500 100644 --- a/tests/Visp.ExecutionTests/Visp.ExecutionTests.fsproj +++ b/tests/Visp.ExecutionTests/Visp.ExecutionTests.fsproj @@ -24,7 +24,7 @@ all - + runtime; build; native; contentfiles; analyzers; buildtransitive