Skip to content

Commit 4f5e040

Browse files
PTKuPTKu
authored
Merge pull request #342 from ix-ax/341-_NEW-FEATURE_Poco_types_should_be_rather_placed_into_onlinenamespace_Poco_instead_of_Poco_onlinenamespace
[NEW-FEATURE] Poco types should be rather placed into onlinenamespace.Poco instead of Poco.onlinenamespace
2 parents f878944 + 6204ab7 commit 4f5e040

File tree

208 files changed

+3495
-3609
lines changed

Some content is hidden

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

208 files changed

+3495
-3609
lines changed

‎.github/workflows/dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: "Run build script"
3030
env:
3131
GH_TOKEN : ${{ secrets.GH_TOKEN }}
32-
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 2 --do-publish true
32+
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 2 --do-publish true --framework net9.0
3333
- name: Test Report
3434
uses: dorny/test-reporter@v1
3535
if: success() || failure()

‎.github/workflows/master.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: "Run build script"
3636
env:
3737
GH_TOKEN : ${{ secrets.GH_TOKEN }}
38-
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 100 --do-publish true --do-publish-release true
38+
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 100 --do-publish true --do-publish-release true --framework net9.0
3939
- name: Test Report
4040
uses: dorny/test-reporter@v1
4141
if: success() || failure()

‎.github/workflows/pr-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
run: dotnet build cake/Build.csproj
2828

2929
- name: "Run build script"
30-
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 1
30+
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 1 --framework net9.0
3131
- name: Test Report
3232
uses: dorny/test-reporter@v1
3333
if: success() || failure()

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: "Run build script"
3636
env:
3737
GH_TOKEN : ${{ secrets.GH_TOKEN }}
38-
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 2 --do-publish true --do-publish-release true
38+
run: dotnet run --project cake/Build.csproj --do-test true --do-pack true --test-level 2 --do-publish true --do-publish-release true --framework net9.0
3939
- name: Test Report
4040
uses: dorny/test-reporter@v1
4141
if: success() || failure()

‎src/Directory.Build.props renamed to ‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0</TargetFrameworks>
44
<!-- Define output directories based on project names
55
<OutputPath>$(MSBuildThisFileDirectory)\.builds\bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
66
<IntermediateOutputPath>$(MSBuildThisFileDirectory)\.builds\obj\$(MSBuildProjectName)\$(Configuration)\</IntermediateOutputPath> -->

‎src/Directory.Packages.props renamed to ‎Directory.Packages.props

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,59 @@
55
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
66
</PropertyGroup>
77
<ItemGroup>
8-
<GlobalPackageReference Include="GitVersion.MsBuild" Version="6.0.5">
8+
<GlobalPackageReference Include="GitVersion.MsBuild" Version="5.10.3">
99
<PrivateAssets>all</PrivateAssets>
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
</GlobalPackageReference>
12-
<PackageVersion Include="Google.Protobuf" Version="3.22.0" />
12+
<PackageVersion Include="Cake.DocFx" Version="1.0.0" />
13+
<PackageVersion Include="Octokit" Version="13.0.1" />
14+
<PackageVersion Include="Octokit.Extensions" Version="1.0.7" />
15+
<PackageVersion Include="Cake.Frosting" Version="5.0.0" />
16+
<PackageVersion Include="Cake.Powershell" Version="4.0.0" />
17+
<PackageVersion Include="Google.Protobuf" Version="3.28.3" />
1318
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
1419
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
15-
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="7.0.2" />
16-
<PackageVersion Include="CliWrap" Version="3.6.0" />
17-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
18-
<PackageVersion Include="NuGet.Configuration" Version="6.3.4" />
19-
<PackageVersion Include="NuGet.Packaging" Version="6.3.4" />
20+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
21+
<PackageVersion Include="CliWrap" Version="3.6.7" />
22+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
23+
<PackageVersion Include="NuGet.Configuration" Version="6.12.1" />
24+
<PackageVersion Include="NuGet.Packaging" Version="6.12.1" />
2025
<PackageVersion Include="Polly" Version="8.5.0" />
2126
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
22-
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
23-
<PackageVersion Include="YamlDotNet" Version="13.0.0" />
24-
<PackageVersion Include="Irony" Version="1.2.0" />
25-
<PackageVersion Include="Irony.Interpreter" Version="1.2.0" />
27+
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
28+
<PackageVersion Include="Irony" Version="1.5.3" />
29+
<PackageVersion Include="Irony.Interpreter" Version="1.5.3" />
2630
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
27-
<PackageVersion Include="LibGit2Sharp" Version="0.27.2" />
31+
<PackageVersion Include="LibGit2Sharp" Version="0.30.0" />
2832
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
29-
<PackageVersion Include="YamlDotNet" Version="13.0.0" />
30-
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
31-
<PackageVersion Include="bunit" Version="1.11.7" />
32-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
33-
<PackageVersion Include="xunit" Version="2.4.2" />
34-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
35-
<PackageVersion Include="ResXResourceReader.NetStandard" Version="1.1.0" />
33+
<PackageVersion Include="System.IO.Packaging" Version="9.0.0" />
34+
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
35+
<PackageVersion Include="YamlDotNet" Version="16.2.0" />
36+
<PackageVersion Include="bunit" Version="1.36.0" />
3637
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
37-
<PackageVersion Include="NSubstitute" Version="5.0.0" />
3838
<PackageVersion Include="xunit" Version="2.9.2" />
3939
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
40+
<PackageVersion Include="ResXResourceReader.NetStandard" Version="1.3.0" />
4041
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
4142
<PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
4243
<PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
4344
<PackageVersion Include="Siemens.Simatic.S7.Webserver.API" Version="2.2.26" />
44-
<PackageVersion Include="nunit" Version="3.13.3" />
45-
<PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
46-
<PackageVersion Include="NSubstitute" Version="5.0.0" />
47-
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.15" />
48-
<PackageVersion Include="AutoFixture" Version="4.17.0" />
49-
<PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.17.0" />
50-
<PackageVersion Include="FluentAssertions" Version="6.8.0" />
51-
<PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
52-
<PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
53-
<PackageVersion Include="Moq" Version="4.18.2" />
54-
<PackageVersion Include="System.Speech" Version="7.0.0" />
45+
<PackageVersion Include="nunit" Version="4.2.2" />
46+
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
47+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
48+
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
49+
<PackageVersion Include="AutoFixture" Version="4.18.1" />
50+
<PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
51+
<PackageVersion Include="FluentAssertions" Version="6.12.2" />
52+
<PackageVersion Include="MSTest.TestAdapter" Version="3.6.3" />
53+
<PackageVersion Include="MSTest.TestFramework" Version="3.6.3" />
54+
<PackageVersion Include="Moq" Version="4.20.72" />
55+
<PackageVersion Include="System.Speech" Version="9.0.0" />
5556
<PackageVersion Include="System.Interactive" Version="6.0.1" />
56-
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.2" />
57-
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.2" />
58-
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.2" />
59-
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.2" />
60-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.2" />
57+
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.0" />
58+
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.0" />
59+
<PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="9.0.0" />
60+
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
61+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.0" />
6162
</ItemGroup>
6263
</Project>

‎GitVersion.yml

Lines changed: 40 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,54 @@
1-
assembly-versioning-scheme: MajorMinorPatch
2-
assembly-file-versioning-scheme: MajorMinorPatch
3-
next-version: 0.19.3
4-
tag-prefix: '[vV]?'
5-
version-in-branch-pattern: (?<version>[vV]?\d+(\.\d+)?(\.\d+)?).*
6-
major-version-bump-message: \+semver:\s?(breaking|major)
7-
minor-version-bump-message: \+semver:\s?(feature|minor)
8-
patch-version-bump-message: \+semver:\s?(fix|patch)
9-
no-bump-message: \+semver:\s?(none|skip)
10-
tag-pre-release-weight: 60000
11-
commit-date-format: yyyy-MM-dd
12-
merge-message-formats: {}
13-
update-build-number: true
14-
semantic-version-format: Strict
15-
strategies:
16-
- Fallback
17-
- ConfiguredNextVersion
18-
- MergeMessage
19-
- TaggedCommit
20-
- TrackReleaseBranches
21-
- VersionInBranchName
1+
mode: ContinuousDeployment
2+
next-version: 0.20.0
223
branches:
234
main:
24-
label: ''
5+
regex: ^master$|^main$
6+
mode: ContinuousDelivery
7+
tag: ''
258
increment: Patch
26-
prevent-increment:
27-
of-merged-branch: true
9+
prevent-increment-of-merged-branch-version: true
2810
track-merge-target: false
29-
track-merge-message: true
30-
regex: ^master$|^main$
31-
source-branches: []
32-
is-source-branch-for: []
11+
source-branches: [ 'develop', 'release' ]
3312
tracks-release-branches: false
3413
is-release-branch: false
35-
is-main-branch: true
14+
is-mainline: true
3615
pre-release-weight: 55000
16+
develop:
17+
regex: ^dev(elop)?(ment)?$
18+
mode: ContinuousDeployment
19+
tag: alpha
20+
increment: Minor
21+
prevent-increment-of-merged-branch-version: false
22+
track-merge-target: true
23+
source-branches: []
24+
tracks-release-branches: true
25+
is-release-branch: false
26+
is-mainline: false
27+
pre-release-weight: 0
3728
release:
38-
mode: ManualDeployment
39-
label: beta
40-
increment: Patch
41-
prevent-increment:
42-
of-merged-branch: true
43-
when-branch-merged: false
44-
when-current-commit-tagged: false
29+
regex: ^releases?[/-]
30+
mode: ContinuousDeployment
31+
tag: preview
32+
increment: None
33+
prevent-increment-of-merged-branch-version: true
4534
track-merge-target: false
46-
track-merge-message: true
47-
regex: ^releases?[/-](?<BranchName>.+)
48-
source-branches:
49-
- main
50-
is-source-branch-for: []
35+
source-branches: [ 'develop', 'main', 'support', 'release' ]
5136
tracks-release-branches: false
5237
is-release-branch: true
53-
is-main-branch: false
54-
pre-release-weight: 30000
55-
feature:
56-
mode: ManualDeployment
57-
label: '{BranchName}'
58-
increment: Inherit
59-
prevent-increment:
60-
when-current-commit-tagged: false
61-
track-merge-message: true
62-
regex: ^features?[/-](?<BranchName>.+)
63-
source-branches:
64-
- main
65-
- release
66-
is-source-branch-for: []
67-
is-main-branch: false
68-
pre-release-weight: 30000
69-
pull-request:
38+
is-mainline: false
39+
pre-release-weight: 30000
40+
support:
41+
regex: ^support[/-]
7042
mode: ContinuousDelivery
71-
label: PullRequest
72-
increment: Inherit
73-
prevent-increment:
74-
of-merged-branch: true
75-
when-current-commit-tagged: false
76-
label-number-pattern: '[/-](?<number>\d+)'
77-
track-merge-message: true
78-
regex: ^(pull|pull\-requests|pr)[/-]
79-
source-branches:
80-
- main
81-
- release
82-
- feature
83-
is-source-branch-for: []
84-
pre-release-weight: 30000
85-
unknown:
86-
mode: ManualDeployment
87-
label: '{BranchName}'
88-
increment: Inherit
89-
prevent-increment:
90-
when-current-commit-tagged: false
91-
track-merge-message: false
92-
regex: (?<BranchName>.+)
93-
source-branches:
94-
- main
95-
- release
96-
- feature
97-
- pull-request
98-
is-source-branch-for: []
99-
is-main-branch: false
43+
tag: ''
44+
increment: Patch
45+
prevent-increment-of-merged-branch-version: true
46+
track-merge-target: false
47+
source-branches: [ 'main' ]
48+
tracks-release-branches: false
49+
is-release-branch: false
50+
is-mainline: true
51+
pre-release-weight: 55000
10052
ignore:
10153
sha: []
102-
mode: ContinuousDelivery
103-
label: '{BranchName}'
104-
increment: Inherit
105-
prevent-increment:
106-
of-merged-branch: false
107-
when-branch-merged: false
108-
when-current-commit-tagged: true
109-
track-merge-target: false
110-
track-merge-message: true
111-
commit-message-incrementing: Enabled
112-
regex: ''
113-
source-branches: []
114-
is-source-branch-for: []
115-
tracks-release-branches: false
116-
is-release-branch: false
117-
is-main-branch: false
54+
merge-message-formats: {}

‎build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# run build
2-
dotnet run --project cake/Build.csproj -- $args
3-
exit $LASTEXITCODE;
2+
dotnet run --project cake/Build.csproj --framework net9.0 -- $args
3+
exit $LASTEXITCODE;vm43001Jetpow3r

‎cake/Build.csproj

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputType>Exe</OutputType>
4-
<TargetFramework>net8.0</TargetFramework>
3+
<OutputType>Exe</OutputType>
54
<RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
65
<IsPackable>false</IsPackable>
76
</PropertyGroup>
87
<ItemGroup>
9-
<PackageReference Include="Cake.DocFx" Version="1.0.0" />
10-
<PackageReference Include="CliWrap" Version="3.5.0" />
11-
<PackageReference Include="CommandLineParser" Version="2.9.1" />
12-
<PackageReference Include="Octokit" Version="4.0.1" />
13-
<PackageReference Include="Octokit.Extensions" Version="1.0.7" />
14-
<PackageReference Include="Cake.Frosting" Version="2.3.0" />
15-
<PackageReference Include="Cake.Powershell" Version="2.0.0" />
16-
<PackageReference Include="Polly" Version="7.2.3" />
17-
<PackageReference Include="GitVersion.MsBuild" Version="6.0.5">
18-
<PrivateAssets>all</PrivateAssets>
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20-
</PackageReference>
8+
<PackageReference Include="Cake.DocFx" />
9+
<PackageReference Include="CliWrap" />
10+
<PackageReference Include="CommandLineParser" />
11+
<PackageReference Include="Octokit" />
12+
<PackageReference Include="Octokit.Extensions" />
13+
<PackageReference Include="Cake.Frosting" />
14+
<PackageReference Include="Cake.Powershell" />
15+
<PackageReference Include="Polly" />
16+
<PackageReference Include="System.IO.Packaging" />
17+
<PackageReference Include="System.Text.Json" />
2118
</ItemGroup>
2219
<ItemGroup>
2320
<ProjectReference Include="..\src\AXSharp.tools\src\AXSharp.nuget.update\AXSharp.nuget.update.csproj" />
24-
</ItemGroup>
21+
</ItemGroup>
2522
</Project>

0 commit comments

Comments
 (0)