mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix versioned BuildPlatforms logic

Browse source
This commit is contained in:
Matt Ellis 2016-05-29 22:38:45 -07:00 • committed by Livar Cunha
parent 2155a419ad
commit 20f9811741
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs
View file

@ -93,7 +93,7 @@ namespace Microsoft.DotNet.Cli.Build.Framework
public static bool IsPlatform(BuildPlatform platform, string version = null) 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) public static bool IsPlatform(BuildPlatform platform)

10
build_projects/dotnet-cli-build/DebTargets.cs
View file

@ -13,14 +13,14 @@ namespace Microsoft.DotNet.Cli.Build
public class DebTargets public class DebTargets
{ {
[Target(nameof(GenerateSdkDeb))] [Target(nameof(GenerateSdkDeb))]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult GenerateDebs(BuildTargetContext c) public static BuildTargetResult GenerateDebs(BuildTargetContext c)
{ {
return c.Success(); return c.Success();
} }
[Target(nameof(InstallSharedFramework))] [Target(nameof(InstallSharedFramework))]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c) public static BuildTargetResult GenerateSdkDeb(BuildTargetContext c)
{ {
var channel = c.BuildContext.Get<string>("Channel").ToLower(); var channel = c.BuildContext.Get<string>("Channel").ToLower();
@ -61,7 +61,7 @@ namespace Microsoft.DotNet.Cli.Build
[Target(nameof(InstallSDK), [Target(nameof(InstallSDK),
nameof(RunE2ETest), nameof(RunE2ETest),
nameof(RemovePackages))] nameof(RemovePackages))]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult TestDebInstaller(BuildTargetContext c) public static BuildTargetResult TestDebInstaller(BuildTargetContext c)
{ {
return c.Success(); return c.Success();
@ -92,7 +92,7 @@ namespace Microsoft.DotNet.Cli.Build
} }
[Target] [Target]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult RunE2ETest(BuildTargetContext c) public static BuildTargetResult RunE2ETest(BuildTargetContext c)
{ {
Directory.SetCurrentDirectory(Path.Combine(Dirs.RepoRoot, "test", "EndToEnd")); Directory.SetCurrentDirectory(Path.Combine(Dirs.RepoRoot, "test", "EndToEnd"));
@ -111,7 +111,7 @@ namespace Microsoft.DotNet.Cli.Build
} }
[Target] [Target]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult RemovePackages(BuildTargetContext c) public static BuildTargetResult RemovePackages(BuildTargetContext c)
{ {
IEnumerable<string> orderedPackageNames = new List<string>() IEnumerable<string> orderedPackageNames = new List<string>()

4
build_projects/dotnet-cli-build/PrepareTargets.cs
View file

@ -317,7 +317,7 @@ namespace Microsoft.DotNet.Cli.Build
} }
[Target] [Target]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult CheckUbuntuDebianPackageBuildDependencies(BuildTargetContext c) public static BuildTargetResult CheckUbuntuDebianPackageBuildDependencies(BuildTargetContext c)
{ {
@ -347,7 +347,7 @@ namespace Microsoft.DotNet.Cli.Build
} }
[Target] [Target]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult CheckUbuntuCoreclrAndCoreFxDependencies(BuildTargetContext c) public static BuildTargetResult CheckUbuntuCoreclrAndCoreFxDependencies(BuildTargetContext c)
{ {
var errorMessageBuilder = new StringBuilder(); var errorMessageBuilder = new StringBuilder();

6
build_projects/dotnet-cli-build/PublishTargets.cs
View file

@ -202,7 +202,7 @@ namespace Microsoft.DotNet.Cli.Build
[Target( [Target(
nameof(PublishSdkDebToDebianRepo))] nameof(PublishSdkDebToDebianRepo))]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult PublishDebFilesToDebianRepo(BuildTargetContext c) public static BuildTargetResult PublishDebFilesToDebianRepo(BuildTargetContext c)
{ {
return c.Success(); return c.Success();
@ -218,7 +218,7 @@ namespace Microsoft.DotNet.Cli.Build
} }
[Target] [Target]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult PublishSdkInstallerFileToAzure(BuildTargetContext c) public static BuildTargetResult PublishSdkInstallerFileToAzure(BuildTargetContext c)
{ {
var version = CliNuGetVersion; var version = CliNuGetVersion;
@ -276,7 +276,7 @@ namespace Microsoft.DotNet.Cli.Build
} }
[Target] [Target]
[BuildPlatforms(BuildPlatform.Ubuntu)] [BuildPlatforms(BuildPlatform.Ubuntu, "14.04")]
public static BuildTargetResult PublishSdkDebToDebianRepo(BuildTargetContext c) public static BuildTargetResult PublishSdkDebToDebianRepo(BuildTargetContext c)
{ {
var version = CliNuGetVersion; var version = CliNuGetVersion;