Skip to content

Commit

Permalink
chore: Update build components and dotnet version
Browse files Browse the repository at this point in the history
  • Loading branch information
vipentti committed Dec 1, 2024
1 parent d893c51 commit cf0ab86
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 14 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
7 changes: 5 additions & 2 deletions build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -84,11 +85,13 @@ public T From<T>()
//From<IUseFSharpLint>().Linter,
];

AbsolutePath ToolsManifestPath => RootDirectory / ".config" / "dotnet-tools.json";

// csharpier-ignore
public Target RestoreTools => _ => _
.Before<IRestore>(it => it.Restore)
.DependentFor<IUseCustomLinters>(it => it.InstallLinters)
.Executes(() => DotNetToolRestore())
.Executes(() => DotNetToolRestore(it => it.SetToolManifest(ToolsManifestPath)))
;

public SolutionFolder SrcFolder => CurrentSolution.GetSolutionFolder("src");
Expand Down
6 changes: 3 additions & 3 deletions build/_build.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="8.1.4" />
<PackageReference Include="Nuke.Components" Version="8.1.4" />
<PackageReference Include="Vipentti.Nuke.Components" Version="0.5.2" />
<PackageReference Include="Nuke.Common" Version="9.0.1" />
<PackageReference Include="Nuke.Components" Version="9.0.1" />
<PackageReference Include="Vipentti.Nuke.Components" Version="0.5.3" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100",
"version": "9.0.102",
"rollForward": "latestMinor"
}
}
2 changes: 0 additions & 2 deletions src/Visp.Compiler/CoreParser.fs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ type ParserOptions =
{ ParserOptions.Default with
ReturnLast = false }



module CoreParser =
open Visp.Compiler.Syntax
open System.Collections.Generic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Verify.Xunit" Version="28.3.2" />
<PackageReference Include="Verify.Xunit" Version="28.4.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Verify.Xunit" Version="28.3.2" />
<PackageReference Include="Verify.Xunit" Version="28.4.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion tests/Visp.ExecutionTests/Visp.ExecutionTests.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Verify.Xunit" Version="28.3.2" />
<PackageReference Include="Verify.Xunit" Version="28.4.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down

0 comments on commit cf0ab86

Please sign in to comment.