Skip to content

Commit

Permalink
Added the ability to target .net 4.5 or .net standard 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Unknown committed Dec 19, 2018
1 parent c1f9cd1 commit bea867f
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 7 deletions.
53 changes: 53 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just comment the entries below and
# uncomment the group further below
###############################################################################

*.sln text eol=crlf
*.csproj text eol=crlf
*.vbproj text eol=crlf
*.vcxproj text eol=crlf
*.vcproj text eol=crlf
*.dbproj text eol=crlf
*.fsproj text eol=crlf
*.lsproj text eol=crlf
*.wixproj text eol=crlf
*.modelproj text eol=crlf
*.sqlproj text eol=crlf
*.wmaproj text eol=crlf

*.xproj text eol=crlf
*.props text eol=crlf
*.filters text eol=crlf
*.vcxitems text eol=crlf


#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

#*.xproj merge=binary
#*.props merge=binary
#*.filters merge=binary
#*.vcxitems merge=binary
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFrameworks>netstandard1.6;net45</TargetFrameworks>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>Greg Cobb</Authors>
Expand All @@ -11,18 +10,24 @@
<RepositoryUrl>https://github.com/dbasoftware/freshdesksharp/</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>freshdesk</PackageTags>
<Version>0.2.0</Version>
<Version>0.2.1</Version>
<PackageLicenseUrl>https://github.com/dbasoftware/freshdesksharp/blob/master/LICENSE</PackageLicenseUrl>
<PackageId>FreshdeskSharp</PackageId>
<Product>FreshdeskSharp</Product>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
<AssemblyTitle>FreshdeskSharp .NET 4.5</AssemblyTitle>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
<AssemblyTitle>FreshdeskSharp .NET Standard 1.6</AssemblyTitle>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="NETStandard.Library" Version="1.6.0" />
<Reference Include="System.Net.Http" Condition="'$(TargetFramework)' == 'net45'" />
</ItemGroup>
<ItemGroup>
<PackageReference Update="NETStandard.Library" Condition="'$(TargetFramework)' == 'netstandard1.6'" Version="1.6.0" />
</ItemGroup>

</Project>

0 comments on commit bea867f

Please sign in to comment.