Merge pull request #207 from nfdi4plants/developer

Release 0.5.0
nfdi4plants · Aug 11, 2023 · fad9561 · fad9561
2 parents 7951930 + 3ff8697
commit fad9561
Show file tree

Hide file tree

Showing 70 changed files with 1,624 additions and 2,296 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -12,27 +12,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
-    - name: Restore local tools
-      run: dotnet tool restore
     - name: Build and test
-      run: dotnet fake build -t runTests
+      run: dotnet run --project ./build/Build.fsproj runTests
 
   build-and-test-windows:
 
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
-    - name: Restore local tools
-      run: dotnet tool restore
     - name: Build and test
-      run: dotnet fake build -t runTests
+      run: dotnet run --project ./build/Build.fsproj runTests
diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml
@@ -11,21 +11,19 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
-    - name: Restore local tools
-      run: dotnet tool restore
     - name: Build and publish
-      run: dotnet fake build -t publishBinariesWin
+      run: dotnet run --project ./build/Build.fsproj publishBinariesWin
     - uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "v0.4.0-win.x64"
+        automatic_release_tag: "v0.5.0-win.x64"
         prerelease: false
-        title: "v0.4.0-win.x64"
+        title: "v0.5.0-win.x64"
         files: |
             src/ArcCommander/config_win/config
             publish/win-x64/arc.exe
@@ -35,21 +33,19 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
-    - name: Restore local tools
-      run: dotnet tool restore
     - name: Build and publish
-      run: dotnet fake build -t publishBinariesLinux
+      run: dotnet run --project ./build/Build.fsproj publishBinariesLinux
     - uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "v0.4.0-linux.x64"
+        automatic_release_tag: "v0.5.0-linux.x64"
         prerelease: false
-        title: "v0.4.0-linux.x64"
+        title: "v0.5.0-linux.x64"
         files: |
             src/ArcCommander/config_unix/config
             publish/linux-x64/arc
@@ -59,21 +55,19 @@ jobs:
     runs-on: macos-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Setup .NET 6.0
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v3
       with:
         dotnet-version: '6.0.x'
-    - name: Restore local tools
-      run: dotnet tool restore
     - name: Build and publish
-      run: dotnet fake build -t publishBinariesMac
+      run: dotnet run --project ./build/Build.fsproj publishBinariesMac
     - uses: "marvinpinto/action-automatic-releases@latest"
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
-        automatic_release_tag: "v0.4.0-osx.x64"
+        automatic_release_tag: "v0.5.0-osx.x64"
         prerelease: false
-        title: "v0.4.0-osx.x64"
+        title: "v0.5.0-osx.x64"
         files: |
             src/ArcCommander/config_unix/config
             publish/osx-x64/arc
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,7 @@
 [Dd]ebug/
 [Rr]elease/
 x64/
-build/
+# build/ 
 [Bb]in/
 [Oo]bj/
 

diff --git a/ArcCommander.sln b/ArcCommander.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30503.244
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32825.248
 MinimumVisualStudioVersion = 15.0.26124.0
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ArcCommander", "src\ArcCommander\ArcCommander.fsproj", "{E482262C-A2BF-44E9-BCD0-A7E2E80F419C}"
 EndProject
@@ -13,9 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{655069DF-7
 		.gitignore = .gitignore
 		.github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml
 		build.cmd = build.cmd
-		build.fsx = build.fsx
 		build.sh = build.sh
-		.config\dotnet-tools.json = .config\dotnet-tools.json
 		global.json = global.json
 		README.md = README.md
 		.github\workflows\release-github.yml = .github\workflows\release-github.yml
@@ -28,6 +26,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".devcontainer", ".devcontai
 		.devcontainer\Dockerfile = .devcontainer\Dockerfile
 	EndProjectSection
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Build", "build\Build.fsproj", "{44736484-8325-4C62-8BA5-3091FB02FAE7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -62,6 +62,18 @@ Global
 		{618F5887-509A-4C7A-8536-6CCA51A8F85B}.Release|x64.Build.0 = Release|Any CPU
 		{618F5887-509A-4C7A-8536-6CCA51A8F85B}.Release|x86.ActiveCfg = Release|Any CPU
 		{618F5887-509A-4C7A-8536-6CCA51A8F85B}.Release|x86.Build.0 = Release|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Debug|x64.Build.0 = Debug|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Debug|x86.Build.0 = Debug|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Release|x64.ActiveCfg = Release|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Release|x64.Build.0 = Release|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Release|x86.ActiveCfg = Release|Any CPU
+		{44736484-8325-4C62-8BA5-3091FB02FAE7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Directory.Build.props b/Directory.Build.props