From 251c41f10ad8ba03fc8127da065b78cdca260349 Mon Sep 17 00:00:00 2001 From: Edgar Gonzalez Date: Tue, 14 Jan 2025 13:28:43 +0000 Subject: [PATCH] Update `fantomas-tools` to target `net8` (#654) * Update fantomas-tools to target `net8` * Update deps * revert V4 FSharp.Core version bum --- infrastructure/Program.fs | 2 +- infrastructure/infrastructure.fsproj | 4 +- infrastructure/packages.lock.json | 8 ++-- src/client/fsharp/FantomasTools.fsproj | 2 +- src/client/fsharp/packages.lock.json | 2 +- src/server/ASTViewer/ASTViewer.fsproj | 4 +- src/server/ASTViewer/packages.lock.json | 40 ++++++++----------- .../FantomasOnlineMain.fsproj | 4 +- .../FantomasOnlineMain/packages.lock.json | 40 ++++++++----------- .../FantomasOnlinePreview.fsproj | 4 +- .../FantomasOnlinePreview/packages.lock.json | 40 ++++++++----------- .../FantomasOnlineV4/FantomasOnlineV4.fsproj | 2 +- .../FantomasOnlineV4/packages.lock.json | 2 +- .../FantomasOnlineV5/FantomasOnlineV5.fsproj | 4 +- .../FantomasOnlineV5/packages.lock.json | 17 ++++---- .../FantomasOnlineV6/FantomasOnlineV6.fsproj | 4 +- .../FantomasOnlineV6/packages.lock.json | 22 ++++------ src/server/OakViewer/OakViewer.fsproj | 4 +- src/server/OakViewer/packages.lock.json | 40 ++++++++----------- 19 files changed, 106 insertions(+), 139 deletions(-) mode change 100644 => 100755 infrastructure/infrastructure.fsproj mode change 100644 => 100755 src/server/ASTViewer/ASTViewer.fsproj mode change 100644 => 100755 src/server/FantomasOnlineMain/FantomasOnlineMain.fsproj mode change 100644 => 100755 src/server/FantomasOnlinePreview/FantomasOnlinePreview.fsproj mode change 100644 => 100755 src/server/FantomasOnlineV4/FantomasOnlineV4.fsproj mode change 100644 => 100755 src/server/FantomasOnlineV5/FantomasOnlineV5.fsproj mode change 100644 => 100755 src/server/FantomasOnlineV6/FantomasOnlineV6.fsproj mode change 100644 => 100755 src/server/OakViewer/OakViewer.fsproj diff --git a/infrastructure/Program.fs b/infrastructure/Program.fs index 836c7fe0..1bacc484 100644 --- a/infrastructure/Program.fs +++ b/infrastructure/Program.fs @@ -208,7 +208,7 @@ let infra () = let args = Lambda.FunctionArgs( Handler = input $"{lambdaProject.FunctionPrefix}::{lambdaInfo.Name}", - Runtime = inputUnion2Of2 Lambda.Runtime.Dotnet6, + Runtime = inputUnion2Of2 Lambda.Runtime.Dotnet8, Code = input (FileArchive(lambdaProject.FileArchive) :> Archive), Role = io lambdaRole.Arn, Timeout = input 30, diff --git a/infrastructure/infrastructure.fsproj b/infrastructure/infrastructure.fsproj old mode 100644 new mode 100755 index 6ed2bc08..6e02c773 --- a/infrastructure/infrastructure.fsproj +++ b/infrastructure/infrastructure.fsproj @@ -2,14 +2,14 @@ Exe - net6.0 + net8.0 - + diff --git a/infrastructure/packages.lock.json b/infrastructure/packages.lock.json index cb9842a6..1045d5ae 100644 --- a/infrastructure/packages.lock.json +++ b/infrastructure/packages.lock.json @@ -1,12 +1,12 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "FSharp.Core": { "type": "Direct", - "requested": "[6.0.6, )", - "resolved": "6.0.6", - "contentHash": "oSbTFqPtsp+EGkWAHwYIYYHyXLJRnbzVwcmM06kmXNLdWsp3P6XZViPSJJ2qUQS8feNK+nyPA0qtpNZXANGB7w==" + "requested": "[8.0.403, )", + "resolved": "8.0.403", + "contentHash": "t1Pvv2++3zMQKKNuiQc1Lz4TCdaBajgG4mLhOE8AoFzborHQ/JbjIaJr6Mrq8m2z15KLu4r6Qz7E3oeACpljTg==" }, "Humanizer.Core": { "type": "Direct", diff --git a/src/client/fsharp/FantomasTools.fsproj b/src/client/fsharp/FantomasTools.fsproj index d145551a..dce5e923 100644 --- a/src/client/fsharp/FantomasTools.fsproj +++ b/src/client/fsharp/FantomasTools.fsproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 FantomasTools.Client FantomasTools.Client $(DefineConstants);FABLE_COMPILER diff --git a/src/client/fsharp/packages.lock.json b/src/client/fsharp/packages.lock.json index 127611e6..970089e1 100644 --- a/src/client/fsharp/packages.lock.json +++ b/src/client/fsharp/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net7.0": { + "net8.0": { "Fable.Browser.Url": { "type": "Direct", "requested": "[1.3.2, )", diff --git a/src/server/ASTViewer/ASTViewer.fsproj b/src/server/ASTViewer/ASTViewer.fsproj old mode 100644 new mode 100755 index 133ab61a..0ae42c35 --- a/src/server/ASTViewer/ASTViewer.fsproj +++ b/src/server/ASTViewer/ASTViewer.fsproj @@ -1,6 +1,6 @@ - net6.0 + net8.0 true Lambda exe @@ -27,7 +27,7 @@ - + \ No newline at end of file diff --git a/src/server/ASTViewer/packages.lock.json b/src/server/ASTViewer/packages.lock.json index 44257217..09ea093e 100644 --- a/src/server/ASTViewer/packages.lock.json +++ b/src/server/ASTViewer/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Amazon.Lambda.APIGatewayEvents": { "type": "Direct", "requested": "[2.5.0, )", @@ -25,9 +25,9 @@ }, "FSharp.Core": { "type": "Direct", - "requested": "[6.0.6, )", - "resolved": "6.0.6", - "contentHash": "oSbTFqPtsp+EGkWAHwYIYYHyXLJRnbzVwcmM06kmXNLdWsp3P6XZViPSJJ2qUQS8feNK+nyPA0qtpNZXANGB7w==" + "requested": "[8.0.403, )", + "resolved": "8.0.403", + "contentHash": "t1Pvv2++3zMQKKNuiQc1Lz4TCdaBajgG4mLhOE8AoFzborHQ/JbjIaJr6Mrq8m2z15KLu4r6Qz7E3oeACpljTg==" }, "Microsoft.Net.Http.Headers": { "type": "Direct", @@ -98,24 +98,18 @@ }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==" }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + "resolved": "4.6.0", + "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg==" }, "System.Runtime": { "type": "Transitive", @@ -128,23 +122,23 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "4.5.1", + "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" }, "fantomas.core": { "type": "Project", "dependencies": { - "FSharp.Core": "[6.0.1, )", + "FSharp.Core": "[8.0.100, )", "Fantomas.FCS": "[1.0.0, )" } }, "fantomas.fcs": { "type": "Project", "dependencies": { - "FSharp.Core": "[6.0.1, )", - "System.Collections.Immutable": "[7.0.0, )", - "System.Diagnostics.DiagnosticSource": "[7.0.0, )", - "System.Memory": "[4.5.5, )", + "FSharp.Core": "[8.0.100, )", + "System.Collections.Immutable": "[8.0.0, )", + "System.Diagnostics.DiagnosticSource": "[8.0.1, )", + "System.Memory": "[4.6.0, )", "System.Runtime": "[4.3.1, )" } } diff --git a/src/server/FantomasOnlineMain/FantomasOnlineMain.fsproj b/src/server/FantomasOnlineMain/FantomasOnlineMain.fsproj old mode 100644 new mode 100755 index 2fbb5e6e..b1ae8ada --- a/src/server/FantomasOnlineMain/FantomasOnlineMain.fsproj +++ b/src/server/FantomasOnlineMain/FantomasOnlineMain.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true Lambda exe @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/src/server/FantomasOnlineMain/packages.lock.json b/src/server/FantomasOnlineMain/packages.lock.json index 44257217..a95d3362 100644 --- a/src/server/FantomasOnlineMain/packages.lock.json +++ b/src/server/FantomasOnlineMain/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Amazon.Lambda.APIGatewayEvents": { "type": "Direct", "requested": "[2.5.0, )", @@ -25,9 +25,9 @@ }, "FSharp.Core": { "type": "Direct", - "requested": "[6.0.6, )", - "resolved": "6.0.6", - "contentHash": "oSbTFqPtsp+EGkWAHwYIYYHyXLJRnbzVwcmM06kmXNLdWsp3P6XZViPSJJ2qUQS8feNK+nyPA0qtpNZXANGB7w==" + "requested": "[8.0.400, )", + "resolved": "8.0.400", + "contentHash": "kHMdDDmlZl98tujgHCmL8/HNH9VKbxsRMC9s7wbwr4noR40SSa5D4d00yF8cMK52s8jabVuiLLcrUw9r+PkKDQ==" }, "Microsoft.Net.Http.Headers": { "type": "Direct", @@ -98,24 +98,18 @@ }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==" }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + "resolved": "4.6.0", + "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg==" }, "System.Runtime": { "type": "Transitive", @@ -128,23 +122,23 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "4.5.1", + "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" }, "fantomas.core": { "type": "Project", "dependencies": { - "FSharp.Core": "[6.0.1, )", + "FSharp.Core": "[8.0.100, )", "Fantomas.FCS": "[1.0.0, )" } }, "fantomas.fcs": { "type": "Project", "dependencies": { - "FSharp.Core": "[6.0.1, )", - "System.Collections.Immutable": "[7.0.0, )", - "System.Diagnostics.DiagnosticSource": "[7.0.0, )", - "System.Memory": "[4.5.5, )", + "FSharp.Core": "[8.0.100, )", + "System.Collections.Immutable": "[8.0.0, )", + "System.Diagnostics.DiagnosticSource": "[8.0.1, )", + "System.Memory": "[4.6.0, )", "System.Runtime": "[4.3.1, )" } } diff --git a/src/server/FantomasOnlinePreview/FantomasOnlinePreview.fsproj b/src/server/FantomasOnlinePreview/FantomasOnlinePreview.fsproj old mode 100644 new mode 100755 index 05474d4a..9880c5df --- a/src/server/FantomasOnlinePreview/FantomasOnlinePreview.fsproj +++ b/src/server/FantomasOnlinePreview/FantomasOnlinePreview.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true Lambda exe @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/src/server/FantomasOnlinePreview/packages.lock.json b/src/server/FantomasOnlinePreview/packages.lock.json index 44257217..09ea093e 100644 --- a/src/server/FantomasOnlinePreview/packages.lock.json +++ b/src/server/FantomasOnlinePreview/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Amazon.Lambda.APIGatewayEvents": { "type": "Direct", "requested": "[2.5.0, )", @@ -25,9 +25,9 @@ }, "FSharp.Core": { "type": "Direct", - "requested": "[6.0.6, )", - "resolved": "6.0.6", - "contentHash": "oSbTFqPtsp+EGkWAHwYIYYHyXLJRnbzVwcmM06kmXNLdWsp3P6XZViPSJJ2qUQS8feNK+nyPA0qtpNZXANGB7w==" + "requested": "[8.0.403, )", + "resolved": "8.0.403", + "contentHash": "t1Pvv2++3zMQKKNuiQc1Lz4TCdaBajgG4mLhOE8AoFzborHQ/JbjIaJr6Mrq8m2z15KLu4r6Qz7E3oeACpljTg==" }, "Microsoft.Net.Http.Headers": { "type": "Direct", @@ -98,24 +98,18 @@ }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==" }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + "resolved": "4.6.0", + "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg==" }, "System.Runtime": { "type": "Transitive", @@ -128,23 +122,23 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "4.5.1", + "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" }, "fantomas.core": { "type": "Project", "dependencies": { - "FSharp.Core": "[6.0.1, )", + "FSharp.Core": "[8.0.100, )", "Fantomas.FCS": "[1.0.0, )" } }, "fantomas.fcs": { "type": "Project", "dependencies": { - "FSharp.Core": "[6.0.1, )", - "System.Collections.Immutable": "[7.0.0, )", - "System.Diagnostics.DiagnosticSource": "[7.0.0, )", - "System.Memory": "[4.5.5, )", + "FSharp.Core": "[8.0.100, )", + "System.Collections.Immutable": "[8.0.0, )", + "System.Diagnostics.DiagnosticSource": "[8.0.1, )", + "System.Memory": "[4.6.0, )", "System.Runtime": "[4.3.1, )" } } diff --git a/src/server/FantomasOnlineV4/FantomasOnlineV4.fsproj b/src/server/FantomasOnlineV4/FantomasOnlineV4.fsproj old mode 100644 new mode 100755 index fb9ed82f..1d5894bd --- a/src/server/FantomasOnlineV4/FantomasOnlineV4.fsproj +++ b/src/server/FantomasOnlineV4/FantomasOnlineV4.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true Lambda exe diff --git a/src/server/FantomasOnlineV4/packages.lock.json b/src/server/FantomasOnlineV4/packages.lock.json index 64c73755..78736567 100644 --- a/src/server/FantomasOnlineV4/packages.lock.json +++ b/src/server/FantomasOnlineV4/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Amazon.Lambda.APIGatewayEvents": { "type": "Direct", "requested": "[2.5.0, )", diff --git a/src/server/FantomasOnlineV5/FantomasOnlineV5.fsproj b/src/server/FantomasOnlineV5/FantomasOnlineV5.fsproj old mode 100644 new mode 100755 index ca99997c..d550ffea --- a/src/server/FantomasOnlineV5/FantomasOnlineV5.fsproj +++ b/src/server/FantomasOnlineV5/FantomasOnlineV5.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true Lambda exe @@ -24,7 +24,7 @@ - + \ No newline at end of file diff --git a/src/server/FantomasOnlineV5/packages.lock.json b/src/server/FantomasOnlineV5/packages.lock.json index 6c5b1a52..3bb36d68 100644 --- a/src/server/FantomasOnlineV5/packages.lock.json +++ b/src/server/FantomasOnlineV5/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Amazon.Lambda.APIGatewayEvents": { "type": "Direct", "requested": "[2.5.0, )", @@ -35,9 +35,9 @@ }, "FSharp.Core": { "type": "Direct", - "requested": "[6.0.6, )", - "resolved": "6.0.6", - "contentHash": "oSbTFqPtsp+EGkWAHwYIYYHyXLJRnbzVwcmM06kmXNLdWsp3P6XZViPSJJ2qUQS8feNK+nyPA0qtpNZXANGB7w==" + "requested": "[8.0.403, )", + "resolved": "8.0.403", + "contentHash": "t1Pvv2++3zMQKKNuiQc1Lz4TCdaBajgG4mLhOE8AoFzborHQ/JbjIaJr6Mrq8m2z15KLu4r6Qz7E3oeACpljTg==" }, "Microsoft.Net.Http.Headers": { "type": "Direct", @@ -120,10 +120,7 @@ "System.Diagnostics.DiagnosticSource": { "type": "Transitive", "resolved": "7.0.0", - "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==" }, "System.Memory": { "type": "Transitive", @@ -141,8 +138,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "4.5.1", + "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" } } } diff --git a/src/server/FantomasOnlineV6/FantomasOnlineV6.fsproj b/src/server/FantomasOnlineV6/FantomasOnlineV6.fsproj old mode 100644 new mode 100755 index 23c851f6..4165c023 --- a/src/server/FantomasOnlineV6/FantomasOnlineV6.fsproj +++ b/src/server/FantomasOnlineV6/FantomasOnlineV6.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true Lambda exe @@ -24,7 +24,7 @@ - + \ No newline at end of file diff --git a/src/server/FantomasOnlineV6/packages.lock.json b/src/server/FantomasOnlineV6/packages.lock.json index b9613bde..a112ab39 100644 --- a/src/server/FantomasOnlineV6/packages.lock.json +++ b/src/server/FantomasOnlineV6/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Amazon.Lambda.APIGatewayEvents": { "type": "Direct", "requested": "[2.5.0, )", @@ -39,9 +39,9 @@ }, "FSharp.Core": { "type": "Direct", - "requested": "[8.0.100, )", - "resolved": "8.0.100", - "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg==" + "requested": "[8.0.403, )", + "resolved": "8.0.403", + "contentHash": "t1Pvv2++3zMQKKNuiQc1Lz4TCdaBajgG4mLhOE8AoFzborHQ/JbjIaJr6Mrq8m2z15KLu4r6Qz7E3oeACpljTg==" }, "Microsoft.Net.Http.Headers": { "type": "Direct", @@ -125,18 +125,12 @@ "System.Collections.Immutable": { "type": "Transitive", "resolved": "8.0.0", - "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", "resolved": "8.0.1", - "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==" }, "System.Memory": { "type": "Transitive", @@ -154,8 +148,8 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "4.5.1", + "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" } } } diff --git a/src/server/OakViewer/OakViewer.fsproj b/src/server/OakViewer/OakViewer.fsproj old mode 100644 new mode 100755 index cc1d8b01..4f7fcd83 --- a/src/server/OakViewer/OakViewer.fsproj +++ b/src/server/OakViewer/OakViewer.fsproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 true Lambda exe @@ -28,7 +28,7 @@ - + \ No newline at end of file diff --git a/src/server/OakViewer/packages.lock.json b/src/server/OakViewer/packages.lock.json index 44257217..09ea093e 100644 --- a/src/server/OakViewer/packages.lock.json +++ b/src/server/OakViewer/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net6.0": { + "net8.0": { "Amazon.Lambda.APIGatewayEvents": { "type": "Direct", "requested": "[2.5.0, )", @@ -25,9 +25,9 @@ }, "FSharp.Core": { "type": "Direct", - "requested": "[6.0.6, )", - "resolved": "6.0.6", - "contentHash": "oSbTFqPtsp+EGkWAHwYIYYHyXLJRnbzVwcmM06kmXNLdWsp3P6XZViPSJJ2qUQS8feNK+nyPA0qtpNZXANGB7w==" + "requested": "[8.0.403, )", + "resolved": "8.0.403", + "contentHash": "t1Pvv2++3zMQKKNuiQc1Lz4TCdaBajgG4mLhOE8AoFzborHQ/JbjIaJr6Mrq8m2z15KLu4r6Qz7E3oeACpljTg==" }, "Microsoft.Net.Http.Headers": { "type": "Direct", @@ -98,24 +98,18 @@ }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, "System.Diagnostics.DiagnosticSource": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "8.0.1", + "contentHash": "vaoWjvkG1aenR2XdjaVivlCV9fADfgyhW5bZtXT23qaEea0lWiUljdQuze4E31vKM7ZWJaSUsbYIKE3rnzfZUg==" }, "System.Memory": { "type": "Transitive", - "resolved": "4.5.5", - "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==" + "resolved": "4.6.0", + "contentHash": "OEkbBQoklHngJ8UD8ez2AERSk2g+/qpAaSWWCBFbpH727HxDq5ydVkuncBaKcKfwRqXGWx64dS6G1SUScMsitg==" }, "System.Runtime": { "type": "Transitive", @@ -128,23 +122,23 @@ }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + "resolved": "4.5.1", + "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw==" }, "fantomas.core": { "type": "Project", "dependencies": { - "FSharp.Core": "[6.0.1, )", + "FSharp.Core": "[8.0.100, )", "Fantomas.FCS": "[1.0.0, )" } }, "fantomas.fcs": { "type": "Project", "dependencies": { - "FSharp.Core": "[6.0.1, )", - "System.Collections.Immutable": "[7.0.0, )", - "System.Diagnostics.DiagnosticSource": "[7.0.0, )", - "System.Memory": "[4.5.5, )", + "FSharp.Core": "[8.0.100, )", + "System.Collections.Immutable": "[8.0.0, )", + "System.Diagnostics.DiagnosticSource": "[8.0.1, )", + "System.Memory": "[4.6.0, )", "System.Runtime": "[4.3.1, )" } }