Skip to content

Commit

Permalink
Removed obsolete nuget stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
tillwolff committed Sep 17, 2018
1 parent 6243c52 commit 4a981cb
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 24 deletions.
9 changes: 6 additions & 3 deletions EPPlus.Html.Test/EPPlus.Html.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="EPPlus, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
<HintPath>..\packages\EPPlus.4.1.0\lib\net40\EPPlus.dll</HintPath>
<Private>True</Private>
<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" />
Expand Down
2 changes: 1 addition & 1 deletion EPPlus.Html.Test/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EPPlus" version="4.1.0" targetFramework="net452" />
<package id="EPPlus" version="4.5.2.1" targetFramework="net452" />
</packages>
9 changes: 3 additions & 6 deletions EPPlus.Html.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlus.Html", "EPPlus.Html\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EPPlus.Html.Test", "EPPlus.Html.Test\EPPlus.Html.Test.csproj", "{DB4C442E-D5FF-4DD2-A809-496D16646D9D}"
EndProject
Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "EPPlus.Html.Package", "EPPlus.Html.Package\EPPlus.Html.Package.nuproj", "{65524BC8-C7CB-402C-B200-BC8456AAAB53}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -23,12 +21,11 @@ Global
{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
{65524BC8-C7CB-402C-B200-BC8456AAAB53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{65524BC8-C7CB-402C-B200-BC8456AAAB53}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65524BC8-C7CB-402C-B200-BC8456AAAB53}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{65524BC8-C7CB-402C-B200-BC8456AAAB53}.Release|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AEC33DC9-51DC-4EFA-9EF8-DD3F9366056E}
EndGlobalSection
EndGlobal
18 changes: 6 additions & 12 deletions EPPlus.Html/EPPlus.Html.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\NuGet.Build.Packaging.0.1.227\build\NuGet.Build.Packaging.props" Condition="Exists('..\packages\NuGet.Build.Packaging.0.1.227\build\NuGet.Build.Packaging.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -34,12 +33,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="EPPlus, Version=4.1.0.0, Culture=neutral, PublicKeyToken=ea159fdaa78159a1, processorArchitecture=MSIL">
<HintPath>..\packages\EPPlus.4.1.0\lib\net40\EPPlus.dll</HintPath>
<Private>True</Private>
<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" />
Expand All @@ -62,14 +64,6 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NuGet.Build.Packaging.0.1.227\build\NuGet.Build.Packaging.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGet.Build.Packaging.0.1.227\build\NuGet.Build.Packaging.props'))" />
<Error Condition="!Exists('..\packages\NuGet.Build.Packaging.0.1.227\build\NuGet.Build.Packaging.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGet.Build.Packaging.0.1.227\build\NuGet.Build.Packaging.targets'))" />
</Target>
<Import Project="..\packages\NuGet.Build.Packaging.0.1.227\build\NuGet.Build.Packaging.targets" Condition="Exists('..\packages\NuGet.Build.Packaging.0.1.227\build\NuGet.Build.Packaging.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">
Expand Down
3 changes: 1 addition & 2 deletions EPPlus.Html/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EPPlus" version="4.1.0" targetFramework="net452" />
<package id="NuGet.Build.Packaging" version="0.1.227" targetFramework="net45" developmentDependency="true" />
<package id="EPPlus" version="4.5.2.1" targetFramework="net45" />
</packages>

0 comments on commit 4a981cb

Please sign in to comment.