[2023-05-07] 再設計

.github/workflows/release.yml

@@ -15,8 +15,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: "recursive"
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
       - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
@@ -28,14 +26,19 @@ jobs:
         run: dotnet restore
       - name: Build
         run: bash build-linux.sh
+
+      - name: Set variables
+        id: variables
+        run: echo "release_version=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
       - name: Zip
         run: |
-          cd ./pub/linux-x64 && zip -r ../../axus-linux-x64-${{ env.RELEASE_VERSION }}.zip ./*
+          cd ./pub/linux-x64 && zip -r ../../axus-linux-x64-${{ steps.variables.outputs.release_version }}.zip ./*
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            axus-linux-x64-${{ env.RELEASE_VERSION }}.zip
+            axus-linux-x64-${{ steps.variables.outputs.release_version }}.zip
+
   windows:
     runs-on: windows-latest
     env:
@@ -45,10 +48,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: "recursive"
-      - name: Set env
-        run: |
-          chcp 65001 #set code page to utf-8
-          echo ("RELEASE_VERSION=" + $env:GITHUB_REF.replace('refs/tags/', '')) >> $env:GITHUB_ENV
       - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
@@ -60,13 +59,19 @@ jobs:
         run: dotnet restore
       - name: Build
         run: pwsh build-win.ps1
+
+      - name: Set variables
+        id: variables
+        run: |
+          chcp 65001 #set code page to utf-8
+          echo ("release_version=" + $env:GITHUB_REF.replace('refs/tags/', '')) >> $env:GITHUB_OUTPUT
       - name: Zip
         uses: vimtor/action-zip@v1
         with:
           files: ./pub/win-x64
-          dest: axus-win-x64-${{ env.RELEASE_VERSION }}.zip
+          dest: axus-win-x64-${{ steps.variables.outputs.release_version }}.zip
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            axus-win-x64-${{ env.RELEASE_VERSION }}.zip
+            axus-win-x64-${{ steps.variables.outputs.release_version }}.zip

.github/workflows/test-slim.yml

@@ -0,0 +1,57 @@
+name: test-slim
+
+on:
+  push:
+    branches:
+      - "**"
+      - "!main"
+      - "!releases/*"
+    paths:
+      - "**"
+      - "!/docs/**"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  StableTest: false
+  ContinuousIntegrationBuild: true
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+      - name: Install dependencies (lib)
+        run: sudo apt-get install libsnappy-dev
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.0.x
+      - name: Setup dotnet tool
+        run: dotnet tool restore
+      - name: Install dependencies
+        run: dotnet restore
+      - name: format check
+        run: dotnet format --verify-no-changes
+      - name: Test
+        run: dotnet test --filter "FullyQualifiedName~Omnius.Axus"
+  windows:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v3
+        with:
+          submodules: "recursive"
+      - name: Setup dotnet
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 7.0.x
+      - name: Install dependencies
+        run: dotnet restore
+      - name: Test
+        run: dotnet test --filter "FullyQualifiedName~Omnius.Axus"

.github/workflows/test.yml

@@ -3,21 +3,31 @@ name: test
 on:
   push:
     branches:
-      - "**"
+      - "main"
+      - "releases/*"
     paths:
       - "**"
       - "!/docs/**"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  StableTest: true
+  ContinuousIntegrationBuild: true
+
 jobs:
   linux:
     runs-on: ubuntu-latest
-    env:
       ContinuousIntegrationBuild: true
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
         with:
           submodules: "recursive"
+      - name: Install dependencies (lib)
+        run: sudo apt-get install libsnappy-dev
       - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
@@ -29,11 +39,9 @@ jobs:
       - name: format check
         run: dotnet format --verify-no-changes
       - name: Test
-        run: dotnet test --filter "FullyQualifiedName~Omnius.Axus"
+        run: dotnet test --no-restore
   windows:
     runs-on: windows-latest
-    env:
-      ContinuousIntegrationBuild: true
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
@@ -46,4 +54,4 @@ jobs:
       - name: Install dependencies
         run: dotnet restore
       - name: Test
-        run: dotnet test --filter "FullyQualifiedName~Omnius.Axus"
+        run: dotnet test --no-restore

.gitignore

@@ -18,6 +18,7 @@ mono_crash.*
 .vscode/*
 !.vscode/tasks.json
 !.vscode/launch.json
+!.vscode/settings.json
 
 # Tool Runtime Dir
 /[Tt]ools/

.gitmodules

@@ -1,4 +1,3 @@
-[submodule "refs/core"]
-	path = refs/core
-    url = [email protected]:omnius-labs/core-cs.git
-	branch = main
+[submodule "refs/core-cs"]
+	path = refs/core-cs
+	url = [email protected]:omnius-labs/core-cs.git

.vscode/launch.json

@@ -26,7 +26,7 @@
                 "-v",
                 "true"
             ],
-            "cwd": "${workspaceFolder}/demo/0",
+            "cwd": "${workspaceFolder}/demo",
             "console": "internalConsole",
             "stopAtEntry": false,
             "windows": {
@@ -52,7 +52,7 @@
                 "-v",
                 "true"
             ],
-            "cwd": "${workspaceFolder}/demo/0",
+            "cwd": "${workspaceFolder}/demo",
             "console": "internalConsole",
             "stopAtEntry": false,
             "windows": {
@@ -71,7 +71,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "design-build (Omnius.Axus.Ui.Desktop)",
-            "cwd": "${workspaceFolder}/demo/0",
+            "cwd": "${workspaceFolder}/demo",
             "console": "internalConsole",
             "stopAtEntry": false,
             "windows": {

.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+    "cSpell.words": [
+        "AUTOINCREMENT",
+        "Axus",
+        "bkey",
+        "Kademlia",
+        "merkle",
+        "Omni",
+        "Omnius",
+        "Xunit"
+    ],
+    "dotnet.defaultSolution": "axus.sln"
+}

Directory.Build.props

@@ -7,12 +7,16 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
+    <InvariantGlobalization>true</InvariantGlobalization>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <DefineConstants Condition=" '$(DesignMode)' != '' ">$(DefineConstants);DESIGN</DefineConstants>
-    <NoWarn>CS1591,CS1998,NU5105,NU1603,NU1605</NoWarn>
+    <NoWarn>CS1591,CS1998,NU5105,NU1603,NU1605,IDE0008</NoWarn>
     <GenerateFullPaths>true</GenerateFullPaths>
     <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))</RepoRoot>
-    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+    <DefineConstants Condition=" '$(StableTest)' == 'true' ">$(DefineConstants);STABLE_TEST</DefineConstants>
+    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
+    <NuGetLockFilePath>$(MSBuildThisFileDirectory)\lock\$(RuntimeIdentifier)\$(MSBuildProjectName).json</NuGetLockFilePath>
+    <RestoreLockedMode Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">true</RestoreLockedMode>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -36,50 +40,30 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <PathMap Condition=" '$(Configuration)' == 'Release' ">$(RepoRoot)=.</PathMap>
   </PropertyGroup>
 
   <!-- Autodetect platform -->
   <PropertyGroup Condition=" '$(NativeDepsPlatform)' == '' And '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Windows)))' ">
     <NativeDepsPlatform>Windows</NativeDepsPlatform>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(NativeDepsPlatform)' == '' And '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' ">
-    <NativeDepsPlatform>Mac</NativeDepsPlatform>
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(NativeDepsPlatform)' == '' And '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' ">
     <NativeDepsPlatform>Linux</NativeDepsPlatform>
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
+  <!-- Set path -->
   <PropertyGroup Condition=" '$(BuildTargetName)' == '' ">
     <BuildTargetName>normal</BuildTargetName>
   </PropertyGroup>
-
   <PropertyGroup Condition=" '$(NativeDepsPlatform)' == 'Windows' ">
     <BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">$(MSBuildThisFileDirectory)tmp\obj\win-$(BuildTargetName)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(MSBuildThisFileDirectory)tmp\bin\win-$(BuildTargetName)\$(MSBuildProjectName)\</BaseOutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(NativeDepsPlatform)' == 'Mac' ">
-    <BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">$(MSBuildThisFileDirectory)tmp\obj\mac-$(BuildTargetName)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-    <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(MSBuildThisFileDirectory)tmp\bin\mac-$(BuildTargetName)\$(MSBuildProjectName)\</BaseOutputPath>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(NativeDepsPlatform)' == 'Linux' ">
     <BaseIntermediateOutputPath Condition=" '$(BaseIntermediateOutputPath)' == '' ">$(MSBuildThisFileDirectory)tmp\obj\linux-$(BuildTargetName)\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
     <BaseOutputPath Condition=" '$(BaseOutputPath)' == '' ">$(MSBuildThisFileDirectory)tmp\bin\linux-$(BuildTargetName)\$(MSBuildProjectName)\</BaseOutputPath>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
-    <NuGetLockFilePath>$(MSBuildThisFileDirectory)\lock\$(RuntimeIdentifier)\$(MSBuildProjectName).json</NuGetLockFilePath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">
-    <RestoreLockedMode>true</RestoreLockedMode>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <PathMap>$(RepoRoot)=.</PathMap>
-  </PropertyGroup>
-
 </Project>

Packages.props

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
+    <PackageReference Update="System.Linq.Async" Version="6.0.1" />
     <PackageReference Update="Avalonia.AvaloniaEdit" Version="0.10.12.2 " />
     <PackageReference Update="Avalonia.Controls.DataGrid" Version="0.10.18" />
     <PackageReference Update="Avalonia.Desktop" Version="0.10.18" />
@@ -18,7 +19,6 @@
     <PackageReference Update="Generator.Equals" Version="2.2.3" />
     <PackageReference Update="GitInfo" Version="2.2.0" />
     <PackageReference Update="Glob.cs" Version="5.1.766" />
-    <PackageReference Update="LiteDB" Version="5.0.15" />
     <PackageReference Update="Material.Avalonia" Version="3.0.0-rc0" />
     <PackageReference Update="MessageBox.Avalonia" Version="2.0.0" />
     <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
@@ -35,6 +35,7 @@
     <PackageReference Update="System.IO.Pipelines" Version="7.0.0" />
     <PackageReference Update="System.Text.Json" Version="7.0.1" />
     <PackageReference Update="YamlDotNet" Version="11.2.1" />
+    <PackageReference Update="RocksDB" Version="8.1.1.38647" />
   </ItemGroup>
 
   <ItemGroup>

README.md

@@ -12,6 +12,7 @@ sudo apt-get install -y libsnappy-dev
 ```
 
 ## Docs
+
 - [Requirements](./docs/requirements/index.adoc)
 - [Specifications](./docs/specifications/index.adoc)
 - [FAQ](./docs/faq.md)