Merge pull request #1 from babysnakes/project-udpates

Project Updates

.config/dotnet-tools.json

@@ -2,28 +2,22 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "fantomas-tool": {
-      "version": "4.7.6",
-      "commands": [
-        "fantomas"
-      ]
-    },
     "dotnet-fsharplint": {
-      "version": "0.21.2",
+      "version": "0.21.3",
       "commands": [
         "dotnet-fsharplint"
       ]
     },
     "paket": {
-      "version": "7.1.4",
+      "version": "7.2.1",
       "commands": [
         "paket"
       ]
     },
-    "fake-cli": {
-      "version": "5.23.0",
+    "fantomas": {
+      "version": "6.1.1",
       "commands": [
-        "fake"
+        "fantomas"
       ]
     }
   }

.editorconfig

@@ -1,6 +1,7 @@
-[*.fs]
+[*.{fs,fsx}]
 fsharp_max_value_binding_width = 80
 fsharp_max_infix_operator_expression = 70
+fsharp_max_if_then_short_width = 50
 
 [*.md]
 max_line_length = 100

.github/workflows/release.yml

@@ -12,19 +12,21 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up .NET
-        uses: xt0rted/[email protected] 
-      - name: Install dependencies
-        run: |
-          dotnet tool restore
-          dotnet paket restore
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '6.0.x'
       - name: Set up dependency caching for faster builds
         uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-paket-${{ hashFiles('**/paket.lock') }}
           restore-keys: |
             ${{ runner.os }}-paket-
+      - name: Install dependencies
+        run: |
+          dotnet tool restore
+          dotnet paket restore
       - name: Test code
-        run: dotnet fake build -t Check
+        run: ./build.sh -t Check
       - name: Create release draft
-        run: dotnet fake build -t Release
+        run: ./build.sh -t Release

.github/workflows/test.yml

@@ -12,17 +12,19 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Set up .NET
-        uses: xt0rted/[email protected] 
-      - name: Install dependencies
-        run: |
-          dotnet tool restore
-          dotnet paket restore
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: '6.0.x'
       - name: Set up dependency caching for faster builds
         uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-paket-${{ hashFiles('**/paket.lock') }}
           restore-keys: |
             ${{ runner.os }}-paket-
+      - name: Install dependencies
+        run: |
+          dotnet tool restore
+          dotnet paket restore
       - name: Run code checks
-        run: dotnet fake build -t Check
+        run: ./build.sh -t Check

.gitignore

@@ -291,7 +291,7 @@ PublishScripts/
 # The packages folder can be ignored because of Package Restore
 **/[Pp]ackages/*
 # except build/, which is used as an MSBuild target.
-!**/[Pp]ackages/build/
+#!**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/[Pp]ackages/repositories.config
 # NuGet v3's project.json files produces more ignorable files

README.md

@@ -22,10 +22,14 @@ dotnet test
 We also use [Fake][] for running some build/test tasks. For help run:
 
 ```powershell
-dotnet fake build
+.\build # on Windows
 ```
 
-This will list the main targets to run. These targets are also running in CI.
+```shell
+./build.sh # on mac/linux
+```
+
+This will show the build system Usage. It could be used in CI.
 
 ### Refreshing Roles List
 

Resources/ReleaseTemplate.md

@@ -4,15 +4,33 @@ TODO: Fill release notes ...
 
 ### Installation Instructions
 
+#### Archives
+
 There are two kinds of archives:
 
-* `roon-tagger-xxx-noarch.*` - These are small and contains only the
-  application. They do require that you have _.Net 6.x_ runtime installed.
-* `roon-tagger-xxx-<ARCH>.*` - These contains everything you need to run
-  _roon-tagger_. If your architecture is not suuported (e.g. you're using a 32
-  bit or ARM processor), please file an issue.
+* `roon-tagger-xxx-noarch.*` - These are small and contains only the application. They do require
+  that you have _.Net 6.x_ runtime installed.
+* `roon-tagger-xxx-<ARCH>.*` - These contains everything you need to run _roon-tagger_. If your
+  architecture is not suuported (e.g. you're using a 32 bit or ARM processor), please file an issue.
+
+Installation is currently manual. You need to extract the archive to somewhere in your computer. In
+_Windows_ you should add the directory you extracted to to the `PATH`. On _Linux_ / _MacOS you can
+symlink the `roon-tagger` executable to somewhere in your `PATH`.
+
+#### Scoop File
+
+[Scoop][scoop] support is currently experimental *and* manual. You can install *Roon Tagger* with
+scoop using the direct manifest URL:
+
+* Copy the URL of the `roon-tagger.json` file in the current release assets.
+* Install roon-tagger using the address copied above:
+
+      scoop install <URL>
+* Uninstall with:
+
+      scoop uninstall roon-tagger
+
+> **Warning**
+> only 64bit systems are supported. for other architecture please file an issue.
 
-Installation is currently manual. You need to extract the archive to somewhere
-in your computer. In _Windows_ you should add the directory you extracted to to
-the `PATH`. On linux/osx you can symlink the `roon-tagger` executable to
-somewhere in your `PATH`.
+[scoop]: https://scoop.sh

RoonTagger.sln

@@ -18,6 +18,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Metadata.Test", "src\Metada
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "RoonTagger.Cli.Test", "src\RoonTagger.Cli.Test\RoonTagger.Cli.Test.fsproj", "{C21A6273-1B76-4993-85AA-DC73F8E54770}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Build", "build\Build.fsproj", "{3342B827-FC6D-419D-A2CB-1D4D25D3714E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -79,6 +81,17 @@ Global
 		{C21A6273-1B76-4993-85AA-DC73F8E54770}.Release|x64.Build.0 = Release|Any CPU
 		{C21A6273-1B76-4993-85AA-DC73F8E54770}.Release|x86.ActiveCfg = Release|Any CPU
 		{C21A6273-1B76-4993-85AA-DC73F8E54770}.Release|x86.Build.0 = Release|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Debug|x64.Build.0 = Debug|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Debug|x86.Build.0 = Debug|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Release|x64.ActiveCfg = Release|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Release|x64.Build.0 = Release|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Release|x86.ActiveCfg = Release|Any CPU
+		{3342B827-FC6D-419D-A2CB-1D4D25D3714E}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{C57CC9D3-5427-4940-9A6D-FA40901CDA62} = {7C6DD87A-C2D8-4A7F-A00F-F6C9F1ED6203}

build.cmd

@@ -0,0 +1,6 @@
+@echo off
+echo Restoring dotnet tools...
+dotnet tool restore
+dotnet paket restore
+
+dotnet run --project ./build/build.fsproj -- %*