Created separate csproj for Netcore 3.0

danielpalme · Feb 9, 2019 · 132b98e · 132b98e
1 parent 5390064
commit 132b98e
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 5 deletions.
diff --git a/src/Readme.txt b/src/Readme.txt
@@ -61,11 +61,11 @@ CHANGELOG
 4.0.11.0
 
     * Fix: Fixed icons on collapse all / expand all
+    * New: Issue #205: DotnetCliTool Nuget package: Added support for .NET Core 3.0
 
 4.0.10.0
 
     * New: Issue #203: Dark theme for Azure DevOps
-    * New: Issue #205: DotnetCliTool Nuget package: Added support for .NET Core 3.0
 
 4.0.9.0
 

diff --git a/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <ApplicationIcon>ProgramIcon.ico</ApplicationIcon>
     <AssemblyName>dotnet-reportgenerator</AssemblyName>
     <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>

diff --git a/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool_dotnet3.csproj b/src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool_dotnet3.csproj
@@ -0,0 +1,35 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <ApplicationIcon>ProgramIcon.ico</ApplicationIcon>
+    <AssemblyName>dotnet-reportgenerator</AssemblyName>
+    <RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
+    <StartupObject>Palmmedia.ReportGenerator.DotnetCliTool.Program</StartupObject>
+    <AssemblyVersion>4.0.11.0</AssemblyVersion>
+    <FileVersion>4.0.11.0</FileVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\target\bin\Debug\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\target\bin\Release\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="ProgramIcon.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="ProgramIcon.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ReportGenerator.Core\ReportGenerator.Core.csproj" />
+    <ProjectReference Include="..\ReportGenerator.DotnetCorePluginLoader\ReportGenerator.DotnetCorePluginLoader.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/ReportGenerator.DotnetCliTool/build_dotnet3.bat b/src/ReportGenerator.DotnetCliTool/build_dotnet3.bat
@@ -0,0 +1 @@
+dotnet publish -c Release ReportGenerator.DotnetCliTool_dotnet3.csproj
diff --git a/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj b/src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
     <RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
     <AssemblyVersion>4.0.11.0</AssemblyVersion>
     <FileVersion>4.0.11.0</FileVersion>

diff --git a/...ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader_3.0..csproj b/...ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader_3.0..csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
+    <AssemblyVersion>4.0.11.0</AssemblyVersion>
+    <FileVersion>4.0.11.0</FileVersion>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <OutputPath>..\target\bin\Debug\</OutputPath>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\target\bin\Release\</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="McMaster.NETCore.Plugins" Version="0.1.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ReportGenerator.Core\ReportGenerator.Core.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/build.proj b/src/build.proj
@@ -22,8 +22,8 @@
 
   <!-- Version, adjust before build -->
   <PropertyGroup>
-    <Version>4.0.11.0</Version>
-    <VersionShort>4.0.11</VersionShort>
+    <Version>4.0.11-netcore3-p2-01</Version>
+    <VersionShort>4.0.11-netcore3-p2-01</VersionShort>
   </PropertyGroup>
 
   <!-- Tools -->