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

Commit a197b2d

Browse files
authored
Merge pull request #82 from JohnCampionJr/master
Updated to .NET 5.0
2 parents 84a02c1 + c11c263 commit a197b2d

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

samples/QuasarCliSample/QuasarCliSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

samples/VueCliSample/VueCliSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

src/VueCliMiddleware.Tests/VueCliMiddleware.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFrameworks>netcoreapp3.1; net5.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
<RootNamespace>VueCliMiddleware</RootNamespace>
77
</PropertyGroup>

src/VueCliMiddleware.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
..\README.md = ..\README.md
1414
EndProjectSection
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuasarCliSample", "..\samples\QuasarCliSample\QuasarCliSample.csproj", "{9C672A02-413F-45CB-ACC7-E067561A40E0}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "QuasarCliSample", "..\samples\QuasarCliSample\QuasarCliSample.csproj", "{9C672A02-413F-45CB-ACC7-E067561A40E0}"
1717
EndProject
1818
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{E0AC4E37-9F26-4CAD-A3F9-10420CB0F9E7}"
1919
EndProject
20-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VueCliSample", "..\samples\VueCliSample\VueCliSample.csproj", "{FBE4604B-BCF1-4220-8292-135193C95967}"
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VueCliSample", "..\samples\VueCliSample\VueCliSample.csproj", "{FBE4604B-BCF1-4220-8292-135193C95967}"
2121
EndProject
2222
Global
2323
GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/VueCliMiddleware/VueCliMiddleware.csproj

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

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

77
<Title>VueCliMiddleware</Title>
8-
<VersionPrefix>3.1.2</VersionPrefix>
8+
<VersionPrefix>3.2.0</VersionPrefix>
99
<VersionSuffix></VersionSuffix>
1010
<LangVersion>Latest</LangVersion>
1111
<Authors>EEParker</Authors>
@@ -23,11 +23,15 @@
2323
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
2424
</ItemGroup>
2525

26-
<ItemGroup>
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
27+
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="5.0.1" />
28+
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
29+
</ItemGroup>
30+
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
2731
<PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.0" />
2832
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
2933
</ItemGroup>
30-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">
34+
<ItemGroup>
3135
<FrameworkReference Include="Microsoft.AspNetCore.App" />
3236
</ItemGroup>
3337

0 commit comments

Comments
 (0)