Skip to content

Commit

Permalink
Removed net451 support, added netstandard 2.0 support
Browse files Browse the repository at this point in the history 
[release]
  • Loading branch information
@Lakritzator
Lakritzator committed Nov 12, 2018
1 parent f96f95c commit 5c8f2b4
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 39 deletions.
2 changes: 1 addition & 1 deletion src/Dapplo.Jira.PowerShell/AddJiraAttachment.cs
View file
Expand Up @@ -23,7 +23,7 @@

#endregion

#if NET451 || NET461
#if NET461

#region Usings

Expand Down
8 changes: 1 addition & 7 deletions src/Dapplo.Jira.PowerShell/Dapplo.Jira.PowerShell.csproj
View file
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Description>A library for accessing Atlassians JIRA from .NET via the PowerShell</Description>
<AssemblyTitle>Dapplo.Jira.PowerShell</AssemblyTitle>
<TargetFrameworks>net451;net461</TargetFrameworks>
<TargetFrameworks>net461</TargetFrameworks>
<AssemblyName>Dapplo.Jira.PowerShell</AssemblyName>
<PackageId>Dapplo.Jira.PowerShell</PackageId>
<PackageTags>atlassian;jira;dapplo;powershell</PackageTags>
Expand All @@ -15,12 +15,6 @@
<ItemGroup>
<ProjectReference Include="..\Dapplo.Jira\Dapplo.Jira.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
<Reference Include="System.Threading.Tasks" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="System.Management.Automation.dll" Version="10.0.10586" />
<Reference Include="System.Threading.Tasks" />
Expand Down
2 changes: 1 addition & 1 deletion src/Dapplo.Jira.PowerShell/GetJiraIssue.cs
View file
Expand Up @@ -23,7 +23,7 @@

#endregion

#if NET451 || NET461
#if NET461

#region Usings

Expand Down
2 changes: 1 addition & 1 deletion src/Dapplo.Jira.PowerShell/GetJiraProjects.cs
View file
Expand Up @@ -23,7 +23,7 @@

#endregion

#if NET451 || NET461
#if NET461

#region Usings

Expand Down
2 changes: 1 addition & 1 deletion src/Dapplo.Jira.PowerShell/Support/AsyncCmdlet.cs
View file
Expand Up @@ -23,7 +23,7 @@

#endregion

#if NET451 || NET461
#if NET461

#region Usings

Expand Down
2 changes: 1 addition & 1 deletion src/Dapplo.Jira.PowerShell/Support/AsyncPump.cs
View file
Expand Up @@ -23,7 +23,7 @@

#endregion

#if NET451 || NET461
#if NET461

#region Usings

Expand Down
11 changes: 5 additions & 6 deletions src/Dapplo.Jira.Tests/Dapplo.Jira.Tests.csproj
View file
Expand Up @@ -8,7 +8,6 @@
<TargetFramework>net461</TargetFramework>
<AssemblyName>Dapplo.Jira.Tests</AssemblyName>
<PackageId>Dapplo.Jira.Tests</PackageId>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
</PropertyGroup>

<ItemGroup>
Expand All @@ -22,16 +21,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.4" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.4" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Log" Version="1.3.11" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Dapplo.Utils" Version="1.1.3" />
<PackageReference Include="Dapplo.Utils" Version="1.1.9" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
Expand Down
2 changes: 1 addition & 1 deletion src/Dapplo.Jira/Converters/SvgBitmapHttpContentConverter.cs
View file
Expand Up @@ -24,7 +24,7 @@
#endregion


#if NET451 || NET461
#if NET461
using System;
using System.Drawing;
using System.Drawing.Imaging;
Expand Down
2 changes: 1 addition & 1 deletion src/Dapplo.Jira/Converters/SvgConfiguration.cs
View file
Expand Up @@ -24,7 +24,7 @@
#endregion


#if NET451 || NET461
#if NET461
using System.Collections.Generic;
using Dapplo.HttpExtensions;
using Dapplo.HttpExtensions.Extensions;
Expand Down
17 changes: 4 additions & 13 deletions src/Dapplo.Jira/Dapplo.Jira.csproj
View file
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Description>A library for accessing Atlassians Jira from .NET</Description>
<AssemblyTitle>Dapplo.Jira</AssemblyTitle>
<TargetFrameworks>netstandard1.3;net451;net461</TargetFrameworks>
<TargetFrameworks>netstandard1.3;netstandard2.0;net461</TargetFrameworks>
<AssemblyName>Dapplo.Jira</AssemblyName>
<PackageId>Dapplo.Jira</PackageId>
<PackageTags>atlassian;jira;dapplo</PackageTags>
Expand All @@ -15,20 +15,11 @@
<DebugSymbols>True</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.4" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.4" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PackageReference Include="Svg" Version="2.3.0" />
<Reference Include="System.Drawing" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.4" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Svg" Version="2.3.0" />
<Reference Include="System.Drawing" />
<Reference Include="System" />
Expand Down
8 changes: 2 additions & 6 deletions src/Dapplo.Jira/JiraClient.cs
View file
Expand Up @@ -35,11 +35,7 @@
using Dapplo.HttpExtensions.Extensions;
using System.Collections.Generic;
using System.Net.Http;
#endif

#if NET451 || NET461
using System.Linq;

using Dapplo.Jira.Converters;
using System.Net.Cache;
#endif
Expand Down Expand Up @@ -135,15 +131,15 @@ public static IJiraClient Create(Uri baseUri, JiraOAuthSettings jiraOAuthSetting
private IHttpBehaviour ConfigureBehaviour(IChangeableHttpBehaviour behaviour, IHttpSettings httpSettings = null)
{

#if NET451 || NET461
#if NET461
// Add SvgBitmapHttpContentConverter if it was not yet added
if (HttpExtensionsGlobals.HttpContentConverters.All(x => x.GetType() != typeof(SvgBitmapHttpContentConverter)))
{
HttpExtensionsGlobals.HttpContentConverters.Add(SvgBitmapHttpContentConverter.Instance.Value);
}
#endif
behaviour.HttpSettings = httpSettings ?? HttpExtensionsGlobals.HttpSettings.ShallowClone();
#if NET451 || NET461
#if NET461
// Disable caching, if no HTTP settings were provided.
if (httpSettings == null)
{
Expand Down

0 comments on commit 5c8f2b4

Please sign in to comment.