Only use managed https with new net472 target

Author: bording

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net46;net472;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <Compile Include="..\LibGit2Sharp\Core\Platform.cs" Link="TestHelpers\Platform.cs" />
-    <Compile Remove="desktop\**" Condition="'$(TargetFramework)' != 'net46'" />
+    <Compile Remove="desktop\**" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
     <Content Include="Resources\**\*.*" CopyToOutputDirectory="PreserveNewest" />
     <None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>

LibGit2Sharp/Core/ManagedHttpSmartSubtransport.cs

@@ -1,3 +1,4 @@
+#if !NET46
 using System;
 using System.IO;
 using System.Linq;
@@ -277,3 +278,4 @@ protected override void Free()
         }
     }
 }
+#endif

LibGit2Sharp/Core/NativeMethods.cs

@@ -26,8 +26,10 @@ internal static class NativeMethods
         private static NativeShutdownObject shutdownObject;
 #pragma warning restore 0414
 
+#if !NET46
         private static SmartSubtransportRegistration<ManagedHttpSmartSubtransport> httpSubtransportRegistration;
         private static SmartSubtransportRegistration<ManagedHttpSmartSubtransport> httpsSubtransportRegistration;
+#endif
 
         static NativeMethods()
         {
@@ -45,7 +47,7 @@ static NativeMethods()
                     string nativeLibraryPath = GetGlobalSettingsNativeLibraryPath();
                     if (nativeLibraryPath != null)
                     {
-#if NETFRAMEWORK
+#if NET46
                         if (Platform.OperatingSystem == OperatingSystemType.Windows)
 #else
                         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
@@ -202,19 +204,22 @@ private static void InitializeNativeLibrary()
                 shutdownObject = new NativeShutdownObject();
             }
 
+#if !NET46
             // Configure the .NET HTTP(S) mechanism on the first initialization of the library in the current process.
             if (initCounter == 1)
             {
                 httpSubtransportRegistration = GlobalSettings.RegisterDefaultSmartSubtransport<ManagedHttpSmartSubtransport>("http");
                 httpsSubtransportRegistration = GlobalSettings.RegisterDefaultSmartSubtransport<ManagedHttpSmartSubtransport>("https");
             }
+#endif
         }
 
         // Shutdown the native library in a finalizer.
         private sealed class NativeShutdownObject : CriticalFinalizerObject
         {
             ~NativeShutdownObject()
             {
+#if !NET46
                 if (httpSubtransportRegistration != null)
                 {
                     GlobalSettings.UnregisterDefaultSmartSubtransport(httpSubtransportRegistration);
@@ -224,6 +229,7 @@ private sealed class NativeShutdownObject : CriticalFinalizerObject
                 {
                     GlobalSettings.UnregisterDefaultSmartSubtransport(httpsSubtransportRegistration);
                 }
+#endif
 
                 git_libgit2_shutdown();
             }

LibGit2Sharp/Core/Platform.cs

@@ -13,7 +13,7 @@ internal enum OperatingSystemType
     internal static class Platform
     {
         public static string ProcessorArchitecture => IntPtr.Size == 8 ? "x64" : "x86";
-#if NETFRAMEWORK 
+#if NET46
         private static bool? _isRunningOnMac;
         private static bool IsRunningOnMac() => _isRunningOnMac ?? (_isRunningOnMac = TryGetIsRunningOnMac()) ?? false;
 #endif
@@ -22,7 +22,7 @@ public static OperatingSystemType OperatingSystem
         {
             get
             {
-#if NETFRAMEWORK
+#if NET46
                 var platform = (int)Environment.OSVersion.Platform;
                 if (platform <= 3 || platform == 5)
                 {
@@ -91,7 +91,7 @@ public static bool IsRunningOnNetFramework()
         public static bool IsRunningOnNetCore()
             => typeof(object).Assembly.GetName().Name != "mscorlib";
 
-#if NETFRAMEWORK
+#if NET46
 #pragma warning disable IDE1006 // Naming Styles
         [DllImport("libc")]
         private static extern int sysctlbyname(

LibGit2Sharp/LibGit2Sharp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net46;net472</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Description>LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono.</Description>
     <Company>LibGit2Sharp contributors</Company>
@@ -31,11 +31,14 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" /> <!-- Needed for T4 generation -->
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <Reference Include="System.Net.Http" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.305]" PrivateAssets="none" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.50" PrivateAssets="all" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
   </ItemGroup>
 
   <Import Project="..\Targets\CodeGenerator.targets" />