Skip to content

Commit 0f9155d

Browse files
committed
Update to use roll forward
1 parent 6e8db8b commit 0f9155d

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ jobs:
4242
name: Build
4343
- run: ./build.sh generatepackages -s true
4444
name: Generate local nuget packages
45-
# - run: ./build.sh validatepackages -s true
46-
# name: "validate *.npkg files that were created"
45+
- run: ./build.sh validatepackages -s true
46+
name: "validate *.npkg files that were created"
4747
- run: ./build.sh generateapichanges -s true
4848
name: "Inspect public API changes"
4949

build/scripts/Targets.fs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ let private currentVersion =
1717
lazy(
1818
restoreTools.Value |> ignore
1919
let r = Proc.Start("dotnet", "minver", "-p", "canary.0")
20-
let o = r.ConsoleOut |> Seq.find (fun l -> not(l.Line.StartsWith("MinVer:")))
20+
let o = r.ConsoleOut |> Seq.find (fun l -> not(l.Line.StartsWith "MinVer:"))
2121
o.Line
2222
)
2323

@@ -45,19 +45,19 @@ let private generatePackages (arguments:ParseResults<Arguments>) =
4545

4646
let private validatePackages (arguments:ParseResults<Arguments>) =
4747
let nugetPackage =
48-
let p = Paths.Output.GetFiles("*.nupkg") |> Seq.sortByDescending(fun f -> f.CreationTimeUtc) |> Seq.head
48+
let p = Paths.Output.GetFiles "*.nupkg" |> Seq.sortByDescending(fun f -> f.CreationTimeUtc) |> Seq.head
4949
Paths.RootRelative p.FullName
50-
exec "dotnet" ["nupkg-validator"; nugetPackage; "-v"; currentVersionInformational.Value; "-a"; Paths.ToolName; "-k"; "96c599bbe3e70f5d"] |> ignore
50+
exec "dotnet" ["nupkg-validator"; nugetPackage; "-v"; currentVersionInformational.Value; "-a"; Paths.ToolName; "-k"; "96c599bbe3e70f5d"; "--allow-roll-forward"] |> ignore
5151

5252
let private generateApiChanges (arguments:ParseResults<Arguments>) =
5353
let output = Paths.RootRelative <| Paths.Output.FullName
5454
let currentVersion = currentVersion.Value
5555
let project = Paths.RootRelative Paths.ToolProject.FullName
56-
let dotnetRun =[ "run"; "-c"; "Release"; "-f"; "net6.0"; "--project"; project]
56+
let dotnetRun =[ "run"; "-c"; "Release"; "-f"; "net9.0"; "--project"; project]
5757
let args =
5858
[
59-
(sprintf "previous-nuget|%s|%s|netcoreapp3.1" Paths.ToolName currentVersion);
60-
(sprintf "directory|src/%s/bin/Release/net6.0" Paths.ToolName);
59+
sprintf "previous-nuget|%s|%s|net8.0" Paths.ToolName currentVersion;
60+
sprintf "directory|src/%s/bin/Release/net9.0" Paths.ToolName;
6161
"--target"; Paths.ToolName; "-f"; "github-comment"; "--output"; output
6262
]
6363

0 commit comments

Comments
 (0)