diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 2dceca2c..9142c876 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,19 +3,19 @@ "isRoot": true, "tools": { "paket": { - "version": "9.0.2", + "version": "11.0.0", "commands": [ "paket" ] }, "fsdocs-tool": { - "version": "19.1.1", + "version": "22.2.0", "commands": [ "fsdocs" ] }, "fantomas": { - "version": "6.3.16", + "version": "8.0.8", "commands": [ "fantomas" ] diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0ee83e07..1f29dea4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,16 +15,16 @@ jobs: fail-fast: false matrix: os: [windows-latest, macOS-latest, ubuntu-latest] - dotnet: [8.0.425] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v7 - - name: Setup .NET Core - uses: actions/setup-dotnet@v3 + - name: Setup .NET SDKs and .NET 8 runtime + uses: actions/setup-dotnet@v6 with: - dotnet-version: ${{ matrix.dotnet }} + dotnet-version: 8.0.x + global-json-file: global.json - name: Install local tools run: dotnet tool restore diff --git a/FsUnit.sln b/FsUnit.sln deleted file mode 100644 index 89c29035..00000000 --- a/FsUnit.sln +++ /dev/null @@ -1,148 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30225.117 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EE5D61BB-A9AF-4FD4-8EA1-46841326A083}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsUnit.NUnit", "src\FsUnit.NUnit\FsUnit.NUnit.fsproj", "{E729B493-15E6-4447-A5A5-A60784924627}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{35F65EEF-9059-4829-93EE-C8F7810B3997}" - ProjectSection(SolutionItems) = preProject - build.cmd = build.cmd - build.sh = build.sh - paket.dependencies = paket.dependencies - paket.lock = paket.lock - RELEASE_NOTES.md = RELEASE_NOTES.md - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{79367338-3E06-4830-AA07-9B429B61F888}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsUnit.NUnit.Test", "tests\FsUnit.NUnit.Test\FsUnit.NUnit.Test.fsproj", "{6064279B-8E7A-4AC7-8420-EB7BC1320C0D}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsUnit.Xunit", "src\FsUnit.Xunit\FsUnit.Xunit.fsproj", "{A2FF7AFB-FD76-4F09-A176-654819796A9A}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsUnit.MsTest", "src\FsUnit.MsTestUnit\FsUnit.MsTest.fsproj", "{ED810E0E-0E09-4528-953A-61594598B650}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsUnit.Xunit.Test", "tests\FsUnit.Xunit.Test\FsUnit.Xunit.Test.fsproj", "{951EC3A5-5BDF-484E-BC1F-D45C69B3725D}" -EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FsUnit.MsTest.Test", "tests\FsUnit.MsTest.Test\FsUnit.MsTest.Test.fsproj", "{1593585D-FE1B-4378-BE53-EE62A4CC84DB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{D33A7B6D-EE0A-4AC6-8240-D4BFA490094E}" - ProjectSection(SolutionItems) = preProject - docs\generate.fsx = docs\generate.fsx - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{9580EF72-AC6E-4B0E-906E-3694A52876DB}" - ProjectSection(SolutionItems) = preProject - docs\content\FsUnitTyped.fsx = docs\content\FsUnitTyped.fsx - docs\content\index.fsx = docs\content\index.fsx - docs\content\license.md = docs\content\license.md - docs\content\MsTest.fsx = docs\content\MsTest.fsx - docs\content\NUnit.fsx = docs\content\NUnit.fsx - docs\content\operators.md = docs\content\operators.md - docs\content\Paket.fsx = docs\content\Paket.fsx - docs\content\release-notes.md = docs\content\release-notes.md - docs\content\xUnit.fsx = docs\content\xUnit.fsx - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {E729B493-15E6-4447-A5A5-A60784924627}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Debug|x64.ActiveCfg = Debug|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Debug|x64.Build.0 = Debug|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Debug|x86.ActiveCfg = Debug|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Debug|x86.Build.0 = Debug|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Release|Any CPU.Build.0 = Release|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Release|x64.ActiveCfg = Release|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Release|x64.Build.0 = Release|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Release|x86.ActiveCfg = Release|Any CPU - {E729B493-15E6-4447-A5A5-A60784924627}.Release|x86.Build.0 = Release|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Debug|x64.ActiveCfg = Debug|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Debug|x64.Build.0 = Debug|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Debug|x86.ActiveCfg = Debug|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Debug|x86.Build.0 = Debug|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Release|Any CPU.Build.0 = Release|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Release|x64.ActiveCfg = Release|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Release|x64.Build.0 = Release|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Release|x86.ActiveCfg = Release|Any CPU - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D}.Release|x86.Build.0 = Release|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Debug|x64.ActiveCfg = Debug|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Debug|x64.Build.0 = Debug|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Debug|x86.ActiveCfg = Debug|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Debug|x86.Build.0 = Debug|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Release|Any CPU.Build.0 = Release|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Release|x64.ActiveCfg = Release|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Release|x64.Build.0 = Release|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Release|x86.ActiveCfg = Release|Any CPU - {A2FF7AFB-FD76-4F09-A176-654819796A9A}.Release|x86.Build.0 = Release|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Debug|x64.ActiveCfg = Debug|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Debug|x64.Build.0 = Debug|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Debug|x86.ActiveCfg = Debug|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Debug|x86.Build.0 = Debug|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Release|Any CPU.Build.0 = Release|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Release|x64.ActiveCfg = Release|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Release|x64.Build.0 = Release|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Release|x86.ActiveCfg = Release|Any CPU - {ED810E0E-0E09-4528-953A-61594598B650}.Release|x86.Build.0 = Release|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Debug|x64.ActiveCfg = Debug|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Debug|x64.Build.0 = Debug|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Debug|x86.ActiveCfg = Debug|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Debug|x86.Build.0 = Debug|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Release|Any CPU.Build.0 = Release|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Release|x64.ActiveCfg = Release|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Release|x64.Build.0 = Release|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Release|x86.ActiveCfg = Release|Any CPU - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D}.Release|x86.Build.0 = Release|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Debug|x64.ActiveCfg = Debug|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Debug|x64.Build.0 = Debug|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Debug|x86.ActiveCfg = Debug|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Debug|x86.Build.0 = Debug|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Release|Any CPU.Build.0 = Release|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Release|x64.ActiveCfg = Release|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Release|x64.Build.0 = Release|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Release|x86.ActiveCfg = Release|Any CPU - {1593585D-FE1B-4378-BE53-EE62A4CC84DB}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {E729B493-15E6-4447-A5A5-A60784924627} = {EE5D61BB-A9AF-4FD4-8EA1-46841326A083} - {6064279B-8E7A-4AC7-8420-EB7BC1320C0D} = {79367338-3E06-4830-AA07-9B429B61F888} - {A2FF7AFB-FD76-4F09-A176-654819796A9A} = {EE5D61BB-A9AF-4FD4-8EA1-46841326A083} - {ED810E0E-0E09-4528-953A-61594598B650} = {EE5D61BB-A9AF-4FD4-8EA1-46841326A083} - {951EC3A5-5BDF-484E-BC1F-D45C69B3725D} = {79367338-3E06-4830-AA07-9B429B61F888} - {1593585D-FE1B-4378-BE53-EE62A4CC84DB} = {79367338-3E06-4830-AA07-9B429B61F888} - {D33A7B6D-EE0A-4AC6-8240-D4BFA490094E} = {35F65EEF-9059-4829-93EE-C8F7810B3997} - {9580EF72-AC6E-4B0E-906E-3694A52876DB} = {D33A7B6D-EE0A-4AC6-8240-D4BFA490094E} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {402FF7D5-E6CC-4B15-A71A-56615B644F7E} - EndGlobalSection -EndGlobal diff --git a/FsUnit.slnx b/FsUnit.slnx new file mode 100644 index 00000000..9444df71 --- /dev/null +++ b/FsUnit.slnx @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/build.fs b/build/build.fs index 0554856d..50eb2e7b 100644 --- a/build/build.fs +++ b/build/build.fs @@ -143,7 +143,7 @@ Target.create "Format" (fun _ -> // Build library & test project Target.create "Build" (fun _ -> - let result = DotNet.exec id "build" "FsUnit.sln -c Release" + let result = DotNet.exec id "build" "FsUnit.slnx -c Release" if not result.OK then failwithf "Build failed: %A" result.Errors) diff --git a/global.json b/global.json index 205b0894..ca621bcb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.425", - "rollForward": "minor" + "version": "10.0.401", + "rollForward": "latestPatch" } } \ No newline at end of file