Add dotnet3.1

Author: skluck

.circleci/config.yml

@@ -64,13 +64,15 @@ workflows:
             - build_dotnet20: { requires: [ fan_in_1 ] }
             - build_dotnet21: { requires: [ fan_in_1 ] }
             - build_dotnet22: { requires: [ fan_in_1 ] }
+            - build_dotnet31: { requires: [ fan_in_1 ] }
 
             - fan_in_2:
                 requires:
                     - build_dotnet11
                     - build_dotnet20
                     - build_dotnet21
                     - build_dotnet22
+                    - build_dotnet31
 
             - build_awscli1_11: { requires: [ fan_in_2 ] }
             - build_awscli1_14: { requires: [ fan_in_2 ] }
@@ -179,6 +181,9 @@ jobs:
     build_dotnet22:
         <<: *build_image
         environment: [ { DOCKER_PATH: './dotnet/2.2', DOCKER_TAG: 'dotnet2.2-debian9' } ]
+    build_dotnet31:
+        <<: *build_image
+        environment: [ { DOCKER_PATH: './dotnet/3.1', DOCKER_TAG: 'dotnet3.1-debian10' } ]
 
     fan_in_2:
         <<: *fan_in

README.md

@@ -76,6 +76,7 @@ Windows containers have all versions of .NET Framework 4.x and .NET Core 1.x and
 - `dotnet2.0-debian8` ([dotnet/2.0/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/dotnet/2.0/Dockerfile))
 - `dotnet2.1-debian8` ([dotnet/2.1/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/dotnet/2.1/Dockerfile))
 - `dotnet2.2-debian9` ([dotnet/2.2/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/dotnet/2.2/Dockerfile))
+- `dotnet3.1-debian10` ([dotnet/3.1/Dockerfile](https://github.com/hal-platform/hal-build-environments/blob/master/dotnet/3.1/Dockerfile))
 
 #### Python
 

dotnet/2.1/Dockerfile

@@ -40,8 +40,6 @@ RUN curl "https://packages.microsoft.com/keys/microsoft.asc" | apt-key add - \
         && \
     apt-get update \
         && \
-apt-cache madison powershell && \
-apt-cache madison dotnet-host && \
     apt-get install -y \
         "dotnet-sdk-${DOTNET_SDK_VERSION}=${DOTNET_PACKAGE_VERSION}-1" \
         "dotnet-host=${DOTNET_SDK_VERSION}.6-1" \

dotnet/2.2/Dockerfile

@@ -29,9 +29,6 @@ RUN curl "https://packages.microsoft.com/keys/microsoft.asc" | apt-key add - \
         && \
     apt-get update \
         && \
-apt-cache madison "powershell" && \
-apt-cache madison "dotnet-host" && \
-apt-cache madison "dotnet-sdk-${DOTNET_SDK_VERSION}" && \
     apt-get install -y \
         "dotnet-sdk-${DOTNET_SDK_VERSION}=${DOTNET_PACKAGE_VERSION}-1" \
         "dotnet-host" \

dotnet/3.1/Dockerfile

@@ -0,0 +1,67 @@
+FROM halplatform/hal-build-environments:debian10-buildpack
+
+# Install .NET CLI dependencies
+RUN \
+    apt-get update \
+        && \
+    apt-get install -y --no-install-recommends \
+        libicu63 \
+        libssl1.1 \
+        libc6 \
+        libgcc1 \
+        libgssapi-krb5-2 \
+        liblttng-ust0 \
+        libstdc++6 \
+        zlib1g \
+        \
+        gettext \
+        apt-transport-https \
+        && \
+    rm -rf /var/lib/apt/lists/*
+
+ENV DOTNET_SDK_VERSION "3.1"
+ENV DOTNET_PACKAGE_VERSION "3.1.100"
+ENV POWERSHELL_VERSION "7.0.0-rc.1"
+
+# Install Dotnet
+
+RUN curl -sL "https://packages.microsoft.com/keys/microsoft.asc" | apt-key add - \
+        && \
+    curl -sLo "/etc/apt/sources.list.d/microsoft.list" \
+        "https://packages.microsoft.com/config/debian/10/prod.list" \
+        && \
+    apt-get update \
+        && \
+    apt-get install -y \
+        "dotnet-sdk-${DOTNET_SDK_VERSION}=${DOTNET_PACKAGE_VERSION}-1" \
+        && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install Powershell
+
+RUN curl -sLo "/tmp/powershell.tgz" \
+    "https://github.com/PowerShell/PowerShell/releases/download/v${POWERSHELL_VERSION}/powershell-${POWERSHELL_VERSION}-linux-x64.tar.gz" \
+        && \
+    mkdir -p "/opt/microsoft/powershell/7" \
+        && \
+    tar zxf "/tmp/powershell.tgz" -C "/opt/microsoft/powershell/7" \
+        && \
+    chmod +x "/opt/microsoft/powershell/7/pwsh" \
+        && \
+    ln -s "/opt/microsoft/powershell/7/pwsh" /usr/bin/pwsh
+
+ENV NUGET_XMLDOC_MODE skip
+ENV DOTNET_CLI_TELEMETRY_OPTOUT 1
+
+# Trigger the population of the local package cache
+RUN mkdir warmup \
+        && \
+    cd warmup \
+        && \
+    dotnet new \
+        && \
+    cd .. \
+        && \
+    rm -rf warmup \
+        && \
+    rm -rf /tmp/NuGetScratch

tools/awscli/1.16/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.6.2-stretch
 
-ENV AWSCLI_VERSION 1.16.131
+ENV AWSCLI_VERSION 1.16.306
 
 RUN \
     curl -Lo "yq" "https://github.com/mikefarah/yq/releases/download/1.14.0/yq_linux_amd64" \