diff --git a/.editorconfig b/.editorconfig index 38880a44..e1863d51 100644 --- a/.editorconfig +++ b/.editorconfig @@ -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 diff --git a/CharLS.sln b/CharLS.sln index 015e2f08..9d86b633 100644 --- a/CharLS.sln +++ b/CharLS.sln @@ -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}" @@ -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 @@ -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 @@ -113,18 +99,18 @@ 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 @@ -132,11 +118,10 @@ Global 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} diff --git a/Directory.Build.props b/Directory.Build.props index b7f264ec..c6e8d1e5 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,6 +4,7 @@ $(SolutionDir)bin\$(Configuration)\$(Platform)\ $(SolutionDir)bin\$(Configuration)\x86\ + $(SolutionDir)bin\$(Configuration)\x86\ $(OutDir) diff --git a/net/AssemblyInfo.cs b/net/AssemblyInfo.cs new file mode 100644 index 00000000..67ada186 --- /dev/null +++ b/net/AssemblyInfo.cs @@ -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)] diff --git a/net/CharLS.ruleset b/net/CharLS.ruleset index dbc9b6b6..e73018d5 100644 --- a/net/CharLS.ruleset +++ b/net/CharLS.ruleset @@ -13,6 +13,7 @@ + diff --git a/net/CharLSNet.csproj b/net/CharLSNet.csproj index 0e13e68f..79369cd6 100644 --- a/net/CharLSNet.csproj +++ b/net/CharLSNet.csproj @@ -1,212 +1,40 @@ - - - + + - Debug - AnyCPU - 8.0.30703 - 2.0 - {6F9955C1-A285-4DE0-B3E6-F69EB08BBD7B} - Library - Properties - CharLS - CharLSNet - v4.6.2 - 512 - 0 - - true - CharLSKeyPair.snk - - - true - DEBUG;TRACE - true - full - AnyCPU - prompt - CharLS.ruleset - $(OutDir)CharLSNet.XML - True - False - True - False - False - False - True - True - False - False - False - True - True - False - False - False - True - False - True - True - False - True - - - - - - - - True - False - Full - Build - 0 - - - TRACE - $(OutDir)CharLSNet.XML - true - true - pdbonly - AnyCPU - prompt + + netstandard2.0 + + + ".NET interop layer for the CharLS JPEG-LS codec" + Team-CharLS + Team-CharLS + 2.0.1 + 2.0.0.0 + 2.0.0.0 + Copyright 2017 Team CharLS + AnyCPU;x64 + Debug;Release;Checked CharLS.ruleset - True - False - True - False - False - False - True - True - False - False - False - True - True - False - False - False - True - False - True - True - False - True - - - - - - - - True - False - ReleaseRequires - Build - 0 - - - true - CODE_ANALYSIS;DEBUG;TRACE - $(OutDir)\CharLSNet.XML - true - full - AnyCPU - true - prompt - CharLS.ruleset - True - False - True - False - False - True - True - True - True - True - False - True - True - False - False - False - False - False - True - True - False - True - - - - - - - - True - False - Full - Build - 3 - - - CharLS.ruleset - ..\bin_2017\Checked\x86\CharLSNet.xml - true - full - true - - - CharLS.ruleset - ..\bin_2017\Debug\x86\CharLSNet.xml - full + $(OutDir)CharLSNet.xml + - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - + - - + + + + - - - - + + + + + - - - \ No newline at end of file + + diff --git a/net/Properties/AssemblyInfo.cs b/net/Properties/AssemblyInfo.cs deleted file mode 100644 index 7911764f..00000000 --- a/net/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -// -// (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: AssemblyTitle("CharLSNet")] -[assembly: AssemblyDescription(".NET 4 Interop layer for the CharLS JPEG-LS codec")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("CharLS")] -[assembly: AssemblyCopyright("Copyright © Jan de Vaan 2007-2011")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -[assembly: CLSCompliant(true)] -[assembly: ComVisible(false)] - -[assembly: AssemblyVersion("1.1.0.0")] -[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/net/packages.config b/net/packages.config deleted file mode 100644 index 65e0b4e8..00000000 --- a/net/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/net14/CharLSNet_Standard14.csproj b/net14/CharLSNet_Standard14.csproj deleted file mode 100644 index 70a4c052..00000000 --- a/net14/CharLSNet_Standard14.csproj +++ /dev/null @@ -1,54 +0,0 @@ - - - netstandard1.4 - Debug;Release;Checked - - - True - - - - True - - - - True - - - - True - - - - True - - - - True - - - - True - - AnyCPU - - - True - - AnyCPU - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nettest/CharLSNetTest.csproj b/nettest/CharLSNetTest.csproj index 4771dd35..65bd595a 100644 --- a/nettest/CharLSNetTest.csproj +++ b/nettest/CharLSNetTest.csproj @@ -11,7 +11,7 @@ Properties CharLS.Test CharLSNetTest - v4.6.2 + v4.7 512 1 @@ -91,9 +91,6 @@ x86 - - ..\packages\NUnit.3.6.1\lib\net45\nunit.framework.dll - @@ -101,7 +98,6 @@ - @@ -187,7 +183,6 @@ DataFiles\TEST8R.PGM PreserveNewest - @@ -203,6 +198,11 @@ CharLSNet + + + 3.8.1 + +