From afed443f9fde87ce04a133280d9fa1faff2ee78e Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Tue, 28 Jan 2020 08:31:37 -0400 Subject: [PATCH] strip CoreOnly usages from codebase as they are no longer needed --- Octokit.Reactive/Octokit.Reactive.csproj | 4 +--- Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj | 4 +--- Octokit.Tests.Integration/Octokit.Tests.Integration.csproj | 4 +--- Octokit.Tests/Octokit.Tests.csproj | 4 +--- Octokit/Octokit.csproj | 4 +--- build/Context.cs | 2 -- build/Lifetime.cs | 7 ------- build/Tasks/Build.cs | 5 ++--- build/Tasks/Package.cs | 5 ++--- 9 files changed, 9 insertions(+), 30 deletions(-) diff --git a/Octokit.Reactive/Octokit.Reactive.csproj b/Octokit.Reactive/Octokit.Reactive.csproj index 597cc1b4a5..ce1375142c 100644 --- a/Octokit.Reactive/Octokit.Reactive.csproj +++ b/Octokit.Reactive/Octokit.Reactive.csproj @@ -6,9 +6,7 @@ GitHub 0.0.0-dev true - False - netstandard1.1;netstandard2.0 - $(TargetFrameworks);net45;net46 + netstandard1.1;netstandard2.0;net45;net46 Octokit.Reactive Octokit.Reactive embedded diff --git a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj index 0dd686c2b3..292232f353 100644 --- a/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj +++ b/Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj @@ -4,9 +4,7 @@ Convention-based tests for Octokit Octokit.Tests.Conventions GitHub - False - netcoreapp2.1 - $(TargetFrameworks);net452 + netcoreapp2.1;net452 $(NoWarn);CS4014;CS1998 Octokit.Tests.Conventions Octokit.Tests.Conventions diff --git a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj index f9d61ef7ac..2a32ba32e5 100644 --- a/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj +++ b/Octokit.Tests.Integration/Octokit.Tests.Integration.csproj @@ -4,9 +4,7 @@ Integration tests for Octokit Octokit.Tests.Integration GitHub - False - netcoreapp2.1 - $(TargetFrameworks);net452 + netcoreapp2.1;net452 $(NoWarn);CS4014;CS1998 Octokit.Tests.Integration Octokit.Tests.Integration diff --git a/Octokit.Tests/Octokit.Tests.csproj b/Octokit.Tests/Octokit.Tests.csproj index cada2a7cdb..860ff37e03 100644 --- a/Octokit.Tests/Octokit.Tests.csproj +++ b/Octokit.Tests/Octokit.Tests.csproj @@ -4,9 +4,7 @@ Tests for Octokit Octokit.Tests GitHub - False - netcoreapp2.1 - $(TargetFrameworks);net452 + netcoreapp2.1;net452 $(NoWarn);CS4014;CS1998 Octokit.Tests Octokit.Tests diff --git a/Octokit/Octokit.csproj b/Octokit/Octokit.csproj index 18b8aefdcd..ff3e223b5e 100644 --- a/Octokit/Octokit.csproj +++ b/Octokit/Octokit.csproj @@ -6,9 +6,7 @@ GitHub 0.0.0-dev true - False - netstandard1.1;netstandard2.0 - $(TargetFrameworks);net45;net46 + netstandard1.1;netstandard2.0;net45;net46 Octokit Octokit embedded diff --git a/build/Context.cs b/build/Context.cs index 0bb16753c1..d31d037875 100644 --- a/build/Context.cs +++ b/build/Context.cs @@ -25,8 +25,6 @@ public class Context : FrostingContext public bool AppVeyor { get; set; } public bool TravisCI { get; set; } - public bool CoreOnly { get; set; } - public Project[] Projects { get; set; } public FilePath DotNetFormatToolPath { get; set; } diff --git a/build/Lifetime.cs b/build/Lifetime.cs index 9d74104d2f..6468c5675d 100644 --- a/build/Lifetime.cs +++ b/build/Lifetime.cs @@ -12,7 +12,6 @@ public override void Setup(Context context) context.Target = context.Argument("target", "Default"); context.Configuration = context.Argument("configuration", "Release"); context.LinkSources = context.Argument("linkSources", false); - context.CoreOnly = context.Argument("CoreOnly", !context.IsRunningOnWindows()); context.Artifacts = "./packaging/"; context.CodeCoverage = "./coverage-results/"; @@ -21,11 +20,6 @@ public override void Setup(Context context) var buildSystem = context.BuildSystem(); context.IsLocalBuild = buildSystem.IsLocalBuild; - if (context.CoreOnly && !context.IsLocalBuild) - { - context.Warning("CoreOnly was specified on a non-local build. Artifacts may be versioned incorrectly!"); - } - context.AppVeyor = buildSystem.AppVeyor.IsRunningOnAppVeyor; context.TravisCI = buildSystem.TravisCI.IsRunningOnTravisCI; context.IsTagged = IsBuildTagged(buildSystem); @@ -68,7 +62,6 @@ public override void Setup(Context context) context.Information("Version suffix: {0}", context.Version.Suffix); context.Information("Configuration: {0}", context.Configuration); context.Information("LinkSources: {0}", context.LinkSources); - context.Information("CoreOnly: {0}", context.CoreOnly); context.Information("Target: {0}", context.Target); context.Information("AppVeyor: {0}", context.AppVeyor); context.Information("TravisCI: {0}", context.TravisCI); diff --git a/build/Tasks/Build.cs b/build/Tasks/Build.cs index af1df81e34..67c76bf6b4 100644 --- a/build/Tasks/Build.cs +++ b/build/Tasks/Build.cs @@ -14,8 +14,7 @@ public override void Run(Context context) Configuration = context.Configuration, ArgumentCustomization = args => args .Append("/p:Version={0}", context.Version.GetSemanticVersion()) - .Append("/p:SourceLinkCreate={0}", context.LinkSources.ToString().ToLower()) - .Append("/p:CoreOnly={0}", context.CoreOnly), + .Append("/p:SourceLinkCreate={0}", context.LinkSources.ToString().ToLower()), }); } -} \ No newline at end of file +} diff --git a/build/Tasks/Package.cs b/build/Tasks/Package.cs index 6673708e76..6562842685 100644 --- a/build/Tasks/Package.cs +++ b/build/Tasks/Package.cs @@ -23,10 +23,9 @@ public override void Run(Context context) NoBuild = true, OutputDirectory = context.Artifacts, ArgumentCustomization = args => args - .Append("/p:Version={0}", context.Version.GetSemanticVersion()) - .Append("/p:CoreOnly={0}", context.CoreOnly), + .Append("/p:Version={0}", context.Version.GetSemanticVersion()), }); } } } -} \ No newline at end of file +}