Skip to content

Commit

Permalink
Update CharLSNet.csproj to target netstandard2.0
Browse files Browse the repository at this point in the history 
Targeting .NET Standard 2.0 allows usage of the .NET wrapper library on all platforms that support .NET core or the .NET framework.
  • Loading branch information
@vbaderks
vbaderks committed Oct 3, 2017
1 parent 44004d1 commit bb30a69
Show file tree
Hide file tree
Showing 12 changed files with 73 additions and 330 deletions.
8 changes: 4 additions & 4 deletions .editorconfig
View file
@@ -1,8 +1,8 @@
root = true

[{src}/**.{h,cpp}]
[*.{h,cpp,cs}]
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
43 changes: 14 additions & 29 deletions CharLS.sln
View file
Expand Up @@ -18,8 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharLSNet", "net\CharLSNet.csproj", "{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CharLSNetTest", "nettest\CharLSNetTest.csproj", "{002B897F-9D96-4A99-853F-53806C39559D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "samples\convert.c\Convert.vcxproj", "{F42C0547-FEB3-40F4-9379-0FF87B44FA0F}"
Expand All @@ -29,7 +27,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Convert", "samples\convert.
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CharLSUnitTest", "unittest\CharLSUnitTest.vcxproj", "{4A912445-1E83-41FA-8B80-C0A9BD4E9289}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CharLSNet_Standard14", "net14\CharLSNet_Standard14.csproj", "{368BA976-8A8A-425C-A082-52FAAD60DEEA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CharLSNet", "net\CharLSNet.csproj", "{CFC22FDD-A405-486A-AEFE-4231424B0AE5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -65,18 +63,6 @@ Global
{1E31F9F1-F175-4082-B3E2-B1F0ECA3F44C}.Release|Win32.Build.0 = Release|Win32
{1E31F9F1-F175-4082-B3E2-B1F0ECA3F44C}.Release|x64.ActiveCfg = Release|x64
{1E31F9F1-F175-4082-B3E2-B1F0ECA3F44C}.Release|x64.Build.0 = Release|x64
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Checked|Win32.ActiveCfg = Checked|Win32
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Checked|Win32.Build.0 = Checked|Win32
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Checked|x64.ActiveCfg = Checked|x64
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Checked|x64.Build.0 = Checked|x64
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Debug|Win32.ActiveCfg = Debug|Win32
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Debug|Win32.Build.0 = Debug|Win32
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Debug|x64.ActiveCfg = Debug|x64
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Debug|x64.Build.0 = Debug|x64
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Release|Win32.ActiveCfg = Release|Win32
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Release|Win32.Build.0 = Release|Win32
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Release|x64.ActiveCfg = Release|x64
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B}.Release|x64.Build.0 = Release|x64
{002B897F-9D96-4A99-853F-53806C39559D}.Checked|Win32.ActiveCfg = Checked|Win32
{002B897F-9D96-4A99-853F-53806C39559D}.Checked|Win32.Build.0 = Checked|Win32
{002B897F-9D96-4A99-853F-53806C39559D}.Checked|x64.ActiveCfg = Checked|x64
Expand Down Expand Up @@ -113,30 +99,29 @@ Global
{4A912445-1E83-41FA-8B80-C0A9BD4E9289}.Release|Win32.Build.0 = Release|Win32
{4A912445-1E83-41FA-8B80-C0A9BD4E9289}.Release|x64.ActiveCfg = Release|x64
{4A912445-1E83-41FA-8B80-C0A9BD4E9289}.Release|x64.Build.0 = Release|x64
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Checked|Win32.ActiveCfg = Checked|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Checked|Win32.Build.0 = Checked|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Checked|x64.ActiveCfg = Checked|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Checked|x64.Build.0 = Checked|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Debug|Win32.ActiveCfg = Debug|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Debug|Win32.Build.0 = Debug|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Debug|x64.ActiveCfg = Debug|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Debug|x64.Build.0 = Debug|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Release|Win32.ActiveCfg = Release|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Release|Win32.Build.0 = Release|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Release|x64.ActiveCfg = Release|Any CPU
{368BA976-8A8A-425C-A082-52FAAD60DEEA}.Release|x64.Build.0 = Release|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Checked|Win32.ActiveCfg = Debug|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Checked|Win32.Build.0 = Debug|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Checked|x64.ActiveCfg = Debug|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Checked|x64.Build.0 = Debug|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Debug|Win32.ActiveCfg = Debug|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Debug|Win32.Build.0 = Debug|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Debug|x64.ActiveCfg = Checked|x64
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Debug|x64.Build.0 = Checked|x64
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Release|Win32.ActiveCfg = Release|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Release|Win32.Build.0 = Release|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Release|x64.ActiveCfg = Release|Any CPU
{CFC22FDD-A405-486A-AEFE-4231424B0AE5}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{7185AD7F-57BA-42C7-A715-239CEA8ADC31} = {1C1CF63C-A53A-449F-90D3-63321015FD65}
{1E31F9F1-F175-4082-B3E2-B1F0ECA3F44C} = {1C1CF63C-A53A-449F-90D3-63321015FD65}
{6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B} = {A81B52AC-655D-4D1F-B21B-9BC4529AB447}
{002B897F-9D96-4A99-853F-53806C39559D} = {A81B52AC-655D-4D1F-B21B-9BC4529AB447}
{F42C0547-FEB3-40F4-9379-0FF87B44FA0F} = {BE733144-010D-4F7F-A619-0B73D8461D60}
{4A912445-1E83-41FA-8B80-C0A9BD4E9289} = {1C1CF63C-A53A-449F-90D3-63321015FD65}
{368BA976-8A8A-425C-A082-52FAAD60DEEA} = {A81B52AC-655D-4D1F-B21B-9BC4529AB447}
{CFC22FDD-A405-486A-AEFE-4231424B0AE5} = {A81B52AC-655D-4D1F-B21B-9BC4529AB447}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {9F2834D1-0A89-4C7C-93FC-B6B97410B1B7}
Expand Down
1 change: 1 addition & 0 deletions Directory.Build.props
View file
Expand Up @@ -4,6 +4,7 @@
<!-- Build to a folder outside the source folders, making it easier to clean. -->
<OutDir>$(SolutionDir)bin\$(Configuration)\$(Platform)\</OutDir>
<OutDir Condition="'$(Platform)'=='Win32'">$(SolutionDir)bin\$(Configuration)\x86\</OutDir>
<OutDir Condition="'$(Platform)'=='AnyCPU'">$(SolutionDir)bin\$(Configuration)\x86\</OutDir>

<!-- C# Projects require the legagy OutputPath variabl. -->
<OutputPath>$(OutDir)</OutputPath>
Expand Down
13 changes: 13 additions & 0 deletions net/AssemblyInfo.cs
View file
@@ -0,0 +1,13 @@
//
// (C) Jan de Vaan 2007-2011, all rights reserved. See the accompanying "License.txt" for licensed use.
//

using System;
using System.Reflection;
using System.Runtime.InteropServices;

[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: CLSCompliant(true)]
[assembly: ComVisible(false)]
1 change: 1 addition & 0 deletions net/CharLS.ruleset
View file
Expand Up @@ -13,6 +13,7 @@
<Rule Id="SA1116" Action="None" />
<Rule Id="SA1117" Action="None" />
<Rule Id="SA1120" Action="None" />
<Rule Id="SA1413" Action="None" />
<Rule Id="SA1503" Action="None" />
<Rule Id="SA1600" Action="None" />
<Rule Id="SA1633" Action="None" />
Expand Down

0 comments on commit bb30a69

Please sign in to comment.