Skip to content

Commit 1805476

Browse files
dustinsoftwaredustinsoftware
authored
Add .NETCore 3 preview support (#791)
* Add .NETCore 3 preview support * Update azure-pipelines.yml * Update appveyor: Use .net core 3 preview sdk * Update azure-pipelines.yml * Update appveyor.yml * Add netcore3 support * Fix loading comments page in sample * Update build dependencies * Bump dotnet SDK version * Update tutorial to .NET Core 3 * Bump global sdk version * appveyor is still sad * RIP appveyor Azure pipelines works better and faster with .NET Core * Fix old comment
1 parent d6fc200 commit 1805476

File tree

17 files changed

+119
-92
lines changed

17 files changed

+119
-92
lines changed

‎appveyor.yml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎azure-pipelines.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ trigger:
22
- master
33

44
pool:
5-
vmImage: 'VS2017-Win2016'
5+
vmImage: 'windows-2019'
66

77
variables:
88
buildPlatform: 'Any CPU'
@@ -15,6 +15,11 @@ steps:
1515

1616
- script: npm install --global npm
1717

18+
- task: DotNetCoreInstaller@0
19+
inputs:
20+
packageType: 'sdk'
21+
version: '3.0.100-preview5-011568'
22+
1823
- task: VSBuild@1
1924
inputs:
2025
solution: 'build.proj'

‎global.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"projects": [ "src", "test" ]
2+
"projects": [ "src", "test" ],
3+
"sdk": {
4+
"version": "3.0.100-preview"
5+
}
36
}

‎runs-msbuild.bat‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ set BUILDTYPE="%~1"
44
set ACTION="%~2"
55

66
for %%s in (
7-
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe"
8-
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\MSBuild.exe"
9-
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Professional\MSBuild\15.0\Bin\MSBuild.exe"
7+
"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe"
8+
"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe"
9+
"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\MSBuild.exe"
10+
"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Preview\MSBuild\Current\Bin\MSBuild.exe"
1011
) do (
1112
if exist %%s (
1213
echo %%s build.proj %ACTION% %BUILDTYPE%

‎src/React.AspNet.Middleware/AspNetFileSystem.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
using System.IO;
99
using Microsoft.AspNetCore.Hosting;
1010

11+
#if NETCOREAPP2_0 || NETSTANDARD2_0
12+
using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
13+
#endif
14+
1115
namespace React.AspNet
1216
{
1317
/// <summary>
@@ -16,13 +20,13 @@ namespace React.AspNet
1620
/// </summary>
1721
public class AspNetFileSystem : FileSystemBase
1822
{
19-
private readonly IHostingEnvironment _hostingEnv;
23+
private readonly IWebHostEnvironment _hostingEnv;
2024

2125
/// <summary>
2226
/// Initializes a new instance of the <see cref="AspNetFileSystem"/> class.
2327
/// </summary>
24-
/// <param name="hostingEnv">The ASP.NET 5 hosting environment</param>
25-
public AspNetFileSystem(IHostingEnvironment hostingEnv)
28+
/// <param name="hostingEnv">The .NET Core hosting environment</param>
29+
public AspNetFileSystem(IWebHostEnvironment hostingEnv)
2630
{
2731
_hostingEnv = hostingEnv;
2832
}

‎src/React.AspNet.Middleware/BabelFileMiddleware.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
using Microsoft.Extensions.Logging;
1616
using Microsoft.Extensions.Options;
1717

18+
#if NETCOREAPP2_0 || NETSTANDARD2_0
19+
using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
20+
#endif
21+
1822
namespace React.AspNet
1923
{
2024
/// <summary>
@@ -23,7 +27,7 @@ namespace React.AspNet
2327
public class BabelFileMiddleware
2428
{
2529
private readonly RequestDelegate _next;
26-
private readonly IHostingEnvironment _hostingEnv;
30+
private readonly IWebHostEnvironment _hostingEnv;
2731
private readonly ILoggerFactory _loggerFactory;
2832
private readonly BabelFileOptions _options;
2933

@@ -34,7 +38,7 @@ public class BabelFileMiddleware
3438
/// <param name="options">The configuration options.</param>
3539
/// <param name="hostingEnv">The hosting environment.</param>
3640
/// <param name="loggerFactory">An <see cref="ILoggerFactory"/> instance used to create loggers.</param>
37-
public BabelFileMiddleware(RequestDelegate next, BabelFileOptions options, IHostingEnvironment hostingEnv, ILoggerFactory loggerFactory)
41+
public BabelFileMiddleware(RequestDelegate next, BabelFileOptions options, IWebHostEnvironment hostingEnv, ILoggerFactory loggerFactory)
3842
{
3943
if (next == null)
4044
throw new ArgumentNullException("next");
@@ -93,4 +97,3 @@ private StaticFileMiddleware CreateFileMiddleware(IBabel babel)
9397
}
9498
}
9599
}
96-

‎src/React.AspNet.Middleware/MemoryFileCacheCore.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
using Microsoft.AspNetCore.Hosting;
1212
using Microsoft.Extensions.FileProviders;
1313

14+
#if NETCOREAPP2_0 || NETSTANDARD2_0
15+
using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
16+
#endif
17+
1418
namespace React.AspNet
1519
{
1620
/// <summary>
@@ -19,14 +23,14 @@ namespace React.AspNet
1923
public class MemoryFileCacheCore : ICache
2024
{
2125
private readonly IMemoryCache _cache;
22-
private readonly IHostingEnvironment _hostingEnv;
26+
private readonly IWebHostEnvironment _hostingEnv;
2327

2428
/// <summary>
2529
/// Initializes a new instance of the <see cref="MemoryFileCacheCore" /> class.
2630
/// </summary>
2731
/// <param name="cache">The cache to use</param>
2832
/// <param name="hostingEnv">The ASP.NET hosting environment.</param>
29-
public MemoryFileCacheCore(IMemoryCache cache, IHostingEnvironment hostingEnv)
33+
public MemoryFileCacheCore(IMemoryCache cache, IWebHostEnvironment hostingEnv)
3034
{
3135
_cache = cache;
3236
_hostingEnv = hostingEnv;
@@ -52,7 +56,7 @@ public MemoryFileCacheCore(IMemoryCache cache, IHostingEnvironment hostingEnv)
5256
/// <param name="key">The cache key</param>
5357
/// <param name="data">Data to cache</param>
5458
/// <param name="slidingExpiration">
55-
/// Sliding expiration, if cache key is not accessed in this time period it will
59+
/// Sliding expiration, if cache key is not accessed in this time period it will
5660
/// automatically be removed from the cache
5761
/// </param>
5862
/// <param name="cacheDependencyFiles">

‎src/React.AspNet.Middleware/React.AspNet.Middleware.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Copyright>Copyright 2014-Present Facebook, Inc</Copyright>
66
<AssemblyTitle>ReactJS.NET - Babel middleware for ASP.NET Core</AssemblyTitle>
77
<Authors>Daniel Lo Nigro</Authors>
8-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>React.AspNet.Middleware</AssemblyName>
1111
<AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
@@ -33,7 +33,7 @@
3333
<ProjectReference Include="..\React.Core\React.Core.csproj" />
3434
</ItemGroup>
3535

36-
<ItemGroup>
36+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
3737
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
3838
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
3939
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
@@ -42,6 +42,10 @@
4242
<PackageReference Include="Microsoft.Sourcelink.Github" Version="1.0.0-beta2-19270-01" PrivateAssets="All" />
4343
</ItemGroup>
4444

45+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
46+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="3.0.0-preview3-19153-02" />
47+
</ItemGroup>
48+
4549
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
4650
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4751
</PropertyGroup>

‎src/React.AspNet.Middleware/ReactBuilderExtensions.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
using Microsoft.Extensions.Caching.Memory;
1919
#endif
2020

21+
#if NETCOREAPP2_0 || NETSTANDARD2_0
22+
using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
23+
#endif
24+
2125
namespace React.AspNet
2226
{
2327
/// <summary>
@@ -83,7 +87,7 @@ TinyIoCContainer.RegisterOptions registerOptions
8387
/// <param name="services">ASP.NET dependency injection container</param>
8488
private static void RegisterAspNetServices(TinyIoCContainer container, IServiceProvider services)
8589
{
86-
container.Register(services.GetRequiredService<IHostingEnvironment>());
90+
container.Register(services.GetRequiredService<IWebHostEnvironment>());
8791
#if !NET451
8892
container.Register(services.GetRequiredService<IMemoryCache>());
8993
#endif

‎src/React.AspNet/React.AspNet.csproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Copyright>Copyright 2014-Present Facebook, Inc</Copyright>
66
<AssemblyTitle>ReactJS.NET (ASP.NET Core MVC)</AssemblyTitle>
77
<Authors>Daniel Lo Nigro</Authors>
8-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
8+
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<AssemblyName>React.AspNet</AssemblyName>
1111
<AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
@@ -30,10 +30,14 @@
3030
<ProjectReference Include="..\React.Core\React.Core.csproj" />
3131
</ItemGroup>
3232

33-
<ItemGroup>
33+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
3434
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.0.0" />
3535
</ItemGroup>
3636

37+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
38+
<FrameworkReference Include="Microsoft.AspNetCore.App" Version="3.0.0-preview3-19153-02" />
39+
</ItemGroup>
40+
3741
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3842
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
3943
</PropertyGroup>

0 commit comments

Comments
 (0)