Skip to content

Commit

Permalink
Use latest .NET 6.0 SDK patch version and update devcontainer to use …
Browse files Browse the repository at this point in the history
….NET 6 as well (#1955)

* Update global.json

* Update README.md

* Update Dockerfile

* Update devcontainer.json

* Update devcontainer.json

* Update devcontainer.json

* Update global.json
  • Loading branch information
bergmeister authored Jan 18, 2024
1 parent 2245064 commit cc2f9b7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

FROM mcr.microsoft.com/dotnet/core/sdk:3.1.419
FROM mcr.microsoft.com/dotnet/sdk:6.0

RUN pwsh --command Install-Module platyPS,Pester -Force
24 changes: 13 additions & 11 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or the definition README at
// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/dotnetcore-3.0
// For format details, see https://aka.ms/vscode-remote/devcontainer.json
{
"name": "C# (.NET Core 3.1)",
"name": "C# (.NET 6.0)",
"dockerFile": "Dockerfile",
"settings": {
"terminal.integrated.shell.linux": "/usr/bin/pwsh"
},
"postCreateCommand": "dotnet restore",
"extensions": [
"ms-dotnettools.csharp",
"ms-vscode.powershell-preview"
]
"customizations": {
"vscode": {
"settings": {
"terminal.integrated.defaultProfile.linux": "pwsh"
},
"extensions": [
"ms-dotnettools.csharp",
"ms-vscode.powershell"
]
}
}
}
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ To install **PSScriptAnalyzer** from source code:

### Requirements

- [.NET 6.0.11 containing 6.0.403 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) or
newer patch release
- [Latest .NET 6.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/6.0)
* If building for Windows PowerShell versions, then the .NET Framework 4.6.2 [targeting pack](https://dotnet.microsoft.com/en-us/download/dotnet-framework/net462) (also referred to as developer/targeting pack) need to be installed. This is only possible on Windows.
* Optionally but recommended for development: [Visual Studio 2017/2019](https://www.visualstudio.com/downloads)
- [Pester v5 PowerShell module, available on PowerShell Gallery](https://github.com/pester/Pester)
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.403"
"version": "6.0.418"
}
}

0 comments on commit cc2f9b7

Please sign in to comment.