Skip to content

Commit e806469

Browse files
mzorecmzorec
committed
Adds .net 6.0 support
1 parent 3cb17b0 commit e806469

File tree

6 files changed

+12
-44
lines changed

6 files changed

+12
-44
lines changed

‎src/FlubuCore.GlobalTool/FlubuCore.GlobalTool.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<PackAsTool>true</PackAsTool>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
66
<ToolCommandName>flubu</ToolCommandName>
77
<PackageTags>dotnet;flubu;flubucore;build;builder;script;buildscript;automation;VisualStudio</PackageTags>
88
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>

‎src/FlubuCore.Tool/FlubuCore.Tool.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<PackAsTool>true</PackAsTool>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>netcoreapp2.1;netcoreapp3.0;net5.0;</TargetFrameworks>
5+
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
66
<ToolCommandName>flubu</ToolCommandName>
77
<PackageTags>dotnet;flubu;flubucore;build;builder;script;buildscript;automation;VisualStudio</PackageTags>
88
<Authors>Marko Zorec;Zoro Zorec;Micheal Tsai</Authors>

‎src/FlubuCore.WebApi.Tests/FlubuCore.WebApi.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net5.0</TargetFrameworks>
3+
<TargetFramework>net5.0</TargetFramework>
44
<WarningsAsErrors>true</WarningsAsErrors>
55
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
66
<NoWarn>1701;1702;1705;1591;1573;1572;1574</NoWarn>

‎src/FlubuCore.WebApi.Updater/FlubuCore.WebApi.Updater.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-
<TargetFrameworks>netcoreapp2.0;net462</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
55
</PropertyGroup>
66

77
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">

‎src/FlubuCore.WebApi/FlubuCore.WebApi.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.0;netcoreapp2.1;netcoreapp3.1;net462;net5.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp3.1;net462;net5.0</TargetFrameworks>
55
<WarningsAsErrors>true</WarningsAsErrors>
66
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
77
<NoWarn>1701;1702;1705;1591;1573;1572;1574</NoWarn>
88
<Version>5.1.8</Version><AssemblyVersion>5.1.8.0</AssemblyVersion><FileVersion>5.1.8.0</FileVersion></PropertyGroup>
9-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
10-
<ReferringTargetFrameworkForProjectReferences>.NETStandard,Version=v2.0</ReferringTargetFrameworkForProjectReferences>
11-
<DefineConstants>NETCOREAPP2_0;</DefineConstants>
12-
</PropertyGroup>
13-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
14-
<ReferringTargetFrameworkForProjectReferences>.NETStandard,Version=v2.0</ReferringTargetFrameworkForProjectReferences>
15-
<DefineConstants>NETCOREAPP2_1;</DefineConstants>
16-
</PropertyGroup>
179
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
1810
<ReferringTargetFrameworkForProjectReferences>.NETStandard,Version=v2.0</ReferringTargetFrameworkForProjectReferences>
1911
<DefineConstants>NETCOREAPP3_1;</DefineConstants>
@@ -103,28 +95,7 @@
10395
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="4.0.1" />
10496
<PackageReference Include="MailKit" Version="2.6.0" />
10597
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
106-
</ItemGroup>
107-
108-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
109-
<ProjectReference Include="..\FlubuCore.LiteDb\FlubuCore.LiteDb.csproj" />
110-
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
111-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
112-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
113-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
114-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
115-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
116-
</ItemGroup>
117-
118-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
119-
<ProjectReference Include="..\FlubuCore.LiteDb\FlubuCore.LiteDb.csproj" />
120-
<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
121-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
122-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.2.0" />
123-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="2.2.0" />
124-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
125-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
126-
</ItemGroup>
127-
98+
</ItemGroup>
12899
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
129100
<ProjectReference Include="..\FlubuCore.LiteDb\FlubuCore.LiteDb.csproj" />
130101
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
@@ -134,6 +105,11 @@
134105
<ProjectReference Include="..\FlubuCore.LiteDb\FlubuCore.LiteDb.csproj" />
135106
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
136107
</ItemGroup>
108+
109+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
110+
<ProjectReference Include="..\FlubuCore.LiteDb\FlubuCore.LiteDb.csproj" />
111+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.0" />
112+
</ItemGroup>
137113

138114
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
139115
<ProjectReference Include="..\FlubuCore.LiteDb\FlubuCore.LiteDb.csproj" >

‎src/dotnet-flubu/dotnet-flubu.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net462;netcoreapp2.1;netcoreapp3.1;net5.0;</TargetFrameworks>
3+
<TargetFrameworks>net462;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
44
<WarningsAsErrors>true</WarningsAsErrors>
55
<AssemblyName>dotnet-flubu</AssemblyName>
66
<OutputType>Exe</OutputType>
@@ -29,14 +29,6 @@
2929
<CodeAnalysisRuleSet>..\stylecop.ruleset</CodeAnalysisRuleSet>
3030
<NoWarn>1701;1702;1705;1591;1573;1572;1574</NoWarn>
3131
</PropertyGroup>
32-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
33-
<ReferringTargetFrameworkForProjectReferences>.NETStandard,Version=v2.0</ReferringTargetFrameworkForProjectReferences>
34-
<DefineConstants>NETCOREAPP2_0;</DefineConstants>
35-
</PropertyGroup>
36-
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
37-
<ReferringTargetFrameworkForProjectReferences>.NETStandard,Version=v2.0</ReferringTargetFrameworkForProjectReferences>
38-
<DefineConstants>NETCOREAPP2_1;</DefineConstants>
39-
</PropertyGroup>
4032
<PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
4133
<RuntimeIdentifiers>win7-x64;win7-x86</RuntimeIdentifiers>
4234
</PropertyGroup>

0 commit comments

Comments
 (0)