Skip to content

Update .NET and devcontainer settings #15073

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
merged 2 commits into from
Apr 12, 2023
Merged

Update .NET and devcontainer settings #15073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c268561
Update .NET and devcontainer
vzarytovskii Apr 12, 2023
2bc3e3a
Update .NET and devcontainer
vzarytovskii Apr 12, 2023
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
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

ARG VARIANT=7.0.202-bullseye-slim-amd64
ARG VARIANT=7.0.203-bullseye-slim-amd64
FROM mcr.microsoft.com/dotnet/sdk:${VARIANT}

# Avoid warnings by switching to noninteractive
Expand Down
26 changes: 12 additions & 14 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,25 @@
"args": {
// Update 'VARIANT' to pick a .NET Core version: 3.1, 5.0, 6.0, 7.0
// Append -bullseye(-slim), -focal, or -jammy to pin to an OS version.
"VARIANT": "7.0.202-bullseye-slim-amd64"
"VARIANT": "7.0.203-bullseye-slim-amd64"
}
},
"hostRequirements": {
"cpus": 2,
"memory": "4gb",
"storage": "32gb"
},
"customizations": {
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-dotnettools.csharp",
"Ionide.Ionide-fsharp",
"tintoy.msbuild-project-tools"
]
}
},

// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-dotnettools.csharp",
"Ionide.Ionide-fsharp",
"tintoy.msbuild-project-tools"
],
//"onCreateCommand": [ // It is a bit buggy in codespaces, so for now, need to run it manually.
// "/bin/bash",
// "-c",
// "./build.sh",
// "-c",
// "Debug"
//],
"onCreateCommand": [ "dotnet", "build", "FSharp.Compiler.Service.sln"],
"waitFor": "onCreateCommand"
}
4 changes: 2 additions & 2 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
"*.fs": "${capture}.fsi"
},
"FSharp.suggestGitignore": false,
"FSharp.enableMSBuildProjectGraph": false,
"FSharp.enableMSBuildProjectGraph": true,
"FSharp.enableAdaptiveLspServer": true,
"FSharp.workspacePath": "FSharp.Compiler.Service.sln",
"FSharp.workspaceModePeekDeepLevel": 1,
"FSharp.enableBackgroundServices": false,
"FSharp.excludeProjectDirectories": [
".git",
".vscode",
"eng",
"artifacts",
"fcs-samples",
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"sdk": {
"version": "7.0.202",
"version": "7.0.203",
Copy link
Member

@auduchinok auduchinok Apr 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@vzarytovskii Could it be possible to keep an older version (given we have rollForward enabled), so it's not required for FCS contributors to immediately install 7.0.203?

Copy link
Member Author

@vzarytovskii vzarytovskii Apr 13, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We almost always want to be on the latest stable one, and switching to the previews closer to release, around summer, when we want to "dogfood" new .NET. And we want to build with it, run with it, make test framework and VS use it, etc. I don't think that we can do it properly in CI with just rollForward, we need to specify exact versions to install.

"allowPrerelease": true,
"rollForward": "latestPatch"
},
"tools": {
"dotnet": "7.0.202",
"dotnet": "7.0.203",
"vs": {
"version": "17.5",
"components": ["Microsoft.VisualStudio.Component.FSharp"]
Expand Down