From 1a0a77363ba47eefcbf705dfb450275db16964e9 Mon Sep 17 00:00:00 2001 From: Rich Lander Date: Fri, 12 Jul 2024 16:13:14 -0700 Subject: [PATCH 1/8] Update CentOS version --- .vsts-ci.yml | 8 ++++---- .vsts-pr.yml | 4 ++-- src/SourceBuild/content/README.md | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index fa5705869d9b..1dfcec65caad 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -54,8 +54,8 @@ extends: image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode cblMariner20Fpm: image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm - centosStream8: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + centosStream9: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 debian11: image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 fedora36: @@ -132,8 +132,8 @@ extends: - template: eng/build.yml@self parameters: agentOs: Linux - jobName: Build_CentOS_8_Stream_Debug_x64 - container: centosStream8 + jobName: Build_CentOS_Stream_9_Debug_x64 + container: centosStream9 buildConfiguration: Debug buildArchitecture: x64 linuxPortable: false diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 3698546de360..65f508a4a70e 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -87,8 +87,8 @@ stages: - template: eng/build-pr.yml parameters: agentOs: Linux - jobName: Build_CentOS_8_Stream_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + jobName: Build_CentOS_Stream_9_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' buildConfiguration: Debug buildArchitecture: x64 linuxPortable: false diff --git a/src/SourceBuild/content/README.md b/src/SourceBuild/content/README.md index c83ad9a6de67..a0406bf83110 100644 --- a/src/SourceBuild/content/README.md +++ b/src/SourceBuild/content/README.md @@ -123,11 +123,11 @@ You can also build the repository using a Docker image which has the required pr The example below creates a Docker volume named `vmr` and clones and builds the VMR there. ```sh -docker run --rm -it -v vmr:/vmr -w /vmr mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 +docker run --rm -it -v vmr:/vmr -w /vmr mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 git clone https://github.com/dotnet/dotnet . ./prep.sh && ./build.sh --online mkdir -p $HOME/.dotnet -tar -zxf artifacts/x64/Release/dotnet-sdk-8.0.100-centos.8-x64.tar.gz -C $HOME/.dotnet +tar -zxf artifacts/x64/Release/dotnet-sdk-8.0.100-centos.9-x64.tar.gz -C $HOME/.dotnet ln -s $HOME/.dotnet/dotnet /usr/bin/dotnet ``` From f1ab1e8b1d87421d06dd46fc16a170d85ad018e8 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Thu, 10 Jul 2025 10:40:45 -0700 Subject: [PATCH 2/8] Merging internal commits for release/8.0.1xx (#20495) Co-authored-by: Mirroring Co-authored-by: DotNet-Bot Co-authored-by: ProductConstructionServiceProd Co-authored-by: Marc Paine Co-authored-by: Matt Thalman --- NuGet.config | 17 ++++++ eng/Version.Details.xml | 120 ++++++++++++++++++++-------------------- eng/Versions.props | 52 ++++++++--------- 3 files changed, 103 insertions(+), 86 deletions(-) diff --git a/NuGet.config b/NuGet.config index 02e6768deb66..97a5ebd1f53b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,26 @@ + + + + + + + + + + @@ -38,11 +48,18 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d77511f09826..32e84fbad3b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ce68f29d66fae8adb0e78b44afbb09dc3cdfbb7 + c4a3ad74410330b2a4004886916f56253d88fd1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa4d80b76c2431a825be026f6bbabca63e1f42ef + cea5fa610dba4e0c024727f4c528a66018b820a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebec7e89791189b708284a372160e80906724174 + 20d5fd85ce9c57773e657ddac495345b58660952 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebec7e89791189b708284a372160e80906724174 + 20d5fd85ce9c57773e657ddac495345b58660952 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebec7e89791189b708284a372160e80906724174 + 20d5fd85ce9c57773e657ddac495345b58660952 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ebec7e89791189b708284a372160e80906724174 + 20d5fd85ce9c57773e657ddac495345b58660952 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f3291acee6a0b0b2340013b1320af91fe160096f + 92d43c655032c60ddf0b3727041e05c93055ee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3385cf1d42f4e488140452369a247a4a16183ce4 + 480ddbb714f16a09b74e75cff57e1da769e9d82d https://github.com/dotnet/fsharp @@ -146,22 +146,22 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 77545d6fd5ca79bc08198fd6d8037c14843f14ad + ef853a71052646a42abf17e888ec6d9a69614ad9 https://github.com/dotnet/roslyn a77b6e41d030878096fa496e00e4c0dffe5af9f0 - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 3ab07f0cf43d15c3d05da60fb0ff44b49799ed5e + + https://github.com/dotnet/msbuild + af11d4f253ee5c813bfd4f9d5902772638014572 - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 3ab07f0cf43d15c3d05da60fb0ff44b49799ed5e + + https://github.com/dotnet/msbuild + af11d4f253ee5c813bfd4f9d5902772638014572 @@ -173,18 +173,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2b0cca8ad3a88e02fe0878139009ffffde071f1f + 976b101e5539557c20e2ac39885ac879531bcf82 https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 2b0cca8ad3a88e02fe0878139009ffffde071f1f + 976b101e5539557c20e2ac39885ac879531bcf82 diff --git a/eng/Versions.props b/eng/Versions.props index aedc97163d94..2ab0b4a6ad67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.17-servicing.25266.4 + 8.0.18-servicing.25312.3 - 8.0.17-servicing.25266.9 + 8.0.18-servicing.25317.3 @@ -64,22 +64,22 @@ - 8.0.17 - 8.0.17 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 - 8.0.17-servicing.25266.9 + 8.0.18 + 8.0.18 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 + 8.0.18-servicing.25317.6 0.2.0 - 8.0.117 - 8.0.117-servicing.25269.18 - 8.0.117-servicing.25269.18 + 8.0.118 + 8.0.118-servicing.25320.10 + 8.0.118-servicing.25320.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -90,27 +90,27 @@ - 8.0.17-servicing.25266.2 + 8.0.18-servicing.25311.17 - 8.0.17-servicing.25266.2 - 8.0.17-servicing.25266.2 - 8.0.17 - 8.0.17 - 8.0.17 - 8.0.17 + 8.0.18-servicing.25311.17 + 8.0.18-servicing.25311.17 + 8.0.18 + 8.0.18 + 8.0.18 + 8.0.18 2.1.0 8.0.1 6.0.1 - 8.0.5 + 8.0.6 - 8.0.17-servicing.25267.1 - 8.0.17-servicing.25267.1 - 8.0.17 - 8.0.17 + 8.0.18-servicing.25317.2 + 8.0.18-servicing.25317.2 + 8.0.18 + 8.0.18 @@ -126,7 +126,7 @@ - 17.8.27 + 17.8.31 @@ -183,7 +183,7 @@ 14.0.8478 17.0.8478 - 8.0.17 + 8.0.18 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 83aa7700e08c6d6066de2c495d055e4df9745b25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 02:02:35 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/arcade build 20250716.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25366.2 --- NuGet.config | 16 ---------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 10 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97a5ebd1f53b..2b1529bc6ce2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,17 @@ - - - - - - - - - @@ -48,18 +39,11 @@ - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32e84fbad3b4..4459da4b8ff5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -219,18 +219,18 @@ - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 2ab0b4a6ad67..be8fdc136156 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.25326.1 + 8.0.0-beta.25366.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 82b2798ba307..bb048ad125a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index f694b5be68da..795ba936ad1c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25326.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25366.2" } } From 6c62442292b20a4fee7d7a0d1475a1922efe1362 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Jul 2025 02:02:44 +0000 Subject: [PATCH 4/8] Update dependencies from https://github.com/dotnet/arcade build 20250716.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.25326.1 -> To Version 8.0.0-beta.25366.2 --- NuGet.config | 16 ---------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 10 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d69ab2f060f..43bec3e9b4e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,26 +7,17 @@ - - - - - - - - - @@ -45,21 +36,14 @@ - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c04c820d36ac..472acb63deb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 0ea60100c41f..1f64b050eda2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.25326.1 + 8.0.0-beta.25366.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 82b2798ba307..bb048ad125a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index f694b5be68da..795ba936ad1c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25326.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25366.2" } } From 74a945735c005ef584592380518a86d50dd6f5c1 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 18 Jul 2025 10:54:54 -0700 Subject: [PATCH 5/8] Hard-code os name in centos-9 build leg to centos.8 (to match the runtime-deps consumption) --- .vsts-ci.yml | 1 + .vsts-pr.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d9a1ce91a2fb..6a93a9e789b7 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -135,6 +135,7 @@ extends: buildArchitecture: x64 linuxPortable: false runTests: true + additionalBuildParameters: '/p:OSName=centos.8' - template: eng/build.yml@self parameters: agentOs: Linux diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 65f508a4a70e..290108e06add 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -93,6 +93,7 @@ stages: buildArchitecture: x64 linuxPortable: false runTests: true + additionalBuildParameters: '/p:OSName=centos.8' - template: eng/build-pr.yml parameters: agentOs: Linux From e4fe63798c0118f331e1da852bf2127136f1b4ce Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 18 Jul 2025 15:17:37 -0700 Subject: [PATCH 6/8] Use the centos8 runtime rid as runtime doesn't float it's rid --- src/redist/targets/GenerateLayout.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 9ce7496291cd..ae57a2b83e27 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -50,7 +50,9 @@ $(InstallerTargetArchitecture) + $(CoreSetupRid) + centos.8-x64 $(Architecture) $(OSName)-$(InstallerTargetArchitecture) rhel.7-aarch64 From ff62a728e7e5c687c94d4b360c6eeb17300dbf09 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 21 Jul 2025 11:43:09 -0700 Subject: [PATCH 7/8] Revert passing centos.8 as the OS name as I think that's overwriting the RID. We can make this a reduced rid graph compatible value instead if this doesn't work. Need to update the CI yml as well if this works. --- .vsts-pr.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 290108e06add..65f508a4a70e 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -93,7 +93,6 @@ stages: buildArchitecture: x64 linuxPortable: false runTests: true - additionalBuildParameters: '/p:OSName=centos.8' - template: eng/build-pr.yml parameters: agentOs: Linux From 9d31f8713c4355693ac955244095f51c568dc587 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 21 Jul 2025 16:01:27 -0700 Subject: [PATCH 8/8] Surpress test on linux leg --- test/SdkTests/TestsToSkipLinux.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/SdkTests/TestsToSkipLinux.xml b/test/SdkTests/TestsToSkipLinux.xml index b2bfd698a206..db2474aab3b9 100644 --- a/test/SdkTests/TestsToSkipLinux.xml +++ b/test/SdkTests/TestsToSkipLinux.xml @@ -6,5 +6,8 @@ +