Skip to content

Commit

Permalink
Merge pull request #18 from vitaliy-leschenko/master
Browse files Browse the repository at this point in the history
Added support to .NET Standard 1.0
  • Loading branch information
ENikS authored Jan 3, 2018
2 parents a15684c + e624656 commit 62efbb4
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions src/CommonServiceLocator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<Version>2.0.1</Version>
<PackageReleaseNotes>This release contains a portable class library that targets .NET 4.0, 4.5, and 4.7, .NET Core 1.0, and .NET Standard 2.0</PackageReleaseNotes>
<PackageReleaseNotes>This release contains a portable class library that targets .NET 4.0, 4.5, and 4.7, .NET Core 1.0, .NET Standard 1.0 and .NET Standard 2.0</PackageReleaseNotes>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -27,10 +27,14 @@
<RootNamespace>CommonServiceLocator</RootNamespace>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0' OR '$(TargetFramework)' == 'netstandard2.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0' OR '$(TargetFramework)' == 'netstandard1.0' OR '$(TargetFramework)' == 'netstandard2.0'">
<Compile Remove="ActivationException.Desktop.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
<PackageReference Include="System.ComponentModel" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != '' AND '$(TargetFramework)' != 'net40' ">
<Compile Remove="net40\**" />
<EmbeddedResource Remove="net40\**" />
Expand All @@ -39,7 +43,7 @@

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<TargetFrameworks>netcoreapp1.0;netstandard2.0;net40;net45;net47</TargetFrameworks>
<TargetFrameworks>netcoreapp1.0;netstandard1.0;netstandard2.0;net40;net45;net47</TargetFrameworks>
<OutputPath>$(SolutionDir)lib</OutputPath>
</PropertyGroup>

Expand Down

0 comments on commit 62efbb4

Please sign in to comment.