Merge branch 'master' into pre-release/1.0.7

Author: AdamPurcell-USDA

.config/dotnet-tools.json

@@ -3,10 +3,11 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "4.6.1",
+      "version": "5.4.5",
       "commands": [
         "reportgenerator"
-      ]
+      ],
+      "rollForward": false
     }
   }
 }

.devcontainer/Dockerfile

@@ -1,85 +1,15 @@
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1
-
-# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
-# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
-# will be updated to match your local UID/GID (when using the dockerFile property).
-# See https://aka.ms/vscode-remote/containers/non-root-user for details.
-ARG USERNAME=vscode
-ARG USER_UID=1000
-ARG USER_GID=$USER_UID
-
-# [Optional] Version of Node.js to install.
-ARG INSTALL_NODE="true"
-ARG NODE_VERSION="lts/*"
-ENV NVM_DIR=/home/vscode/.nvm
-
-# [Optional] Install the Azure CLI
-ARG INSTALL_AZURE_CLI="false"
-
-# Avoid warnings by switching to noninteractive
-ENV DEBIAN_FRONTEND=noninteractive
-
-    # Configure apt and install packages
-RUN apt-get update \
-    && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
-    #
-    # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
-    && apt-get -y install git openssh-client less iproute2 procps apt-transport-https gnupg2 curl lsb-release \
-    #
-    # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user.
-    && groupadd --gid $USER_GID $USERNAME \
-    && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \
-    # [Optional] Add sudo support for the non-root user
-    && apt-get install -y sudo \
-    && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\
-    && chmod 0440 /etc/sudoers.d/$USERNAME \
-    #
-    # Add vscode folders to prevent re-installs
-    && mkdir -p /home/$USERNAME/.vscode-server/extensions \
-        /home/$USERNAME/.vscode-server-insiders/extensions \
-    && chown -R $USERNAME \
-        /home/$USERNAME/.vscode-server \
-        /home/$USERNAME/.vscode-server-insiders \
-    #
-    # [Optional] Install Node.js for ASP.NET Core Web Applicationss
-    && if [ "$INSTALL_NODE" = "true" ]; then \
-        #
-        # Install nvm and Node
-        mkdir ${NVM_DIR} \
-        && curl -so- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash 2>&1 \
-        && chown -R vscode:vscode ${NVM_DIR} \
-        && /bin/bash -c "source $NVM_DIR/nvm.sh \
-            && nvm install ${NODE_VERSION} \
-            && nvm alias default ${NODE_VERSION}" 2>&1 \
-        && INIT_STRING='[ -s "$NVM_DIR/nvm.sh" ] && \\. "$NVM_DIR/nvm.sh"  && [ -s "$NVM_DIR/bash_completion" ] && \\. "$NVM_DIR/bash_completion"' \
-        && echo $INIT_STRING >> /home/vscode/.bashrc \
-        && echo $INIT_STRING >> /home/vscode/.zshrc \
-        && echo $INIT_STRING >> /root/.zshrc \
-        #
-        # Install yarn
-        && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
-        && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
-        && apt-get update \
-        && apt-get -y install --no-install-recommends yarn; \
-    fi \
-    #
-    # [Optional] Install the Azure CLI
-    && if [ "$INSTALL_AZURE_CLI" = "true" ]; then \
-        echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
-        && curl -sL https://packages.microsoft.com/keys/microsoft.asc | apt-key add - 2>/dev/null \
-        && apt-get update \
-        && apt-get install -y azure-cli; \
-    fi \
-    #
-    # Clean up
-    && apt-get autoremove -y \
-    && apt-get clean -y \
-    && rm -rf /var/lib/apt/lists/*
-
-# Switch back to dialog for any ad-hoc use of apt-get
-ENV DEBIAN_FRONTEND=dialog
+FROM mcr.microsoft.com/devcontainers/base:alpine
+ENV PATH $PATH:/home/vscode/.dotnet:/home/vscode/.dotnet/tools
+
+ARG VARIANT
+RUN if [ "${VARIANT#*noble}" != "$VARIANT"  ]; then \
+    if id "ubuntu" &>/dev/null; then \
+    echo "Deleting user 'ubuntu'  for $VARIANT" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for $VARIANT"; \
+    else \
+    echo "User 'ubuntu' does not exist for $VARIANT"; \
+    fi; \
+    fi
+
+# clear this environment variable so xml docs from NuGet packages are unpackaged. The default dotnet/sdk image sets it to 'skip'.
+# see https://github.com/dotnet/dotnet-docker/issues/2790
+ENV NUGET_XMLDOC_MODE=

.devcontainer/devcontainer.json

@@ -1,39 +1,48 @@
 // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.117.1/containers/dotnetcore-3.1
 {
-  "name": "C# (.NET Core 3.1)",
-  "dockerFile": "Dockerfile",
-  // Set *default* container specific settings.json values on container create.
-  "settings": {
-    "terminal.integrated.shell.linux": "/bin/bash"
+  "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+  "features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+      "additionalVersions": "lts"
+    }
+  },
+  "customizations": {
+    // Set *default* container specific settings.json values on container create.
+    "settings": {
+      "omnisharp.enableMsBuildLoadProjectsOnDemand": true,
+      "omnisharp.enableRoslynAnalyzers": true,
+      "omnisharp.enableEditorConfigSupport": true,
+      "omnisharp.enableImportCompletion": true
+    },
+    // Configure properties specific to VS Code.
+    "vscode": {
+      // Add the IDs of extensions you want installed when the container is created.
+      "extensions": [
+        "github.vscode-github-actions",
+        "ms-dotnettools.csdevkit",
+        "EditorConfig.EditorConfig",
+        "dbaeumer.vscode-eslint"
+      ]
+    }
   },
-  // Add the IDs of extensions you want installed when the container is created.
-  "extensions": [
-    "editorconfig.editorconfig",
-    "jchannon.csharpextensions",
-    "k--kato.docomment",
-    "ms-dotnettools.csharp"
-  ],
-  // Use 'forwardPorts' to make a list of ports inside the container available locally.
-  // "forwardPorts": [5000, 5001],
-  // [Optional] To reuse of your local HTTPS dev cert, first export it locally using this command:
-  //  * Windows PowerShell:
-  //     dotnet dev-certs https --trust; dotnet dev-certs https -ep "$env:USERPROFILE/.aspnet/https/aspnetapp.pfx" -p "SecurePwdGoesHere"
-  //  * macOS/Linux terminal:
-  //     dotnet dev-certs https --trust; dotnet dev-certs https -ep "${HOME}/.aspnet/https/aspnetapp.pfx" -p "SecurePwdGoesHere"
-  //
-  // Next, after running the command above, uncomment lines in the 'mounts' and 'remoteEnv' lines below,
-  // and open / rebuild the container so the settings take effect.
-  //
-  "remoteUser": "vscode",
   "mounts": [
-    "source=vscode-extensions,target=/home/vscode/.vscode-server/extensions,type=volume",
-    // And/or for VS Code Insiders
-    "source=vscode-insiders,target=/home/vscode/.vscode-server-insiders/extensions,type=volume",
+    // user profile
+    "source=profile,target=/home/vscode,type=volume",
+    // vscode extensions
+    "target=/vscode/.vscode-server,type=volume",
+    // bash history
+    //"source=dddseed-bashhistory,target=/commandhistory,type=volume"
+    // ssh config for git
+    "source=${localEnv:HOME}${localEnv:USERPROFILE}/.ssh/,target=/home/vscode/.ssh,type=bind,consistency=cached"
+    // personal NuGet.Config for any api keys
+    //"source=${localEnv:APPDATA}/NuGet/NuGet.config,target=/home/vscode/.nuget/NuGet/NuGet.Config,type=bind,consistency=cached"
   ],
   "remoteEnv": {
-    // "ASPNETCORE_Kestrel__Certificates__Default__Password": "SecurePwdGoesHere",
-    // "ASPNETCORE_Kestrel__Certificates__Default__Path": "/home/vscode/.aspnet/https/aspnetapp.pfx",
+    // move Nuget global packages store to a directory where user vscode has write access
+    // because the NuGet.Config mount below is mounted as readonly
+    // "NUGET_PACKAGES": "/home/vscode/.cache/nuget/packages"
   },
-  //"postCreateCommand": "sudo chown vscode dotnet"
+  //"postCreateCommand": "dotnet restore",
+  "remoteUser": "vscode"
 }