Merge branch 'rel/2.0.0-preview2' into dev

Author: SteveSandersonMS

build/common.props

@@ -16,7 +16,8 @@
  <PackageReference Include="Internal.AspNetCore.Sdk" Version="$(InternalAspNetCoreSdkVersion)" PrivateAssets="All" />
  </ItemGroup>
 
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
+ <ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework'">
  <PackageReference Include="NETStandard.Library" Version="$(BundledNETStandardPackageVersion)" />
+ <PackageReference Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
  </ItemGroup>
 </Project>

build/dependencies.props

@@ -2,10 +2,10 @@
  <PropertyGroup>
  <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
  <AutoMapperVersion>5.0.2</AutoMapperVersion>
- <CoreFxVersion>4.3.0</CoreFxVersion>
  <InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
  <JsonNetVersion>10.0.1</JsonNetVersion>
  <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
+ <NETStandardLibraryNETFrameworkVersion>2.0.0-*</NETStandardLibraryNETFrameworkVersion>
  <RuntimeFrameworkVersion Condition="'$(TargetFramework)'=='netcoreapp2.0'">2.0.0-*</RuntimeFrameworkVersion>
  <ThreadingDataflowVersion>4.7.0</ThreadingDataflowVersion>
  </PropertyGroup>

build/repo.targets

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
- <Import Project="..\..\..\build\dependencies.props" />
+ <Import Project="..\..\..\build\common.props" />
 
  <PropertyGroup>
- <TargetFramework>netcoreapp2.0</TargetFramework>
+ <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
  <IsPackable>false</IsPackable>
  <OutputType>exe</OutputType>
  </PropertyGroup>

samples/misc/LatencyTest/LatencyTest.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
- <Import Project="..\..\..\build\dependencies.props" />
+ <Import Project="..\..\..\build\common.props" />
 
  <PropertyGroup>
- <TargetFramework>netcoreapp2.0</TargetFramework>
+ <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
  <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
  <IsPackable>false</IsPackable>
  </PropertyGroup>

samples/misc/NodeServicesExamples/NodeServicesExamples.csproj

@@ -27,13 +27,15 @@ public override async Task ExecuteResultAsync(ActionContext context)
  {
  var nodeServices = context.HttpContext.RequestServices.GetRequiredService<INodeServices>();
  var hostEnv = context.HttpContext.RequestServices.GetRequiredService<IHostingEnvironment>();
+ var applicationLifetime = context.HttpContext.RequestServices.GetRequiredService<IApplicationLifetime>();
  var applicationBasePath = hostEnv.ContentRootPath;
  var request = context.HttpContext.Request;
  var response = context.HttpContext.Response;
 
  var prerenderedHtml = await Prerenderer.RenderToString(
  applicationBasePath,
  nodeServices,
+ applicationLifetime.ApplicationStopping,
  _moduleExport,
  request.GetEncodedUrl(),
  request.Path + request.QueryString.Value,

samples/misc/Webpack/ActionResults/PrerenderResult.cs

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
- <Import Project="..\..\..\build\dependencies.props" />
+ <Import Project="..\..\..\build\common.props" />
 
  <PropertyGroup>
- <TargetFramework>netcoreapp2.0</TargetFramework>
+ <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
  <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
  <IsPackable>false</IsPackable>
  </PropertyGroup>

samples/misc/Webpack/Webpack.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/Microsoft.AspNetCore.NodeServices.Sockets.csproj

@@ -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/NamedPipeConnection.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
  }
  }
 }