Update samples to target both netcoreapp2.0 and net461

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

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

samples/misc/LatencyTest/LatencyTest.csproj

@@ -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/NodeServicesExamples/NodeServicesExamples.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/Webpack/ActionResults/PrerenderResult.cs

@@ -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/Webpack.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>