Skip to content

Commit

Permalink
Merge branch 'feature/support_dotnet_standard_2.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
eduardobursa committed Feb 9, 2019
2 parents f3138a4 + 9164c05 commit b993bf8
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 90 deletions.
2 changes: 1 addition & 1 deletion HelperSharp.Mvc/HelperSharp.Mvc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\HelperSharp\HelperSharp.csproj">
<Project>{25E1AB57-401D-43EF-8E89-36CD59EBB9BB}</Project>
<Project>{e19bd54e-9227-4ccc-bc85-a17000667886}</Project>
<Name>HelperSharp</Name>
</ProjectReference>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions HelperSharp.UnitTests/HelperSharp.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
<Name>HelperSharp.WebApi</Name>
</ProjectReference>
<ProjectReference Include="..\HelperSharp\HelperSharp.csproj">
<Project>{25E1AB57-401D-43EF-8E89-36CD59EBB9BB}</Project>
<Project>{e19bd54e-9227-4ccc-bc85-a17000667886}</Project>
<Name>HelperSharp</Name>
</ProjectReference>
</ItemGroup>
Expand All @@ -135,4 +135,4 @@
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
</Target>
</Project>
</Project>
37 changes: 20 additions & 17 deletions HelperSharp.sln
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelperSharp", "HelperSharp\HelperSharp.csproj", "{25E1AB57-401D-43EF-8E89-36CD59EBB9BB}"
EndProject
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2035
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelperSharp.UnitTests", "HelperSharp.UnitTests\HelperSharp.UnitTests.csproj", "{6E862BD0-5715-43A1-AF83-8D0CE4D76808}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{9B6C10D9-02CC-42B4-9AAB-18005DF7EB56}"
Expand All @@ -20,16 +20,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelperSharp.Pcl", "HelperSh
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelperSharp.Pcl.UnitTests", "HelperSharp.Pcl.UnitTests\HelperSharp.Pcl.UnitTests.csproj", "{10E69E96-C1CE-49B8-BC54-2FF4324B5C80}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelperSharp", "HelperSharp\HelperSharp.csproj", "{E19BD54E-9227-4CCC-BC85-A17000667886}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{10E69E96-C1CE-49B8-BC54-2FF4324B5C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10E69E96-C1CE-49B8-BC54-2FF4324B5C80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10E69E96-C1CE-49B8-BC54-2FF4324B5C80}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10E69E96-C1CE-49B8-BC54-2FF4324B5C80}.Release|Any CPU.Build.0 = Release|Any CPU
{6E862BD0-5715-43A1-AF83-8D0CE4D76808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6E862BD0-5715-43A1-AF83-8D0CE4D76808}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6E862BD0-5715-43A1-AF83-8D0CE4D76808}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E862BD0-5715-43A1-AF83-8D0CE4D76808}.Release|Any CPU.Build.0 = Release|Any CPU
{1D52592A-E34B-4449-80EF-27A293A20C3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1D52592A-E34B-4449-80EF-27A293A20C3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1D52592A-E34B-4449-80EF-27A293A20C3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand All @@ -38,22 +40,23 @@ Global
{249D705A-2BC7-4369-9762-D9F658217C4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{249D705A-2BC7-4369-9762-D9F658217C4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{249D705A-2BC7-4369-9762-D9F658217C4E}.Release|Any CPU.Build.0 = Release|Any CPU
{25E1AB57-401D-43EF-8E89-36CD59EBB9BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25E1AB57-401D-43EF-8E89-36CD59EBB9BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25E1AB57-401D-43EF-8E89-36CD59EBB9BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25E1AB57-401D-43EF-8E89-36CD59EBB9BB}.Release|Any CPU.Build.0 = Release|Any CPU
{6E862BD0-5715-43A1-AF83-8D0CE4D76808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6E862BD0-5715-43A1-AF83-8D0CE4D76808}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6E862BD0-5715-43A1-AF83-8D0CE4D76808}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6E862BD0-5715-43A1-AF83-8D0CE4D76808}.Release|Any CPU.Build.0 = Release|Any CPU
{92FE15FC-4FD4-4743-8E7B-EC74FF77DD03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{92FE15FC-4FD4-4743-8E7B-EC74FF77DD03}.Debug|Any CPU.Build.0 = Debug|Any CPU
{92FE15FC-4FD4-4743-8E7B-EC74FF77DD03}.Release|Any CPU.ActiveCfg = Release|Any CPU
{92FE15FC-4FD4-4743-8E7B-EC74FF77DD03}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{10E69E96-C1CE-49B8-BC54-2FF4324B5C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{10E69E96-C1CE-49B8-BC54-2FF4324B5C80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{10E69E96-C1CE-49B8-BC54-2FF4324B5C80}.Release|Any CPU.ActiveCfg = Release|Any CPU
{10E69E96-C1CE-49B8-BC54-2FF4324B5C80}.Release|Any CPU.Build.0 = Release|Any CPU
{E19BD54E-9227-4CCC-BC85-A17000667886}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E19BD54E-9227-4CCC-BC85-A17000667886}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E19BD54E-9227-4CCC-BC85-A17000667886}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E19BD54E-9227-4CCC-BC85-A17000667886}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6491D25F-9A3B-41DB-9D46-CC65D032E32D}
EndGlobalSection
EndGlobal
94 changes: 37 additions & 57 deletions HelperSharp/HelperSharp.csproj
Original file line number Diff line number Diff line change
@@ -1,68 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">

<!-- targets -->
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{25E1AB57-401D-43EF-8E89-36CD59EBB9BB}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>HelperSharp</RootNamespace>
<AssemblyName>HelperSharp</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworks>net35;net40;netstandard2.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;CODE_ANALYSIS</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DocumentationFile>bin\Debug\HelperSharp.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>

<!-- build -->
<PropertyGroup>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<DocumentationFile>bin\Release\HelperSharp.XML</DocumentationFile>
<RestorePackages>true</RestorePackages>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
</PropertyGroup>

<!-- assembly info -->
<PropertyGroup>
<AssemblyTitle>HelperSharp</AssemblyTitle>
<Company>Skahal Studios</Company>
<Copyright>Diego Giacomelli, http://diegogiacomelli.com.br</Copyright>
<Description>A set of helpers and extensions for C# programming.</Description>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>HelperSharp.snk</AssemblyOriginatorKeyFile>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
</PropertyGroup>

<!-- nuget package info -->
<PropertyGroup>
<AssemblyOriginatorKeyFile>HelperSharp.snk</AssemblyOriginatorKeyFile>
<Authors>Diego Giacomelli</Authors>
<Owners>g1acomell1</Owners>
<PackageId>HelperSharp</PackageId>
<PackageProjectUrl>https://github.com/giacomelli/HelperSharp</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/giacomelli/HelperSharp/blob/master/LICENSE</PackageLicenseUrl>
<RequireLicenseAcceptance>false</RequireLicenseAcceptance>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/giacomelli/HelperSharp.git</RepositoryUrl>
<PackageReleaseNotes>See changes at https://github.com/giacomelli/HelperSharp.</PackageReleaseNotes>
</PropertyGroup>

<PropertyGroup>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net35'">$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="MD5Helper.cs" />
<Compile Include="NameValueCollectionExtensions.cs" />
<Compile Include="Properties\AssemblyInfo.cs">
<ExcludeFromStyleCop>True</ExcludeFromStyleCop>
</Compile>
<Compile Include="CurrencyHelper.cs" />
<Compile Include="CharExtensions.cs" />
<Compile Include="ConvertibleExtensions.cs" />
<Compile Include="ReflectionHelper.cs" />
<Compile Include="GravatarHelper.cs" />
<Compile Include="ArrayExtensions.cs" />
<Compile Include="DateTimeExtensions.cs" />
<Compile Include="EnumerableExtensions.cs" />
<Compile Include="EnumerableHelper.cs" />
<Compile Include="ExceptionHelper.cs" />
<Compile Include="ExpressionHelper.cs" />
<Compile Include="ObjectHelper.cs" />
<Compile Include="StringExtensions.cs" />
</ItemGroup>
<ItemGroup>
<None Include="HelperSharp.snk" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

</Project>
15 changes: 4 additions & 11 deletions HelperSharp/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
using System;
using System;
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyTitle("HelperSharp")]
[assembly: AssemblyDescription("A set of helpers and extensions.")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Skahal Studios")]
[assembly: AssemblyProduct("HelperSharp")]
[assembly: AssemblyCopyright("giacomelli")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0")]
[assembly: AssemblyFileVersion("1.0.0")]

[assembly: CLSCompliant(false)]
[assembly: ComVisible(false)]
[assembly: CLSCompliant(false)]
[module: SuppressMessage("Microsoft.Design", "CA2210:AssembliesShouldHaveValidStrongNames")]
6 changes: 4 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
skip_tags: true
version: 0.5.{build}
os: Visual Studio 2017
configuration: Release

# configure environment / install required software in build process
Expand All @@ -18,6 +19,7 @@ nuget:

# restore nuget packages before build
before_build:
- dotnet --version
- nuget restore .\HelperSharp.sln

# build configuration
Expand All @@ -26,12 +28,12 @@ build:
verbosity: minimal

test_script:
- ps: .\packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -register:user -target:nunit-console.exe -register:user "-targetargs:""HelperSharp.UnitTests\bin\$env:CONFIGURATION\HelperSharp.UnitTests.dll"" /noshadow" -filter:"+[HelperSharp.*]*" -output:opencoverCoverage.xml
- ps: .\packages\OpenCover.4.6.166\tools\OpenCover.Console.exe -register:user -target:nunit-console.exe -register:user "-targetargs:""HelperSharp.UnitTests\bin\$env:CONFIGURATION\HelperSharp.UnitTests.dll"" /noshadow" -filter:"+[HelperSharp.UnitTests]*" -output:opencoverCoverage.xml
- ps: .\packages\coveralls.io.1.4.2\tools\coveralls.net.exe --opencover -f opencoverCoverage.xml -r $env:COVERALLS_REPO_TOKEN

# create nuget packages =]
after_build:
- nuget pack .\HelperSharp\HelperSharp.csproj -OutputDirectory .\build
- ps: dotnet pack .\HelperSharp\HelperSharp.csproj -c release -o ..\build -p:PackageVersion=$env:GitVersion_SemVer --no-build --include-symbols --include-source
- nuget pack .\HelperSharp.Mvc\HelperSharp.Mvc.csproj -OutputDirectory .\build
- nuget pack .\HelperSharp.WebApi\HelperSharp.WebApi.csproj -OutputDirectory .\build

Expand Down

0 comments on commit b993bf8

Please sign in to comment.