Update Proj-Info to use FCS and FSharp.Core from 9.0.100 (#219)

This change * removes .NET 6 and 7 targets, adding a .NET 9 target * removes Paket in favor of NuGet CPM * updates the packaging of the app to include READMEs Co-authored-by: Chet Husk <[email protected]> Co-authored-by: Chet Husk <[email protected]>
ionide · Nov 18, 2024 · 0e15b52 · 0e15b52
1 parent 2a86558
commit 0e15b52
Show file tree

Hide file tree

Showing 36 changed files with 344 additions and 1,277 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -1,30 +1,5 @@
 {
-  "version": 1,
-  "isRoot": true,
-  "tools": {
-    "paket": {
-      "version": "8.0.3",
-      "commands": [
-        "paket"
-      ]
-    },
-    "fake-cli": {
-      "version": "6.0.0",
-      "commands": [
-        "fake"
-      ]
-    },
-    "octonav": {
-      "version": "0.0.1",
-      "commands": [
-        "octonav"
-      ]
-    },
-    "fantomas": {
-      "version": "6.1.2",
-      "commands": [
-        "fantomas"
-      ]
-    }
-  }
+    "version": 1,
+    "isRoot": true,
+    "tools": {}
 }
diff --git a/.editorconfig b/.editorconfig
@@ -55,16 +55,6 @@ end_of_line = crlf
 [*.{ps1, psm1}]
 end_of_line = crlf
 
-# Paket files
-[paket.*]
-trim_trailing_whitespace = true
-indent_size = 2
-
-[*.paket.references]
-trim_trailing_whitespace = true
-indent_size = 2
-
-
 # YAML Files
 [*.{yml,yaml}]
 indent_size = 2

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,30 +11,27 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet-version: ["", "6.0.x", "7.0.x"]
+        dotnet-version: ["", "8.0.x", "9.0.x"]
         # these entries will mesh with the above combinations
         include:
           # just use what's in the repo
           - global-json-file: "global.json"
             dotnet-version: ""
-            include-prerelease: false
             label: "repo global.json"
-            build_net7: false
-            globaljson-command: "dotnet new globaljson --sdk-version 6.0.400"
-          # latest 6.0 stable
+            build_net9: false
+            globaljson-command: "dotnet new globaljson --sdk-version 8.0.400"
+          # latest 8.0 stable
           - global-json-file: "global.json"
-            dotnet-version: "6.0.x"
-            include-prerelease: false
-            label: "6.0 stable"
-            build_net7: false
-            globaljson-command: "dotnet new globaljson --sdk-version 6.0.0 --roll-forward latestMinor"
-          # latest 7.0 preview
+            dotnet-version: "8.0.x"
+            label: "8.0 stable"
+            build_net9: false
+            globaljson-command: "dotnet new globaljson --sdk-version 8.0.0 --roll-forward latestMinor"
+          # latest 9.0 stable
           - global-json-file: "global.json"
-            dotnet-version: "7.0.x"
-            include-prerelease: true
-            label: "7.0 preview"
-            build_net7: true
-            globaljson-command: "dotnet new globaljson --sdk-version 7.0.0 --roll-forward latestMinor"
+            dotnet-version: "9.0.x"
+            label: "9.0 stable"
+            build_net9: true
+            globaljson-command: "dotnet new globaljson --sdk-version 9.0.0 --roll-forward latestMinor"
       fail-fast: false # we have timing issues on some OS, so we want them all to run
     runs-on: ${{ matrix.os }}
     timeout-minutes: 15
@@ -46,13 +43,12 @@ jobs:
 
       # setup .NET per the repo global.json
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v4
 
       # setup .NET per test session
       - name: Setup .NET
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v4
         with:
-          include-prerelease: ${{ matrix.include-prerelease }}
           global-json-file: ${{ matrix.global-json-file }}
           dotnet-version: ${{ matrix.dotnet-version }}
 
@@ -72,7 +68,7 @@ jobs:
       - name: Run build and test
         run: dotnet run --project build
         env:
-          BuildNet7: ${{ matrix.build_net7 }}
+          BuildNet9: ${{ matrix.build_net9 }}
 
       - name: Archive test results
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,12 +12,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Setup .NET Core
-        uses: actions/setup-dotnet@v2
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
-            7.0.x
-          include-prerelease: true
+            8.0.x
+            9.0.x
       # since we're packaging for net7 now...
       - name: remove global.json
         run: rm global.json
@@ -28,11 +27,11 @@ jobs:
       - name: Run build
         run: dotnet run --project build
         env:
-          BuildNet7: true
+          BuildNet9: true
           IgnoreTests: true
       - name: Get Changelog Entry
         id: changelog_reader
-        uses: mindsers/changelog-reader-action@v1.1.0
+        uses: mindsers/changelog-reader-action@v2
         with:
           version: ${{ github.ref }}
           path: ./CHANGELOG.md
@@ -48,7 +47,7 @@ jobs:
           draft: false
           prerelease: false
       - name: Upload binaries to release
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: src/**/*.nupkg