From c9af08f2cced777f4005e0cf7fcf9d483fd6361b Mon Sep 17 00:00:00 2001 From: Erik Rasmussen Date: Thu, 18 Jan 2024 04:54:54 +0000 Subject: [PATCH] Add devcontainer and update SDK (#12) * Ignore AWS file * Let dotnet restore do its thing * WIP on devcontainer json file * No leading 0- * Customizations * More specific image * Update sdk --- .devcontainer/devcontainer.json | 13 +++++++++++++ .gitignore | 1 + .vscode/extensions.json | 6 ++++++ CliWrap.FSharp.sln | 1 + global.json | 2 +- src/CliWrap.FSharp.Tests/packages.lock.json | 8 ++++---- src/CliWrap.FSharp/packages.lock.json | 6 +++--- 7 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 .devcontainer/devcontainer.json create mode 100644 .vscode/extensions.json diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 0000000..9ef2421 --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,13 @@ +{ + "name": "CliWrap.FSharp", + "image": "mcr.microsoft.com/devcontainers/dotnet:1.1.2-8.0-bookworm-slim", + "containerUser": "vscode", + "customizations": { + "vscode": { + "extensions": [ + "Ionide.Ionide-fsharp", + "EditorConfig.EditorConfig" + ] + } + } +} diff --git a/.gitignore b/.gitignore index 9544b85..b6cc7f6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ .idea/**/contentModel.xml .idea/**/codeStyleConfig.xml .idea/**/discord.xml +.idea/**/aws.xml # Artifacts bin/ diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..c280205 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "ionide.ionide-fsharp", + "editorconfig.editorconfig" + ] +} diff --git a/CliWrap.FSharp.sln b/CliWrap.FSharp.sln index 286879c..b1a784a 100644 --- a/CliWrap.FSharp.sln +++ b/CliWrap.FSharp.sln @@ -34,6 +34,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{BC5059 .gitignore = .gitignore .githooks\pre-commit = .githooks\pre-commit CliWrap.FSharp.sln.DotSettings = CliWrap.FSharp.sln.DotSettings + .devcontainer\devcontainer.json = .devcontainer\devcontainer.json EndProjectSection EndProject Global diff --git a/global.json b/global.json index 014e236..380b5b1 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "8.0.101", "rollForward": "latestMinor" } } diff --git a/src/CliWrap.FSharp.Tests/packages.lock.json b/src/CliWrap.FSharp.Tests/packages.lock.json index f4f6fcf..f506b86 100644 --- a/src/CliWrap.FSharp.Tests/packages.lock.json +++ b/src/CliWrap.FSharp.Tests/packages.lock.json @@ -29,9 +29,9 @@ }, "FSharp.Core": { "type": "Direct", - "requested": "[8.0.100, )", - "resolved": "8.0.100", - "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg==" + "requested": "[8.0.101, )", + "resolved": "8.0.101", + "contentHash": "sOLz3O4BOxnTKfd5OChdRmDUy4Id0GfoEClRG4nzIod8LY1LJZcNyygKAV0A78XOLh8yvhA5hsDYKZXGCR9blw==" }, "Microsoft.NET.Test.Sdk": { "type": "Direct", @@ -1047,7 +1047,7 @@ "type": "Project", "dependencies": { "CliWrap": "[3.6.4, )", - "FSharp.Core": "[8.0.100, )" + "FSharp.Core": "[8.0.101, )" } } } diff --git a/src/CliWrap.FSharp/packages.lock.json b/src/CliWrap.FSharp/packages.lock.json index a4a4e10..90415e5 100644 --- a/src/CliWrap.FSharp/packages.lock.json +++ b/src/CliWrap.FSharp/packages.lock.json @@ -10,9 +10,9 @@ }, "FSharp.Core": { "type": "Direct", - "requested": "[8.0.100, )", - "resolved": "8.0.100", - "contentHash": "ZOVZ/o+jI3ormTZOa28Wh0tSRoyle1f7lKFcUN61sPiXI7eDZu8eSveFybgTeyIEyW0ujjp31cp7GOglDgsNEg==" + "requested": "[8.0.101, )", + "resolved": "8.0.101", + "contentHash": "sOLz3O4BOxnTKfd5OChdRmDUy4Id0GfoEClRG4nzIod8LY1LJZcNyygKAV0A78XOLh8yvhA5hsDYKZXGCR9blw==" }, "Microsoft.SourceLink.GitHub": { "type": "Direct",