From b9e73d4ece519cc2fdeb0515c3ab231ea01718a5 Mon Sep 17 00:00:00 2001 From: Jan Pluskal Date: Mon, 11 Nov 2019 13:41:05 +0100 Subject: [PATCH 1/6] Migrate to new vs2017+ csproj format. --- LICENSE => LICENSE.txt | 0 Properties/AssemblyInfo.cs | 23 --------- icon.png | Bin 0 -> 8812 bytes kaitai_struct_runtime_csharp.csproj | 72 +++++++++++++--------------- kaitai_struct_runtime_csharp.nuspec | 21 -------- 5 files changed, 34 insertions(+), 82 deletions(-) rename LICENSE => LICENSE.txt (100%) delete mode 100644 Properties/AssemblyInfo.cs create mode 100644 icon.png delete mode 100644 kaitai_struct_runtime_csharp.nuspec diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs deleted file mode 100644 index eb0def8..0000000 --- a/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -// NOTE: These attributes are used in the kaitai_struct_runtime_csharp.nuspec NuGet package config file. -[assembly: AssemblyTitle("Kaitai.Struct.Runtime")] -[assembly: AssemblyDescription("This library implements Kaitai Struct API for C#.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Kaitai Project")] -[assembly: AssemblyProduct("Kaitai Struct Runtime")] -[assembly: AssemblyCopyright("Copyright © Kaitai Project 2016-2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.7.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/icon.png b/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..537771f3f0db73f20631097e373ff06ec7206344 GIT binary patch literal 8812 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 literal 0 HcmV?d00001 diff --git a/kaitai_struct_runtime_csharp.csproj b/kaitai_struct_runtime_csharp.csproj index 1ae4432..54ae9b2 100644 --- a/kaitai_struct_runtime_csharp.csproj +++ b/kaitai_struct_runtime_csharp.csproj @@ -1,43 +1,39 @@ - - + + - Release - AnyCPU - {8339A750-C407-4CE8-8E31-51CB2EFD3A4B} - Library - Kaitai - Kaitai.Struct.Runtime - v4.5 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - false + netstandard2.0 + true + 1701;1702;CS1591 - - full - true - bin\Release - prompt - 4 - false - bin\Release\Kaitai.Struct.Runtime.xml + + + KaitaiStruct.Runtime.CSharp + + Kaitai Project + This library implements Kaitai Struct API for C#. + Kaitai Struct Runtime + Copyright © Kaitai Project 2016-2018 + Kaitai.Struct.Runtime + Kaitai + http://kaitai.io/ + https://github.com/kaitai-io/kaitai_struct_csharp_runtime + Kaitai Struct File-Format Binary Protocols + LICENSE.txt + icon.png + + 0.7.0.0 + 0.7.0.0 + 0.7.0.0 + + + Changed default namespace to Kaitai. + Changed assembly name to Kaitai.Struct.Runtime. + + - - - - - - - - - + + - - \ No newline at end of file + + diff --git a/kaitai_struct_runtime_csharp.nuspec b/kaitai_struct_runtime_csharp.nuspec deleted file mode 100644 index e7687e4..0000000 --- a/kaitai_struct_runtime_csharp.nuspec +++ /dev/null @@ -1,21 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - https://github.com/kaitai-io/kaitai_struct_csharp_runtime/blob/master/LICENSE - http://kaitai.io/ - https://avatars2.githubusercontent.com/u/17322584?s=280&v=4 - false - $description$ - - Changed default namespace to Kaitai. - Changed assembly name to Kaitai.Struct.Runtime. - - $copyright$ - Kaitai Struct File-Format Binary Protocols - - \ No newline at end of file From 5a7f5d53bb86088f7d28a241bb75d800c78bcb91 Mon Sep 17 00:00:00 2001 From: Jan Pluskal Date: Mon, 11 Nov 2019 14:28:14 +0100 Subject: [PATCH 2/6] Add multi-targeting for netstandard1.3;net4.5 --- kaitai_struct_runtime_csharp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaitai_struct_runtime_csharp.csproj b/kaitai_struct_runtime_csharp.csproj index 54ae9b2..1ac8803 100644 --- a/kaitai_struct_runtime_csharp.csproj +++ b/kaitai_struct_runtime_csharp.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + netstandard2.0;net4.5 true 1701;1702;CS1591 From 195ae93a4d991b479e4bb085e5ac675cdc294e7f Mon Sep 17 00:00:00 2001 From: Jan Pluskal Date: Wed, 13 Nov 2019 08:33:16 +0100 Subject: [PATCH 3/6] Bumping copyright to 2019 --- kaitai_struct_runtime_csharp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaitai_struct_runtime_csharp.csproj b/kaitai_struct_runtime_csharp.csproj index 1ac8803..0775ac3 100644 --- a/kaitai_struct_runtime_csharp.csproj +++ b/kaitai_struct_runtime_csharp.csproj @@ -12,7 +12,7 @@ Kaitai Project This library implements Kaitai Struct API for C#. Kaitai Struct Runtime - Copyright © Kaitai Project 2016-2018 + Copyright © Kaitai Project 2016-2019 Kaitai.Struct.Runtime Kaitai http://kaitai.io/ From 506dba7ca1eadc07990886c7c4e764465adfaaa9 Mon Sep 17 00:00:00 2001 From: Jan Pluskal Date: Wed, 13 Nov 2019 08:34:27 +0100 Subject: [PATCH 4/6] Remove obsolete PackageReleaseNotes --- kaitai_struct_runtime_csharp.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kaitai_struct_runtime_csharp.csproj b/kaitai_struct_runtime_csharp.csproj index 0775ac3..3f19290 100644 --- a/kaitai_struct_runtime_csharp.csproj +++ b/kaitai_struct_runtime_csharp.csproj @@ -25,10 +25,7 @@ 0.7.0.0 0.7.0.0 - - Changed default namespace to Kaitai. - Changed assembly name to Kaitai.Struct.Runtime. - + From 389a7cef09272c7587d789520089481d7ae92111 Mon Sep 17 00:00:00 2001 From: Jan Pluskal Date: Wed, 13 Nov 2019 08:36:16 +0100 Subject: [PATCH 5/6] Bupmping version to 0.8.0.0 --- kaitai_struct_runtime_csharp.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kaitai_struct_runtime_csharp.csproj b/kaitai_struct_runtime_csharp.csproj index 3f19290..f669ade 100644 --- a/kaitai_struct_runtime_csharp.csproj +++ b/kaitai_struct_runtime_csharp.csproj @@ -21,9 +21,9 @@ LICENSE.txt icon.png - 0.7.0.0 - 0.7.0.0 - 0.7.0.0 + 0.8.0.0 + 0.8.0.0 + 0.8.0.0 From 5380c408c267310ae584effc4d1f9e20b7149243 Mon Sep 17 00:00:00 2001 From: Jan Pluskal Date: Wed, 13 Nov 2019 08:43:07 +0100 Subject: [PATCH 6/6] Change TargetFrameworks to netstandard1.3;net4.5 to extend compatibility. --- kaitai_struct_runtime_csharp.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaitai_struct_runtime_csharp.csproj b/kaitai_struct_runtime_csharp.csproj index f669ade..5670c7b 100644 --- a/kaitai_struct_runtime_csharp.csproj +++ b/kaitai_struct_runtime_csharp.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net4.5 + netstandard1.3;net4.5 true 1701;1702;CS1591