Skip to content

Commit ac19795

Browse files
nblumhardtnblumhardt
authored
Merge pull request #462 from nblumhardt/net10.0
Update to `net10.0` SDK and dependencies
2 parents 1dc94cb + 1fac09f commit ac19795

File tree

10 files changed

+41
-31
lines changed

10 files changed

+41
-31
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Setup
2727
uses: actions/setup-dotnet@v4
2828
with:
29-
dotnet-version: 9.0.x
29+
dotnet-version: 10.0.x
3030
- name: Compute build number
3131
shell: bash
3232
run: |

‎Directory.Version.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
33
<!-- This must match the major and minor components of the referenced Microsoft.Extensions.Configuration package. -->
4-
<VersionPrefix>9.0.1</VersionPrefix>
4+
<VersionPrefix>10.0.0</VersionPrefix>
55
</PropertyGroup>
66
</Project>

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.100",
44
"allowPrerelease": false,
55
"rollForward": "latestFeature"
66
}

‎sample/Sample/Sample.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net8.0;net9.0;net10.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<GenerateDocumentationFile>false</GenerateDocumentationFile>
77
</PropertyGroup>
@@ -15,14 +15,14 @@
1515
</ItemGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
1919
<PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
20-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
21-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
20+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
21+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
2222
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
23-
<PackageReference Include="Serilog.Expressions" Version="4.0.0" />
23+
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
2424
<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
25-
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
25+
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
2626
<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
2727
</ItemGroup>
2828

‎serilog-settings-configuration.sln.DotSettings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,7 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
560560
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
561561
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
562562
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
563+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002EMemberReordering_002EMigrations_002ECSharpFileLayoutPatternRemoveIsAttributeUpgrade/@EntryIndexedValue">True</s:Boolean>
563564
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
564565
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
565566
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>

‎serilog-settings-configuration.sln.DotSettings.user‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=1b016ada_002Dd437_002D4769_002Da97e_002D159b81809a02/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="All tests from Solution" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;
3+
&lt;Solution /&gt;
4+
&lt;/SessionState&gt;</s:String>
5+
</wpf:ResourceDictionary>

‎src/Serilog.Settings.Configuration/Serilog.Settings.Configuration.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Authors>Serilog Contributors</Authors>
66
<!-- These must match the Dependencies tab in https://www.nuget.org/packages/microsoft.extensions.configuration at
77
the target version. -->
8-
<TargetFrameworks>net462;netstandard2.0;net8.0;net9.0</TargetFrameworks>
8+
<TargetFrameworks>net462;netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
99
<PackageTags>serilog;json;appsettings</PackageTags>
1010
<PackageIcon>icon.png</PackageIcon>
1111
<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -16,16 +16,16 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="PolySharp" Version="1.13.2" PrivateAssets="All" />
20-
<PackageReference Include="Serilog" Version="4.2.0-*" />
19+
<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="All" />
20+
<PackageReference Include="Serilog" Version="4.3.0" />
2121
<None Include="..\..\assets\icon.png" Pack="true" PackagePath="" Visible="false" />
2222
<None Include="..\..\README.md" Pack="true" PackagePath="" Visible="false" />
2323
<InternalsVisibleTo Include="Serilog.Settings.Configuration.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100fb8d13fd344a1c6fe0fe83ef33c1080bf30690765bc6eb0df26ebfdf8f21670c64265b30db09f73a0dea5b3db4c9d18dbf6d5a25af5ce9016f281014d79dc3b4201ac646c451830fc7e61a2dfd633d34c39f87b81894191652df5ac63cc40c77f3542f702bda692e6e8a9158353df189007a49da0f3cfd55eb250066b19485ec" />
2424
</ItemGroup>
2525

2626
<ItemGroup>
2727
<!-- The versions of all references in this group must match the major and minor components of the package version prefix. -->
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" />
3030
</ItemGroup>
3131
</Project>

‎test/Serilog.Settings.Configuration.Tests/Serilog.Settings.Configuration.Tests.csproj‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT'">net48</TargetFrameworks>
5-
<TargetFrameworks>$(TargetFrameworks);net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>$(TargetFrameworks);net8.0;net9.0;net10.0</TargetFrameworks>
66
<DeterministicSourcePaths>false</DeterministicSourcePaths>
77
<GenerateDocumentationFile>false</GenerateDocumentationFile>
88
</PropertyGroup>
@@ -19,17 +19,20 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="CliWrap" Version="3.6.7" />
23-
<PackageReference Include="FluentAssertions" Version="6.12.2" />
24-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
25-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
26-
<PackageReference Include="NuGet.Frameworks" Version="6.12.1" />
27-
<PackageReference Include="Polly" Version="8.5.0" />
28-
<PackageReference Include="Serilog.Expressions" Version="4.0.0" />
29-
<PackageReference Include="xunit" Version="2.9.2" />
30-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
31-
<PackageReference Include="Shouldly" Version="4.2.1" />
32-
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
22+
<PackageReference Include="CliWrap" Version="3.10.0" />
23+
<PackageReference Include="FluentAssertions" Version="8.8.0" />
24+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
25+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
26+
<PackageReference Include="NuGet.Frameworks" Version="7.0.0" />
27+
<PackageReference Include="Polly" Version="8.6.4" />
28+
<PackageReference Include="Serilog.Expressions" Version="5.0.0" />
29+
<PackageReference Include="xunit" Version="2.9.3" />
30+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
31+
<PrivateAssets>all</PrivateAssets>
32+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
33+
</PackageReference>
34+
<PackageReference Include="Shouldly" Version="4.3.0" />
35+
<PackageReference Include="PublicApiGenerator" Version="11.5.1" />
3336
</ItemGroup>
3437

3538
<ItemGroup>

‎test/TestApp/TestApp.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<UseCurrentRuntimeIdentifier>true</UseCurrentRuntimeIdentifier>
1212
<SelfContained>true</SelfContained>
1313
<GenerateDocumentationFile>false</GenerateDocumentationFile>
14+
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
1415
</PropertyGroup>
1516

1617
<ItemGroup Condition="$(Configuration) == 'Debug'">
@@ -22,10 +23,10 @@
2223
</ItemGroup>
2324

2425
<ItemGroup>
25-
<PackageReference Include="Costura.Fody" Version="5.7.0" PrivateAssets="all" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
26+
<PackageReference Include="Costura.Fody" Version="6.0.0" PrivateAssets="all" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
2728
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
28-
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
29+
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
2930
</ItemGroup>
3031

3132
</Project>

‎test/TestDummies/TestDummies.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Serilog" Version="4.2.0-*" />
9+
<PackageReference Include="Serilog" Version="4.3.0" />
1010
<PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="all" />
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
1515
</ItemGroup>
1616

1717
</Project>

0 commit comments

Comments
 (0)