Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for netstandard20 #89

Merged
merged 4 commits into from
Jun 11, 2018
Merged

Add support for netstandard20 #89

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4f2d6a6
Rename NETSTANDARD1_3 to NETCOREAPP1_0 in tests
jariq Jun 11, 2018
b837a26
Add netstandard2.0 and netcoreapp2.0 to target frameworks
jariq Jun 11, 2018
5a8880c
Build scripts for netstandard2.0
jariq Jun 11, 2018
a7c541a
Add netstandard2.0 to AppVeyor
jariq Jun 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add netstandard2.0 and netcoreapp2.0 to target frameworks
  • Loading branch information
@jariq
jariq committed Jun 11, 2018
commit b837a26bdbb57d28264b742aa8924cd8aca69321
5 changes: 2 additions & 3 deletions ...1Interop.NetStandard/Pkcs11Interop.DotNetCore.Tests/Pkcs11Interop.DotNetCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp1.1</TargetFramework>
<TargetFrameworks>netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
<RootNamespace>Net.Pkcs11Interop.Tests</RootNamespace>
<DefineConstants>$(DefineConstants);NETSTANDARD1_3</DefineConstants>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
Expand Down
6 changes: 3 additions & 3 deletions src/Pkcs11Interop.NetStandard/Pkcs11Interop.Mock/Pkcs11Interop.Mock.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
<RootNamespace>Net.Pkcs11Interop.Mock</RootNamespace>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
Expand Down
7 changes: 4 additions & 3 deletions src/Pkcs11Interop.NetStandard/Pkcs11Interop/Pkcs11Interop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
<RootNamespace>Net.Pkcs11Interop</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
Expand Down Expand Up @@ -2254,4 +2254,5 @@
<Link>regeneratecode.sh</Link>
</None>
</ItemGroup>

</Project>