Skip to content

Commit 7097c1e

Browse files
authored
Merge pull request #331 from nblumhardt/2024-rtm
Enable .NET tool major-version roll-forward, update dependencies
2 parents 3f0aa95 + 7eb36b2 commit 7097c1e

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

Build.ps1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ Clean-Output
8686
Create-ArtifactDir
8787
Restore-Packages
8888
Publish-Archives($version)
89-
# Temporarily disabled while SerilogTracing is in pre-release
90-
# Publish-DotNetTool($version)
89+
Publish-DotNetTool($version)
9190
Execute-Tests($version)
9291
Publish-Docs($version)
9392

src/Roastery/Roastery.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<PackageReference Include="Serilog" Version="3.1.1" />
10-
<PackageReference Include="SerilogTracing" Version="1.0.0-dev-00088" />
10+
<PackageReference Include="SerilogTracing" Version="1.0.0" />
1111
</ItemGroup>
1212

1313
</Project>

src/SeqCli/Cli/Features/OutputFormatFeature.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
using Seq.Api.Model;
2222
using SeqCli.Config;
2323
using SeqCli.Csv;
24-
using SeqCli.Levels;
2524
using SeqCli.Output;
2625
using Serilog;
2726
using Serilog.Core;

src/SeqCli/SeqCli.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<TreatSpecificWarningsAsErrors />
1111
<PackAsTool>true</PackAsTool>
1212
<ToolCommandName>seqcli</ToolCommandName>
13-
<LangVersion>default</LangVersion>
13+
<RollForward>Major</RollForward>
14+
<LangVersion>latest</LangVersion>
1415
<Nullable>enable</Nullable>
1516
</PropertyGroup>
1617
<ItemGroup>
@@ -34,7 +35,7 @@
3435
<PackageReference Include="Serilog.Formatting.Compact.Reader" Version="3.0.0" />
3536
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
3637
<PackageReference Include="Autofac" Version="8.0.0" />
37-
<PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
38+
<PackageReference Include="Serilog.Sinks.Seq" Version="7.0.0" />
3839
<PackageReference Include="Superpower" Version="3.0.0" />
3940
<PackageReference Include="System.Reactive" Version="6.0.0" />
4041
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />

test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Autofac" Version="8.0.0" />
9-
<PackageReference Include="xunit" Version="2.6.2" />
10-
<PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
8+
<PackageReference Include="xunit" Version="2.7.0" />
119
</ItemGroup>
1210
<ItemGroup>
1311
<None Update="Data\*">

test/SeqCli.Tests/SeqCli.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
7-
<PackageReference Include="xunit" Version="2.6.2" />
8-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
6+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
7+
<PackageReference Include="xunit" Version="2.7.0" />
8+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</PackageReference>

0 commit comments

Comments
 (0)