Skip to content

Commit c8fd206

Browse files
mitchelsellersmitchelsellers
authored
Merge pull request #56 from IowaComputerGurus/feature/net8-update
Updated to .NET 8
2 parents 733d986 + 601e8a4 commit c8fd206

File tree

7 files changed

+70
-21
lines changed

7 files changed

+70
-21
lines changed

‎.github/release.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
changelog:
2+
exclude:
3+
labels:
4+
- question
5+
- wontfix
6+
- invalid
7+
categories:
8+
- title: Exciting New Features 🎉
9+
labels:
10+
- enhancement
11+
- feature
12+
- title: Squashed Bugs 🐛
13+
labels:
14+
- bug
15+
- breaking-change
16+
- title: Adminstrative/Maintenance
17+
labels:
18+
- administrative
19+
- documentation
20+
- title: Other Changes
21+
labels:
22+
- "*"

‎.github/workflows/ci-build.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,16 @@ jobs:
2121
- name: Ensure .NET Installed
2222
uses: actions/setup-dotnet@v4
2323
with:
24-
dotnet-version: 6.0.x
24+
dotnet-version: 8.0.x
2525

2626
- name: Install GitVersion
27-
run: dotnet tool install --global GitVersion.Tool
27+
uses: gittools/actions/gitversion/[email protected]
28+
with:
29+
versionSpec: '6.0.5'
2830

2931
- name: Determine Version
3032
id: gitversion
31-
uses: gittools/actions/gitversion/[email protected].11
33+
uses: gittools/actions/gitversion/[email protected].3
3234
with:
3335
useConfigFile: true
3436

@@ -79,11 +81,13 @@ jobs:
7981
dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
8082
8183
- name: Install GitVersion
82-
run: dotnet tool install --global GitVersion.Tool
84+
uses: gittools/actions/gitversion/[email protected]
85+
with:
86+
versionSpec: '6.0.5'
8387

8488
- name: Determine Version
8589
id: gitversion
86-
uses: gittools/actions/gitversion/[email protected].11
90+
uses: gittools/actions/gitversion/[email protected].3
8791
with:
8892
useConfigFile: true
8993

‎.github/workflows/release-build.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ jobs:
2020
- name: Ensure .NET Installed
2121
uses: actions/setup-dotnet@v4
2222
with:
23-
dotnet-version: 6.0.x
23+
dotnet-version: 8.0.x
2424

2525
- name: Install GitVersion
26-
run: dotnet tool install --global GitVersion.Tool
26+
uses: gittools/actions/gitversion/[email protected]
27+
with:
28+
versionSpec: '6.0.5'
2729

2830
- name: Determine Version
2931
id: gitversion
30-
uses: gittools/actions/gitversion/[email protected].11
32+
uses: gittools/actions/gitversion/[email protected].3
3133
with:
3234
useConfigFile: true
3335

‎src/EncryptionKeyGenerator/EncryptionKeyGenerator.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>

‎src/NetCore.Utilities.Tests/AesDerivedKeyEncryptionServiceTests.cs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,26 @@ public void EncryptAndDecryptShouldRoundTripProperly(string input, string salt)
100100
Assert.Equal(input, decrypted);
101101
}
102102

103+
[Theory]
104+
[InlineData("CustomerManagementUser")]
105+
[InlineData("aa")]
106+
[InlineData("aaa")]
107+
[InlineData("aaaa")]
108+
[InlineData("aaaaa")]
109+
[InlineData("aaaaaa")]
110+
[InlineData("aaaaaaa")]
111+
[InlineData("aaaaaaaa")]
112+
[InlineData("aaaaaaaaa")]
113+
[InlineData("aaaaaaaaaa")]
114+
[InlineData("aaaaaaaaaaa")]
115+
public void RoundTrip_WithGuidSalt(string input)
116+
{
117+
var salt = Guid.NewGuid().ToString();
118+
var encrypted = _service.Encrypt(input, salt);
119+
var decrypted = _service.Decrypt(encrypted, salt);
120+
Assert.Equal(input, decrypted);
121+
}
122+
103123
/////<summary>
104124
///// This test is need to ensure that stored values, that were encrypted with the known IV/Secret still can be properly decrypted.
105125
///// This was necessary after weird behaviors noticed in .NET 5 -> .NET 6 transition

‎src/NetCore.Utilities.Tests/NetCore.Utilities.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>ICG.NetCore.Utilities.Tests</RootNamespace>
77
<OutputType>Library</OutputType>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="coverlet.collector" Version="3.1.2">
11+
<PackageReference Include="coverlet.collector" Version="6.0.2">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
16-
<PackageReference Include="Moq" Version="4.17.1" />
17-
<PackageReference Include="xunit" Version="2.4.1" />
18-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
15+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
17+
<PackageReference Include="Moq" Version="4.20.72" />
18+
<PackageReference Include="xunit" Version="2.9.2" />
19+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1920
<PrivateAssets>all</PrivateAssets>
2021
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2122
</PackageReference>

‎src/NetCore.Utilities/NetCore.Utilities.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-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RootNamespace>ICG.NetCore.Utilities</RootNamespace>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -37,11 +37,11 @@
3737
</PropertyGroup>
3838

3939
<ItemGroup>
40-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
41-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
42-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
43-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
44-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
40+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
41+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
42+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
43+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
44+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
4545
<PrivateAssets>all</PrivateAssets>
4646
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4747
</PackageReference>

0 commit comments

Comments
 (0)