Skip to content

Commit 6ba3570

Browse files
authored
- Release v2.0.1
* Release v2.0.1
1 parent 67cd086 commit 6ba3570

52 files changed

Lines changed: 245 additions & 109 deletions

Some content is hidden

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

.github/workflows/Build-Master.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Setup .NET
1515
uses: actions/setup-dotnet@v3
1616
with:
@@ -28,7 +28,7 @@ jobs:
2828
github-token: '${{ secrets.GITHUB_TOKEN }}'
2929
steps:
3030
- name: Step-01 Checkout code
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
with:
3333
fetch-depth: 0
3434
- name: Step-02 Lint Code Base

.github/workflows/Master-CodeQL.yml

Lines changed: 54 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,64 +13,86 @@ name: "Master-CodeQL"
1313

1414
on:
1515
push:
16-
pull_request:
17-
types: [opened, reopened, edited, synchronize]
18-
paths-ignore:
19-
- "**/*.md"
20-
- "**/*.gitignore"
21-
- "**/*.gitattributes"
16+
branches: [ "master" ]
2217
schedule:
23-
- cron: '35 15 * * 2'
18+
- cron: '42 7 * * 5'
2419

2520
jobs:
2621
analyze:
27-
name: Analyze
28-
runs-on: ubuntu-latest
22+
name: Analyze (${{ matrix.language }})
23+
# Runner size impacts CodeQL analysis time. To learn more, please see:
24+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
25+
# - https://gh.io/supported-runners-and-hardware-resources
26+
# - https://gh.io/using-larger-runners (GitHub.com only)
27+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
28+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
2929
permissions:
30+
# required for all workflows
31+
security-events: write
32+
33+
# required to fetch internal or private CodeQL packs
34+
packages: read
35+
36+
# only required for workflows in private repositories
3037
actions: read
3138
contents: read
32-
security-events: write
3339

3440
strategy:
3541
fail-fast: false
3642
matrix:
37-
language: [ 'csharp' ]
38-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
39-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
40-
43+
include:
44+
- language: actions
45+
build-mode: none
46+
- language: csharp
47+
build-mode: none
48+
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
49+
# Use `c-cpp` to analyze code written in C, C++ or both
50+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
51+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
52+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
53+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
54+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
55+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
4156
steps:
4257
- name: Checkout repository
43-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
59+
60+
# Add any setup steps before running the `github/codeql-action/init` action.
61+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
62+
# or others). This is typically only required for manual builds.
63+
# - name: Setup runtime (example)
64+
# uses: actions/setup-example@v1
4465

4566
# Initializes the CodeQL tools for scanning.
4667
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v2
68+
uses: github/codeql-action/init@v3
4869
with:
4970
languages: ${{ matrix.language }}
71+
build-mode: ${{ matrix.build-mode }}
5072
# If you wish to specify custom queries, you can do so here or in a config file.
5173
# By default, queries listed here will override any specified in a config file.
5274
# Prefix the list here with "+" to use these queries and those in the config file.
5375

54-
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
76+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5577
# queries: security-extended,security-and-quality
5678

57-
58-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
59-
# If this step fails, then you should remove it and run the build manually (see below)
60-
- name: Autobuild
61-
uses: github/codeql-action/autobuild@v2
62-
79+
# If the analyze step fails for one of the languages you are analyzing with
80+
# "We were unable to automatically build your code", modify the matrix above
81+
# to set the build mode to "manual" for that language. Then modify this step
82+
# to build your code.
6383
# ℹ️ Command-line programs to run using the OS shell.
6484
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
65-
66-
# If the Autobuild fails above, remove it and uncomment the following three lines.
67-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
68-
69-
# - run: |
70-
# echo "Run, Build Application using script"
71-
# ./location_of_script_within_repo/buildscript.sh
85+
- if: matrix.build-mode == 'manual'
86+
shell: bash
87+
run: |
88+
echo 'If you are using a "manual" build mode for one or more of the' \
89+
'languages you are analyzing, replace this with the commands to build' \
90+
'your code, for example:'
91+
echo ' make bootstrap'
92+
echo ' make release'
93+
exit 1
7294
7395
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@v2
96+
uses: github/codeql-action/analyze@v3
7597
with:
76-
category: "/language:${{matrix.language}}"
98+
category: "/language:${{matrix.language}}"

.github/workflows/PullRequest-CI.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
versionSpec: 5.x
4040

4141
- name: Step-02 Check out Code
42-
uses: actions/checkout@v2
42+
uses: actions/checkout@v4
4343
with:
4444
fetch-depth: 0
4545

@@ -59,12 +59,12 @@ jobs:
5959
working-directory: '${{ env.working-directory }}'
6060

6161
- name: Step-06 Build Version (Beta)
62-
if: ${{ !startsWith(github.head_ref, 'release/')}}
62+
if: ('!startsWith(github.ref, ''refs/heads/release'')')
6363
run: dotnet build --configuration Release --no-restore -p:PackageVersion=${{ steps.gitversion.outputs.nuGetVersion }}
6464
working-directory: '${{ env.working-directory }}'
6565

6666
- name: Step-06 Build Version (Release)
67-
if: ${{ startsWith(github.head_ref, 'release/')}}
67+
if: ('startsWith(github.ref, ''refs/heads/release'')')
6868
run: dotnet build --configuration Release --no-restore -p:PackageVersion=${{ steps.gitversion.outputs.MajorMinorPatch }}
6969
working-directory: '${{ env.working-directory }}'
7070

@@ -73,7 +73,7 @@ jobs:
7373
working-directory: '${{ env.working-directory }}'
7474

7575
- name: Step-08 Upload Build Artifacts
76-
uses: actions/upload-artifact@v3
76+
uses: actions/upload-artifact@v4
7777
with:
7878
name: build-artifact
7979
path: ${{env.working-directory}}
@@ -90,7 +90,7 @@ jobs:
9090
working-directory: /home/runner/work/Schemio/Schemio
9191
steps:
9292
- name: Step-01 Retrieve Build Artifacts
93-
uses: actions/download-artifact@v3
93+
uses: actions/download-artifact@v4
9494
with:
9595
name: build-artifact
9696
path: ${{env.working-directory}}
@@ -104,14 +104,14 @@ jobs:
104104
Release:
105105
name: Release to Nuget
106106
needs: [Package]
107-
if: ${{ startsWith(github.head_ref, 'release/')}}
107+
if: ('startsWith(github.ref, ''refs/heads/release'')')
108108
runs-on: ubuntu-latest
109109
env:
110110
github-token: '${{ secrets.GH_Packages }}'
111111
nuget-token: '${{ secrets.NUGET_API_KEY }}'
112112
working-directory: /home/runner/work/Schemio/Schemio
113113
steps:
114-
- uses: actions/checkout@v2
114+
- uses: actions/checkout@v4
115115

116116
# - name: Setup dotnet
117117
# uses: actions/setup-dotnet@v1

.github/workflows/PullRequest-CodeQL.yml

Lines changed: 53 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,65 +12,91 @@
1212
name: "PullRequest-CodeQL"
1313

1414
on:
15-
push:
1615
pull_request:
1716
types: [opened, reopened, edited, synchronize]
1817
paths-ignore:
1918
- "**/*.md"
2019
- "**/*.gitignore"
21-
- "**/*.gitattributes"
20+
- "**/*.gitattributes"
2221
schedule:
23-
- cron: '35 15 * * 2'
22+
- cron: '42 7 * * 5'
2423

2524
jobs:
2625
analyze:
27-
name: Analyze
28-
runs-on: ubuntu-latest
26+
name: Analyze (${{ matrix.language }})
27+
# Runner size impacts CodeQL analysis time. To learn more, please see:
28+
# - https://gh.io/recommended-hardware-resources-for-running-codeql
29+
# - https://gh.io/supported-runners-and-hardware-resources
30+
# - https://gh.io/using-larger-runners (GitHub.com only)
31+
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
32+
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
2933
permissions:
34+
# required for all workflows
35+
security-events: write
36+
37+
# required to fetch internal or private CodeQL packs
38+
packages: read
39+
40+
# only required for workflows in private repositories
3041
actions: read
3142
contents: read
32-
security-events: write
3343

3444
strategy:
3545
fail-fast: false
3646
matrix:
37-
language: [ 'csharp' ]
38-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
39-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
40-
47+
include:
48+
- language: actions
49+
build-mode: none
50+
- language: csharp
51+
build-mode: none
52+
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
53+
# Use `c-cpp` to analyze code written in C, C++ or both
54+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
55+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
56+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
57+
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
58+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
59+
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
4160
steps:
4261
- name: Checkout repository
43-
uses: actions/checkout@v3
62+
uses: actions/checkout@v4
63+
64+
# Add any setup steps before running the `github/codeql-action/init` action.
65+
# This includes steps like installing compilers or runtimes (`actions/setup-node`
66+
# or others). This is typically only required for manual builds.
67+
# - name: Setup runtime (example)
68+
# uses: actions/setup-example@v1
4469

4570
# Initializes the CodeQL tools for scanning.
4671
- name: Initialize CodeQL
47-
uses: github/codeql-action/init@v2
72+
uses: github/codeql-action/init@v3
4873
with:
4974
languages: ${{ matrix.language }}
75+
build-mode: ${{ matrix.build-mode }}
5076
# If you wish to specify custom queries, you can do so here or in a config file.
5177
# By default, queries listed here will override any specified in a config file.
5278
# Prefix the list here with "+" to use these queries and those in the config file.
5379

54-
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
80+
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5581
# queries: security-extended,security-and-quality
5682

57-
58-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
59-
# If this step fails, then you should remove it and run the build manually (see below)
60-
- name: Autobuild
61-
uses: github/codeql-action/autobuild@v2
62-
83+
# If the analyze step fails for one of the languages you are analyzing with
84+
# "We were unable to automatically build your code", modify the matrix above
85+
# to set the build mode to "manual" for that language. Then modify this step
86+
# to build your code.
6387
# ℹ️ Command-line programs to run using the OS shell.
6488
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
65-
66-
# If the Autobuild fails above, remove it and uncomment the following three lines.
67-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
68-
69-
# - run: |
70-
# echo "Run, Build Application using script"
71-
# ./location_of_script_within_repo/buildscript.sh
89+
- if: matrix.build-mode == 'manual'
90+
shell: bash
91+
run: |
92+
echo 'If you are using a "manual" build mode for one or more of the' \
93+
'languages you are analyzing, replace this with the commands to build' \
94+
'your code, for example:'
95+
echo ' make bootstrap'
96+
echo ' make release'
97+
exit 1
7298
7399
- name: Perform CodeQL Analysis
74-
uses: github/codeql-action/analyze@v2
100+
uses: github/codeql-action/analyze@v3
75101
with:
76102
category: "/language:${{matrix.language}}"

GitVersion.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
next-version: 2.0.0
1+
next-version: 2.0.1
22
tag-prefix: '[vV]'
33
mode: ContinuousDeployment
44
branches:

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Code Shayk
3+
Copyright (c) 2025 Code Shayk
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# <img src="https://github.com/CodeShayk/Schemio/blob/master/Images/ninja-icon-16.png" alt="ninja" style="width:30px;"/> Schemio v2.0
1+
# <img src="https://github.com/CodeShayk/Schemio/blob/master/Images/ninja-icon-16.png" alt="ninja" style="width:30px;"/> Schemio v2.0.1
22
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://github.com/CodeShayk/Schemio/blob/master/LICENSE.md)
33
[![Master-Build](https://github.com/CodeShayk/Schemio/actions/workflows/Build-Master.yml/badge.svg)](https://github.com/CodeShayk/Schemio/actions/workflows/Build-Master.yml)
44
[![GitHub Release](https://img.shields.io/github/v/release/CodeShayk/Schemio?logo=github&sort=semver)](https://github.com/CodeShayk/Schemio/releases/latest)

src/Schemio.API/Schemio.API.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net9.0</TargetFrameworks>
55
<IsPackable>true</IsPackable>
6-
<Nullable>enable</Nullable>
6+
<Nullable>disable</Nullable>
77
<Title>Schemio with EntityFramework</Title>
88
<Authors>Code Shayk</Authors>
99
<Company>Code Shayk</Company>
1010
<Description>.Net Library to hydrate data entities by object graph using schema paths (supports XPath &amp; JSONPath). Supports Web API using HttpClient. </Description>
11-
<Copyright>Copyright (c) 2024 Code Shayk</Copyright>
11+
<Copyright>Copyright (c) 2025 Code Shayk</Copyright>
1212
<PackageProjectUrl>https://github.com/CodeShayk/Schemio/wiki/i.-Home</PackageProjectUrl>
1313
<PackageIcon>ninja-icon-16.png</PackageIcon>
1414
<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -20,7 +20,7 @@
2020
<IncludeSymbols>True</IncludeSymbols>
2121
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2222
<GenerateDocumentationFile>True</GenerateDocumentationFile>
23-
<Version>2.0.0</Version>
23+
<Version>2.0.1</Version>
2424
</PropertyGroup>
2525

2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

src/Schemio.API/WebQuery.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected virtual IDictionary<string, string> GetRequestHeaders()
4949
/// </summary>
5050
/// <returns></returns>
5151
protected virtual IEnumerable<string> GetResponseHeaders()
52-
{ return []; }
52+
{ return Enumerable.Empty<string>(); }
5353

5454
/// <summary>
5555
/// Implement to construct the api web query.
@@ -149,7 +149,7 @@ async Task<IQueryResult> IWebQuery.Run(IHttpClientFactory httpClientFactory, ILo
149149
return null;
150150
}
151151

152-
private void SetResponseHeaders(HttpResponseMessage response, TQueryResult? result)
152+
private void SetResponseHeaders(HttpResponseMessage response, TQueryResult result)
153153
{
154154
if (response.Headers == null || result == null)
155155
return;
@@ -173,7 +173,8 @@ private void SetResponseHeaders(HttpResponseMessage response, TQueryResult? resu
173173
? responseHeader.Value.ElementAt(0)
174174
: string.Empty;
175175

176-
webResult.Headers ??= new Dictionary<string, string>();
176+
if (webResult.Headers == null)
177+
webResult.Headers = new Dictionary<string, string>();
177178

178179
webResult.Headers.Add(responseHeader.Key, value);
179180
}

src/Schemio.Core/BaseQuery.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Threading.Tasks;
4+
15
namespace Schemio.Core
26
{
37
/// <summary>

0 commit comments

Comments
 (0)