diff --git a/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs b/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs index 61b4ecff7..46803629b 100644 --- a/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs +++ b/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs @@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Build.Framework public static bool IsPlatform(BuildPlatform platform, string version = null) { - return IsPlatform(platform) && IsVersion(version); + return IsPlatform(platform) && (version == null || IsVersion(version)); } public static bool IsPlatform(BuildPlatform platform) diff --git a/build_projects/dotnet-cli-build/DebTargets.cs b/build_projects/dotnet-cli-build/DebTargets.cs index ab9324e8d..0fab6aa82 100644 --- a/build_projects/dotnet-cli-build/DebTargets.cs +++ b/build_projects/dotnet-cli-build/DebTargets.cs @@ -13,14 +13,14 @@ namespace Microsoft.DotNet.Cli.Build public class DebTargets { [Target(nameof(GenerateSdkDeb))] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult GenerateDebs(BuildTargetContext c) { return c.Success(); } [Target(nameof(InstallSharedFramework))] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c) { var channel = c.BuildContext.Get("Channel").ToLower(); @@ -61,7 +61,7 @@ namespace Microsoft.DotNet.Cli.Build [Target(nameof(InstallSDK), nameof(RunE2ETest), nameof(RemovePackages))] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult TestDebInstaller(BuildTargetContext c) { return c.Success(); @@ -92,7 +92,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult RunE2ETest(BuildTargetContext c) { Directory.SetCurrentDirectory(Path.Combine(Dirs.RepoRoot, "test", "EndToEnd")); @@ -111,7 +111,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult RemovePackages(BuildTargetContext c) { IEnumerable orderedPackageNames = new List() diff --git a/build_projects/dotnet-cli-build/PrepareTargets.cs b/build_projects/dotnet-cli-build/PrepareTargets.cs index 03b5e5038..1b69277a2 100644 --- a/build_projects/dotnet-cli-build/PrepareTargets.cs +++ b/build_projects/dotnet-cli-build/PrepareTargets.cs @@ -317,7 +317,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult CheckUbuntuDebianPackageBuildDependencies(BuildTargetContext c) { @@ -347,7 +347,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult CheckUbuntuCoreclrAndCoreFxDependencies(BuildTargetContext c) { var errorMessageBuilder = new StringBuilder(); diff --git a/build_projects/dotnet-cli-build/PublishTargets.cs b/build_projects/dotnet-cli-build/PublishTargets.cs index 51422a11b..3e485c3bc 100644 --- a/build_projects/dotnet-cli-build/PublishTargets.cs +++ b/build_projects/dotnet-cli-build/PublishTargets.cs @@ -202,7 +202,7 @@ namespace Microsoft.DotNet.Cli.Build [Target( nameof(PublishSdkDebToDebianRepo))] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult PublishDebFilesToDebianRepo(BuildTargetContext c) { return c.Success(); @@ -218,7 +218,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult PublishSdkInstallerFileToAzure(BuildTargetContext c) { var version = CliNuGetVersion; @@ -276,7 +276,7 @@ namespace Microsoft.DotNet.Cli.Build } [Target] - [BuildPlatforms(BuildPlatform.Ubuntu)] + [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")] public static BuildTargetResult PublishSdkDebToDebianRepo(BuildTargetContext c) { var version = CliNuGetVersion;