diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index d77cb454d4..bec65d73c1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,11 +1,10 @@ # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/dotnet/.devcontainer/base.Dockerfile -# [Choice] .NET version: 6.0, 5.0, 6.0-bullseye, 5.0-bullseye, 6.0-focal, 5.0-focal +# [Choice] .NET version: 6.0, 6.0-bullseye, 6.0-focal ARG VARIANT="6.0-bullseye" FROM mcr.microsoft.com/vscode/devcontainers/dotnet -# "install" the dotnet 5.0 & 6.0 runtime for tests -COPY --from=mcr.microsoft.com/dotnet/sdk:5.0 /usr/share/dotnet/shared /usr/share/dotnet/shared +# "install" the dotnet 6.0 runtime for tests COPY --from=mcr.microsoft.com/dotnet/sdk:6.0 /usr/share/dotnet/shared /usr/share/dotnet/shared # # Add mkdocs for doc generation diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e303b33333..a52dcaa8a2 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "build": { "dockerfile": "Dockerfile", "args": { - // Update 'VARIANT' to pick a .NET Core version: 5.0, 6.0 + // Update 'VARIANT' to pick a .NET Core version: 6.0 // Append -bullseye or -focal to pin to an OS version. "VARIANT": "latest" } diff --git a/.github/workflows/netcore.yml b/.github/workflows/netcore.yml index 8808440e6c..dafba365a7 100644 --- a/.github/workflows/netcore.yml +++ b/.github/workflows/netcore.yml @@ -19,10 +19,6 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Setup .NET 5 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.* - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index be35bbd487..78e83aa188 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,10 +13,6 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Setup .NET 5 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 5.0.* - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: