Skip to content

Add support for both .Net Core 2.1 and .Net Core 3.1 #14884

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
Sep 4, 2020
Merged

Add support for both .Net Core 2.1 and .Net Core 3.1 #14884

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
bf6121b
Add support for both .Net Core 2.1 and .Net Core 3.1
AlexanderSher Sep 3, 2020
80fb8e6
Install runtime instead of SDK
AlexanderSher Sep 4, 2020
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
8 changes: 5 additions & 3 deletions ...ntainers/UbuntuNetCore2Keyring/Dockerfile → ...ontainers/UbuntuNetCoreKeyring/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1-bionic AS build

ENV \
NO_AT_BRIDGE=1 \
DOCKER_CONTAINER_NAME="ubuntu_netcore2_keyring" \
DOCKER_CONTAINER_NAME="ubuntu_netcore_keyring" \
PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \
POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetCoreSDK-Ubuntu-18.04

Expand All @@ -13,9 +13,11 @@ RUN apt-get update \
dbus-x11 \
gnome-keyring

# Install PowerShell
# Install PowerShell && .net core runtime 2.1
RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
&& apt-get update \
&& apt-get install -y powershell \
&& pwsh --version
&& pwsh --version \
&& apt-get install -y dotnet-runtime-2.1 \
&& dotnet --list-runtimes
4 changes: 2 additions & 2 deletions eng/containers/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ pool:
vmImage: 'ubuntu-18.04'

variables:
dockerfile: ./eng/containers/UbuntuNetCore2Keyring/Dockerfile
dockerfile: ./eng/containers/UbuntuNetCoreKeyring/Dockerfile
containerRegistry: 'azsdkengsys'
imageRepository: 'dotnet/ubuntu_netcore2_keyring'
imageRepository: 'dotnet/ubuntu_netcore_keyring'
imageTag: $(build.buildid)

steps:
Expand Down