Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reviewed project structure and site #34

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
8 changes: 4 additions & 4 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -72,15 +72,15 @@ 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

- name: Build documentation
run: |
choco install docfx
cd src\Documentation
cd src\documentation
docfx

- uses: actions/upload-artifact@v3
Expand All @@ -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
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/pullrequest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,26 +28,25 @@ 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

- 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
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

- name: Build documentation
run: |
choco install docfx
cd src\Documentation
cd src\documentation
docfx
4 changes: 2 additions & 2 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"globalMetadata": {
"_appLogoPath": "images/logo.png",
"_appTitle": "CLI Parser website",
"_appFooter": "<span>Copyright © 2021 MASES s.r.l..<br>Generated by <strong>DocFX</strong></span>",
"_appFooter": "<span>Copyright © 2023 MASES s.r.l..<br>Generated by <strong>DocFX</strong></span>",
"_gitContribute": {

}
Expand Down
File renamed without changes
File renamed without changes.
18 changes: 14 additions & 4 deletions src/Documentation/toc.yml → src/documentation/toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<RootNamespace>MASES.CLIParser</RootNamespace>
<Title>CLIParser - a parser for command line interface</Title>
<Description>CLIParser - a parser for command line interface</Description>
<Copyright>Copyright © MASES s.r.l. 2022</Copyright>
<Copyright>Copyright © MASES s.r.l. 2023</Copyright>
<Owners>MASES s.r.l.</Owners>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>3.1.2.0</Version>
<Product>CLIParser</Product>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<OutputPath>..\..\bin\</OutputPath>
<OutputPath>..\..\..\bin\</OutputPath>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<PackageProjectUrl>https://github.com/masesgroup/CLIParser/</PackageProjectUrl>
Expand Down Expand Up @@ -41,8 +41,8 @@
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
<ItemGroup>
<None Include="..\..\LICENSE" Pack="true" PackagePath="" />
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\..\..\LICENSE" Pack="true" PackagePath="" />
<None Include="..\..\..\README.md" Pack="true" PackagePath="\" />
<None Include="..\Common\CLIParser.snk" Link="CLIParser.snk" />
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
File renamed without changes.
14 changes: 7 additions & 7 deletions tests/CLIParserTest.sln
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/CLIParserTest/CLIParserTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<RootNamespace>MASES.CLIParserTest</RootNamespace>
<Title>CLIParserTest - a parser test tool for CLIParser</Title>
<Description>CLIParserTest - a parser test tool for CLIParser</Description>
<Copyright>Copyright © MASES s.r.l. 2022</Copyright>
<Copyright>Copyright © MASES s.r.l. 2023</Copyright>
<Authors>MASES s.r.l.</Authors>
<Company>MASES s.r.l.</Company>
<Version>3.1.2.0</Version>
<TargetFrameworks>net462;net6.0;net7.0</TargetFrameworks>
<OutputPath>..\..\bin\</OutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\CLIParser\CLIParser.csproj" />
<ProjectReference Include="..\..\src\net\CLIParser\CLIParser.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="MyFile">
Expand Down
2 changes: 1 addition & 1 deletion tests/CLIParserTest/Program.cs
Original file line number Diff line number Diff line change
@@ -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
Expand Down