Skip to content

Commit 9a73c4e

Browse files
authored
Merge pull request #11 from meiermade/ameier/updates
update to .net 8; move extras into main
2 parents 98d8bc9 + 4dfc0fc commit 9a73c4e

23 files changed

Lines changed: 147 additions & 421 deletions

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "7.2.1",
6+
"version": "8.0.3",
77
"commands": [
88
"paket"
99
]

.github/workflows/pull_request.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
name: Test
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- name: Setup dotnet
13-
uses: actions/setup-dotnet@v3
13+
uses: actions/setup-dotnet@v4
1414
with:
15-
dotnet-version: 6.x
15+
dotnet-version: 8.x
1616
- name: Install Tools
1717
run: dotnet tool restore
1818
- name: Install Packages

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
name: Publish
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Setup dotnet
15-
uses: actions/setup-dotnet@v3
15+
uses: actions/setup-dotnet@v4
1616
with:
17-
dotnet-version: 6.x
17+
dotnet-version: 8.x
1818
- name: Restore Tools
1919
run: dotnet tool restore
2020
- name: Install Packages

FSharp.ViewEngine.sln

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.ViewEngine", "src\FS
99
EndProject
1010
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Build", "src\Build\Build.fsproj", "{2562C7E1-2366-4DB0-9A86-278B8AA5117B}"
1111
EndProject
12-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.ViewEngine.Alpine", "src\FSharp.ViewEngine.Alpine\FSharp.ViewEngine.Alpine.fsproj", "{325F2CEB-48C4-4A50-92F9-F0FD47696010}"
13-
EndProject
14-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.ViewEngine.Htmx", "src\FSharp.ViewEngine.Htmx\FSharp.ViewEngine.Htmx.fsproj", "{1FF01C65-876F-46F6-9401-2A244ECD8C8F}"
15-
EndProject
16-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.ViewEngine.Html", "src\FSharp.ViewEngine.Html\FSharp.ViewEngine.Html.fsproj", "{C2C4C623-1410-4F91-9EC3-4A06CD443659}"
17-
EndProject
1812
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Tests", "src\Tests\Tests.fsproj", "{65C2946A-1B1E-45AB-8196-DFE772FA9240}"
1913
EndProject
20-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.ViewEngine.Svg", "src\FSharp.ViewEngine.Svg\FSharp.ViewEngine.Svg.fsproj", "{DAF8D1FC-8012-4C28-B436-5DBFBA5E9029}"
21-
EndProject
2214
Global
2315
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2416
Debug|Any CPU = Debug|Any CPU
@@ -36,34 +28,14 @@ Global
3628
{2562C7E1-2366-4DB0-9A86-278B8AA5117B}.Debug|Any CPU.Build.0 = Debug|Any CPU
3729
{2562C7E1-2366-4DB0-9A86-278B8AA5117B}.Release|Any CPU.ActiveCfg = Release|Any CPU
3830
{2562C7E1-2366-4DB0-9A86-278B8AA5117B}.Release|Any CPU.Build.0 = Release|Any CPU
39-
{325F2CEB-48C4-4A50-92F9-F0FD47696010}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{325F2CEB-48C4-4A50-92F9-F0FD47696010}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{325F2CEB-48C4-4A50-92F9-F0FD47696010}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{325F2CEB-48C4-4A50-92F9-F0FD47696010}.Release|Any CPU.Build.0 = Release|Any CPU
43-
{1FF01C65-876F-46F6-9401-2A244ECD8C8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{1FF01C65-876F-46F6-9401-2A244ECD8C8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{1FF01C65-876F-46F6-9401-2A244ECD8C8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{1FF01C65-876F-46F6-9401-2A244ECD8C8F}.Release|Any CPU.Build.0 = Release|Any CPU
47-
{C2C4C623-1410-4F91-9EC3-4A06CD443659}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{C2C4C623-1410-4F91-9EC3-4A06CD443659}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{C2C4C623-1410-4F91-9EC3-4A06CD443659}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{C2C4C623-1410-4F91-9EC3-4A06CD443659}.Release|Any CPU.Build.0 = Release|Any CPU
5131
{65C2946A-1B1E-45AB-8196-DFE772FA9240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5232
{65C2946A-1B1E-45AB-8196-DFE772FA9240}.Debug|Any CPU.Build.0 = Debug|Any CPU
5333
{65C2946A-1B1E-45AB-8196-DFE772FA9240}.Release|Any CPU.ActiveCfg = Release|Any CPU
5434
{65C2946A-1B1E-45AB-8196-DFE772FA9240}.Release|Any CPU.Build.0 = Release|Any CPU
55-
{DAF8D1FC-8012-4C28-B436-5DBFBA5E9029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56-
{DAF8D1FC-8012-4C28-B436-5DBFBA5E9029}.Debug|Any CPU.Build.0 = Debug|Any CPU
57-
{DAF8D1FC-8012-4C28-B436-5DBFBA5E9029}.Release|Any CPU.ActiveCfg = Release|Any CPU
58-
{DAF8D1FC-8012-4C28-B436-5DBFBA5E9029}.Release|Any CPU.Build.0 = Release|Any CPU
5935
EndGlobalSection
6036
GlobalSection(NestedProjects) = preSolution
6137
{4093E9E9-D923-4945-A458-C1F861C3FD1D} = {EA093A44-5365-45ED-B8FB-C506C95405A6}
6238
{2562C7E1-2366-4DB0-9A86-278B8AA5117B} = {EA093A44-5365-45ED-B8FB-C506C95405A6}
63-
{325F2CEB-48C4-4A50-92F9-F0FD47696010} = {EA093A44-5365-45ED-B8FB-C506C95405A6}
64-
{1FF01C65-876F-46F6-9401-2A244ECD8C8F} = {EA093A44-5365-45ED-B8FB-C506C95405A6}
65-
{C2C4C623-1410-4F91-9EC3-4A06CD443659} = {EA093A44-5365-45ED-B8FB-C506C95405A6}
6639
{65C2946A-1B1E-45AB-8196-DFE772FA9240} = {EA093A44-5365-45ED-B8FB-C506C95405A6}
67-
{DAF8D1FC-8012-4C28-B436-5DBFBA5E9029} = {EA093A44-5365-45ED-B8FB-C506C95405A6}
6840
EndGlobalSection
6941
EndGlobal

global.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"sdk": {
3+
"version": "8.0.100",
4+
"rollForward": "latestFeature"
5+
}
6+
}

paket.dependencies

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
source https://api.nuget.org/v3/index.json
22
storage: none
33

4-
nuget FSharp.Core
5-
64
group Build
75
source https://api.nuget.org/v3/index.json
86
storage: none
97
nuget Fake.Core.Target
10-
nuget Fake.Core.SemVer
11-
nuget Fake.DotNet.Cli
128

139
group Tests
1410
source https://api.nuget.org/v3/index.json

0 commit comments

Comments
 (0)