From 49401f186cdfd42ae9ec123581bdfb05584e5baf Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:23:13 +0100 Subject: [PATCH 1/6] Review 1 --- .github/workflows/build.yaml | 6 +++--- .github/workflows/pullrequest.yaml | 4 ++-- .github/workflows/release.yaml | 4 ++-- LICENSE | 2 +- src/{Documentation => _documentation}/.gitignore | 0 .../api/.gitignore | 0 src/{Documentation => _documentation}/api/index.md | 0 .../apidoc/.gitignore | 0 .../articles/intro.md | 0 .../articles/toc.yml | 0 .../articles/usage.md | 0 src/{Documentation => _documentation}/docfx.json | 0 .../images/logo.png | Bin src/{Documentation => _documentation}/index.md | 0 src/{Documentation => _documentation}/toc.yml | 0 src/{ => net}/CLIParser.sln | 0 src/{ => net}/CLIParser/ArgumentMetadata.cs | 2 +- src/{ => net}/CLIParser/CLIParser.cs | 2 +- src/{ => net}/CLIParser/CLIParser.csproj | 4 ++-- src/{ => net}/CLIParser/InternalConst.cs | 2 +- src/{ => net}/Common/CLIParser.snk | Bin tests/CLIParserTest/CLIParserTest.csproj | 4 ++-- tests/CLIParserTest/Program.cs | 2 +- 23 files changed, 16 insertions(+), 16 deletions(-) rename src/{Documentation => _documentation}/.gitignore (100%) rename src/{Documentation => _documentation}/api/.gitignore (100%) rename src/{Documentation => _documentation}/api/index.md (100%) rename src/{Documentation => _documentation}/apidoc/.gitignore (100%) rename src/{Documentation => _documentation}/articles/intro.md (100%) rename src/{Documentation => _documentation}/articles/toc.yml (100%) rename src/{Documentation => _documentation}/articles/usage.md (100%) rename src/{Documentation => _documentation}/docfx.json (100%) rename src/{Documentation => _documentation}/images/logo.png (100%) rename src/{Documentation => _documentation}/index.md (100%) rename src/{Documentation => _documentation}/toc.yml (100%) rename src/{ => net}/CLIParser.sln (100%) rename src/{ => net}/CLIParser/ArgumentMetadata.cs (99%) rename src/{ => net}/CLIParser/CLIParser.cs (99%) rename src/{ => net}/CLIParser/CLIParser.csproj (96%) rename src/{ => net}/CLIParser/InternalConst.cs (98%) rename src/{ => net}/Common/CLIParser.snk (100%) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index dd599af..cca25c6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -60,7 +60,7 @@ jobs: - uses: nuget/setup-nuget@v1 with: nuget-version: '5.x' - - run: nuget restore src\CLIParser.sln + - run: nuget restore src\net\CLIParser.sln - name: Compile run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" tests\CLIParserTest.sln @@ -72,7 +72,7 @@ jobs: dotnet run --framework net7.0 --project tests\CLIParserTest\CLIParserTest.csproj - name: Create Release - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\CLIParser.sln + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\CLIParser.sln - name: Clear documentation folder run: Remove-Item .\docs\* -Recurse -Force -Exclude _config.yml,CNAME @@ -80,7 +80,7 @@ jobs: - name: Build documentation run: | choco install docfx - cd src\Documentation + cd src\documentation docfx - uses: actions/upload-artifact@v3 diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml index 7252067..604f8e6 100644 --- a/.github/workflows/pullrequest.yaml +++ b/.github/workflows/pullrequest.yaml @@ -28,7 +28,7 @@ jobs: - uses: nuget/setup-nuget@v1 with: nuget-version: '5.x' - - run: nuget restore src\CLIParser.sln + - run: nuget restore src\net\CLIParser.sln - name: Compile run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" tests\CLIParserTest.sln @@ -49,5 +49,5 @@ jobs: - name: Build documentation run: | choco install docfx - cd src\Documentation + cd src\documentation docfx diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 31da448..664664b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -31,10 +31,10 @@ jobs: with: nuget-version: '5.x' - - run: nuget restore src\CLIParser.sln + - run: nuget restore src\net\CLIParser.sln - name: Build NuGet Packages - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\CLIParser.sln + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\CLIParser.sln - uses: nuget/setup-nuget@v1 with: diff --git a/LICENSE b/LICENSE index 5c9d0b0..f10bf54 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 MASES s.r.l. +Copyright (c) 2023 MASES s.r.l. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/Documentation/.gitignore b/src/_documentation/.gitignore similarity index 100% rename from src/Documentation/.gitignore rename to src/_documentation/.gitignore diff --git a/src/Documentation/api/.gitignore b/src/_documentation/api/.gitignore similarity index 100% rename from src/Documentation/api/.gitignore rename to src/_documentation/api/.gitignore diff --git a/src/Documentation/api/index.md b/src/_documentation/api/index.md similarity index 100% rename from src/Documentation/api/index.md rename to src/_documentation/api/index.md diff --git a/src/Documentation/apidoc/.gitignore b/src/_documentation/apidoc/.gitignore similarity index 100% rename from src/Documentation/apidoc/.gitignore rename to src/_documentation/apidoc/.gitignore diff --git a/src/Documentation/articles/intro.md b/src/_documentation/articles/intro.md similarity index 100% rename from src/Documentation/articles/intro.md rename to src/_documentation/articles/intro.md diff --git a/src/Documentation/articles/toc.yml b/src/_documentation/articles/toc.yml similarity index 100% rename from src/Documentation/articles/toc.yml rename to src/_documentation/articles/toc.yml diff --git a/src/Documentation/articles/usage.md b/src/_documentation/articles/usage.md similarity index 100% rename from src/Documentation/articles/usage.md rename to src/_documentation/articles/usage.md diff --git a/src/Documentation/docfx.json b/src/_documentation/docfx.json similarity index 100% rename from src/Documentation/docfx.json rename to src/_documentation/docfx.json diff --git a/src/Documentation/images/logo.png b/src/_documentation/images/logo.png similarity index 100% rename from src/Documentation/images/logo.png rename to src/_documentation/images/logo.png diff --git a/src/Documentation/index.md b/src/_documentation/index.md similarity index 100% rename from src/Documentation/index.md rename to src/_documentation/index.md diff --git a/src/Documentation/toc.yml b/src/_documentation/toc.yml similarity index 100% rename from src/Documentation/toc.yml rename to src/_documentation/toc.yml diff --git a/src/CLIParser.sln b/src/net/CLIParser.sln similarity index 100% rename from src/CLIParser.sln rename to src/net/CLIParser.sln diff --git a/src/CLIParser/ArgumentMetadata.cs b/src/net/CLIParser/ArgumentMetadata.cs similarity index 99% rename from src/CLIParser/ArgumentMetadata.cs rename to src/net/CLIParser/ArgumentMetadata.cs index 389fb2d..c18e237 100644 --- a/src/CLIParser/ArgumentMetadata.cs +++ b/src/net/CLIParser/ArgumentMetadata.cs @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 MASES s.r.l. + * Copyright (c) 2023 MASES s.r.l. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/CLIParser/CLIParser.cs b/src/net/CLIParser/CLIParser.cs similarity index 99% rename from src/CLIParser/CLIParser.cs rename to src/net/CLIParser/CLIParser.cs index 923bf81..0520fb5 100644 --- a/src/CLIParser/CLIParser.cs +++ b/src/net/CLIParser/CLIParser.cs @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 MASES s.r.l. + * Copyright (c) 2023 MASES s.r.l. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/CLIParser/CLIParser.csproj b/src/net/CLIParser/CLIParser.csproj similarity index 96% rename from src/CLIParser/CLIParser.csproj rename to src/net/CLIParser/CLIParser.csproj index 6d337fa..4d924c9 100644 --- a/src/CLIParser/CLIParser.csproj +++ b/src/net/CLIParser/CLIParser.csproj @@ -4,7 +4,7 @@ MASES.CLIParser CLIParser - a parser for command line interface CLIParser - a parser for command line interface - Copyright © MASES s.r.l. 2022 + Copyright © MASES s.r.l. 2023 MASES s.r.l. MASES s.r.l. MASES s.r.l. @@ -12,7 +12,7 @@ CLIParser true netstandard2.0 - ..\..\bin\ + ..\..\..\bin\ true true https://github.com/masesgroup/CLIParser/ diff --git a/src/CLIParser/InternalConst.cs b/src/net/CLIParser/InternalConst.cs similarity index 98% rename from src/CLIParser/InternalConst.cs rename to src/net/CLIParser/InternalConst.cs index 6e6b117..6fb1bd3 100644 --- a/src/CLIParser/InternalConst.cs +++ b/src/net/CLIParser/InternalConst.cs @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2022 MASES s.r.l. + * Copyright (c) 2023 MASES s.r.l. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal diff --git a/src/Common/CLIParser.snk b/src/net/Common/CLIParser.snk similarity index 100% rename from src/Common/CLIParser.snk rename to src/net/Common/CLIParser.snk diff --git a/tests/CLIParserTest/CLIParserTest.csproj b/tests/CLIParserTest/CLIParserTest.csproj index 3e16c13..15a2562 100644 --- a/tests/CLIParserTest/CLIParserTest.csproj +++ b/tests/CLIParserTest/CLIParserTest.csproj @@ -6,7 +6,7 @@ MASES.CLIParserTest CLIParserTest - a parser test tool for CLIParser CLIParserTest - a parser test tool for CLIParser - Copyright © MASES s.r.l. 2022 + Copyright © MASES s.r.l. 2023 MASES s.r.l. MASES s.r.l. 3.1.2.0 @@ -14,7 +14,7 @@ ..\..\bin\ - + diff --git a/tests/CLIParserTest/Program.cs b/tests/CLIParserTest/Program.cs index ed4f438..d102943 100644 --- a/tests/CLIParserTest/Program.cs +++ b/tests/CLIParserTest/Program.cs @@ -1,7 +1,7 @@ /* * MIT License * - * Copyright (c) 2021 MASES s.r.l. + * Copyright (c) 2023 MASES s.r.l. * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal From ba4f567c2c9f68e1db2840eff0023a488a46f828 Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:23:39 +0100 Subject: [PATCH 2/6] Review 2 --- src/{_documentation => documentation}/.gitignore | 0 .../api/.gitignore | 0 src/{_documentation => documentation}/api/index.md | 0 .../apidoc/.gitignore | 0 .../articles/intro.md | 0 .../articles/toc.yml | 0 .../articles/usage.md | 0 src/{_documentation => documentation}/docfx.json | 0 .../images/logo.png | Bin src/{_documentation => documentation}/index.md | 0 src/{_documentation => documentation}/toc.yml | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename src/{_documentation => documentation}/.gitignore (100%) rename src/{_documentation => documentation}/api/.gitignore (100%) rename src/{_documentation => documentation}/api/index.md (100%) rename src/{_documentation => documentation}/apidoc/.gitignore (100%) rename src/{_documentation => documentation}/articles/intro.md (100%) rename src/{_documentation => documentation}/articles/toc.yml (100%) rename src/{_documentation => documentation}/articles/usage.md (100%) rename src/{_documentation => documentation}/docfx.json (100%) rename src/{_documentation => documentation}/images/logo.png (100%) rename src/{_documentation => documentation}/index.md (100%) rename src/{_documentation => documentation}/toc.yml (100%) diff --git a/src/_documentation/.gitignore b/src/documentation/.gitignore similarity index 100% rename from src/_documentation/.gitignore rename to src/documentation/.gitignore diff --git a/src/_documentation/api/.gitignore b/src/documentation/api/.gitignore similarity index 100% rename from src/_documentation/api/.gitignore rename to src/documentation/api/.gitignore diff --git a/src/_documentation/api/index.md b/src/documentation/api/index.md similarity index 100% rename from src/_documentation/api/index.md rename to src/documentation/api/index.md diff --git a/src/_documentation/apidoc/.gitignore b/src/documentation/apidoc/.gitignore similarity index 100% rename from src/_documentation/apidoc/.gitignore rename to src/documentation/apidoc/.gitignore diff --git a/src/_documentation/articles/intro.md b/src/documentation/articles/intro.md similarity index 100% rename from src/_documentation/articles/intro.md rename to src/documentation/articles/intro.md diff --git a/src/_documentation/articles/toc.yml b/src/documentation/articles/toc.yml similarity index 100% rename from src/_documentation/articles/toc.yml rename to src/documentation/articles/toc.yml diff --git a/src/_documentation/articles/usage.md b/src/documentation/articles/usage.md similarity index 100% rename from src/_documentation/articles/usage.md rename to src/documentation/articles/usage.md diff --git a/src/_documentation/docfx.json b/src/documentation/docfx.json similarity index 100% rename from src/_documentation/docfx.json rename to src/documentation/docfx.json diff --git a/src/_documentation/images/logo.png b/src/documentation/images/logo.png similarity index 100% rename from src/_documentation/images/logo.png rename to src/documentation/images/logo.png diff --git a/src/_documentation/index.md b/src/documentation/index.md similarity index 100% rename from src/_documentation/index.md rename to src/documentation/index.md diff --git a/src/_documentation/toc.yml b/src/documentation/toc.yml similarity index 100% rename from src/_documentation/toc.yml rename to src/documentation/toc.yml From 2884f5573e5f0a0992584ad232cf1f7240bdd554 Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:25:19 +0100 Subject: [PATCH 3/6] Review 3 --- src/documentation/docfx.json | 2 +- src/documentation/toc.yml | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/documentation/docfx.json b/src/documentation/docfx.json index 931ed5e..7daeac0 100644 --- a/src/documentation/docfx.json +++ b/src/documentation/docfx.json @@ -55,7 +55,7 @@ "globalMetadata": { "_appLogoPath": "images/logo.png", "_appTitle": "CLI Parser website", - "_appFooter": "Copyright © 2021 MASES s.r.l..
Generated by DocFX", + "_appFooter": "Copyright © 2023 MASES s.r.l..
Generated by DocFX", "_gitContribute": { } diff --git a/src/documentation/toc.yml b/src/documentation/toc.yml index bfae8ec..4c3e095 100644 --- a/src/documentation/toc.yml +++ b/src/documentation/toc.yml @@ -13,14 +13,24 @@ href: https://masesgroup.github.io/sinapse/ - name: JCOBridge href: https://masesgroup.github.io/JCOBridge/ + - name: JNet + href: https://masesgroup.github.io/JNet/ + - name: KNet + href: https://masesgroup.github.io/KNet/ + - name: KEFCore + href: https://masesgroup.github.io/KEFCore/ + - name: KNetOPC + href: https://masesgroup.github.io/KNetOPC/ - name: JCOReflector href: https://masesgroup.github.io/JCOReflector/ - - name: DDMChat - href: https://masesgroup.github.io/DDMChat/ + - name: NuReflector + href: https://masesgroup.github.io/NuReflector/ + - name: DataDistributionManager + href: https://masesgroup.github.io/DataDistributionManager/ + - name: CLIParser + href: https://masesgroup.github.io/CLIParser/ - name: JCO SWT Bridge href: https://masesgroup.github.io/JCOSWTBridge/ - - name: JCOBridge Examples - href: https://masesgroup.github.io/JCOBridge-Examples - name: External links dropdown: true items: From 963088b41ad5ba27eefeaca2eba7c18aeeac9b28 Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:07:16 +0100 Subject: [PATCH 4/6] Fix --- src/net/CLIParser/CLIParser.csproj | 4 ++-- tests/CLIParserTest.sln | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/net/CLIParser/CLIParser.csproj b/src/net/CLIParser/CLIParser.csproj index 4d924c9..d0366e6 100644 --- a/src/net/CLIParser/CLIParser.csproj +++ b/src/net/CLIParser/CLIParser.csproj @@ -41,8 +41,8 @@ true - - + + diff --git a/tests/CLIParserTest.sln b/tests/CLIParserTest.sln index 09e6cd1..8d583aa 100644 --- a/tests/CLIParserTest.sln +++ b/tests/CLIParserTest.sln @@ -1,11 +1,11 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31624.102 +# Visual Studio Version 17 +VisualStudioVersion = 17.7.34202.233 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CLIParserTest", "CLIParserTest\CLIParserTest.csproj", "{3EF594CC-5450-45D3-BAB0-07D4B11C4872}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CLIParser", "..\src\CLIParser\CLIParser.csproj", "{0505A98D-02B9-4B91-8B3D-BF16F5F0B623}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CLIParser", "..\src\net\CLIParser\CLIParser.csproj", "{A235BF90-1C9A-491C-B39A-E6E4386CB2A8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -17,10 +17,10 @@ Global {3EF594CC-5450-45D3-BAB0-07D4B11C4872}.Debug|Any CPU.Build.0 = Debug|Any CPU {3EF594CC-5450-45D3-BAB0-07D4B11C4872}.Release|Any CPU.ActiveCfg = Release|Any CPU {3EF594CC-5450-45D3-BAB0-07D4B11C4872}.Release|Any CPU.Build.0 = Release|Any CPU - {0505A98D-02B9-4B91-8B3D-BF16F5F0B623}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0505A98D-02B9-4B91-8B3D-BF16F5F0B623}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0505A98D-02B9-4B91-8B3D-BF16F5F0B623}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0505A98D-02B9-4B91-8B3D-BF16F5F0B623}.Release|Any CPU.Build.0 = Release|Any CPU + {A235BF90-1C9A-491C-B39A-E6E4386CB2A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A235BF90-1C9A-491C-B39A-E6E4386CB2A8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A235BF90-1C9A-491C-B39A-E6E4386CB2A8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A235BF90-1C9A-491C-B39A-E6E4386CB2A8}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From f0be591324ef634032157ecd272fd533e92fc66f Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:14:56 +0100 Subject: [PATCH 5/6] Test aligned --- .github/workflows/pullrequest.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml index 604f8e6..cb48a01 100644 --- a/.github/workflows/pullrequest.yaml +++ b/.github/workflows/pullrequest.yaml @@ -35,10 +35,9 @@ jobs: - name: Test run: | - dotnet run --framework net461 --project tests\CLIParserTest\CLIParserTest.csproj + dotnet run --framework net462 --project tests\CLIParserTest\CLIParserTest.csproj dotnet run --framework net6.0 --project tests\CLIParserTest\CLIParserTest.csproj - dotnet run --framework net5.0 --project tests\CLIParserTest\CLIParserTest.csproj - dotnet run --framework netcoreapp3.1 --project tests\CLIParserTest\CLIParserTest.csproj + dotnet run --framework net7.0 --project tests\CLIParserTest\CLIParserTest.csproj - name: Create Release run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\CLIParser.sln From 171670e546f9067dc1ed2cfe4cc5aae52dd18791 Mon Sep 17 00:00:00 2001 From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com> Date: Thu, 2 Nov 2023 16:22:13 +0100 Subject: [PATCH 6/6] Fix --- .github/workflows/build.yaml | 2 +- .github/workflows/pullrequest.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cca25c6..68fd887 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -104,7 +104,7 @@ jobs: body: Automated changes by GitHub action reviewers: masesdevelopers assignees: masesdevelopers - labels: documentation, enhancement + labels: documentation, enhancement # - name: Commit changes # if: ${{ github.repository_owner == 'masesgroup'}} #do not push any changes outside main repo diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml index cb48a01..8435620 100644 --- a/.github/workflows/pullrequest.yaml +++ b/.github/workflows/pullrequest.yaml @@ -40,7 +40,7 @@ jobs: dotnet run --framework net7.0 --project tests\CLIParserTest\CLIParserTest.csproj - name: Create Release - run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\CLIParser.sln + run: dotnet build --no-incremental --configuration Release /p:Platform="Any CPU" src\net\CLIParser.sln - name: Clear documentation folder run: Remove-Item .\docs\* -Recurse -Force -Exclude _config.yml,CNAME