Merge pull request #15 from fitogram/ar/T3T-142-UpgradeNetStandard

Updated to .net standard 2
urbansportsclub · Apr 2, 2020 · 6fe9e7e · 6fe9e7e
2 parents df5a32c + dd65247
commit 6fe9e7e
Show file tree

Hide file tree

Showing 11 changed files with 67 additions and 295 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,17 @@
+if: branch IN (alpha, beta, master)
+
+language: csharp
+mono: none
+dotnet: 3.1
+
+script:
+- if [[ $TRAVIS_BRANCH = "master" ]] ; then
+        dotnet pack -c Release /property:Version=0.3.$TRAVIS_BUILD_NUMBER;
+        dotnet nuget push ./EPPlus.Html/bin/Release/EPPlus.Html.0.3.$TRAVIS_BUILD_NUMBER.nupkg -s https://www.myget.org/F/fitogram/auth/085eb83a-9100-4b7d-8748-fcb7182d5111/api/v3/index.json;
+    else
+        dotnet pack -c Release /property:Version=0.3.$TRAVIS_BUILD_NUMBER-$TRAVIS_BRANCH;
+        dotnet nuget push ./EPPlus.Html/bin/Release/EPPlus.Html.0.3.$TRAVIS_BUILD_NUMBER-$TRAVIS_BRANCH.nupkg -s https://www.myget.org/F/fitogram/auth/085eb83a-9100-4b7d-8748-fcb7182d5111/api/v3/index.json;
+    fi
+
+after_success:
+- echo "Tadaaaaaa :)"
diff --git a/EPPlus.Html.Package/EPPlus.Html.Package.nuproj b/EPPlus.Html.Package/EPPlus.Html.Package.nuproj
diff --git a/EPPlus.Html.Package/Readme.txt b/EPPlus.Html.Package/Readme.txt
diff --git a/EPPlus.Html.Test/EPPlus.Html.Test.csproj b/EPPlus.Html.Test/EPPlus.Html.Test.csproj
@@ -1,77 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DB4C442E-D5FF-4DD2-A809-496D16646D9D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EPPlus.Html.Test</RootNamespace>
-    <AssemblyName>EPPlus.Html.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="EPPlus, Version=4.5.2.1, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
-      <HintPath>..\packages\EPPlus.4.5.2.1\lib\net40\EPPlus.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <Folder Include="Properties\" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\EPPlus.Html\EPPlus.Html.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-    <None Include="Resources\Test001.xlsx">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <None Update="Resources\Test001.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\EPPlus.Html\EPPlus.Html.csproj">
-      <Project>{6a9878f8-48ca-410e-92e8-6941f580d39b}</Project>
-      <Name>EPPlus.Html</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>
diff --git a/EPPlus.Html.Test/Program.cs b/EPPlus.Html.Test/Program.cs
@@ -22,14 +22,14 @@ static void Main(string[] args)
 
             string html = worksheet.ToHtml();
 
-            Show(html);
-        }
-
-        static void Show(string html)
-        {
             string tmpFile = Path.GetTempFileName() + ".html";
             File.WriteAllText(tmpFile, html);
-            Process.Start(tmpFile);
+
+            Console.Write("Writing file to ");
+            Console.WriteLine(tmpFile);
+            Console.WriteLine("Press any key to exit");
+
+            Console.ReadKey();
         }
     }
 }
diff --git a/EPPlus.Html.Test/Properties/AssemblyInfo.cs b/EPPlus.Html.Test/Properties/AssemblyInfo.cs
diff --git a/EPPlus.Html.Test/packages.config b/EPPlus.Html.Test/packages.config
diff --git a/EPPlus.Html.sln b/EPPlus.Html.sln
@@ -1,26 +1,28 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29926.136
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlus.Html", "EPPlus.Html\EPPlus.Html.csproj", "{6A9878F8-48CA-410E-92E8-6941F580D39B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EPPlus.Html", "EPPlus.Html\EPPlus.Html.csproj", "{DD0868EA-82D4-4442-8305-72B141999A6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlus.Html.Test", "EPPlus.Html.Test\EPPlus.Html.Test.csproj", "{DB4C442E-D5FF-4DD2-A809-496D16646D9D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EPPlus.Html.Test", "EPPlus.Html.Test\EPPlus.Html.Test.csproj", "{51880D22-928D-4F51-ABD6-33D2C4B78635}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B6AC7AF8-42D1-4535-8184-79556AE95F5C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6A9878F8-48CA-410E-92E8-6941F580D39B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6A9878F8-48CA-410E-92E8-6941F580D39B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6A9878F8-48CA-410E-92E8-6941F580D39B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6A9878F8-48CA-410E-92E8-6941F580D39B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DB4C442E-D5FF-4DD2-A809-496D16646D9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DB4C442E-D5FF-4DD2-A809-496D16646D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DB4C442E-D5FF-4DD2-A809-496D16646D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DB4C442E-D5FF-4DD2-A809-496D16646D9D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD0868EA-82D4-4442-8305-72B141999A6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD0868EA-82D4-4442-8305-72B141999A6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD0868EA-82D4-4442-8305-72B141999A6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD0868EA-82D4-4442-8305-72B141999A6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51880D22-928D-4F51-ABD6-33D2C4B78635}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51880D22-928D-4F51-ABD6-33D2C4B78635}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51880D22-928D-4F51-ABD6-33D2C4B78635}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51880D22-928D-4F51-ABD6-33D2C4B78635}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/EPPlus.Html/EPPlus.Html.csproj b/EPPlus.Html/EPPlus.Html.csproj
@@ -1,74 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6A9878F8-48CA-410E-92E8-6941F580D39B}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>EPPlus.Html</RootNamespace>
-    <AssemblyName>EPPlus.Html</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
+    <PackageId>EPPlus.Html</PackageId>
+    <Version>0.3.0</Version>
+    <Authors>Till Wolff, Andreas Rudischhauser</Authors>
+    <Description>This is a wrapper around EPPlus</Description>
+    <Copyright>Fitogram GmbH</Copyright>
+    <RepositoryUrl>https://github.com/fitogram/EPPlus.Html</RepositoryUrl>
+    <PackageReleaseNotes>Updated to .NET Standard 2.0</PackageReleaseNotes>
+    <Company>Fitogram GmbH</Company>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="EPPlus, Version=4.5.2.1, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
-      <HintPath>..\packages\EPPlus.4.5.2.1\lib\net40\EPPlus.dll</HintPath>
-    </Reference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="System" />
-    <Reference Include="System.configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Security" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Converters\ExcelToCss.cs" />
-    <Compile Include="EPPlusExtensions.cs" />
-    <Compile Include="Html\CssDeclaration.cs" />
-    <Compile Include="Html\CssInlineStyles.cs" />
-    <Compile Include="Html\HtmlAttributeCollection.cs" />
-    <Compile Include="Html\HtmlElement.cs" />
-    <Compile Include="Html\HtmlElementCollection.cs" />
-    <Compile Include="Html\RenderElement.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Folder Include="Properties\" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="EPPlus.Core" Version="1.5.4" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+
+</Project>