Remove net40 target

Author: bording

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
-    <DefineConstants Condition=" '$(TargetFramework)' == 'net46' ">$(DefineConstants);DESKTOP</DefineConstants>
+    <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
+    <DefineConstants Condition=" '$(TargetFramework)' == 'net461' ">$(DefineConstants);DESKTOP</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,7 +21,7 @@
   <ItemGroup>
     <Compile Include="..\LibGit2Sharp\Core\Epoch.cs" Link="TestHelpers\Epoch.cs" />
     <Compile Include="..\LibGit2Sharp\Core\Platform.cs" Link="TestHelpers\Platform.cs" />
-    <Compile Remove="desktop\**" Condition=" '$(TargetFramework)' != 'net46' " />
+    <Compile Remove="desktop\**" Condition=" '$(TargetFramework)' != 'net461' " />
   </ItemGroup>
 
 </Project>

LibGit2Sharp.Tests/app.config

@@ -13,7 +13,7 @@ public ArrayMarshaler(T[] objs)
 
             for (var i = 0; i < objs.Length; i++)
             {
-                IntPtr ptr = Marshal.AllocHGlobal(MarshalPortable.SizeOf<T>());
+                IntPtr ptr = Marshal.AllocHGlobal(Marshal.SizeOf<T>());
                 ptrs[i] = ptr;
                 Marshal.StructureToPtr(objs[i], ptr, false);
             }

LibGit2Sharp/Core/ArrayMarshaler.cs

@@ -8,7 +8,7 @@ internal struct GitOdbBackend
     {
         static GitOdbBackend()
         {
-            GCHandleOffset = MarshalPortable.OffsetOf<GitOdbBackend>(nameof(GCHandle)).ToInt32();
+            GCHandleOffset = Marshal.OffsetOf<GitOdbBackend>(nameof(GCHandle)).ToInt32();
         }
 
         public uint Version;

LibGit2Sharp/Core/GitOdbBackend.cs

@@ -15,7 +15,7 @@ internal class GitOdbBackendStream
     {
         static GitOdbBackendStream()
         {
-            GCHandleOffset = MarshalPortable.OffsetOf<GitOdbBackendStream>(nameof(GCHandle)).ToInt32();
+            GCHandleOffset = Marshal.OffsetOf<GitOdbBackendStream>(nameof(GCHandle)).ToInt32();
         }
 
         public IntPtr Backend;

LibGit2Sharp/Core/GitOdbBackendStream.cs

@@ -8,7 +8,7 @@ internal class GitSmartSubtransport
     {
         static GitSmartSubtransport()
         {
-            GCHandleOffset = MarshalPortable.OffsetOf<GitSmartSubtransport>(nameof(GCHandle)).ToInt32();
+            GCHandleOffset = Marshal.OffsetOf<GitSmartSubtransport>(nameof(GCHandle)).ToInt32();
         }
 
         public action_callback Action;

LibGit2Sharp/Core/GitSmartSubtransport.cs

@@ -8,7 +8,7 @@ internal class GitSmartSubtransportStream
     {
         static GitSmartSubtransportStream()
         {
-            GCHandleOffset = MarshalPortable.OffsetOf<GitSmartSubtransportStream>(nameof(GCHandle)).ToInt32();
+            GCHandleOffset = Marshal.OffsetOf<GitSmartSubtransportStream>(nameof(GCHandle)).ToInt32();
         }
 
         public IntPtr SmartTransport;

LibGit2Sharp/Core/GitSmartSubtransportStream.cs

@@ -1,5 +1,4 @@
 using System;
-using System.IO;
 using System.Runtime.InteropServices;
 
 namespace LibGit2Sharp.Core
@@ -13,68 +12,29 @@ internal enum OperatingSystemType
 
     internal static class Platform
     {
-        private static Lazy<OperatingSystemType> _operatingSystem = new Lazy<OperatingSystemType>(
-            DetermineOperatingSystem,
-            System.Threading.LazyThreadSafetyMode.PublicationOnly);
+        public static string ProcessorArchitecture => IntPtr.Size == 8 ? "x64" : "x86";
 
-        public static string ProcessorArchitecture
+        public static OperatingSystemType OperatingSystem
         {
-            get { return IntPtr.Size == 8 ? "x64" : "x86"; }
-        }
-
-        public static OperatingSystemType OperatingSystem => _operatingSystem.Value;
-
-        private static OperatingSystemType DetermineOperatingSystem()
-        {
-#if DESKTOP
-            // See http://www.mono-project.com/docs/faq/technical/#how-to-detect-the-execution-platform
-            switch ((int)Environment.OSVersion.Platform)
+            get
             {
-                case 4:
-                case 128:
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                {
+                    return OperatingSystemType.Windows;
+                }
+
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+                {
                     return OperatingSystemType.Unix;
+                }
 
-                case 6:
+                if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                {
                     return OperatingSystemType.MacOSX;
+                }
 
-                default:
-                    return OperatingSystemType.Windows;
-            }
-#else
-            try
-            {
-                return OperatingSystem_CoreFxStyle();
-            }
-            catch (FileNotFoundException)
-            {
-                // We're probably running on .NET 4.6.1 or earlier where the API isn't available.
-                // This would suggest we're running on Windows. Although if our portable library
-                // is being used on mono, it could be *nix or OSX too.
-                return OperatingSystemType.Windows;
-            }
-#endif
-        }
-
-#if !DESKTOP
-        private static OperatingSystemType OperatingSystem_CoreFxStyle()
-        {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                return OperatingSystemType.Windows;
-            }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            {
-                return OperatingSystemType.Unix;
-            }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                return OperatingSystemType.MacOSX;
-            }
-            else
-            {
                 throw new InvalidOperationException();
             }
         }
-#endif
     }
 }

LibGit2Sharp/Core/MarshalPortable.cs

@@ -261,16 +261,16 @@ int StreamCreateCallback(out IntPtr git_writestream_out, GitFilter self, IntPtr
                 Marshal.StructureToPtr(state.thisStream, state.thisPtr, false);
 
                 state.nextPtr = git_writestream_next;
-                state.nextStream = MarshalPortable.PtrToStructure<GitWriteStream>(state.nextPtr);
-                
+                state.nextStream = Marshal.PtrToStructure<GitWriteStream>(state.nextPtr);
+
                 state.filterSource = FilterSource.FromNativePtr(filterSourcePtr);
                 state.output = new WriteStream(state.nextStream, state.nextPtr);
 
                 Create(state.filterSource.Path, state.filterSource.Root, state.filterSource.SourceMode);
 
                 if (!activeStreams.TryAdd(state.thisPtr, state))
                 {
-                    // AFAICT this is a theoretical error that could only happen if we manage 
+                    // AFAICT this is a theoretical error that could only happen if we manage
                     // to free the stream pointer but fail to remove the dictionary entry.
                     throw new InvalidOperationException("Overlapping stream pointers");
                 }

LibGit2Sharp/Core/Platform.cs

@@ -23,7 +23,6 @@ static GlobalSettings()
         {
             if (Platform.OperatingSystem == OperatingSystemType.Windows)
             {
-#if DESKTOP
                 /* Assembly.CodeBase is not actually a correctly formatted
                  * URI.  It's merely prefixed with `file:///` and has its
                  * backslashes flipped.  This is superior to EscapedCodeBase,
@@ -45,9 +44,6 @@ static GlobalSettings()
                 }
 
                 managedPath = Path.GetDirectoryName(managedPath);
-#else
-                string managedPath = AppContext.BaseDirectory;
-#endif
 
                 nativeLibraryPath = Path.Combine(managedPath, "lib", "win32");
             }

LibGit2Sharp/Filter.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <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>
@@ -12,7 +12,6 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\libgit2sharp.snk</AssemblyOriginatorKeyFile>
-    <DefineConstants Condition=" '$(TargetFramework)' == 'net40' ">$(DefineConstants);DESKTOP</DefineConstants>
   </PropertyGroup>
 
   <!-- Disable SourceLink when running on Travis CI -->

LibGit2Sharp/GlobalSettings.cs

@@ -239,7 +239,7 @@ private unsafe Blob CreateBlob(Stream stream, string hintpath, long? numberOfByt
             }
 
             IntPtr writestream_ptr = Proxy.git_blob_create_fromstream(repo.Handle, hintpath);
-            GitWriteStream writestream = MarshalPortable.PtrToStructure<GitWriteStream>(writestream_ptr);
+            GitWriteStream writestream = Marshal.PtrToStructure<GitWriteStream>(writestream_ptr);
 
             try
             {