Move core packages to netstandard2.0

Author: SteveSandersonMS

build/dependencies.props

@@ -6,7 +6,7 @@
     <InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
     <JsonNetVersion>10.0.1</JsonNetVersion>
     <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
-    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netstandard2.0'">2.0.0-*</RuntimeFrameworkVersion>
     <ThreadingDataflowVersion>4.7.0</ThreadingDataflowVersion>
   </PropertyGroup>
 </Project>

src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>Socket-based RPC for Microsoft.AspNetCore.NodeServices.</Description>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
   </PropertyGroup>
@@ -15,14 +15,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Microsoft.Tpl.Dataflow" Version="$(MicrosoftDataflowVersion)" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="System.IO.Pipes" Version="$(CoreFxVersion)" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="$(ThreadingDataflowVersion)" />
   </ItemGroup>
 

src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/NamedPipeConnection.cs

@@ -18,11 +18,7 @@ public override async Task<Stream> Open(string address)
                 PipeDirection.InOut,
                 PipeOptions.Asynchronous);
 
-#if NET451
-            _namedPipeClientStream.Connect();
-#else
             await _namedPipeClientStream.ConnectAsync().ConfigureAwait(false);
-#endif
 
             return _namedPipeClientStream;
         }

src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/StreamConnection.cs

@@ -11,9 +11,6 @@ internal abstract class StreamConnection : IDisposable
 
         public static StreamConnection Create()
         {
-#if NET451
-            return new NamedPipeConnection();
-#else
             var useNamedPipes = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(
                 System.Runtime.InteropServices.OSPlatform.Windows);
             if (useNamedPipes)
@@ -24,7 +21,6 @@ public static StreamConnection Create()
             {
                 return new UnixDomainSocketConnection();
             }
-#endif
         }
     }
 }

src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketConnection.cs

@@ -10,16 +10,6 @@ internal class UnixDomainSocketConnection : StreamConnection
         private NetworkStream _networkStream;
         private Socket _socket;
 
-#if NET451
-        public override Task<Stream> Open(string address)
-        {
-            // The 'null' assignments avoid the compiler warnings about unassigned fields.
-            // Note that this whole class isn't supported on .NET 4.5.1, since that's not cross-platform.
-            _networkStream = null;
-            _socket = null;
-            throw new System.PlatformNotSupportedException();
-        }
-#else
         public override async Task<Stream> Open(string address)
         {
             var endPoint = new UnixDomainSocketEndPoint("/tmp/" + address);
@@ -28,7 +18,6 @@ public override async Task<Stream> Open(string address)
             _networkStream = new NetworkStream(_socket);
             return _networkStream;
         }
-#endif
 
         public override void Dispose()
         {

src/Microsoft.AspNetCore.NodeServices.Sockets/PhysicalConnections/UnixDomainSocketEndPoint.cs

@@ -59,11 +59,7 @@ internal UnixDomainSocketEndPoint(SocketAddress socketAddress)
             }
             else
             {
-#if NET451
-                _encodedPath = new byte[0];
-#else
                 _encodedPath = Array.Empty<byte>();
-#endif
                 _path = string.Empty;
             }
         }

src/Microsoft.AspNetCore.NodeServices.Sockets/VirtualConnections/VirtualConnection.cs

@@ -12,11 +12,7 @@ namespace Microsoft.AspNetCore.NodeServices.Sockets.VirtualConnections
     /// </summary>
     internal class VirtualConnection : Stream
     {
-#if NET451
-        private readonly static Task CompletedTask = Task.FromResult((object)null);
-#else
         private readonly static Task CompletedTask = Task.CompletedTask;
-#endif
         private VirtualConnectionClient _host;
         private readonly BufferBlock<byte[]> _receivedDataQueue = new BufferBlock<byte[]>();
         private ArraySegment<byte> _receivedDataNotYetUsed;

src/Microsoft.AspNetCore.NodeServices/HostingModels/OutOfProcessNodeInstance.cs

@@ -315,11 +315,7 @@ private void EnsureFileSystemWatcherIsDisposed()
 
         private static void SetEnvironmentVariable(ProcessStartInfo startInfo, string name, string value)
         {
-#if NET451
-            startInfo.EnvironmentVariables[name] = value;
-#else
             startInfo.Environment[name] = value;
-#endif
         }
 
         private static Process LaunchNodeProcess(ProcessStartInfo startInfo)

src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj

@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <Description>Invoke Node.js modules at runtime in ASP.NET Core applications.</Description>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <PackageTags>aspnetcore;aspnetcoremvc;nodeservices</PackageTags>
     <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -18,11 +18,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(AspNetCoreVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
-    <PackageReference Include="System.Diagnostics.Process" Version="$(CoreFxVersion)" />
-    <PackageReference Include="System.IO.FileSystem.Watcher" Version="$(CoreFxVersion)" />
     <PackageReference Include="System.Runtime.Loader" Version="$(CoreFxVersion)" />
   </ItemGroup>
 

src/Microsoft.AspNetCore.NodeServices/Util/StringAsTempFile.cs

@@ -23,15 +23,10 @@ public StringAsTempFile(string content)
 
             // Because .NET finalizers don't reliably run when the process is terminating, also
             // add event handlers for other shutdown scenarios.
-#if NET451
-            AppDomain.CurrentDomain.ProcessExit += HandleProcessExit;
-            AppDomain.CurrentDomain.DomainUnload += HandleProcessExit;
-#else
             // Note that this still doesn't capture SIGKILL (at least on macOS) - there doesn't
             // appear to be a way of doing that. So in that case, the temporary file will be
             // left behind.
             System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += HandleAssemblyUnloading;
-#endif
         }
 
         /// <summary>
@@ -55,12 +50,7 @@ private void DisposeImpl(bool disposing)
                 if (disposing)
                 {
                     // Dispose managed state
-#if NET451
-                    AppDomain.CurrentDomain.ProcessExit -= HandleProcessExit;
-                    AppDomain.CurrentDomain.DomainUnload -= HandleProcessExit;
-#else
                     System.Runtime.Loader.AssemblyLoadContext.Default.Unloading -= HandleAssemblyUnloading;
-#endif
                 }
 
                 EnsureTempFileDeleted();
@@ -81,17 +71,10 @@ private void EnsureTempFileDeleted()
             }
         }
 
-#if NET451
-        private void HandleProcessExit(object sender, EventArgs args)
-        {
-            EnsureTempFileDeleted();
-        }
-#else
         private void HandleAssemblyUnloading(System.Runtime.Loader.AssemblyLoadContext context)
         {
             EnsureTempFileDeleted();
         }
-#endif
 
         /// <summary>
         /// Implements the finalization part of the IDisposable pattern by calling Dispose(false).