Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

strip CoreOnly usages from codebase as they are no longer needed #2072

Merged
merged 1 commit into from
Jan 28, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Octokit.Reactive/Octokit.Reactive.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
<Authors>GitHub</Authors>
<Version>0.0.0-dev</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<CoreOnly Condition="$(CoreOnly) == '' and $([MSBuild]::IsOsPlatform('Windows'))">False</CoreOnly>
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="$(CoreOnly) != '' and !$(CoreOnly)">$(TargetFrameworks);net45;net46</TargetFrameworks>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net46</TargetFrameworks>
<AssemblyName>Octokit.Reactive</AssemblyName>
<PackageId>Octokit.Reactive</PackageId>
<DebugType>embedded</DebugType>
Expand Down
4 changes: 1 addition & 3 deletions Octokit.Tests.Conventions/Octokit.Tests.Conventions.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
<Description>Convention-based tests for Octokit</Description>
<AssemblyTitle>Octokit.Tests.Conventions</AssemblyTitle>
<Authors>GitHub</Authors>
<CoreOnly Condition="$(CoreOnly) == '' and $([MSBuild]::IsOsPlatform('Windows'))">False</CoreOnly>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition="$(CoreOnly) != '' and !$(CoreOnly)">$(TargetFrameworks);net452</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
<NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
<AssemblyName>Octokit.Tests.Conventions</AssemblyName>
<PackageId>Octokit.Tests.Conventions</PackageId>
Expand Down
4 changes: 1 addition & 3 deletions Octokit.Tests.Integration/Octokit.Tests.Integration.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
<Description>Integration tests for Octokit</Description>
<AssemblyTitle>Octokit.Tests.Integration</AssemblyTitle>
<Authors>GitHub</Authors>
<CoreOnly Condition="$(CoreOnly) == '' and $([MSBuild]::IsOsPlatform('Windows'))">False</CoreOnly>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition="$(CoreOnly) != '' and !$(CoreOnly)">$(TargetFrameworks);net452</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
<NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
<AssemblyName>Octokit.Tests.Integration</AssemblyName>
<PackageId>Octokit.Tests.Integration</PackageId>
Expand Down
4 changes: 1 addition & 3 deletions Octokit.Tests/Octokit.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
<Description>Tests for Octokit</Description>
<AssemblyTitle>Octokit.Tests</AssemblyTitle>
<Authors>GitHub</Authors>
<CoreOnly Condition="$(CoreOnly) == '' and $([MSBuild]::IsOsPlatform('Windows'))">False</CoreOnly>
<TargetFrameworks>netcoreapp2.1</TargetFrameworks>
<TargetFrameworks Condition="$(CoreOnly) != '' and !$(CoreOnly)">$(TargetFrameworks);net452</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
<NoWarn>$(NoWarn);CS4014;CS1998</NoWarn>
<AssemblyName>Octokit.Tests</AssemblyName>
<PackageId>Octokit.Tests</PackageId>
Expand Down
4 changes: 1 addition & 3 deletions Octokit/Octokit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
<Authors>GitHub</Authors>
<Version>0.0.0-dev</Version>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<CoreOnly Condition="$(CoreOnly) == '' and $([MSBuild]::IsOsPlatform('Windows'))">False</CoreOnly>
<TargetFrameworks>netstandard1.1;netstandard2.0</TargetFrameworks>
<TargetFrameworks Condition="$(CoreOnly) != '' and !$(CoreOnly)">$(TargetFrameworks);net45;net46</TargetFrameworks>
<TargetFrameworks>netstandard1.1;netstandard2.0;net45;net46</TargetFrameworks>
<AssemblyName>Octokit</AssemblyName>
<PackageId>Octokit</PackageId>
<DebugType>embedded</DebugType>
Expand Down
2 changes: 0 additions & 2 deletions build/Context.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down
7 changes: 0 additions & 7 deletions build/Lifetime.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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/";
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
5 changes: 2 additions & 3 deletions build/Tasks/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
});
}
}
}
5 changes: 2 additions & 3 deletions build/Tasks/Package.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()),
});
}
}
}
}
}