From 2c6d66877c56908882eb52d5e2125b13929a0187 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 14 Apr 2023 09:58:36 -0500 Subject: [PATCH 1/9] Disable source-build tarball official builds in unsupported branches (#16107) --- eng/source-build-tarball-build-official.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 5d396baab..aa1de43eb 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -11,10 +11,12 @@ resources: - release/* - internal/release/* exclude: - - release/6.0.3xx - - internal/release/6.0.3xx - - release/6.0.4xx - - internal/release/6.0.4xx + - release/7.0.2xx + - internal/release/7.0.2xx + - release/7.0.3xx + - internal/release/7.0.3xx + - release/7.0.4xx + - internal/release/7.0.4xx stages: - build From c3b8680e2f761cbb2303c9ca728173be0536e3d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 19 Apr 2023 15:01:54 +0000 Subject: [PATCH 2/9] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230419.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23063.1 -> To Version 7.0.0-alpha.1.23219.1 --- NuGet.config | 15 --------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 907a39c16..23d9d0b8e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,17 @@ - - - - - - - - @@ -47,18 +39,11 @@ - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91a0017d6..25602acd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade 7c5e5a782c67460b123c8e41d484ebcca8002c93 - + https://github.com/dotnet/source-build-reference-packages - 9964206e0dd215eee4ed199b9041a94e16ba4c45 + 525b6c35cc5c5c9b80b47044be2e4e77858d505a From f277f1473fb2a42a9df116585542bda2da883374 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 20 Mar 2023 14:07:20 -0700 Subject: [PATCH 3/9] Publish checksums (#15803) --- eng/Publishing.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 3d0751dd8..f564a94e3 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -78,12 +78,12 @@ - - - - - - + + + + + + Date: Tue, 2 May 2023 11:00:00 -0700 Subject: [PATCH 4/9] Update branding to 7.0.107 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7abd74ea4..07b06104d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 7be262e6ebee7a3e3d58ee277927065ba20c66b1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 May 2023 11:00:06 -0700 Subject: [PATCH 5/9] Update branding to 7.0.205 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 26345d72e..99787c728 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From a828d6f1a8417b5f88d8d9920302169d53fea25c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 May 2023 11:00:10 -0700 Subject: [PATCH 6/9] Update branding to 7.0.301 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c3f147800..eb52c0fe4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm From c661d5dae1946c7b62ea75f12162c05cc4844cbb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 May 2023 12:00:32 -0700 Subject: [PATCH 7/9] Updating branding for hotfix --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 99787c728..5f1a7896f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 2 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing @@ -23,7 +23,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 13)) + $([MSBuild]::Add($(VersionFeature), 12)) From 50b2bc34ff112b490dcfe5a1d0a4a259cefecd69 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 May 2023 12:01:19 -0700 Subject: [PATCH 8/9] Update branding for hotfix --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index eb52c0fe4..40c17316c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,9 +8,9 @@ 7 0 3 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) @@ -23,7 +23,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 17)) + $([MSBuild]::Add($(VersionFeature), 16)) From a26ddd4f08569387be7af57dbb45b4d3ce87ec37 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 3 May 2023 12:19:12 -0700 Subject: [PATCH 9/9] [release/7.0.1xx] Install libLLDB 9 (#16283) --- .vsts-ci.yml | 2 +- eng/docker/debian/Dockerfile | 8 ++++++-- test/SdkTests/SdkTests.csproj | 5 +++++ test/SdkTests/TestsToSkipLinux.xml | 10 ++++++++++ 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 test/SdkTests/TestsToSkipLinux.xml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index eb2acb8c9..9629e3ada 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -174,7 +174,7 @@ stages: _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_Debian_Stretch_Debug_x64: + Build_Debian_11_Debug_x64: _BuildConfig: Debug _DockerParameter: '--docker debian' _LinuxPortable: '' diff --git a/eng/docker/debian/Dockerfile b/eng/docker/debian/Dockerfile index ebafe9adb..e448844a4 100644 --- a/eng/docker/debian/Dockerfile +++ b/eng/docker/debian/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-20211001171226-047508b +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 # Install the deb packaging toolchain we need to build debs RUN apt-get update \ @@ -17,7 +17,7 @@ RUN apt-get update \ # liblldb is needed so deb package build does not throw missing library info errors RUN apt-get update \ - && apt-get -y install liblldb-3.9 \ + && apt-get -y install liblldb-9 \ && rm -rf /var/lib/apt/lists/* # Misc Dependencies for build @@ -27,6 +27,10 @@ RUN rm -rf /var/lib/apt/lists/* && \ sudo && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* + +RUN apt-get update \ + && apt-get -y install python-is-python2 \ + && rm -rf /var/lib/apt/lists/* RUN localedef -c -i en_US -f UTF-8 en_US.UTF-8 diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 9fb5965a4..bb7e250aa 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -225,6 +225,11 @@ $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipPortableLinux.xml" + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipLinux.xml" + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipOSX.xml" diff --git a/test/SdkTests/TestsToSkipLinux.xml b/test/SdkTests/TestsToSkipLinux.xml new file mode 100644 index 000000000..b2bfd698a --- /dev/null +++ b/test/SdkTests/TestsToSkipLinux.xml @@ -0,0 +1,10 @@ + + + + + +