Skip to content

Component updates, .NET6 -> .NET 8 #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsyme merged 5 commits into from
May 2, 2025
Merged

Component updates, .NET6 -> .NET 8 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd386ee
Component updates, .NET6 -> .NET 8
Thorium May 2, 2025
4c27c40
CI fix: Add .NET 8 to CI pipeline
Thorium May 2, 2025
633d47b
CI-pipeline fix trial 2
Thorium May 2, 2025
1652556
CI-pipeline fix trial 3
Thorium May 2, 2025
d16607c
CI-pipeline fix trial 4
Thorium May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "6.2.1",
"commands": [
"paket"
]
},
"fake-cli": {
"version": "5.20.4",
"commands": [
"fake"
]
}
}
{
"version": 1,
"isRoot": true,
"tools": {
"paket": {
"version": "9.0.2",
"commands": [
"paket"
]
},
"fake-cli": {
"version": "6.1.3",
"commands": [
"fake"
]
}
}
}
12 changes: 9 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,22 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, macOS-latest, ubuntu-latest]
dotnet: [6.0.100]
dotnet6: [6.0.428]
dotnet8: [8.0.408]
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v1

- name: Setup .NET Core
- name: Setup .NET Core 6 (for build only)
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ matrix.dotnet }}
dotnet-version: ${{ matrix.dotnet6 }}

- name: Setup .NET Core 8
uses: actions/setup-dotnet@v1
with:
dotnet-version: ${{ matrix.dotnet8 }}

- name: Build on Windows
if: matrix.os == 'windows-latest'
Expand Down
1,122 changes: 565 additions & 557 deletions .paket/Paket.Restore.targets
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 63 additions & 63 deletions FSharp.Data.WsdlProvider.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29709.97
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B98-5CED-492C-A5B7-A5B4F73CF142}"
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
EndProjectSection
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.WsdlProvider.Runtime", "src\FSharp.Data.WsdlProvider.Runtime\FSharp.Data.WsdlProvider.Runtime.fsproj", "{E815D493-7C8C-4691-B9B0-CE38F42026A9}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.WsdlProvider.DesignTime", "src\FSharp.Data.WsdlProvider.DesignTime\FSharp.Data.WsdlProvider.DesignTime.fsproj", "{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.WsdlProvider.Tests", "tests\FSharp.Data.WsdlProvider.Tests\FSharp.Data.WsdlProvider.Tests.fsproj", "{B4407B76-F524-467E-8F2D-049F39526BFE}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FShap.Data.WsdlProvider.DesignTime.Tests", "tests\FShap.Data.WsdlProvider.DesignTime.Tests\FShap.Data.WsdlProvider.DesignTime.Tests.fsproj", "{4E830891-C825-4A2C-8B61-EACE6EBDF59B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{187433B2-65CF-42F5-B504-6E34F4C77604}"
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
Directory.Build.targets = Directory.Build.targets
LICENSE.md = LICENSE.md
paket.dependencies = paket.dependencies
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E815D493-7C8C-4691-B9B0-CE38F42026A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E815D493-7C8C-4691-B9B0-CE38F42026A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E815D493-7C8C-4691-B9B0-CE38F42026A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E815D493-7C8C-4691-B9B0-CE38F42026A9}.Release|Any CPU.Build.0 = Release|Any CPU
{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}.Release|Any CPU.Build.0 = Release|Any CPU
{B4407B76-F524-467E-8F2D-049F39526BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4407B76-F524-467E-8F2D-049F39526BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4407B76-F524-467E-8F2D-049F39526BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4407B76-F524-467E-8F2D-049F39526BFE}.Release|Any CPU.Build.0 = Release|Any CPU
{4E830891-C825-4A2C-8B61-EACE6EBDF59B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E830891-C825-4A2C-8B61-EACE6EBDF59B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E830891-C825-4A2C-8B61-EACE6EBDF59B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E830891-C825-4A2C-8B61-EACE6EBDF59B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B4407B76-F524-467E-8F2D-049F39526BFE} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{4E830891-C825-4A2C-8B61-EACE6EBDF59B} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {95189CD2-D445-47D1-BB6C-E0A96A7D6F9C}
EndGlobalSection
EndGlobal
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.13.35931.197
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{63297B98-5CED-492C-A5B7-A5B4F73CF142}"
ProjectSection(SolutionItems) = preProject
paket.dependencies = paket.dependencies
EndProjectSection
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.WsdlProvider.Runtime", "src\FSharp.Data.WsdlProvider.Runtime\FSharp.Data.WsdlProvider.Runtime.fsproj", "{E815D493-7C8C-4691-B9B0-CE38F42026A9}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.WsdlProvider.DesignTime", "src\FSharp.Data.WsdlProvider.DesignTime\FSharp.Data.WsdlProvider.DesignTime.fsproj", "{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Data.WsdlProvider.Tests", "tests\FSharp.Data.WsdlProvider.Tests\FSharp.Data.WsdlProvider.Tests.fsproj", "{B4407B76-F524-467E-8F2D-049F39526BFE}"
EndProject
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FShap.Data.WsdlProvider.DesignTime.Tests", "tests\FShap.Data.WsdlProvider.DesignTime.Tests\FShap.Data.WsdlProvider.DesignTime.Tests.fsproj", "{4E830891-C825-4A2C-8B61-EACE6EBDF59B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".build", ".build", "{187433B2-65CF-42F5-B504-6E34F4C77604}"
ProjectSection(SolutionItems) = preProject
build.fsx = build.fsx
Directory.Build.targets = Directory.Build.targets
LICENSE.md = LICENSE.md
paket.dependencies = paket.dependencies
README.md = README.md
RELEASE_NOTES.md = RELEASE_NOTES.md
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E815D493-7C8C-4691-B9B0-CE38F42026A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E815D493-7C8C-4691-B9B0-CE38F42026A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E815D493-7C8C-4691-B9B0-CE38F42026A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E815D493-7C8C-4691-B9B0-CE38F42026A9}.Release|Any CPU.Build.0 = Release|Any CPU
{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D4919CBC-7FCE-4EED-94C5-28FF7B80187F}.Release|Any CPU.Build.0 = Release|Any CPU
{B4407B76-F524-467E-8F2D-049F39526BFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4407B76-F524-467E-8F2D-049F39526BFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4407B76-F524-467E-8F2D-049F39526BFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4407B76-F524-467E-8F2D-049F39526BFE}.Release|Any CPU.Build.0 = Release|Any CPU
{4E830891-C825-4A2C-8B61-EACE6EBDF59B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4E830891-C825-4A2C-8B61-EACE6EBDF59B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4E830891-C825-4A2C-8B61-EACE6EBDF59B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4E830891-C825-4A2C-8B61-EACE6EBDF59B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B4407B76-F524-467E-8F2D-049F39526BFE} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
{4E830891-C825-4A2C-8B61-EACE6EBDF59B} = {ED8079DD-2B06-4030-9F0F-DC548F98E1C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {95189CD2-D445-47D1-BB6C-E0A96A7D6F9C}
EndGlobalSection
EndGlobal
1 change: 1 addition & 0 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@echo off

dotnet tool restore
dotnet paket restore
dotnet fake build %*
6 changes: 4 additions & 2 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#r "paket:
source https://api.nuget.org/v3/index.json
framework: netstandard2.0
nuget FSharp.Core < 5
storage: none
nuget FSharp.Core 8.0.301
nuget Fake.Core
nuget Fake.Core.Target
nuget Fake.Core.ReleaseNotes
Expand Down Expand Up @@ -51,6 +51,7 @@ Target.create "Clean" <| fun _ ->
Target.create "Build" <| fun _ ->
DotNet.build (fun p ->
{ p with
MSBuildParams = { p.MSBuildParams with DisableInternalBinLog = true }
Configuration = DotNet.BuildConfiguration.Release } )
BuildPath.sln

Expand All @@ -64,6 +65,7 @@ Target.create "Test" <| fun _ ->

DotNet.test (fun p ->
{ p with
MSBuildParams = { p.MSBuildParams with DisableInternalBinLog = true }
Configuration = DotNet.BuildConfiguration.Release
NoBuild = true
Framework = fx
Expand Down
Loading
Loading