From ee14db0a0e4093705d88652ddf1055a39c93f921 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Sun, 27 Jan 2019 17:19:03 +0900 Subject: [PATCH 1/3] Add UniJSON35 solution. Remove UniJSONPRofiling --- {UniJSONProfiling => UniJSON35}/.gitignore | 10 ++-- UniJSON35/UniJSON/Properties/AssemblyInfo.cs | 36 +++++++++++++ UniJSON35/UniJSON/UnityHelper.cs | 15 ++++++ UniJSON35/UniJSON35.sln | 31 +++++++++++ .../UniJSONPRofiling}/Program.cs | 3 +- .../Properties/AssemblyInfo.cs | 4 +- .../UniJSONPRofiling/UniJSONPRofiling.csproj | 53 +++++++++++++++++++ UniJSONProfiling/App.config | 6 --- UniJSONProfiling/Program.cs.meta | 12 ----- UniJSONProfiling/Properties.meta | 9 ---- .../Properties/AssemblyInfo.cs.meta | 12 ----- UniJSONProfiling/UniJSONPRofiling.csproj.meta | 8 --- UniJSONProfiling/UniJSONPRofiling.sln.meta | 8 --- 13 files changed, 143 insertions(+), 64 deletions(-) rename {UniJSONProfiling => UniJSON35}/.gitignore (75%) create mode 100644 UniJSON35/UniJSON/Properties/AssemblyInfo.cs create mode 100644 UniJSON35/UniJSON/UnityHelper.cs create mode 100644 UniJSON35/UniJSON35.sln rename {UniJSONProfiling => UniJSON35/UniJSONPRofiling}/Program.cs (90%) rename {UniJSONProfiling => UniJSON35/UniJSONPRofiling}/Properties/AssemblyInfo.cs (93%) create mode 100644 UniJSON35/UniJSONPRofiling/UniJSONPRofiling.csproj delete mode 100644 UniJSONProfiling/App.config delete mode 100644 UniJSONProfiling/Program.cs.meta delete mode 100644 UniJSONProfiling/Properties.meta delete mode 100644 UniJSONProfiling/Properties/AssemblyInfo.cs.meta delete mode 100644 UniJSONProfiling/UniJSONPRofiling.csproj.meta delete mode 100644 UniJSONProfiling/UniJSONPRofiling.sln.meta diff --git a/UniJSONProfiling/.gitignore b/UniJSON35/.gitignore similarity index 75% rename from UniJSONProfiling/.gitignore rename to UniJSON35/.gitignore index 2f96ad8ed..f2027e52e 100644 --- a/UniJSONProfiling/.gitignore +++ b/UniJSON35/.gitignore @@ -1,8 +1,8 @@ -/.vs -/bin -/bin.meta -/obj -/obj.meta +.vs +bin +bin.meta +obj +obj.meta *.csproj.user *.csproj.user.meta *.psess diff --git a/UniJSON35/UniJSON/Properties/AssemblyInfo.cs b/UniJSON35/UniJSON/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..82beac6a7 --- /dev/null +++ b/UniJSON35/UniJSON/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 +// アセンブリに関連付けられている情報を変更するには、 +// これらの属性値を変更してください。 +[assembly: AssemblyTitle("UniJSON35")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("UniJSON35")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// ComVisible を false に設定すると、このアセンブリ内の型は COM コンポーネントから +// 参照できなくなります。COM からこのアセンブリ内の型にアクセスする必要がある場合は、 +// その型の ComVisible 属性を true に設定してください。 +[assembly: ComVisible(false)] + +// このプロジェクトが COM に公開される場合、次の GUID が typelib の ID になります +[assembly: Guid("7df65fb7-fc53-4ef8-ac2f-1c825d67c767")] + +// アセンブリのバージョン情報は次の 4 つの値で構成されています: +// +// メジャー バージョン +// マイナー バージョン +// ビルド番号 +// Revision +// +// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます +// 以下のように '*' を使用します: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/UniJSON35/UniJSON/UnityHelper.cs b/UniJSON35/UniJSON/UnityHelper.cs new file mode 100644 index 000000000..fa0807d58 --- /dev/null +++ b/UniJSON35/UniJSON/UnityHelper.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace UnityEngine +{ + [Serializable] + public struct Vector3 + { + public float x; + public float y; + public float z; + } +} diff --git a/UniJSON35/UniJSON35.sln b/UniJSON35/UniJSON35.sln new file mode 100644 index 000000000..71885c50c --- /dev/null +++ b/UniJSON35/UniJSON35.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.168 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniJSONPRofiling", "UniJSONPRofiling\UniJSONPRofiling.csproj", "{DF2210F3-F3ED-4C53-A124-FA57EEF4580E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniJSON", "UniJSON\UniJSON.csproj", "{7DF65FB7-FC53-4EF8-AC2F-1C825D67C767}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {DF2210F3-F3ED-4C53-A124-FA57EEF4580E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DF2210F3-F3ED-4C53-A124-FA57EEF4580E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DF2210F3-F3ED-4C53-A124-FA57EEF4580E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DF2210F3-F3ED-4C53-A124-FA57EEF4580E}.Release|Any CPU.Build.0 = Release|Any CPU + {7DF65FB7-FC53-4EF8-AC2F-1C825D67C767}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DF65FB7-FC53-4EF8-AC2F-1C825D67C767}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DF65FB7-FC53-4EF8-AC2F-1C825D67C767}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DF65FB7-FC53-4EF8-AC2F-1C825D67C767}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {286D805B-571C-4178-B33C-3424B905C7F6} + EndGlobalSection +EndGlobal diff --git a/UniJSONProfiling/Program.cs b/UniJSON35/UniJSONPRofiling/Program.cs similarity index 90% rename from UniJSONProfiling/Program.cs rename to UniJSON35/UniJSONPRofiling/Program.cs index 40c2187f6..f6ef1ff50 100644 --- a/UniJSONProfiling/Program.cs +++ b/UniJSON35/UniJSONPRofiling/Program.cs @@ -1,7 +1,7 @@ using System.IO; using System.Text; -#if UNIJSON_PROFILING + namespace UniJSONPRofiling { class Program @@ -13,4 +13,3 @@ namespace UniJSONPRofiling } } } -#endif \ No newline at end of file diff --git a/UniJSONProfiling/Properties/AssemblyInfo.cs b/UniJSON35/UniJSONPRofiling/Properties/AssemblyInfo.cs similarity index 93% rename from UniJSONProfiling/Properties/AssemblyInfo.cs rename to UniJSON35/UniJSONPRofiling/Properties/AssemblyInfo.cs index 9f185fc74..53c7ea4e4 100644 --- a/UniJSONProfiling/Properties/AssemblyInfo.cs +++ b/UniJSON35/UniJSONPRofiling/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("UniJSONPRofiling")] -[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // このプロジェクトが COM に公開される場合、次の GUID が typelib の ID になります -[assembly: Guid("59cc2d5e-d4c5-4118-b6db-d6a9d9ba01f1")] +[assembly: Guid("df2210f3-f3ed-4c53-a124-fa57eef4580e")] // アセンブリのバージョン情報は次の 4 つの値で構成されています: // diff --git a/UniJSON35/UniJSONPRofiling/UniJSONPRofiling.csproj b/UniJSON35/UniJSONPRofiling/UniJSONPRofiling.csproj new file mode 100644 index 000000000..aca4a57bd --- /dev/null +++ b/UniJSON35/UniJSONPRofiling/UniJSONPRofiling.csproj @@ -0,0 +1,53 @@ + + + + + Debug + AnyCPU + {DF2210F3-F3ED-4C53-A124-FA57EEF4580E} + Exe + UniJSONPRofiling + UniJSONPRofiling + v3.5 + 512 + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + {7df65fb7-fc53-4ef8-ac2f-1c825d67c767} + UniJSON + + + + \ No newline at end of file diff --git a/UniJSONProfiling/App.config b/UniJSONProfiling/App.config deleted file mode 100644 index 731f6de6c..000000000 --- a/UniJSONProfiling/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/UniJSONProfiling/Program.cs.meta b/UniJSONProfiling/Program.cs.meta deleted file mode 100644 index a309fb35a..000000000 --- a/UniJSONProfiling/Program.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: a9e570967f10a8b4bb492b9dde8366a9 -timeCreated: 1533801169 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UniJSONProfiling/Properties.meta b/UniJSONProfiling/Properties.meta deleted file mode 100644 index 037ecf939..000000000 --- a/UniJSONProfiling/Properties.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 281449d948b75bf438f20f57379e18fb -folderAsset: yes -timeCreated: 1533801167 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/UniJSONProfiling/Properties/AssemblyInfo.cs.meta b/UniJSONProfiling/Properties/AssemblyInfo.cs.meta deleted file mode 100644 index 1f9f0a132..000000000 --- a/UniJSONProfiling/Properties/AssemblyInfo.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 08ef0de807abd6a47b854bd0e546d64e -timeCreated: 1533801169 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/UniJSONProfiling/UniJSONPRofiling.csproj.meta b/UniJSONProfiling/UniJSONPRofiling.csproj.meta deleted file mode 100644 index 41854a922..000000000 --- a/UniJSONProfiling/UniJSONPRofiling.csproj.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 442d08a1c2a1c1045a9e56364fefbc22 -timeCreated: 1533801167 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/UniJSONProfiling/UniJSONPRofiling.sln.meta b/UniJSONProfiling/UniJSONPRofiling.sln.meta deleted file mode 100644 index 93e7fad58..000000000 --- a/UniJSONProfiling/UniJSONPRofiling.sln.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 920f66a990de731479c5bc11d2a3b420 -timeCreated: 1533801168 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: From ebef0bce4824a09a797189146623dd0b46d6dd54 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Sun, 27 Jan 2019 17:30:23 +0900 Subject: [PATCH 2/3] Added UniJSONTests --- UniJSON35/.gitignore | 2 +- UniJSON35/UniJSON35.sln | 6 ++ .../UniJSONTests/Properties/AssemblyInfo.cs | 36 ++++++++++ UniJSON35/UniJSONTests/UniJSONTests.csproj | 70 +++++++++++++++++++ UniJSON35/UniJSONTests/packages.config | 5 ++ 5 files changed, 118 insertions(+), 1 deletion(-) create mode 100644 UniJSON35/UniJSONTests/Properties/AssemblyInfo.cs create mode 100644 UniJSON35/UniJSONTests/UniJSONTests.csproj create mode 100644 UniJSON35/UniJSONTests/packages.config diff --git a/UniJSON35/.gitignore b/UniJSON35/.gitignore index f2027e52e..742f06041 100644 --- a/UniJSON35/.gitignore +++ b/UniJSON35/.gitignore @@ -12,4 +12,4 @@ obj.meta *.vspx *.vspx.meta App.config.meta - +packages diff --git a/UniJSON35/UniJSON35.sln b/UniJSON35/UniJSON35.sln index 71885c50c..106dade29 100644 --- a/UniJSON35/UniJSON35.sln +++ b/UniJSON35/UniJSON35.sln @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniJSONPRofiling", "UniJSON EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniJSON", "UniJSON\UniJSON.csproj", "{7DF65FB7-FC53-4EF8-AC2F-1C825D67C767}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniJSONTests", "UniJSONTests\UniJSONTests.csproj", "{B946FAE6-FA0E-40C3-BCC2-803CF3040F0F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {7DF65FB7-FC53-4EF8-AC2F-1C825D67C767}.Debug|Any CPU.Build.0 = Debug|Any CPU {7DF65FB7-FC53-4EF8-AC2F-1C825D67C767}.Release|Any CPU.ActiveCfg = Release|Any CPU {7DF65FB7-FC53-4EF8-AC2F-1C825D67C767}.Release|Any CPU.Build.0 = Release|Any CPU + {B946FAE6-FA0E-40C3-BCC2-803CF3040F0F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B946FAE6-FA0E-40C3-BCC2-803CF3040F0F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B946FAE6-FA0E-40C3-BCC2-803CF3040F0F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B946FAE6-FA0E-40C3-BCC2-803CF3040F0F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UniJSON35/UniJSONTests/Properties/AssemblyInfo.cs b/UniJSON35/UniJSONTests/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..eed738de3 --- /dev/null +++ b/UniJSON35/UniJSONTests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。 +// アセンブリに関連付けられている情報を変更するには、 +// これらの属性値を変更してください。 +[assembly: AssemblyTitle("UniJSONTests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("UniJSONTests")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// ComVisible を false に設定すると、このアセンブリ内の型は COM コンポーネントから +// 参照できなくなります。COM からこのアセンブリ内の型にアクセスする必要がある場合は、 +// その型の ComVisible 属性を true に設定してください。 +[assembly: ComVisible(false)] + +// このプロジェクトが COM に公開される場合、次の GUID が typelib の ID になります +[assembly: Guid("b946fae6-fa0e-40c3-bcc2-803cf3040f0f")] + +// アセンブリのバージョン情報は次の 4 つの値で構成されています: +// +// メジャー バージョン +// マイナー バージョン +// ビルド番号 +// Revision +// +// すべての値を指定するか、次を使用してビルド番号とリビジョン番号を既定に設定できます +// 以下のように '*' を使用します: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/UniJSON35/UniJSONTests/UniJSONTests.csproj b/UniJSON35/UniJSONTests/UniJSONTests.csproj new file mode 100644 index 000000000..6cdf35941 --- /dev/null +++ b/UniJSON35/UniJSONTests/UniJSONTests.csproj @@ -0,0 +1,70 @@ + + + + + + + Debug + AnyCPU + {B946FAE6-FA0E-40C3-BCC2-803CF3040F0F} + Library + Properties + UniJSONTests + UniJSONTests + v4.0 + 512 + true + + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\NUnit.3.11.0\lib\net35\nunit.framework.dll + + + + + + + + + + + + + + + {7df65fb7-fc53-4ef8-ac2f-1c825d67c767} + UniJSON + + + + + + + + + このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。 + + + + + \ No newline at end of file diff --git a/UniJSON35/UniJSONTests/packages.config b/UniJSON35/UniJSONTests/packages.config new file mode 100644 index 000000000..d94a13cb9 --- /dev/null +++ b/UniJSON35/UniJSONTests/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From 40aa08d49a9fb87e8a2a951ad41c71273f894adf Mon Sep 17 00:00:00 2001 From: ousttrue Date: Sun, 27 Jan 2019 17:40:54 +0900 Subject: [PATCH 3/3] fixed .gitignore --- .gitignore | 4 +-- UniJSON35/UniJSON/UniJSON.csproj | 46 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 UniJSON35/UniJSON/UniJSON.csproj diff --git a/.gitignore b/.gitignore index 9d406cce0..6bab57fed 100644 --- a/.gitignore +++ b/.gitignore @@ -18,9 +18,9 @@ Assets/AssetStoreTools* # Autogenerated VS/MD/Consulo solution and project files ExportedObj/ .consulo/ -*.csproj +/*.csproj *.unityproj -*.sln +/*.sln *.suo *.tmp *.user diff --git a/UniJSON35/UniJSON/UniJSON.csproj b/UniJSON35/UniJSON/UniJSON.csproj new file mode 100644 index 000000000..4498ee504 --- /dev/null +++ b/UniJSON35/UniJSON/UniJSON.csproj @@ -0,0 +1,46 @@ + + + + + Debug + AnyCPU + {7DF65FB7-FC53-4EF8-AC2F-1C825D67C767} + Library + Properties + UniJSON35 + UniJSON35 + v3.5 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + +