Skip to content

Commit 3d18f70

Browse files
MrZoidbergMrZoidberg
authored
Updated nuget packages. Added .NET 7 support (#33)
* Updated nuget packages. Added .NET 7 support
1 parent b4f999a commit 3d18f70

File tree

7 files changed

+106
-34
lines changed

7 files changed

+106
-34
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "2.2.0",
6+
"version": "3.0.0",
77
"commands": [
88
"dotnet-cake"
99
]

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
run: git fetch --tags
2828
shell: pwsh
2929
- name: 'Install .NET Core SDK'
30-
uses: actions/setup-dotnet@v2
30+
uses: actions/setup-dotnet@v3
3131
with:
32-
dotnet-version: '6.0.x'
32+
dotnet-version: '7.0.x'
3333
- name: 'Fix permissions'
3434
run: chmod +x ./Tests/VaultSharp.Extensions.Configuration.Test/approle.sh && chmod +x ./Tests/VaultSharp.Extensions.Configuration.Test/approle_nolist.sh
3535
shell: bash

‎Directory.Build.targets‎

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

33
<Target Name="Versioning" BeforeTargets="MinVer">
44
<PropertyGroup Label="Build">
5-
<MinVerDefaultPreReleasePhase>preview</MinVerDefaultPreReleasePhase>
5+
<MinVerDefaultPreReleaseIdentifiers>preview.0</MinVerDefaultPreReleaseIdentifiers>
66
<!-- Tag your repository with the semantic version e.g. '1.0.0' to version all NuGet packages. If you have
77
multiple NuGet packages in your solution and want to version them separately, then uncomment this line
88
and tag your repository with the name of the package followed by the semantic version e.g.

‎Source/Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1717
<!-- Optional: Embed source files that are not tracked by the source control manager to the PDB -->
1818
<EmbedUntrackedSources>true</EmbedUntrackedSources>
19+
<Deterministic>True</Deterministic>
1920
<!-- Optional: Include PDB in the built .nupkg -->
2021
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
2122
</PropertyGroup>

‎Source/SampleWebApp/SampleWebApp.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<TargetFramework>net6.0</TargetFramework>
55
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
66
<IsPackable>false</IsPackable>
7+
<WarningLevel>0</WarningLevel>
78
</PropertyGroup>
89

910
<ItemGroup>
@@ -16,11 +17,14 @@
1617
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1718
</PackageReference>
1819
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
19-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
20+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.5.22">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
24+
<PackageReference Include="MinVer" Version="4.3.0">
2025
<PrivateAssets>all</PrivateAssets>
2126
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2227
</PackageReference>
23-
<PackageReference Include="MinVer" Version="4.1.0" />
2428
</ItemGroup>
2529

2630

‎Source/VaultSharp.Extensions.Configuration/VaultSharp.Extensions.Configuration.csproj‎

Lines changed: 48 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,49 +3,80 @@
33
<PropertyGroup Label="Build">
44
<LangVersion>default</LangVersion>
55
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
6-
<NoWarn>SA1633;SA1028;SA1309;CA1303</NoWarn>
6+
<NoWarn>SA1633;SA1028;SA1309;CA1303;CS1591</NoWarn>
77
<PackageId>VaultSharp.Extensions.Configuration</PackageId>
88
<PackageLicenseExpression>MIT</PackageLicenseExpression>
99
<Nullable>enable</Nullable>
10-
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
10+
<TargetFrameworks>net6.0;net7.0;netstandard2.1</TargetFrameworks>
1111
<IncludeSymbols>true</IncludeSymbols>
1212
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
13-
<Copyright>Copyright 2022 © Mikhail Merkulov. All rights Reserved</Copyright>
13+
<Copyright>Copyright 2023 © Mikhail Merkulov. All rights Reserved</Copyright>
1414
</PropertyGroup>
1515

1616
<PropertyGroup Label="Package">
1717
<Product>VaultSharp.Extensions.Configuration</Product>
18-
<Description>Configuration extension that allows you to use Hashicorp Vault as a configuration backend.</Description>
18+
<Description>
19+
Configuration extension that allows you to use Hashicorp Vault as a configuration backend.
20+
This library is built with .NET Standard 2.1, .NET 6 &amp; .NET 7
21+
</Description>
1922
<PackageTags>Vault;Configuration;Data protection;Hashicorp</PackageTags>
2023
</PropertyGroup>
2124

2225
<ItemGroup>
2326
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2427
<PrivateAssets>all</PrivateAssets>
2528
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26-
</PackageReference>
27-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
29+
</PackageReference>
30+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.5.22">
2831
<PrivateAssets>all</PrivateAssets>
29-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
32+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3033
</PackageReference>
31-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
34+
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
3235
<PrivateAssets>all</PrivateAssets>
3336
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3437
</PackageReference>
35-
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3">
38+
</ItemGroup>
39+
40+
<ItemGroup>
41+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.5.22" />
42+
<PackageReference Include="VaultSharp" Version="1.13.0.1" />
43+
<PackageReference Include="MinVer" Version="4.3.0">
3644
<PrivateAssets>all</PrivateAssets>
3745
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3846
</PackageReference>
3947
</ItemGroup>
4048

41-
<ItemGroup>
49+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
50+
<PackageReference Include="System.Text.Json" Version="7.0.2" />
51+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
52+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
53+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
54+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1">
55+
<PrivateAssets>all</PrivateAssets>
56+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
57+
</PackageReference>
58+
</ItemGroup>
59+
60+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
61+
<PackageReference Include="System.Text.Json" Version="7.0.2" />
4262
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
4363
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
4464
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
45-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.2.32" />
65+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
66+
<PrivateAssets>all</PrivateAssets>
67+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
68+
</PackageReference>
69+
</ItemGroup>
70+
71+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
4672
<PackageReference Include="System.Text.Json" Version="7.0.2" />
47-
<PackageReference Include="VaultSharp" Version="1.13.0.1" />
48-
<PackageReference Include="MinVer" Version="4.1.0" />
73+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
74+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
75+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
76+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1">
77+
<PrivateAssets>all</PrivateAssets>
78+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
79+
</PackageReference>
4980
</ItemGroup>
5081

5182
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
@@ -56,6 +87,10 @@
5687
<AssemblyTitle>VaultSharp configuration extensions .NET 6</AssemblyTitle>
5788
</PropertyGroup>
5889

90+
<PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
91+
<AssemblyTitle>VaultSharp configuration extensions .NET 7</AssemblyTitle>
92+
</PropertyGroup>
93+
5994
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net6.0|AnyCPU'">
6095
<WarningLevel>5</WarningLevel>
6196
</PropertyGroup>

‎Tests/VaultSharp.Extensions.Configuration.Test/VaultSharp.Extensions.Configuration.Test.csproj‎

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<IsPackable>false</IsPackable>
66
<GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
77
<TargetFramework>net6.0</TargetFramework>
8+
<NoWarn>VSTHRD200;CS1591;CS8618</NoWarn>
89
</PropertyGroup>
910

1011
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -21,36 +22,67 @@
2122

2223
<ItemGroup>
2324
<PackageReference Include="Docker.DotNet" Version="3.125.14" />
24-
<PackageReference Include="FluentAssertions" Version="6.7.0" />
25-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
26-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
28-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
29-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
25+
<PackageReference Include="FluentAssertions" Version="6.11.0" />
26+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
3027
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
31-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
32-
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.2.32" />
33-
<PackageReference Include="coverlet.collector" Version="3.1.2" PrivateAssets="all">
28+
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
29+
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.5.22" />
30+
<PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="all">
3431
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3532
</PackageReference>
36-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
33+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.5.22">
3734
<PrivateAssets>all</PrivateAssets>
38-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
35+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3936
</PackageReference>
40-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.2.32">
37+
<PackageReference Include="Moq" Version="4.18.4" />
38+
<PackageReference Include="MinVer" Version="4.3.0">
4139
<PrivateAssets>all</PrivateAssets>
4240
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4341
</PackageReference>
44-
<PackageReference Include="Moq" Version="4.18.1" />
45-
<PackageReference Include="MinVer" Version="4.1.0" />
4642
<PackageReference Include="Testcontainers" Version="3.1.0" />
47-
<PackageReference Include="xunit" Version="2.4.1" />
43+
<PackageReference Include="xunit" Version="2.4.2" />
4844
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
4945
<PrivateAssets>all</PrivateAssets>
5046
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5147
</PackageReference>
5248
</ItemGroup>
5349

50+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
51+
<PackageReference Include="System.Text.Json" Version="7.0.2" />
52+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
53+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
54+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
55+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
56+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1">
57+
<PrivateAssets>all</PrivateAssets>
58+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
59+
</PackageReference>
60+
</ItemGroup>
61+
62+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
63+
<PackageReference Include="System.Text.Json" Version="7.0.2" />
64+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
65+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
66+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
67+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
68+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
69+
<PrivateAssets>all</PrivateAssets>
70+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
71+
</PackageReference>
72+
</ItemGroup>
73+
74+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
75+
<PackageReference Include="System.Text.Json" Version="7.0.2" />
76+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
77+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
78+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
79+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
80+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1">
81+
<PrivateAssets>all</PrivateAssets>
82+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
83+
</PackageReference>
84+
</ItemGroup>
85+
5486
<ItemGroup>
5587
<None Update="approle.sh">
5688
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

0 commit comments

Comments
 (0)