Skip to content

Commit

Permalink
Added suport for netstandard1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Tautz committed Feb 3, 2019
1 parent f413f1d commit a2be717
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 9 deletions.
13 changes: 9 additions & 4 deletions src/Viren.Core/Viren.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net46;netstandard2.0;</TargetFrameworks>
<TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net46;netstandard1.3;netstandard2.0;</TargetFrameworks>
<TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>0.5.6</Version>
<Version>0.5.7</Version>
<Authors>Teal Partners</Authors>
<Company>Teal Partners</Company>
<Product>Viren .NET client core library</Product>
Expand All @@ -19,7 +19,11 @@
<ApplicationIcon>icon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net46'">
<AssemblyTitle>Viren.Core .NET Framework 4.6</AssemblyTitle>
<AssemblyTitle>Viren.Core .NET 4.6</AssemblyTitle>
<DefineConstants>$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
<AssemblyTitle>Viren.Core .NET Standard 1.3</AssemblyTitle>
<DefineConstants>$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
Expand All @@ -29,7 +33,8 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net46'">
<ItemGroup Condition="'$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46'">
<Reference Include="System.Net.Http" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>0.5.6</Version>
<Version>0.5.7</Version>
<Authors>Teal Partners</Authors>
<Product>Viren execution .NET client</Product>
<RepositoryUrl>https://github.com/tealpartners/viren.net</RepositoryUrl>
Expand Down
12 changes: 8 additions & 4 deletions src/Viren.Execution/Viren.Execution.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net46;netstandard2.0;</TargetFrameworks>
<TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net46;netstandard1.3;netstandard2.0;</TargetFrameworks>
<TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>0.5.6</Version>
<Version>0.5.7</Version>
<Authors>Teal Partners</Authors>
<Product>Viren execution .NET client</Product>
<RepositoryUrl>https://github.com/tealpartners/viren.net</RepositoryUrl>
Expand All @@ -22,11 +22,15 @@
<RootNamespace>Viren.Execution</RootNamespace>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='net46'">
<AssemblyTitle>Viren.Execution .NET Framework 4.6</AssemblyTitle>
<AssemblyTitle>Viren.Core .NET 4.6</AssemblyTitle>
<DefineConstants>$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
<AssemblyTitle>Viren.Core .NET Standard 1.3</AssemblyTitle>
<DefineConstants>$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<AssemblyTitle>Viren.Execution .NET Standard 2.0</AssemblyTitle>
<AssemblyTitle>Viren.Core .NET Standard 2.0</AssemblyTitle>
<DefineConstants>$(AdditionalConstants)</DefineConstants>
</PropertyGroup>
<ItemGroup>
Expand Down

0 comments on commit a2be717

Please sign in to comment.