Merge pull request #25 from dbrattli/update-project

Update project structure

Author: dbrattli

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "paket": {
+      "version": "9.0.2",
+      "commands": [
+        "paket"
+      ],
+      "rollForward": false
+    }
+  }
+}

.github/workflows/build-and-test.yml

@@ -12,18 +12,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.1.301
-    - name: Setup dotnet manifest
-      run: dotnet new tool-manifest
-    - name: Setup paket
-      run: dotnet tool install Paket
+        dotnet-version: 9.0.300
+    - name: Restore tools
+      run: dotnet tool restore
     - name: Install dependencies
-      run: dotnet restore
+      run: dotnet paket restore
     - name: Build
-      run: dotnet build --configuration Release --no-restore
+      run: dotnet build --configuration Release
     - name: Test
-      run: dotnet test --no-restore --verbosity normal
+      run: dotnet test --verbosity normal

.github/workflows/publish.yml

@@ -11,19 +11,21 @@ jobs:
     timeout-minutes: 10
     steps:
     - name: Checkout code
-      uses: actions/checkout@v1
+      uses: actions/checkout@v4
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: 9.0.300
 
-    - name: Setup dotnet manifest
-      run: dotnet new tool-manifest
-    - name: Setup paket
-      run: dotnet tool install Paket
-    - name: Dotnet Pack
-      run: dotnet pack -c release -p:PackageVersion=${GITHUB_REF##*/v}
+    - name: Restore tools
+      run: dotnet tool restore
+    - name: Install dependencies
+      run: dotnet paket restore
+    - name: Build
+      run: dotnet build --configuration Release
+    - name: Pack
+      run: dotnet pack -c Release -p:PackageVersion=${GITHUB_REF##*/v}
 
     - name: Push Feliz.ViewEngine Nuget
       run: dotnet nuget push src/bin/Release/*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }}

.paket/Paket.Restore.targets

@@ -23,5 +23,8 @@
   <ItemGroup>
     <Content Include="*.fsproj; *.fs; *.js;" PackagePath="fable\" />
   </ItemGroup>
-  <Import Project=".paket\Paket.Restore.targets" />
+  <ItemGroup>
+    <ProjectReference Include="..\src\Feliz.ViewEngine.fsproj" />
+  </ItemGroup>
+  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>

Feliz.Bulma.ViewEngine/.paket/Paket.Restore.targets

@@ -1,4 +1,4 @@
-group Main
+group Bulma
 
-Fsharp.Core
+FSharp.Core
 Feliz.ViewEngine

Feliz.Bulma.ViewEngine/Feliz.Bulma.ViewEngine.fsproj

@@ -19,3 +19,11 @@ group Test
     nuget Microsoft.NET.Test.Sdk ~> 16
     nuget MSTest.TestAdapter ~> 1
     nuget MSTest.TestFramework ~> 1
+
+group Bulma
+    source https://www.nuget.org/api/v2
+    storage: none
+    framework: netstandard2.0
+
+    nuget FSharp.Core ~> 4.7 lowest_matching: true
+    nuget Feliz.ViewEngine >= 0.15

Feliz.Bulma.ViewEngine/paket.references

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net9</TargetFramework>
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>