From 61e33031c55dee50e1940024f3a7c2608f9d71e1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 9 May 2022 16:04:51 -0700 Subject: [PATCH 1/5] Remove 16.04 ubuntu legs and old docker files. --- .vsts-ci.yml | 9 +---- eng/docker/ubuntu.16.04/Dockerfile | 65 ------------------------------ eng/docker/ubuntu.16.10/Dockerfile | 64 ----------------------------- 3 files changed, 1 insertion(+), 137 deletions(-) delete mode 100644 eng/docker/ubuntu.16.04/Dockerfile delete mode 100644 eng/docker/ubuntu.16.10/Dockerfile diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 4a1ca1503..3c8408e94 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -156,13 +156,6 @@ stages: strategy: matrix: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - Build_Ubuntu_16_04_Debug_x64: - _BuildConfig: Debug - _DockerParameter: '--docker ubuntu.16.04' - _LinuxPortable: '' - _RuntimeIdentifier: '' - _BuildArchitecture: 'x64' - _TestArg: $(_NonWindowsTestArg) Build_Ubuntu_18_04_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker ubuntu.18.04' @@ -297,7 +290,7 @@ stages: _AdditionalBuildParameters: '/p:HostOSName="linux-musl"' Build_Linux_Portable_Deb_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker ubuntu.16.04' + _DockerParameter: '--docker ubuntu.18.04' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' diff --git a/eng/docker/ubuntu.16.04/Dockerfile b/eng/docker/ubuntu.16.04/Dockerfile deleted file mode 100644 index c58504613..000000000 --- a/eng/docker/ubuntu.16.04/Dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -FROM ubuntu:16.04 - -# Install the base toolchain we need to build anything (clang, cmake, make and the like) -# this does not include libraries that we need to compile different projects, we'd like -# them in a different layer. -RUN rm -rf rm -rf /var/lib/apt/lists/* && \ - apt-get clean && \ - apt-get update && \ - apt-get install -y cmake \ - make \ - llvm-3.5 \ - clang-3.5 \ - git \ - curl \ - tar \ - sudo && \ - apt-get clean - -# Install Build Prereqs -RUN apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts && \ - apt-get clean - -# Dependencies for CoreCLR and CoreFX -RUN apt-get install -y libunwind8 \ - libkrb5-3 \ - libicu55 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 \ - liblldb-3.6 && \ - apt-get clean - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} - -# Set up Azure Artifacts credential provider. -# We download the installer and execute it using ${USER_ID} so that the installer -# put the NuGet plugins in the correct $HOME/.nuget folder. -RUN curl -O https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh -RUN chmod +x ./installcredprovider.sh - -# Set user to the one we just created -USER ${USER_ID} - -RUN ./installcredprovider.sh diff --git a/eng/docker/ubuntu.16.10/Dockerfile b/eng/docker/ubuntu.16.10/Dockerfile deleted file mode 100644 index 0497a6fb5..000000000 --- a/eng/docker/ubuntu.16.10/Dockerfile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM ubuntu:16.10 - -# Misc Dependencies for build -RUN apt-get update && \ - apt-get -qqy install \ - curl \ - unzip \ - gettext \ - sudo && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# This could become a "microsoft/coreclr" image, since it just installs the dependencies for CoreCLR (and stdlib) -RUN apt-get update && \ - apt-get -qqy install \ - libunwind8 \ - libkrb5-3 \ - libicu57 \ - liblttng-ust0 \ - libssl1.0.0 \ - zlib1g \ - libuuid1 \ - liblldb-3.5 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Install Build Prereqs -RUN apt-get update && \ - apt-get -qqy install \ - debhelper \ - build-essential \ - devscripts \ - git \ - cmake \ - clang-3.5 && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* - -# Use clang as c++ compiler -RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-3.5 100 -RUN update-alternatives --set c++ /usr/bin/clang++-3.5 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g sudo -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chmod -R 755 /usr/lib/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} \ No newline at end of file From e7e17f825281a203b0da51dae45e8681a1c3a391 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Wed, 11 May 2022 13:35:39 -0500 Subject: [PATCH 2/5] Update TestScenario to use rid based on current arch (#13819) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs index f5a04de1e..9249f53ef 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/TestScenario.cs @@ -50,11 +50,11 @@ public class TestScenario { dotNetHelper.ExecutePublish(projectName, selfContained: false); dotNetHelper.ExecutePublish(projectName, selfContained: true, Config.TargetRid); - dotNetHelper.ExecutePublish(projectName, selfContained: true, "linux-x64"); + dotNetHelper.ExecutePublish(projectName, selfContained: true, $"linux-{Config.TargetArchitecture}"); } if (Commands.HasFlag(DotNetActions.PublishR2R)) { - dotNetHelper.ExecutePublish(projectName, selfContained: true, "linux-x64", trimmed: true, readyToRun: true); + dotNetHelper.ExecutePublish(projectName, selfContained: true, $"linux-{Config.TargetArchitecture}", trimmed: true, readyToRun: true); } if (Commands.HasFlag(DotNetActions.Test)) { From e01c18dae42a45c137237b201689686d7dd31b86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 May 2022 11:16:09 -0700 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/arcade build 20220511.7 (#13836) Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22254.3 -> To Version 6.0.0-beta.22261.7 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 12 ++++++++---- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index b8361e1de..793b1fbae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,22 @@ - + + + + - @@ -41,15 +43,17 @@ - + + + + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b1a5591..b34b1d552 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/arcade - 5fdd5b6c08c6c39edf12001400a11786c03b3e35 + e3cbecc5b0e51374e3d71dbb976004ab9cc90430 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f2e4799cf..102d71ac9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.22254.3 + 6.0.0-beta.22261.7 diff --git a/global.json b/global.json index c751a7b2d..de4424c2a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.104", + "dotnet": "6.0.105", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22254.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22254.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22261.7", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.22261.7" } } From bf117cb0d37ef8674dc9182dfa5fe8f5ee439e97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 May 2022 07:54:02 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220512.1 (#13832) [release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-7bf204aa-9e0a-41ec-a411-ae6cd93b52b9 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 793b1fbae..35b2341fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,9 @@ + + + @@ -43,6 +46,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b34b1d552..ae88123fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -211,9 +211,9 @@ https://github.com/dotnet/arcade e3cbecc5b0e51374e3d71dbb976004ab9cc90430 - + https://github.com/dotnet/source-build-reference-packages - b1f5e7bc4d52db0031868cdd5e90b76118c2c31a + 07eecddb8505ad0dccb6ff6f23379d6b67aedc64 From ee1b7085a6eb99c97851ed67fc3fd52b8bda3ba0 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Fri, 13 May 2022 14:24:13 -0700 Subject: [PATCH 5/5] [6.0.1xx] Update template versions from dotnet/aspnetcore (#13839) --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 102d71ac9..10fc6f219 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.16 + 5.0.17 4.8.1-servicing.19605.5 3.1.2-servicing.20066.4 @@ -129,7 +129,7 @@ 3.1.15 $(MicrosoftDotNetCommonItemTemplates31PackageVersion) $(MicrosoftDotNetTestProjectTemplates50PackageVersion) - 3.1.24 + 3.1.25 3.2.1 4.8.0-rc2.19462.10 @@ -144,7 +144,7 @@ 1.0.2-beta3 $(MicrosoftDotNetCommonItemTemplates21PackageVersion) 1.0.2-beta4.22064.3 - 2.1.30 + 2.1.34