Merge remote-tracking branch 'origin/master' into issue-167_attribute…

…definitions-link-blockrecord

.github/workflows/build.yml

@@ -12,12 +12,11 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - name: Checkout
-      run: git config --global core.autocrlf true
     - uses: actions/checkout@v2
-      with: 
+      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

.github/workflows/build_n_test.yml

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

.github/workflows/coveralls.yml

@@ -0,0 +1,36 @@
+name: Coveralls
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+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: src/CSUtilities
+      run: |
+          dotnet restore
+          dotnet build --no-restore
+          dotnet test -p:CollectCoverage=true -p:CoverletOutput=TestResults/ -p:CoverletOutputFormat=lcov --no-build --verbosity normal CSUtilities.Tests/
+          dotnet test -p:CollectCoverage=true -p:CoverletOutput=TestResults/ -p:CoverletOutputFormat=lcov --no-build --verbosity normal CSMath.Tests/
+    - name: Coveralls action
+      uses: coverallsapp/github-action@v2
+      with:
+        github-token: ${{ github.token }}
+        files: src/ACadSharp.Tests/TestResults/coverage.net6.0.info src/CSUtilities/CSUtilities.Tests/TestResults/coverage.info src/CSUtilities/CSMath.Tests/TestResults/coverage.info 

.github/workflows/publish.yml

@@ -1,24 +1,25 @@
-#name: Publish NuGet package
+name: Publish NuGet package
 
-#on:
-#  push:
-#    tags:
-#      - '*'
+on:
+ workflow_dispatch:
+ release:
+    branches: [ master ]
 
-#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 NuGet package
-#      run: dotnet pack ./ACadSharp.sln -c Release -o packages
-#    - name: Publish NuGet package
-#      run: dotnet nuget push .\packages\ACadSharp*.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
+jobs:
+ build:
+   runs-on: windows-latest
+   steps:
+   - uses: actions/checkout@v3
+     with: 
+       submodules: true
+       fetch-depth: 0
+   - name: Publish NuGet package
+     working-directory: src
+     run: |
+         git submodule update --force --recursive --init --remote
+         dotnet restore
+         dotnet build --configuration Release
+         dotnet pack ./ACadSharp/ACadSharp.csproj --configuration Release
+         foreach($file in (Get-ChildItem ./nupkg -Recurse -Include *.nupkg)) {
+              dotnet nuget push $file --api-key "${{ secrets.NUGET_API_KEY }}" --source https://api.nuget.org/v3/index.json --skip-duplicate
+         }

.github/workflows/wiki-gen.yml

@@ -0,0 +1,21 @@
+name: Wiki genrator
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+    - name: Checkout
+      run: git config --global core.autocrlf true
+    - uses: actions/checkout@v2
+      with: 
+        submodules: true
+    - name: Update Wiki
+      run: ./update-wiki.sh
+      shell: bash
+      env:
+        ASSEMBLY_PATH: "ACadSharp/bin/Release/net6.0/ACadSharp.dll"
+        GITHUB_TOKEN: ${{ github.token }}

.gitmodules

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