update to v0.2.2 (#16)

* update from cryptogarageinc v0.2.5

Co-authored-by: k-matsuzawa <[email protected]>

.github/workflows/check_pre-merge.yml

@@ -0,0 +1,62 @@
+name: pre-merge check
+
+on: 
+  push:
+    branches:
+    - master
+    - develop
+    - features/sprint*
+  pull_request:
+    branches:
+    - master
+    - develop
+    - features/sprint*
+
+jobs:
+  test-dotnet5:
+    name: dotnet 5.0
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-10.15, macos-11.0, windows-2019, ubuntu-20.04, ubuntu-18.04]
+
+    steps:
+    - name: setup dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - uses: actions/checkout@v2
+    - name: build and test
+      if: runner.os != 'Windows'
+      run: |
+        ./tools/build.sh
+        ./tools/test.sh
+    - name: build and test on win
+      if: runner.os == 'Windows'
+      run: |
+        ./tools/build.bat
+        ./tools/test.bat
+
+  test-dotnet3:
+    name: dotnet 3.1
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-10.15, windows-2019, ubuntu-20.04, ubuntu-18.04]
+
+    steps:
+    - name: setup dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 3.1.x
+    - uses: actions/checkout@v2
+    - name: build and test
+      if: runner.os != 'Windows'
+      run: |
+        ./tools/build_core3.sh
+        ./tools/test_core3.sh
+    - name: build and test on win
+      if: runner.os == 'Windows'
+      run: |
+        ./tools/build_core3.bat
+        ./tools/test_core3.bat

.github/workflows/code_scanner.yml

@@ -7,6 +7,10 @@ on:
     - develop
     - features/sprint*
     - feature/code_scanning
+    paths:
+    - '**.cs'
+    - '**/code_scanner.yml'
+    - '**/external_project_local_setting.config'
   pull_request:
     branches:
     - master
@@ -16,7 +20,7 @@ on:
 jobs:
   analyze-CodeQL:
     name: CodeQL
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     strategy:
       fail-fast: false
@@ -34,6 +38,11 @@ jobs:
         # We must fetch at least the immediate parents so that if this is a pull request then we can checkout the head.
         fetch-depth: 2
 
+    - name: setup dotnet
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+
     # If this run was triggered by a pull request event, then checkout the head of the pull request instead of the merge commit.
     - run: git checkout HEAD^2
       if: ${{ github.event_name == 'pull_request' }}

.github/workflows/create_release-and-upload.yml

@@ -12,7 +12,7 @@ env:
 jobs:
   create_releases:
     name: create-releases
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     outputs:
       release_url: ${{ steps.output_url.outputs.upload_url }}
 
@@ -48,7 +48,7 @@ jobs:
   upload-object-windows:
     name: upload-object-win
     needs: create_releases
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
     - name: setup dotnet
@@ -71,8 +71,8 @@ jobs:
       shell: bash
     - name: cmake-build
       run: |
-        .\tools\build.bat
-        .\tools\test.bat
+        .\tools\build_core3.bat
+        .\tools\test_core3.bat
       timeout-minutes: 20
     - name: cmake-install
       shell: cmd
@@ -119,10 +119,10 @@ jobs:
       run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
     - name: cmake-build
       run: |
-        ./tools/build.sh
+        ./tools/build_core3.sh
     - name: test
       run: |
-        ./tools/test.sh
+        ./tools/test_core3.sh
     - name: create archive file
       run: |
         mkdir dist
@@ -148,7 +148,7 @@ jobs:
   upload-object-macos:
     name: upload-object-macos
     needs: create_releases
-    runs-on: macos-latest
+    runs-on: macos-10.15
 
     steps:
     - name: setup dotnet
@@ -166,10 +166,10 @@ jobs:
       run: xcodebuild -version
     - name: cmake-build
       run: |
-        ./tools/build.sh
+        ./tools/build_core3.sh
     - name: test
       run: |
-        ./tools/test.sh
+        ./tools/test_core3.sh
     - name: create archive file
       run: |
         mkdir dist

dotnet_project/CfdCsharpProject.CliTests/CfdCsharpProject.CliTests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
     <StartupObject>Cfd.Tests.Cli.CfdCliTestMain</StartupObject>
     <OutputName>cfdcs_test</OutputName>
     <AssemblyName>cfdcs_test</AssemblyName>

dotnet_project/CfdCsharpProject.xTests/CfdCsharpProject.xTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
 

dotnet_project/CfdCsharpProject/CfdCsharpProject.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks>
     <AssemblyName>cfdcs</AssemblyName>
     <Platforms>x64</Platforms>
   </PropertyGroup>

external/CMakeLists.txt

@@ -43,7 +43,7 @@ if(CFD_TARGET_VERSION)
 set(CFD_TARGET_TAG  ${CFD_TARGET_VERSION})
 message(STATUS "[external project local] cfd target=${CFD_TARGET_VERSION}")
 else()
-set(CFD_TARGET_TAG  v0.2.0)
+set(CFD_TARGET_TAG  v0.2.2)
 endif()
 if(CFD_TARGET_URL)
 set(CFD_TARGET_REP  ${CFD_TARGET_URL})