Skip to content
This repository was archived by the owner on Nov 6, 2023. It is now read-only.

Commit fda874f

Browse files
committed
Test version for dotnetcore3.0
1 parent 293b59b commit fda874f

File tree

3 files changed

+23
-11
lines changed

3 files changed

+23
-11
lines changed

src/VueCliMiddleware.Tests/VueCliMiddleware.Tests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
5-
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
65
<IsPackable>false</IsPackable>
7-
86
<RootNamespace>VueCliMiddleware</RootNamespace>
97
</PropertyGroup>
108

119
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
1311
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
1412
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
1513
</ItemGroup>

src/VueCliMiddleware/Util/Internals.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
using System.IO;
1414
using System.Text;
1515
using System.Text.RegularExpressions;
16+
using System.Threading.Tasks;
17+
using Microsoft.AspNetCore.Builder;
18+
using Microsoft.Extensions.DependencyInjection;
19+
using Microsoft.Extensions.Logging;
1620

1721

1822
[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("VueCliMiddleware.Tests")]
@@ -26,10 +30,15 @@ public static ILogger GetOrCreateLogger(
2630
{
2731
// If the DI system gives us a logger, use it. Otherwise, set up a default one.
2832
var loggerFactory = appBuilder.ApplicationServices.GetService<ILoggerFactory>();
29-
var logger = loggerFactory != null
30-
? loggerFactory.CreateLogger(logCategoryName)
31-
: new ConsoleLogger(logCategoryName, null, false);
32-
return logger;
33+
if (loggerFactory == null)
34+
{
35+
loggerFactory = LoggerFactory.Create(builder =>
36+
{
37+
builder.AddConsole();
38+
});
39+
}
40+
41+
return loggerFactory.CreateLogger(logCategoryName);
3342
}
3443
}
3544

src/VueCliMiddleware/VueCliMiddleware.csproj

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
<PropertyGroup>
44
<Description>Helpers for building single-page applications on ASP.NET MVC Core using Vue Cli.</Description>
5-
<TargetFramework>netstandard2.0</TargetFramework>
5+
<TargetFramework>netcoreapp3.0</TargetFramework>
66

77
<Title>VueCliMiddleware</Title>
8-
<VersionPrefix>2.2.1</VersionPrefix>
8+
<VersionPrefix>3.0.0</VersionPrefix>
9+
<VersionSuffix>preview6</VersionSuffix>
910
<LangVersion>Latest</LangVersion>
1011
<Authors>EEParker</Authors>
1112
<RepositoryUrl>https://github.com/EEParker/aspnetcore-vueclimiddleware.git</RepositoryUrl>
@@ -14,7 +15,11 @@
1415
</PropertyGroup>
1516

1617
<ItemGroup>
17-
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="2.2.0" />
18+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.0.0-preview6.19307.2" />
19+
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0-preview6.19304.6" />
20+
</ItemGroup>
21+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
22+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1823
</ItemGroup>
1924

2025
</Project>

0 commit comments

Comments
 (0)