Skip to content
This repository has been archived by the owner on Jan 25, 2019. It is now read-only.

Commit

Permalink
Updated to Visual Studio 2017
Browse files Browse the repository at this point in the history
  • Loading branch information
VahidN committed Mar 16, 2017
1 parent e397aa7 commit d28d3ef
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 179 deletions.
9 changes: 4 additions & 5 deletions EPPlus.Core.sln
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26228.4
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{210E96E3-E4A7-41EE-B074-59FCDAE0B1EC}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FE6890B6-B80E-44A1-B9C5-97C547E88E42}"
ProjectSection(SolutionItems) = preProject
global.json = global.json
LICENSE.md = LICENSE.md
README.md = README.md
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EPPlus.Core", "src\EPPlus.Core\EPPlus.Core.xproj", "{C3EB7AEC-CCF7-42B8-B137-0A8AE146FBC1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EPPlus.Core", "src\EPPlus.Core\EPPlus.Core.csproj", "{C3EB7AEC-CCF7-42B8-B137-0A8AE146FBC1}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EPPlus.Core.FunctionalTests", "src\EPPlus.Core.FunctionalTests\EPPlus.Core.FunctionalTests.xproj", "{B3F95982-4924-42B0-A23A-D5CA7895F92C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EPPlus.Core.FunctionalTests", "src\EPPlus.Core.FunctionalTests\EPPlus.Core.FunctionalTests.csproj", "{B3F95982-4924-42B0-A23A-D5CA7895F92C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
6 changes: 0 additions & 6 deletions global.json

This file was deleted.

30 changes: 30 additions & 0 deletions src/EPPlus.Core.FunctionalTests/EPPlus.Core.FunctionalTests.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<AssemblyName>EPPlus.Core.FunctionalTests</AssemblyName>
<PackageId>EPPlus.Core.FunctionalTests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<PackageTargetFallback>$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<RuntimeFrameworkVersion>1.1.1</RuntimeFrameworkVersion>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\EPPlus.Core\EPPlus.Core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.13" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.13" />
</ItemGroup>

<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>

</Project>
22 changes: 0 additions & 22 deletions src/EPPlus.Core.FunctionalTests/EPPlus.Core.FunctionalTests.xproj

This file was deleted.

26 changes: 0 additions & 26 deletions src/EPPlus.Core.FunctionalTests/project.json

This file was deleted.

85 changes: 85 additions & 0 deletions src/EPPlus.Core/EPPlus.Core.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>EPPlus.Core is an unofficial port of the EPPlus library to .NET Core.</Description>
<VersionPrefix>1.3.1</VersionPrefix>
<Authors>Vahid Nasiri</Authors>
<TargetFrameworks>net40;net45;net46;netstandard1.3</TargetFrameworks>
<DefineConstants>$(DefineConstants);NO_SFX</DefineConstants>
<NoWarn>$(NoWarn);1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AssemblyName>EPPlus.Core</AssemblyName>
<PackageId>EPPlus.Core</PackageId>
<PackageTags>EPPlus;aspnetcore;Excel;Export;Report;Reporting;OOXML</PackageTags>
<PackageProjectUrl>https://github.com/VahidN/EPPlus.Core</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/VahidN/EPPlus.Core/blob/master/LICENSE.md</PackageLicenseUrl>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.3' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.1</NetStandardImplicitPackageVersion>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Security" />
<Reference Include="System.Drawing" />
<Reference Include="System.Data" />
<Reference Include="PresentationCore" />
<Reference Include="System.Web" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Security" />
<Reference Include="System.Drawing" />
<Reference Include="System.Data" />
<Reference Include="PresentationCore" />
<Reference Include="System.Web" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Security" />
<Reference Include="System.Drawing" />
<Reference Include="System.Data" />
<Reference Include="PresentationCore" />
<Reference Include="System.Web" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<DefineConstants>$(DefineConstants);COREFX</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<PlatformTarget>anycpu</PlatformTarget>
</PropertyGroup>

<Target Name="PostcompileScript" AfterTargets="Build" Condition=" '$(IsCrossTargetingBuild)' != 'true' ">
<Exec Command="dotnet pack --no-build --configuration $(Configuration)" />
</Target>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="CoreCompat.System.Drawing" Version="1.0.0-beta006" />
<PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
<PackageReference Include="System.Data.Common" Version="4.3.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Security.Claims" Version="4.3.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.3.0" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
<PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
<PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
<PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
</ItemGroup>

</Project>
21 changes: 0 additions & 21 deletions src/EPPlus.Core/EPPlus.Core.xproj

This file was deleted.

99 changes: 0 additions & 99 deletions src/EPPlus.Core/project.json

This file was deleted.

0 comments on commit d28d3ef

Please sign in to comment.