Skip to content

Commit 114bb59

Browse files
committed
update tools and scripts
1 parent 4cd18f5 commit 114bb59

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

build/scripts/Paths.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ let GenerateApiChanges = false
1515

1616
let Root =
1717
let mutable dir = DirectoryInfo(".")
18-
while dir.GetFiles("*.sln").Length = 0 do dir <- dir.Parent
18+
while dir.GetFiles("*.slnx").Length = 0 do dir <- dir.Parent
1919
Environment.CurrentDirectory <- dir.FullName
2020
dir
2121

build/scripts/Targets.fs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ let exec binary args =
2525
let private restoreTools = lazy (exec "dotnet" [ "tool"; "restore" ])
2626

2727
let private currentVersion =
28-
lazy
29-
(restoreTools.Value |> ignore
30-
let r = Proc.Start("dotnet", "minver", "-d=canary", "-m=0.1")
31-
let o = r.ConsoleOut |> Seq.find (fun l -> not (l.Line.StartsWith("MinVer:")))
32-
o.Line)
28+
lazy(
29+
restoreTools.Value |> ignore
30+
let r = Proc.Start("dotnet", "minver", "-p", "canary.0", "-m", "0.1")
31+
let o = r.ConsoleOut |> Seq.find (fun l -> not(l.Line.StartsWith "MinVer:"))
32+
o.Line
33+
)
3334

3435
let private currentVersionInformational =
3536
lazy
@@ -111,8 +112,8 @@ let private generateApiChanges (arguments: ParseResults<Arguments>) =
111112

112113
let firstPath project tfms =
113114
tfms
114-
|> Seq.map (fun tfm -> (tfm, sprintf "directory|src/%s/bin/Release/%s" project Paths.MainTFM))
115-
|> Seq.where (fun (tfm, path) -> File.Exists path)
115+
|> Seq.map (fun tfm -> (tfm, $".artifacts/bin/%s{project}/release_%s{Paths.MainTFM}"))
116+
|> Seq.where (fun (tfm, path) -> Directory.Exists path)
116117
|> Seq.tryHead
117118

118119
nugetPackages

dotnet-tools.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"isRoot": true,
44
"tools": {
55
"minver-cli": {
6-
"version": "2.3.1",
6+
"version": "6.0.0",
77
"commands": [
88
"minver"
99
],
1010
"rollForward": false
1111
},
1212
"assembly-differ": {
13-
"version": "0.14.0",
13+
"version": "0.17.0",
1414
"commands": [
1515
"assembly-differ"
1616
],
1717
"rollForward": false
1818
},
1919
"release-notes": {
20-
"version": "0.6.0",
20+
"version": "0.10.0",
2121
"commands": [
2222
"release-notes"
2323
],
2424
"rollForward": false
2525
},
2626
"nupkg-validator": {
27-
"version": "0.7.0",
27+
"version": "0.10.1",
2828
"commands": [
2929
"nupkg-validator"
3030
],

examples/aspnetcore-with-serilog/AspnetCoreExample.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
1212
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
1313
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
14-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
1514
</ItemGroup>
1615
<ItemGroup>
1716
<ProjectReference Include="..\..\src\Elastic.Apm.SerilogEnricher\Elastic.Apm.SerilogEnricher.csproj" />

0 commit comments

Comments
 (0)