Skip to content

Commit def2b94

Browse files
i4004i4004
committed
[up] Microsoft.Extensions.Configuration bump to 8
[up] test deps to latest
1 parent ad102ad commit def2b94

File tree

9 files changed

+49
-40
lines changed

9 files changed

+49
-40
lines changed

‎.vscode/settings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"cref",
88
"Etcdserverpb",
99
"Grpc",
10+
"msbuild",
1011
"Mvccpb",
1112
"Protobuf",
1213
"seealso",

‎src/Etcd.Microsoft.Extensions.Configuration/CHANGELOG.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@
22

33
## [1.1.0] - 2025-10-31
44

5+
### Removed
6+
7+
- .NET 6 explicit support
8+
9+
### Added
10+
11+
- .NET 8 explicit support
12+
513
### Added
614

715
- Load credentials from environment variables overriding local settings (#10)
816

917
### Dependencies
1018

1119
- Grpc.Core bump to 2.46.6
12-
- Microsoft.Extensions.Configuration bump to 6.0.2
20+
- Microsoft.Extensions.Configuration bump to 8.0.0
1321

1422
## [1.0.4] - 2022-12-02
1523

‎src/Etcd.Microsoft.Extensions.Configuration/Etcd.Microsoft.Extensions.Configuration.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
3+
<TargetFrameworks>net8.0;netstandard2.1;netstandard2.0;net462</TargetFrameworks>
44
<LangVersion>latest</LangVersion>
55
<Nullable>enable</Nullable>
66
<EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -24,7 +24,7 @@
2424
</PropertyGroup>
2525
<ItemGroup>
2626
<PackageReference Include="dotnet-etcd" Version="4.2.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.2" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
2828
</ItemGroup>
2929
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
3030
<PackageReference Include="Grpc.Core" Version="2.46.6" />

‎tests/Integration/Etcd.Microsoft.Extensions.Configuration.IntegrationTests.Core/Etcd.Microsoft.Extensions.Configuration.IntegrationTests.Core.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<LangVersion>latest</LangVersion>
55

66
<Description>Etcd.Microsoft.Extensions.Configuration integration tests under .NET Core</Description>
@@ -11,13 +11,13 @@
1111
<ProjectReference Include="..\..\..\src\Etcd.Microsoft.Extensions.Configuration\Etcd.Microsoft.Extensions.Configuration.csproj" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="coverlet.msbuild" Version="3.1.*" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.*" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.*" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.*" />
18-
<PackageReference Include="NUnit" Version="3.13.*" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.*" />
20-
<PackageReference Include="Moq" Version="4.18.*" />
14+
<PackageReference Include="coverlet.msbuild" Version="6.0.*" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.*" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.*" />
18+
<PackageReference Include="NUnit" Version="4.4.*" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.*" />
20+
<PackageReference Include="Moq" Version="4.20.*" />
2121
</ItemGroup>
2222
<ItemGroup>
2323
<None Update="appsettings.json">

‎tests/Integration/Etcd.Microsoft.Extensions.Configuration.IntegrationTests.Core/Settings/ConfigurationBasedEtcdSettingsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void Ctor_ExistingSettings_Loaded()
2323

2424
// Assert
2525

26-
Assert.AreEqual("http://localhost:2379", settings.ConnectionString);
27-
Assert.AreEqual("1234321", settings.CertificateData);
26+
Assert.That(settings.ConnectionString, Is.EqualTo("http://localhost:2379"));
27+
Assert.That(settings.CertificateData, Is.EqualTo("1234321"));
2828
}
2929
}

‎tests/Integration/Etcd.Microsoft.Extensions.Configuration.IntegrationTests/ConfigurationBuilderTests.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ public void Build_WithSettingsFromEtcd_IConfigurationLoadedWithoutErrors()
3232

3333
// Assert
3434

35-
Assert.IsNotNull(config);
36-
Assert.IsTrue(config.GetChildren().Any());
37-
38-
Assert.AreEqual("Item 1 value", testSection["Item1"]);
39-
Assert.AreEqual("Item 2 value", testSection["Item2"]);
40-
Assert.AreEqual("Sub section value 1", testSubSection["Item1"]);
41-
Assert.AreEqual("Sub section value 2", testSubSection["Item2"]);
42-
Assert.AreEqual(2, list.Count);
43-
Assert.AreEqual("Item 1", list[0]);
44-
Assert.AreEqual("Item 2", list[1]);
45-
Assert.AreEqual("1234321", testAppSection["Item1"]);
35+
Assert.That(config, Is.Not.Null);
36+
Assert.That(config.GetChildren().Any(), Is.True);
37+
38+
Assert.That(testSection["Item1"], Is.EqualTo("Item 1 value"));
39+
Assert.That(testSection["Item2"], Is.EqualTo("Item 2 value"));
40+
Assert.That(testSubSection["Item1"], Is.EqualTo("Sub section value 1"));
41+
Assert.That(testSubSection["Item2"], Is.EqualTo("Sub section value 2"));
42+
Assert.That(list.Count, Is.EqualTo(2));
43+
Assert.That(list[0], Is.EqualTo("Item 1"));
44+
Assert.That(list[1], Is.EqualTo("Item 2"));
45+
Assert.That(testAppSection["Item1"], Is.EqualTo("1234321"));
4646
}
4747
}

‎tests/Integration/Etcd.Microsoft.Extensions.Configuration.IntegrationTests/Etcd.Microsoft.Extensions.Configuration.IntegrationTests.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
<ProjectReference Include="..\..\..\src\Etcd.Microsoft.Extensions.Configuration\Etcd.Microsoft.Extensions.Configuration.csproj" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="coverlet.msbuild" Version="3.1.*" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.*" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.*" />
17-
<PackageReference Include="NUnit" Version="3.13.*" />
18-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.*" />
19-
<PackageReference Include="Moq" Version="4.18.*" />
14+
<PackageReference Include="coverlet.msbuild" Version="6.0.*" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.*" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.*" />
17+
<PackageReference Include="NUnit" Version="4.4.*" />
18+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.*" />
19+
<PackageReference Include="Moq" Version="4.20.*" />
2020
</ItemGroup>
2121
</Project>

‎tests/Unit/Etcd.Microsoft.Extensions.Configuration.Tests/Etcd.Microsoft.Extensions.Configuration.Tests.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<LangVersion>latest</LangVersion>
55

66
<Description>Etcd.Microsoft.Extensions.Configuration integration tests under .NET Core</Description>
@@ -11,13 +11,13 @@
1111
<ProjectReference Include="..\..\..\src\Etcd.Microsoft.Extensions.Configuration\Etcd.Microsoft.Extensions.Configuration.csproj" />
1212
</ItemGroup>
1313
<ItemGroup>
14-
<PackageReference Include="coverlet.msbuild" Version="3.1.*" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.*" />
16-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.*" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.*" />
18-
<PackageReference Include="NUnit" Version="3.13.*" />
19-
<PackageReference Include="NUnit3TestAdapter" Version="4.2.*" />
20-
<PackageReference Include="Moq" Version="4.18.*" />
14+
<PackageReference Include="coverlet.msbuild" Version="6.0.*" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.*" />
16+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.*" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.*" />
18+
<PackageReference Include="NUnit" Version="4.4.*" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="5.2.*" />
20+
<PackageReference Include="Moq" Version="4.20.*" />
2121
</ItemGroup>
2222
<ItemGroup>
2323
<None Update="appsettings.json">

‎tests/Unit/Etcd.Microsoft.Extensions.Configuration.Tests/Settings/ConfigurationBasedEtcdSettingsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void Ctor_ExistingSettings_Loaded()
2222

2323
// Assert
2424

25-
Assert.AreEqual("http://localhost:2379", settings.ConnectionString);
26-
Assert.AreEqual("1234321", settings.CertificateData);
25+
Assert.That(settings.ConnectionString, Is.EqualTo("http://localhost:2379"));
26+
Assert.That(settings.CertificateData, Is.EqualTo("1234321"));
2727
}
2828
}

0 commit comments

Comments
 (0)