Skip to content

Commit

Permalink
Merge pull request #416 from DomCR/src-created
Browse files Browse the repository at this point in the history
repo-rescturcture
  • Loading branch information
DomCR authored Aug 15, 2024
2 parents 512392c + 6d2719b commit ed0b790
Show file tree
Hide file tree
Showing 508 changed files with 57 additions and 140 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ jobs:
runs-on: windows-latest

steps:
- name: Checkout
run: git config --global core.autocrlf true
- uses: actions/checkout@v2
with:
submodules: true
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Restore dependencies and Build
working-directory: src
run: |
dotnet restore
dotnet build --configuration Release --no-restore
29 changes: 11 additions & 18 deletions .github/workflows/build_n_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,22 @@ on:
pull_request:
branches: [ master ]

env:
SAMPLES_FOLDER: "../../../../samples"
OUTPUT_SAMPLES_FOLDER: "../../../../samples/out"
OUTPUT_SINGLE_CASES_FOLDER: "../../../../samples/out/single_cases"
LOCAL_ENV: "false"
DELTA: "0.00001"
DECIMAL_PRECISION: "5"
RUN_DWG_WRITER_SINGLE_CASES_TEST: "false"
defaults:
run:
working-directory: ./src

jobs:
build:

runs-on: windows-latest

steps:
- name: Checkout
run: git config --global core.autocrlf true
- uses: actions/checkout@v2
with:
submodules: true
- name: Restore dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Test
run: dotnet test --configuration Release --no-build --verbosity normal
- uses: cardinalby/export-env-action@v2
with:
envFile: 'github.env'
- name: Build and test
run: |
dotnet restore
dotnet build --configuration Release --no-restore
dotnet test --configuration Release --no-build --verbosity normal
17 changes: 6 additions & 11 deletions .github/workflows/coveralls.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,24 @@ on:
pull_request:
branches: [ master ]

env:
SAMPLES_FOLDER: "../../../../samples"
OUTPUT_SAMPLES_FOLDER: "../../../../samples/out"
OUTPUT_SINGLE_CASES_FOLDER: "../../../../samples/out/single_cases"
LOCAL_ENV: "false"
DELTA: "0.00001"
DECIMAL_PRECISION: "5"
RUN_DWG_WRITER_SINGLE_CASES_TEST: "false"

jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- uses: cardinalby/export-env-action@v2
with:
envFile: 'github.env'
- name: Build and Test ACadSharp
working-directory: src
run: |
dotnet restore
dotnet build --no-restore
dotnet test -p:CollectCoverage=true -p:CoverletOutput=TestResults/ -p:CoverletOutputFormat=lcov --no-build --verbosity normal ACadSharp.Tests/
- name: Build and Test Submodules
working-directory: CSUtilities
working-directory: src/CSUtilities
run: |
dotnet restore
dotnet build --no-restore
Expand All @@ -38,4 +33,4 @@ jobs:
uses: coverallsapp/github-action@v2
with:
github-token: ${{ github.token }}
files: ACadSharp.Tests/TestResults/coverage.info CSUtilities/CSUtilities.Tests/TestResults/coverage.info CSUtilities/CSMath.Tests/TestResults/coverage.info
files: src/ACadSharp.Tests/TestResults/coverage.info src/CSUtilities/CSUtilities.Tests/TestResults/coverage.info src/CSUtilities/CSMath.Tests/TestResults/coverage.info
4 changes: 1 addition & 3 deletions .github/workflows/wiki-gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ on:

jobs:
build:

runs-on: windows-latest
steps:

- name: Checkout
run: git config --global core.autocrlf true
- uses: actions/checkout@v2
Expand All @@ -19,5 +17,5 @@ jobs:
run: ./update-wiki.sh
shell: bash
env:
ASSEMBLY_PATH: "ACadSharp/bin/Release/net6.0/ACadSharp.dll"
ASSEMBLY_PATH: "src/ACadSharp/bin/Release/net6.0/ACadSharp.dll"
GITHUB_TOKEN: ${{ github.token }}
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "CSUtilities"]
path = CSUtilities
url = https://github.com/DomCR/CSUtilities
[submodule "src/CSUtilities"]
path = src/CSUtilities
url = https://github.com/DomCR/CSUtilities.git
76 changes: 0 additions & 76 deletions ACadSharp/Entities/PolyFaceMesh.cs

This file was deleted.

7 changes: 7 additions & 0 deletions github.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SAMPLES_FOLDER: "../../../../../samples"
OUTPUT_SAMPLES_FOLDER: "../../../../../samples/out"
OUTPUT_SINGLE_CASES_FOLDER: "../../../../../samples/out/single_cases"
LOCAL_ENV: "false"
DELTA: "0.00001"
DECIMAL_PRECISION: "5"
RUN_DWG_WRITER_SINGLE_CASES_TEST: "false"
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace ACadSharp.Examples
{
class Program
{
const string _file = "../../../../samples/sample_AC1032.dwg";
const string _file = "../../../../../samples/sample_AC1032.dwg";

static void Main(string[] args)
{
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
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 @@ -24,9 +24,9 @@ public static class TestVariables

static TestVariables()
{
EnvironmentVars.SetIfNull("SAMPLES_FOLDER", "../../../../samples/");
EnvironmentVars.SetIfNull("OUTPUT_SAMPLES_FOLDER", "../../../../samples/out");
EnvironmentVars.SetIfNull("OUTPUT_SINGLE_CASES_FOLDER", "../../../../samples/out/single_cases");
EnvironmentVars.SetIfNull("SAMPLES_FOLDER", "../../../../../samples/");
EnvironmentVars.SetIfNull("OUTPUT_SAMPLES_FOLDER", "../../../../../samples/out");
EnvironmentVars.SetIfNull("OUTPUT_SINGLE_CASES_FOLDER", "../../../../../samples/out/single_cases");
EnvironmentVars.SetIfNull("LOCAL_ENV", "true");
EnvironmentVars.SetIfNull("DELTA", "0.00001");
EnvironmentVars.SetIfNull("DECIMAL_PRECISION", "5");
Expand Down
37 changes: 19 additions & 18 deletions ACadSharp.sln → src/ACadSharp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,32 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ACadSharp.Examples", "ACadS
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D4F40AC7-232A-4140-B26C-C432E6B82E53}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
.gitmodules = .gitmodules
..\.editorconfig = ..\.editorconfig
..\.gitignore = ..\.gitignore
..\.gitmodules = ..\.gitmodules
Directory.Build.props = Directory.Build.props
.config\dotnet-tools.json = .config\dotnet-tools.json
LICENSE = LICENSE
README.md = README.md
..\LICENSE = ..\LICENSE
..\README.md = ..\README.md
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ACadSharp.Tests", "ACadSharp.Tests\ACadSharp.Tests.csproj", "{3503AFF9-E9C1-46F4-8E40-81D3035093DD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "reference", "reference", "{B86AD482-05C4-400E-9CAE-7B96AD6B0C3E}"
ProjectSection(SolutionItems) = preProject
reference\ACadFileExploration.xlsx = reference\ACadFileExploration.xlsx
reference\autocad_2012_pdf_dxf-reference_enu.pdf = reference\autocad_2012_pdf_dxf-reference_enu.pdf
reference\OpenDesign_Specification_for_.dwg_files.pdf = reference\OpenDesign_Specification_for_.dwg_files.pdf
..\reference\ACadFileExploration.xlsx = ..\reference\ACadFileExploration.xlsx
..\reference\autocad_2012_pdf_dxf-reference_enu.pdf = ..\reference\autocad_2012_pdf_dxf-reference_enu.pdf
..\reference\OpenDesign_Specification_for_.dwg_files.pdf = ..\reference\OpenDesign_Specification_for_.dwg_files.pdf
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{9F28195B-66DE-4C0C-B1C0-C8BF3300ED9F}"
ProjectSection(SolutionItems) = preProject
.github\FUNDING.yml = .github\FUNDING.yml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{B2461717-C79A-4081-AD58-5DF52D2EC41F}"
ProjectSection(SolutionItems) = preProject
.github\workflows\build.yml = .github\workflows\build.yml
.github\workflows\build_n_test.yml = .github\workflows\build_n_test.yml
.github\workflows\coveralls.yml = .github\workflows\coveralls.yml
publish.yml = publish.yml
.github\workflows\wiki-gen.yml = .github\workflows\wiki-gen.yml
..\.github\workflows\build.yml = ..\.github\workflows\build.yml
..\.github\workflows\build_n_test.yml = ..\.github\workflows\build_n_test.yml
..\.github\workflows\coveralls.yml = ..\.github\workflows\coveralls.yml
..\.github\workflows\publish.yml = ..\.github\workflows\publish.yml
..\.github\workflows\wiki-gen.yml = ..\.github\workflows\wiki-gen.yml
EndProjectSection
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CSUtilities", "CSUtilities\CSUtilities\CSUtilities.shproj", "{B4EF345D-52B9-47F1-AA2A-B4AE85F62EFC}"
Expand All @@ -48,6 +43,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "CSMath", "CSUtilities\CSMat
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{824FC7E8-4401-428C-87E7-2EA8A78D54BB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{003AC2BC-9682-4C4D-86CC-D5EB4CDC2126}"
ProjectSection(SolutionItems) = preProject
.config\dotnet-tools.json = .config\dotnet-tools.json
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -83,6 +83,7 @@ Global
{B2461717-C79A-4081-AD58-5DF52D2EC41F} = {9F28195B-66DE-4C0C-B1C0-C8BF3300ED9F}
{B4EF345D-52B9-47F1-AA2A-B4AE85F62EFC} = {824FC7E8-4401-428C-87E7-2EA8A78D54BB}
{411B6122-5EF6-46DB-A8F2-43E9C1841E4A} = {824FC7E8-4401-428C-87E7-2EA8A78D54BB}
{003AC2BC-9682-4C4D-86CC-D5EB4CDC2126} = {D4F40AC7-232A-4140-B26C-C432E6B82E53}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B40C2E48-575E-40D1-88C5-272437A5683F}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<Import Project="..\CSUtilities\CSUtilities\CSUtilities.projitems" Label="Shared" />

<ItemGroup>
<None Include="..\README.md">
<None Include="..\..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit ed0b790

Please sign in to comment.