Tidying up DefineConstants

Octokit.Tests.Integration/Helper.cs

@@ -74,8 +74,6 @@ public static class Helper
 
         static readonly Lazy<Credentials> _githubAppCredentials = new Lazy<Credentials>(() =>
         {
-            // GitHubJwt nuget package only available for netstandard2.0+
-#if GITHUBJWT_HELPER_AVAILABLE
             var generator = new GitHubJwt.GitHubJwtFactory(
                 new GitHubJwt.FilePrivateKeySource(GitHubAppPemFile),
                 new GitHubJwt.GitHubJwtFactoryOptions
@@ -87,11 +85,6 @@ public static class Helper
 
             var jwtToken = generator.CreateEncodedJwtToken();
             return new Credentials(jwtToken, AuthenticationType.Bearer);
-#else
-            // return null, which will cause the [GitHubAppTest]'s to not be discovered
-            return null;
-#endif
-
         });
 
         static readonly Lazy<Uri> _customUrl = new Lazy<Uri>(() =>

Octokit.Tests.Integration/Octokit.Tests.Integration.csproj

@@ -19,35 +19,28 @@
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <DefineConstants>$(DefineConstants);GITHUBJWT_HELPER_AVAILABLE</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\Octokit.Tests\Helpers\AssertEx.cs" />
     <EmbeddedResource Include="fixtures\hello-world.txt;fixtures\hello-world.zip" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
     <None Include="app.config" />
   </ItemGroup>
-
+	
   <ItemGroup>
     <ProjectReference Include="..\Octokit\Octokit.csproj" />
     <ProjectReference Include="..\Octokit.Reactive\Octokit.Reactive.csproj" />
     <ProjectReference Include="..\Octokit.Tests\Octokit.Tests.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
-    <PackageReference Include="System.IO.Compression" Version="4.3.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
+	<PackageReference Include="GitHubJwt" Version="0.0.5" />
+	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+	<PackageReference Include="System.IO.Compression" Version="4.3.0" />
+	<PackageReference Include="xunit" Version="2.4.2" />
+	<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
   </ItemGroup>
 
   <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
-    <PackageReference Include="GitHubJwt" Version="0.0.5" />
+	<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">

Octokit.Tests/Fixtures/EmbeddedResource.cs

@@ -20,13 +20,7 @@ public EmbeddedResource(Assembly assembly, string resourceName)
 
         public string GetResourceAsString(Encoding encoding = null)
         {
-            encoding = encoding ??
-#if HAS_DEFAULT_ENCODING
-                Encoding.Default;
-#else
-                // http://stackoverflow.com/questions/35929391/how-can-i-determine-the-default-encoding-in-a-portable-class-library
-                Encoding.GetEncoding(0);
-#endif
+            encoding = encoding ?? Encoding.GetEncoding(0);
 
             using (var sr = new StreamReader(GetResourceStream(), encoding))
             {

Octokit.Tests/Fixtures/Fixtures.cs

@@ -1,12 +1,9 @@
-#if HAS_TYPEINFO
-using System.Reflection;
-#endif
+using System.Reflection;
 
 namespace Octokit.Tests
 {
     public static class Fixtures
     {
-#if HAS_TYPEINFO
         public static EmbeddedResource AuthorizationsJson =
             new EmbeddedResource(typeof(Fixtures).GetTypeInfo().Assembly, "Octokit.Tests.Fixtures.authorizations.json");
 
@@ -33,33 +30,5 @@ public static class Fixtures
 
         public static EmbeddedResource ReleaseAssetJson =
             new EmbeddedResource(typeof(Fixtures).GetTypeInfo().Assembly, "Octokit.Tests.Fixtures.release_asset.json");
-#else
-        public static EmbeddedResource AuthorizationsJson =
-            new EmbeddedResource(typeof(Fixtures).Assembly, "Octokit.Tests.Fixtures.authorizations.json");
-
-        public static EmbeddedResource AuthorizationJson =
-            new EmbeddedResource(typeof(Fixtures).Assembly, "Octokit.Tests.Fixtures.authorization.json");
-
-        public static EmbeddedResource UserJson =
-            new EmbeddedResource(typeof(Fixtures).Assembly, "Octokit.Tests.Fixtures.user.json");
-
-        public static EmbeddedResource UserFullJson =
-            new EmbeddedResource(typeof(Fixtures).Assembly, "Octokit.Tests.Fixtures.user_full.json");
-
-        public static EmbeddedResource RepositoryJson =
-            new EmbeddedResource(typeof(Fixtures).Assembly, "Octokit.Tests.Fixtures.repository.json");
-
-        public static EmbeddedResource RepositoriesJson =
-            new EmbeddedResource(typeof(Fixtures).Assembly, "Octokit.Tests.Fixtures.repositories.json");
-
-        public static EmbeddedResource ReleasesJson =
-            new EmbeddedResource(typeof(Fixtures).Assembly, "Octokit.Tests.Fixtures.releases.json");
-
-        public static EmbeddedResource ReleaseJson =
-            new EmbeddedResource(typeof(Fixtures).Assembly, "Octokit.Tests.Fixtures.release.json");
-
-        public static EmbeddedResource ReleaseAssetJson =
-            new EmbeddedResource(typeof(Fixtures).Assembly, "Octokit.Tests.Fixtures.release_asset.json");
-#endif
     }
 }

Octokit.Tests/Http/RateLimitTests.cs

@@ -79,6 +79,7 @@ public void CanPopulateObjectFromSerializedData()
                 };
 
                 var rateLimit = new RateLimit(headers);
+
                 var deserialized = BinaryFormatterExtensions.SerializeAndDeserializeObject(rateLimit);
 
                 Assert.Equal(100, deserialized.Limit);

Octokit.Tests/Octokit.Tests.csproj

@@ -32,10 +32,6 @@
     <PackageReference Include="NSubstitute" Version="4.4.0" />
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <DefineConstants>$(DefineConstants);NO_SERIALIZABLE;HAS_TYPEINFO</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" />

Octokit.Tests/SelfTests.cs

@@ -1,6 +1,4 @@
-#if HAS_TYPEINFO
-using System.Reflection;
-#endif
+using System.Reflection;
 using Xunit;
 
 /// <summary>
@@ -11,11 +9,7 @@ public class SelfTests
     [Fact]
     public void NoTestsUseAsyncVoid()
     {
-#if HAS_TYPEINFO
         var errors = typeof(SelfTests).GetTypeInfo().Assembly.GetAsyncVoidMethodsList();
-#else
-        var errors = typeof(SelfTests).Assembly.GetAsyncVoidMethodsList();
-#endif
         Assert.Equal("", errors);
     }
 }

Octokit/Exceptions/AbuseException.cs

@@ -4,20 +4,16 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net;
-#if !NO_SERIALIZABLE
 using System.Runtime.Serialization;
 using System.Security;
-#endif
 
 namespace Octokit
 {
     /// <summary>
     /// Represents a subset of the HTTP 403 - Forbidden response returned from the API when the forbidden response is related to an abuse detection mechanism.
     /// Contains the amount of seconds after which it's safe to retry the request.
     /// </summary>
-#if !NO_SERIALIZABLE
     [Serializable]
-#endif
     [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors",
         Justification = "These exceptions are specific to the GitHub API and not general purpose exceptions")]
     public class AbuseException : ForbiddenException
@@ -63,7 +59,6 @@ public override string Message
             get { return ApiErrorMessageSafe ?? "Request Forbidden - Abuse Detection"; }
         }
 
-#if !NO_SERIALIZABLE
         /// <summary>
         /// Constructs an instance of AbuseException
         /// </summary>
@@ -86,6 +81,5 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
             base.GetObjectData(info, context);
             info.AddValue("RetryAfterSeconds", RetryAfterSeconds);
         }
-#endif
     }
 }

Octokit/Exceptions/ApiException.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
-#if !NO_SERIALIZABLE
 using System.Runtime.Serialization;
-#endif
 using System.Security;
 using Octokit.Internal;
 
@@ -12,9 +10,7 @@ namespace Octokit
     /// <summary>
     /// Represents errors that occur from the GitHub API.
     /// </summary>
-#if !NO_SERIALIZABLE
     [Serializable]
-#endif
     [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors",
         Justification = "These exceptions are specific to the GitHub API and not general purpose exceptions")]
     public class ApiException : Exception
@@ -143,7 +139,6 @@ static ApiError GetApiErrorFromExceptionMessage(string responseContent)
             return new ApiError(responseContent);
         }
 
-#if !NO_SERIALIZABLE
         /// <summary>
         /// Constructs an instance of ApiException.
         /// </summary>
@@ -170,7 +165,6 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
             info.AddValue("HttpStatusCode", StatusCode);
             info.AddValue("ApiError", ApiError);
         }
-#endif
 
         /// <summary>
         /// Get the inner error message from the API response

Octokit/Exceptions/ApiValidationException.cs

@@ -2,18 +2,14 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
-#if !NO_SERIALIZABLE
 using System.Runtime.Serialization;
-#endif
 
 namespace Octokit
 {
     /// <summary>
     /// Represents a HTTP 422 - Unprocessable Entity response returned from the API.
     /// </summary>
-#if !NO_SERIALIZABLE
     [Serializable]
-#endif
     [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors",
         Justification = "These exceptions are specific to the GitHub API and not general purpose exceptions")]
     public class ApiValidationException : ApiException
@@ -60,7 +56,6 @@ public override string Message
             get { return ApiErrorMessageSafe ?? "Validation Failed"; }
         }
 
-#if !NO_SERIALIZABLE
         /// <summary>
         /// Constructs an instance of ApiValidationException
         /// </summary>
@@ -76,6 +71,5 @@ protected ApiValidationException(SerializationInfo info, StreamingContext contex
             : base(info, context)
         {
         }
-#endif
     }
 }

Octokit/Exceptions/AuthorizationException.cs

@@ -2,18 +2,14 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
-#if !NO_SERIALIZABLE
 using System.Runtime.Serialization;
-#endif
 
 namespace Octokit
 {
     /// <summary>
     /// Represents a HTTP 401 - Unauthorized response returned from the API.
     /// </summary>
-#if !NO_SERIALIZABLE
     [Serializable]
-#endif
     [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors",
         Justification = "These exceptions are specific to the GitHub API and not general purpose exceptions")]
     public class AuthorizationException : ApiException
@@ -51,7 +47,6 @@ public AuthorizationException(HttpStatusCode httpStatusCode, Exception innerExce
         {
         }
 
-#if !NO_SERIALIZABLE
         /// <summary>
         /// Constructs an instance of AuthorizationException.
         /// </summary>
@@ -67,6 +62,5 @@ protected AuthorizationException(SerializationInfo info, StreamingContext contex
             : base(info, context)
         {
         }
-#endif
     }
 }

Octokit/Exceptions/ForbiddenException.cs

@@ -2,18 +2,14 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
-#if !NO_SERIALIZABLE
 using System.Runtime.Serialization;
-#endif
 
 namespace Octokit
 {
     /// <summary>
     /// Represents a HTTP 403 - Forbidden response returned from the API.
     /// </summary>
-#if !NO_SERIALIZABLE
     [Serializable]
-#endif
     [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors",
         Justification = "These exceptions are specific to the GitHub API and not general purpose exceptions")]
     public class ForbiddenException : ApiException
@@ -43,7 +39,6 @@ public override string Message
             get { return ApiErrorMessageSafe ?? "Request Forbidden"; }
         }
 
-#if !NO_SERIALIZABLE
         /// <summary>
         /// Constructs an instance of ForbiddenException
         /// </summary>
@@ -59,6 +54,5 @@ protected ForbiddenException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
         }
-#endif
     }
 }

Octokit/Exceptions/InvalidGitIgnoreTemplateException.cs

@@ -1,17 +1,13 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
-#if !NO_SERIALIZABLE
 using System.Runtime.Serialization;
-#endif
 
 namespace Octokit
 {
     /// <summary>
     /// Represents a HTTP 403 - Forbidden response returned from the API.
     /// </summary>
-#if !NO_SERIALIZABLE
     [Serializable]
-#endif
     [SuppressMessage("Microsoft.Design", "CA1032:ImplementStandardExceptionConstructors",
         Justification = "These exceptions are specific to the GitHub API and not general purpose exceptions")]
     public class InvalidGitIgnoreTemplateException : ApiValidationException
@@ -38,7 +34,6 @@ public override string Message
             }
         }
 
-#if !NO_SERIALIZABLE
         /// <summary>
         /// Constructs an instance of InvalidGitignoreTemplateException
         /// </summary>
@@ -53,6 +48,5 @@ public override string Message
         protected InvalidGitIgnoreTemplateException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         { }
-#endif
     }
 }