From 7373d4d309e645e80658dc3adc3688ca6c34c3b2 Mon Sep 17 00:00:00 2001
From: John Beisner <johnbeisner@users.noreply.github.com>
Date: Tue, 8 May 2018 10:05:21 -0700
Subject: [PATCH] Fixing CI build breaks for new CI legs; CLI:release/2.1.3xx
 (#9202)

* Fedora 27, openSUSE 43.2, and Ubuntu 18.04 should not build native installer packages nor
"IncludeSharedFrameworksForBackwardsCompatibilityTests"

* Formatting...

* Skip test: 'ItRollsForwardToTheLatestVersion'
---
 build/BuildDefaults.props                         | 15 +++++++++++++--
 .../EndToEnd/GivenSelfContainedAppsRollForward.cs |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props
index e1c354c67..757d6ec36 100644
--- a/build/BuildDefaults.props
+++ b/build/BuildDefaults.props
@@ -6,10 +6,21 @@
     <!-- https://github.com/dotnet/cli/issues/8800 -->
     <IncludeNuGetPackageArchive Condition=" $(Architecture.StartsWith('arm')) ">false</IncludeNuGetPackageArchive>
     <IncludeNuGetPackageArchive Condition=" '$(IncludeNuGetPackageArchive)' == '' ">true</IncludeNuGetPackageArchive>
-    <SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' AND ($(Rid.StartsWith('rhel.6')) OR $(Rid.StartsWith('linux-musl')))">true</SkipBuildingInstallers>
+    <SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' AND
+        ($(Rid.StartsWith('rhel.6'))
+        OR $(Rid.StartsWith('linux-musl'))
+        OR $(Rid.StartsWith('fedora.27'))
+        OR $(Rid.StartsWith('opensuse.43.2'))
+        OR $(Rid.StartsWith('ubuntu.18.04')))">true</SkipBuildingInstallers>
     <SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' ">false</SkipBuildingInstallers>
     <UsePortableLinuxSharedFramework Condition=" '$(UsePortableLinuxSharedFramework)' == '' AND '$(OSPlatform)' == 'linux' AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64' ">true</UsePortableLinuxSharedFramework>
-    <IncludeSharedFrameworksForBackwardsCompatibilityTests Condition=" $(IncludeSharedFrameworksForBackwardsCompatibilityTests) == '' AND '$(Rid)' != 'linux-x64' AND '$(Rid)' != 'rhel.6-x64' AND '$(Rid)' != 'linux-musl-x64'">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>
+    <IncludeSharedFrameworksForBackwardsCompatibilityTests Condition=" $(IncludeSharedFrameworksForBackwardsCompatibilityTests) == ''
+        AND '$(Rid)' != 'linux-x64'
+        AND '$(Rid)' != 'rhel.6-x64'
+        AND '$(Rid)' != 'linux-musl-x64'
+        AND '$(Rid)' != 'fedora.27-x64'
+        AND '$(Rid)' != 'opensuse.43.2-x64'
+        AND '$(Rid)' != 'ubuntu.18.04-x64'">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>
     <HighEntropyVA>true</HighEntropyVA>
 
     <!-- Only use asset target fallback that we set (not implicit one to net461). -->
diff --git a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
index 4bc4464bf..080197472 100644
--- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
+++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
@@ -16,7 +16,7 @@ namespace EndToEnd
     public class GivenSelfContainedAppsRollForward : TestBase
     {
 
-        [Theory]
+        [Theory(Skip = "Runtime 1.1 support for openSUSE and Fedora 27 needed")]
         //  MemberData is used instead of InlineData here so we can access it in another test to
         //  verify that we are covering the latest release of .NET Core
         [MemberData(nameof(SupportedNetCoreAppVersions))]