Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
changelog:
exclude:
labels:
- question
- wontfix
- invalid
categories:
- title: Exciting New Features 🎉
labels:
- enhancement
- feature
- title: Squashed Bugs 🐛
labels:
- bug
- breaking-change
- title: Adminstrative/Maintenance
labels:
- administrative
- documentation
- title: Other Changes
labels:
- "*"
14 changes: 9 additions & 5 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,16 @@ jobs:
- name: Ensure .NET Installed
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Install GitVersion
run: dotnet tool install --global GitVersion.Tool
uses: gittools/actions/gitversion/setup@v3.1.3
with:
versionSpec: '6.0.5'

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/execute@v3.1.11
uses: gittools/actions/gitversion/execute@v3.1.3
with:
useConfigFile: true

Expand Down Expand Up @@ -79,11 +81,13 @@ jobs:
dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner

- name: Install GitVersion
run: dotnet tool install --global GitVersion.Tool
uses: gittools/actions/gitversion/setup@v3.1.3
with:
versionSpec: '6.0.5'

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/execute@v3.1.11
uses: gittools/actions/gitversion/execute@v3.1.3
with:
useConfigFile: true

Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@ jobs:
- name: Ensure .NET Installed
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.0.x

- name: Install GitVersion
run: dotnet tool install --global GitVersion.Tool
uses: gittools/actions/gitversion/setup@v3.1.3
with:
versionSpec: '6.0.5'

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/execute@v3.1.11
uses: gittools/actions/gitversion/execute@v3.1.3
with:
useConfigFile: true

Expand Down
2 changes: 1 addition & 1 deletion src/EncryptionKeyGenerator/EncryptionKeyGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
20 changes: 20 additions & 0 deletions src/NetCore.Utilities.Tests/AesDerivedKeyEncryptionServiceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,26 @@ public void EncryptAndDecryptShouldRoundTripProperly(string input, string salt)
Assert.Equal(input, decrypted);
}

[Theory]
[InlineData("CustomerManagementUser")]
[InlineData("aa")]
[InlineData("aaa")]
[InlineData("aaaa")]
[InlineData("aaaaa")]
[InlineData("aaaaaa")]
[InlineData("aaaaaaa")]
[InlineData("aaaaaaaa")]
[InlineData("aaaaaaaaa")]
[InlineData("aaaaaaaaaa")]
[InlineData("aaaaaaaaaaa")]
public void RoundTrip_WithGuidSalt(string input)
{
var salt = Guid.NewGuid().ToString();
var encrypted = _service.Encrypt(input, salt);
var decrypted = _service.Decrypt(encrypted, salt);
Assert.Equal(input, decrypted);
}

/////<summary>
///// This test is need to ensure that stored values, that were encrypted with the known IV/Secret still can be properly decrypted.
///// This was necessary after weird behaviors noticed in .NET 5 -> .NET 6 transition
Expand Down
13 changes: 7 additions & 6 deletions src/NetCore.Utilities.Tests/NetCore.Utilities.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<RootNamespace>ICG.NetCore.Utilities.Tests</RootNamespace>
<OutputType>Library</OutputType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Moq" Version="4.17.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="Moq" Version="4.20.72" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
12 changes: 6 additions & 6 deletions src/NetCore.Utilities/NetCore.Utilities.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>ICG.NetCore.Utilities</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Expand Down Expand Up @@ -37,11 +37,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading