Skip to content

Commit 6267a13

Browse files
chrisstrawchrisstraw-isc
chrisstraw
and
chrisstraw-isc
authored
net 10 upgrade (#201)
* net10 updates * upgraded Microsoft.NET.Test.Sdk * upgrades to Microsoft.NET.Test.Sdk * test nuget package cleanup * Azure App Config updates * Test Updates * updated from rc to release * Serilog updates * moved serilog to new repo * Serilog Hosting * cleanup and nuget updates * dependabot * pipeline updates * added AUTOMAPPER_LICENSE_KEY env variable * Fixed Test failure, remove Obsolete 9.x --------- Co-authored-by: Chris Straw <chris.straw@contractors.courts.in.gov>
1 parent 3ac44af commit 6267a13

File tree

204 files changed

+524
-5998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+524
-5998
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
"dotnet-sonarscanner": {
6-
"version": "10.3.0",
6+
"version": "11.0.0",
77
"commands": [
88
"dotnet-sonarscanner"
99
]

‎.github/dependabot.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/" # Location of package manifests
5+
schedule:
6+
interval: "weekly"
7+
labels:
8+
- "dependencies"
9+
- "github-actions"
10+
11+
- package-ecosystem: "nuget"
12+
directory: "/tests"
13+
schedule:
14+
interval: "weekly"
15+
labels:
16+
- "dependencies"
17+
- "nuget"
18+

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
types: [opened, synchronize, reopened]
1111

1212
env:
13-
SOLUTION_FILE: "OLT.Core.sln"
13+
SOLUTION_FILE: "OLT.Core.slnx"
1414
SOURCE_DIRECTORY: ${{ github.workspace }}
1515
SENDGRID_TMPL_JSON: ${{ secrets.SENDGRID_TMPL_JSON }}
1616
SENDGRID_TMPL_TAG: ${{ secrets.SENDGRID_TMPL_TAG }}
@@ -27,7 +27,8 @@ env:
2727
AZURE_APP_CONFIG_CONNECTION_STRING: ${{ secrets.AZURE_APP_CONFIG_CONNECTION_STRING }}
2828
AWS_ACCESS_KEY: ${{ secrets.AWS_ACCESS_KEY }}
2929
AWS_SECRET_KEY: ${{ secrets.AWS_SECRET_KEY }}
30-
REDIS_CACHE: ${{ secrets.REDIS_CACHE }}
30+
REDIS_CACHE: ${{ secrets.REDIS_CACHE }}
31+
AUTOMAPPER_LICENSE_KEY: ${{ secrets.AUTOMAPPER_LICENSE_KEY }}
3132

3233
jobs:
3334
build:
@@ -64,6 +65,7 @@ jobs:
6465
dotnet-version: |
6566
8.0.x
6667
9.0.x
68+
10.0.x
6769
6870
- name: Get branch name
6971
id: branch-name

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
env:
88
PACKAGE_OUTPUT_DIRECTORY: ${{ github.workspace }}/output
99
SOURCE_DIRECTORY: ${{ github.workspace }}
10-
SOLUTION_FILE: "OLT.Core.sln"
10+
SOLUTION_FILE: "OLT.Core.slnx"
1111
NUGET_SOURCE_URL: "https://api.nuget.org/v3/index.json"
1212

1313
jobs:
@@ -23,6 +23,7 @@ jobs:
2323
dotnet-version: |
2424
8.0.x
2525
9.0.x
26+
10.0.x
2627
2728
- name: Get Version
2829
id: get_version

‎OLT.Core.sln‎

Lines changed: 0 additions & 470 deletions
This file was deleted.

‎OLT.Core.slnx‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<Solution>
2+
<Folder Name="/.build/">
3+
<File Path="src/Directory.Build.props" />
4+
</Folder>
5+
<Folder Name="/.build/Pipelines/">
6+
<File Path=".config/dotnet-tools.json" />
7+
<File Path=".github/dependabot.yml" />
8+
<File Path=".github/workflows/build.yml" />
9+
<File Path=".github/workflows/release.yml" />
10+
</Folder>
11+
<Folder Name="/.build/test/">
12+
<File Path="tests/Directory.Build.props" />
13+
</Folder>
14+
<Folder Name="/.solution/">
15+
<File Path="README.md" />
16+
</Folder>
17+
<Folder Name="/OLT.AspNetCore/" />
18+
<Folder Name="/OLT.AspNetCore/OLT.AspNetCore.Authentication.JwtBearer/">
19+
<Project Path="src/OLT.AspNetCore.Authentication.JwtBearer/OLT.AspNetCore.Authentication.JwtBearer.csproj" />
20+
<Project Path="tests/OLT.AspNetCore.Authentication.JwtBearer.Tests/OLT.AspNetCore.Authentication.JwtBearer.Tests.csproj" />
21+
</Folder>
22+
<Folder Name="/OLT.AspNetCore/OLT.AspNetCore/">
23+
<Project Path="src/OLT.AspNetCore/OLT.AspNetCore.csproj" />
24+
<Project Path="tests/OLT.AspNetCore.Tests/OLT.AspNetCore.Tests.csproj" />
25+
</Folder>
26+
<Folder Name="/OLT.Core.Abstractions/">
27+
<Project Path="src/OLT.Core.Attribute.Abstractions/OLT.Core.Attribute.Abstractions.csproj" />
28+
<Project Path="src/OLT.Core.DependencyInjection.Abstractions/OLT.Core.DependencyInjection.Abstractions.csproj" />
29+
<Project Path="src/OLT.Core.Exception.Abstractions/OLT.Core.Exception.Abstractions.csproj" />
30+
<Project Path="src/OLT.Core.Hosting.Abstractions/OLT.Core.Hosting.Abstractions.csproj" />
31+
<Project Path="src/OLT.Core.Model.Abstractions/OLT.Core.Model.Abstractions.csproj" />
32+
<Project Path="src/OLT.Core.Service.Abstractions/OLT.Core.Service.Abstractions.csproj" />
33+
<Project Path="tests/OLT.Core.Attribute.Abstractions.Tests/OLT.Core.Attribute.Abstractions.Tests.csproj" />
34+
<Project Path="tests/OLT.Core.DependencyInjection.Abstractions.Tests/OLT.Core.DependencyInjection.Abstractions.Tests.csproj" />
35+
<Project Path="tests/OLT.Core.Exception.Abstractions.Tests/OLT.Core.Exception.Abstractions.Tests.csproj" />
36+
<Project Path="tests/OLT.Core.Hosting.Abstractions.Tests/OLT.Core.Hosting.Abstractions.Tests.csproj" />
37+
<Project Path="tests/OLT.Core.Model.Abstractions.Tests/OLT.Core.Model.Abstractions.Tests.csproj" />
38+
<Project Path="tests/OLT.Core.Service.Abstractions.Tests/OLT.Core.Service.Abstractions.Tests.csproj" />
39+
</Folder>
40+
<Folder Name="/OLT.Core.CommandBus/">
41+
<Project Path="src/OLT.Core.CommandBus.Abstractions/OLT.Core.CommandBus.Abstractions.csproj" />
42+
<Project Path="src/OLT.Core.CommandBus/OLT.Core.CommandBus.csproj" />
43+
<Project Path="tests/OLT.Core.CommandBus.Tests/OLT.Core.CommandBus.Tests.csproj" />
44+
</Folder>
45+
<Folder Name="/OLT.Core.EntityFrameworkCore.Abstractions/">
46+
<Project Path="src/OLT.Core.EntityFrameworkCore.Abstractions/OLT.Core.EntityFrameworkCore.Abstractions.csproj" />
47+
<Project Path="tests/OLT.Core.EntityFrameworkCore.Abstractions.Tests/OLT.Core.EntityFrameworkCore.Abstractions.Tests.csproj" />
48+
</Folder>
49+
<Folder Name="/OLT.Core.EntityFrameworkCore.SqlServer.Abstractions/">
50+
<Project Path="src/OLT.Core.EntityFrameworkCore.SqlServer.Abstractions/OLT.Core.EntityFrameworkCore.SqlServer.Abstractions.csproj" />
51+
<Project Path="tests/OLT.Core.EntityFrameworkCore.SqlServer.Abstractions.Tests/OLT.Core.EntityFrameworkCore.SqlServer.Abstractions.Tests.csproj" />
52+
</Folder>
53+
<Folder Name="/OLT.EF.Core.Services/">
54+
<Project Path="src/OLT.EF.Core.Services/OLT.EF.Core.Services.csproj" />
55+
<Project Path="tests/OLT.EF.Core.Services.Tests.Automapper/OLT.EF.Core.Services.Tests.Automapper.csproj" />
56+
<Project Path="tests/OLT.EF.Core.Services.Tests.DataAdapter/OLT.EF.Core.Services.Tests.DataAdapter.csproj" />
57+
<Project Path="tests/OLT.EF.Core.Services.Tests.Lib/OLT.EF.Core.Services.Tests.Lib.csproj" />
58+
</Folder>
59+
<Folder Name="/OLT.Extensions.Configuration/">
60+
<Project Path="src/OLT.Extensions.Configuration.Amazon.SystemManager/OLT.Extensions.Configuration.Amazon.SystemManager.csproj" />
61+
<Project Path="src/OLT.Extensions.Configuration.Azure.AppConfig/OLT.Extensions.Configuration.Azure.AppConfig.csproj" />
62+
<Project Path="src/OLT.Extensions.Configuration/OLT.Extensions.Configuration.csproj" />
63+
<Project Path="tests/OLT.Extensions.Configuration.Tests/OLT.Extensions.Configuration.Tests.csproj" />
64+
</Folder>
65+
<Folder Name="/OLT.Extensions.General/">
66+
<Project Path="src/OLT.Extensions.General/OLT.Extensions.General.csproj" />
67+
<Project Path="tests/OLT.Extensions.General.Tests/OLT.Extensions.General.Tests.csproj" />
68+
</Folder>
69+
<Folder Name="/OLT.Searchers/">
70+
<Project Path="src/OLT.Searchers.DateRange/OLT.Searchers.DateRange.csproj" />
71+
<Project Path="src/OLT.Searchers.GenericFilter/OLT.Searchers.GenericFilter.csproj" />
72+
<Project Path="tests/OLT.Searchers.Tests/OLT.Searchers.Tests.csproj" />
73+
</Folder>
74+
</Solution>

‎README.md‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@
88
| ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
99
| [OLT.AspNetCore](./src//OLT.AspNetCore/) | [![Nuget](https://img.shields.io/nuget/v/OLT.AspNetCore)](https://www.nuget.org/packages/OLT.AspNetCore) |
1010
| [OLT.AspNetCore.Authentication](./src/OLT.AspNetCore.Authentication/) | [![Nuget](https://img.shields.io/nuget/v/OLT.AspNetCore.Authentication)](https://www.nuget.org/packages/OLT.AspNetCore.Authentication) |
11-
| [OLT.AspNetCore.Authentication.ApiKey](./src/OLT.AspNetCore.Authentication.ApiKey/) | [![Nuget](https://img.shields.io/nuget/v/OLT.AspNetCore.Authentication.ApiKey)](https://www.nuget.org/packages/OLT.AspNetCore.Authentication.ApiKey) |
1211
| [OLT.AspNetCore.Authentication.JwtBearer](./src/OLT.AspNetCore.Authentication.JwtBearer/) | [![Nuget](https://img.shields.io/nuget/v/OLT.AspNetCore.Authentication.JwtBearer)](https://www.nuget.org/packages/OLT.AspNetCore.Authentication.JwtBearer) |
13-
| [OLT.AspNetCore.Serilog](./src/OLT.AspNetCore.Serilog/) | [![Nuget](https://img.shields.io/nuget/v/OLT.AspNetCore.Serilog)](https://www.nuget.org/packages/OLT.AspNetCore.Serilog) |
14-
| [OLT.AspNetCore.Shared](./src/OLT.AspNetCore.Shared/) | [![Nuget](https://img.shields.io/nuget/v/OLT.AspNetCore.Shared)](https://www.nuget.org/packages/OLT.AspNetCore.Shared) |
15-
| [OLT.AspNetCore.Versioning](./src/OLT.AspNetCore.Versioning/) | [![Nuget](https://img.shields.io/nuget/v/OLT.AspNetCore.Versioning)](https://www.nuget.org/packages/OLT.AspNetCore.Versioning) |
1612
| [OLT.Core.CommandBus](./src/OLT.Core.CommandBus/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Core.CommandBus)](https://www.nuget.org/packages/OLT.Core.CommandBus) |
1713
| [OLT.Core.Common](./src/OLT.Core.Common/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Core.Common)](https://www.nuget.org/packages/OLT.Core.Common) |
1814
| [OLT.Core.Common.Abstractions](./src/OLT.Core.Common.Abstractions/) | [![Nuget](https://img.shields.io/nuget/v/OOLT.Core.Common.Abstractions)](https://www.nuget.org/packages/OLT.Core.Common.Abstractions) |
@@ -22,36 +18,11 @@
2218
| [OLT.EF.Core.SeedHelpers.Csv](./src/OLT.EF.Core.SeedHelpers.Csv/) | [![Nuget](https://img.shields.io/nuget/v/OLT.EF.Core.SeedHelpers.Csv)](https://www.nuget.org/packages/OLT.EF.Core.SeedHelpers.Csv) |
2319
| [OLT.EF.Core.Services](./src/OLT.EF.Core.Services/) | [![Nuget](https://img.shields.io/nuget/v/OLT.EF.Core.Services)](https://www.nuget.org/packages/OLT.EF.Core.Services) |
2420
| [OLT.EF.Core.SqlServer](./src/OLT.EF.Core.SqlServer/) | [![Nuget](https://img.shields.io/nuget/v/OLT.EF.Core.SqlServer)](https://www.nuget.org/packages/OLT.EF.Core.SqlServer) |
25-
| [OLT.Extensions.Caching.Memory](./src/OLT.Extensions.Caching.Memory/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Extensions.Caching.Memory)](https://www.nuget.org/packages/OLT.Extensions.Caching.Memory) |
26-
| [OLT.Extensions.Caching.Redis](./src/OLT.Extensions.Caching.Redis/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Extensions.Caching.Redis)](https://www.nuget.org/packages/OLT.Extensions.Caching.Redis) |
27-
| [OLT.Extensions.Caching.Shared](./src/OLT.Extensions.Caching.Shared/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Extensions.Caching.Shared)](https://www.nuget.org/packages/OLT.Extensions.Caching.Shared) |
2821
| [OLT.Extensions.Configuration](./src/OLT.Extensions.Configuration/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Extensions.Configuration)](https://www.nuget.org/packages/OLT.Extensions.Configuration) |
2922
| [OLT.Extensions.Configuration.Amazon.SystemManager](./src/OLT.Extensions.Configuration.Amazon.SystemManager/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Extensions.Configuration.Amazon.SystemManager)](https://www.nuget.org/packages/OLT.Extensions.Configuration.Amazon.SystemManager) |
3023
| [OLT.Extensions.Configuration.Azure.AppConfig](./src/OLT.Extensions.Configuration.Azure.AppConfig/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Extensions.Configuration.Azure.AppConfig)](https://www.nuget.org/packages/OLT.Extensions.Configuration.Azure.AppConfig) |
3124
| [OLT.Extensions.DependencyInjection](./src/OLT.Extensions.DependencyInjection/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Extensions.DependencyInjection)](https://www.nuget.org/packages/OLT.Extensions.DependencyInjection) |
3225
| [OLT.Extensions.General](./src/OLT.Extensions.General/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Extensions.General)](https://www.nuget.org/packages/OLT.Extensions.General) |
33-
| [OLT.Logging.Serilog](./src/OLT.Logging.Serilog/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Logging.Serilog)](https://www.nuget.org/packages/OLT.Logging.Serilog) |
34-
| [OLT.Logging.Serilog.MSSqlServer](./src/OLT.Logging.Serilog.MSSqlServer/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Logging.Serilog.MSSqlServer)](https://www.nuget.org/packages/OLT.Logging.Serilog.MSSqlServer) |
3526
| [OLT.Searchers.DateRange](./src/OLT.Searchers.DateRange/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Searchers.DateRange)](https://www.nuget.org/packages/OLT.Searchers.DateRange) |
3627
| [OLT.Searchers.GenericFilter](./src/OLT.Searchers.GenericFilter/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Searchers.GenericFilter)](https://www.nuget.org/packages/OLT.Searchers.GenericFilter) |
3728

38-
---
39-
40-
## MOVED TO NEW REPO
41-
42-
| Library | New Repo |
43-
| ------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
44-
| OLT.EPPlus | [https://github.com/OuterlimitsTech/olt-dotnet-extensions-epplus](https://github.com/OuterlimitsTech/olt-dotnet-extensions-epplus) |
45-
| OLT.Email | [https://github.com/OuterlimitsTech/olt-sendgrid](https://github.com/OuterlimitsTech/olt-sendgrid) |
46-
| OLT.Email.SendGrid | [https://github.com/OuterlimitsTech/olt-sendgrid](https://github.com/OuterlimitsTech/olt-sendgrid) |
47-
| OLT.Email.SendGrid.Shared | [https://github.com/OuterlimitsTech/olt-sendgrid](https://github.com/OuterlimitsTech/olt-sendgrid) |
48-
49-
## DEPRECATED LIBRARIES
50-
51-
| Library | Version | Notes |
52-
| ----------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------- |
53-
| [OLT.Core.Rules](./src/OLT.Core.Rules/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Core.Rules)](https://www.nuget.org/packages/OLT.Core.Rules) | Fully Deprecated with the creation of the Command Bus |
54-
| [OLT.Builder.File](./src/OLT.Builder.File/) | [![Nuget](https://img.shields.io/nuget/v/OLT.Builder.File)](https://www.nuget.org/packages/OLT.Builder.File) | Fully Deprecated with no replacement |
55-
| [OLT.Extensions.AzureAppConfiguration](https://github.com/OuterlimitsTech/olt-dotnet-libraries) | [![Nuget](https://img.shields.io/nuget/v/OLT.Extensions.AzureAppConfiguration)](https://www.nuget.org/packages/OLT.Extensions.AzureAppConfiguration) | _Renamed to OLT.Extensions.Configuration.Azure.AppConfig_ |
56-
| [OLT.Shared](https://github.com/OuterlimitsTech/olt-dotnet-libraries) | [![Nuget](https://img.shields.io/nuget/v/OLT.Shared)](https://www.nuget.org/packages/OLT.Shared) | OLT.Core.Common, OLT.Core.Services, OLT.Core.Rules |
57-
| [OLT.Shared.Data](https://github.com/OuterlimitsTech/olt-dotnet-libraries) | [![Nuget](https://img.shields.io/nuget/v/OLT.Shared.Data)](https://www.nuget.org/packages/OLT.Shared.Data) | Fully Deprecated or moved to another packages |

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Company>OuterLimits Technologies, Inc</Company>
66
<Product>OLT Core Libraries</Product>
77
<Authors>Chris Straw</Authors>
8-
<Copyright>Copyright © 2003-2024, OuterLimits Technologies, Inc Plainfield, IN</Copyright>
8+
<Copyright>Copyright © 2003-2026, OuterLimits Technologies, Inc Plainfield, IN</Copyright>
99
<RepositoryUrl>https://github.com/OuterlimitsTech/olt-dotnet-core</RepositoryUrl>
1010
<PackageIcon>icon.png</PackageIcon>
1111
<EmbedUntrackedSources>true</EmbedUntrackedSources>

‎src/OLT.AspNetCore.Authentication.JwtBearer/IOltAuthenticationJwtBearer.cs‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

0 commit comments

Comments
 (0)