diff --git a/GitHub.Unity.sln b/GitHub.Unity.sln index 0197b47fc..c9da69500 100644 --- a/GitHub.Unity.sln +++ b/GitHub.Unity.sln @@ -5,8 +5,12 @@ VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Unity", "src\UnityExtension\Assets\Editor\GitHub.Unity\GitHub.Unity.csproj", "{ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Unity.45", "src\UnityExtension\Assets\Editor\GitHub.Unity\GitHub.Unity.45.csproj", "{ADD7A18B-DD2A-4C22-A2C1-488964EFF30B}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Api", "src\GitHub.Api\GitHub.Api.csproj", "{B389ADAF-62CC-486E-85B4-2D8B078DF763}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Api.45", "src\GitHub.Api\GitHub.Api.45.csproj", "{B389ADAF-62CC-486E-85B4-2D8B078DF76B}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Logging", "src\GitHub.Logging\GitHub.Logging.csproj", "{BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CopyLibrariesToDevelopmentFolder", "src\packaging\CopyLibrariesToDevelopmentFolder\CopyLibrariesToDevelopmentFolder.csproj", "{44257C81-EE4A-4817-9AF4-A26C02AA6DD4}" @@ -31,6 +35,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestWebServer", "src\tests\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityTests", "src\UnityExtension\Assets\Editor\UnityTests\UnityTests.csproj", "{462CDBD4-0DDA-4854-1B13-CFDACBFB66F5}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionLoader", "src\UnityExtension\Assets\Editor\GitHub.Unity\ExtensionLoader\ExtensionLoader.csproj", "{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -46,6 +52,13 @@ Global {ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}.dev|Any CPU.Build.0 = dev|Any CPU {ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}.Release|Any CPU.Build.0 = Release|Any CPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30B}.DebugNoUnity|Any CPU.ActiveCfg = Debug|Any CPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30B}.dev|Any CPU.ActiveCfg = dev|Any CPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30B}.dev|Any CPU.Build.0 = dev|Any CPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30B}.Release|Any CPU.Build.0 = Release|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.Debug|Any CPU.Build.0 = Debug|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.DebugNoUnity|Any CPU.ActiveCfg = Debug|Any CPU @@ -54,6 +67,14 @@ Global {B389ADAF-62CC-486E-85B4-2D8B078DF763}.dev|Any CPU.Build.0 = dev|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.Release|Any CPU.ActiveCfg = Release|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.Release|Any CPU.Build.0 = Release|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF76B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF76B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF76B}.DebugNoUnity|Any CPU.ActiveCfg = Debug|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF76B}.DebugNoUnity|Any CPU.Build.0 = Debug|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF76B}.dev|Any CPU.ActiveCfg = dev|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF76B}.dev|Any CPU.Build.0 = dev|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF76B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF76B}.Release|Any CPU.Build.0 = Release|Any CPU {BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.Debug|Any CPU.Build.0 = Debug|Any CPU {BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.DebugNoUnity|Any CPU.ActiveCfg = Debug|Any CPU @@ -132,6 +153,14 @@ Global {462CDBD4-0DDA-4854-1B13-CFDACBFB66F5}.dev|Any CPU.Build.0 = Debug|Any CPU {462CDBD4-0DDA-4854-1B13-CFDACBFB66F5}.Release|Any CPU.ActiveCfg = Release|Any CPU {462CDBD4-0DDA-4854-1B13-CFDACBFB66F5}.Release|Any CPU.Build.0 = Release|Any CPU + {6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.DebugNoUnity|Any CPU.ActiveCfg = Debug|Any CPU + {6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.DebugNoUnity|Any CPU.Build.0 = Debug|Any CPU + {6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.dev|Any CPU.ActiveCfg = dev|Any CPU + {6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.dev|Any CPU.Build.0 = dev|Any CPU + {6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -147,4 +176,7 @@ Global {3DD3451C-30FA-4294-A3A9-1E080342F867} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D} {462CDBD4-0DDA-4854-1B13-CFDACBFB66F5} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {66BD4D50-3779-4912-9596-2C838BF24911} + EndGlobalSection EndGlobal diff --git a/common/packaging.targets b/common/packaging.targets index 77f866e20..06609f4e6 100644 --- a/common/packaging.targets +++ b/common/packaging.targets @@ -7,8 +7,9 @@ @@ -25,13 +26,13 @@ Condition="!$([System.String]::Copy('%(Filename)').Contains('deleteme')) and !$([System.String]::Copy('%(Extension)').Contains('xml')) and !$([System.String]::Copy('%(Extension)').Contains('pdb')) and !$([System.String]::Copy('%(Extension)').Contains('dll.mdb'))" /> - + - + diff --git a/common/properties.props b/common/properties.props index 977f217b3..8316329ed 100644 --- a/common/properties.props +++ b/common/properties.props @@ -3,7 +3,7 @@ Internal - ENABLE_METRICS + ENABLE_METRICS $(BuildDefs);ENABLE_MONO $(SolutionDir)script\lib\ diff --git a/src/GitHub.Api/GitHub.Api.45.csproj b/src/GitHub.Api/GitHub.Api.45.csproj new file mode 100644 index 000000000..dd7be03ae --- /dev/null +++ b/src/GitHub.Api/GitHub.Api.45.csproj @@ -0,0 +1,284 @@ + + + + + Debug + AnyCPU + {B389ADAF-62CC-486E-85B4-2D8B078DF76B} + Library + Properties + GitHub.Unity + GitHub.Api.45 + v4.5 + 512 + + 6 + + + ..\UnityExtension\Assets\Editor\build\ + + + + true + full + false + DEBUG;TRACE;$(BuildDefs);NET_4_6 + prompt + 4 + false + false + true + + + pdbonly + true + TRACE;$(BuildDefs);NET_4_6 + prompt + 4 + Release + false + false + true + + + true + full + false + TRACE;DEBUG;DEVELOPER_BUILD;$(BuildDefs);NET_4_6 + prompt + 4 + false + false + true + ..\..\common\codeanalysis-debug.ruleset + + + Debug + + + + $(SolutionDir)lib\ICSharpCode.SharpZipLib.dll + + + $(SolutionDir)lib\Mono.Posix.dll + + + $(SolutionDir)\lib\sfw\sfw.net.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + True + True + Localization.resx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Metrics\MetricsService.cs + + + Properties\ApplicationInfo_Local.cs + + + + + + + Properties\ApplicationInfo_Local.cs-example + + + Properties\ApplicationInfo_Local.cs + + + + + + + {bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0} + GitHub.Logging + + + + + + + + + + + + + + + + + + PublicResXFileCodeGenerator + Localization.Designer.cs + Designer + + + + + + \ No newline at end of file diff --git a/src/GitHub.Api/Helpers/TaskHelpers.cs b/src/GitHub.Api/Helpers/TaskHelpers.cs index 33481c029..fb5695329 100644 --- a/src/GitHub.Api/Helpers/TaskHelpers.cs +++ b/src/GitHub.Api/Helpers/TaskHelpers.cs @@ -8,14 +8,18 @@ static class TaskHelpers { public static Task GetCompletedTask(T result) { +#if NET_4_6 + return Task.FromResult(result); +#else return TaskEx.FromResult(result); +#endif } public static Task ToTask(this Exception exception) { - TaskCompletionSource completionSource = new TaskCompletionSource(); - completionSource.TrySetException(exception); - return completionSource.Task; + TaskCompletionSource completionSource = new TaskCompletionSource(); + completionSource.TrySetException(exception); + return completionSource.Task; } } diff --git a/src/GitHub.Api/Properties/AssemblyInfo.cs b/src/GitHub.Api/Properties/AssemblyInfo.cs index 1c8fb5107..ecf892a01 100644 --- a/src/GitHub.Api/Properties/AssemblyInfo.cs +++ b/src/GitHub.Api/Properties/AssemblyInfo.cs @@ -3,6 +3,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("GitHub.Api")] -[assembly: AssemblyDescription("GitHub Api")] +[assembly: AssemblyDescription("GitHub for Unity API")] [assembly: Guid("4B424108-D0E8-4BF9-9B0C-4FB49E532AB9")] [assembly: InternalsVisibleTo("GitHub.Unity")] +[assembly: InternalsVisibleTo("GitHub.Unity.45")] diff --git a/src/GitHub.Logging/Extensions/ExceptionExtensions.cs b/src/GitHub.Logging/Extensions/ExceptionExtensions.cs index b22772799..9c4c0f71c 100644 --- a/src/GitHub.Logging/Extensions/ExceptionExtensions.cs +++ b/src/GitHub.Logging/Extensions/ExceptionExtensions.cs @@ -3,7 +3,7 @@ namespace GitHub.Logging { - static class ExceptionExtensions + public static class ExceptionExtensions { public static string GetExceptionMessage(this Exception ex) { diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs index 3d99d48f9..b1d83ca2c 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs @@ -1,9 +1,6 @@ using GitHub.Logging; using System; using System.IO; -using System.Net; -using System.Net.Security; -using System.Security.Cryptography.X509Certificates; using UnityEditor; using UnityEngine; diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef new file mode 100644 index 000000000..c400f84eb --- /dev/null +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef @@ -0,0 +1,8 @@ +{ + "name": "ExtensionLoader", + "references": [], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [] +} \ No newline at end of file diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.cs new file mode 100644 index 000000000..770a49ec5 --- /dev/null +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.cs @@ -0,0 +1,86 @@ +using UnityEditor; +using UnityEngine; +using System.IO; +using System; + +namespace GitHub.Unity +{ + [InitializeOnLoad] + public class ExtensionLoader : ScriptableSingleton + { + [SerializeField] private bool initialized = true; + + public bool Initialized + { + get + { + return initialized; + } + set + { + initialized = value; + Save(true); + } + } + + private static bool inSourceMode = false; + private const string sourceModePath = "Assets/Editor/build/"; + private const string realPath = "Assets/Plugins/GitHub/Editor/"; + + private static string[] assemblies20 = { "System.Threading.dll", "AsyncBridge.Net35.dll", "ReadOnlyCollectionsInterfaces.dll", "GitHub.Api.dll", "GitHub.Unity.dll" }; + private static string[] assemblies45 = { "GitHub.Api.45.dll", "GitHub.Unity.45.dll" }; + + static ExtensionLoader() + { + EditorApplication.update += Initialize; + } + + private static void Initialize() + { + EditorApplication.update -= Initialize; + + // we're always doing this right now because if the plugin gets updated all the meta files will be disabled and we need to re-enable them + // we should probably detect if our assets change and re-run this instead of doing it every time + //if (!ExtensionLoader.instance.Initialized) + { + var scriptPath = Path.Combine(Application.dataPath, "Editor" + Path.DirectorySeparatorChar + "GitHub.Unity" + Path.DirectorySeparatorChar + "EntryPoint.cs"); + inSourceMode = File.Exists(scriptPath); + ToggleAssemblies(); + //ExtensionLoader.instance.Initialized = true; + AssetDatabase.SaveAssets(); + } + + } + + private static void ToggleAssemblies() + { + var path = inSourceMode ? sourceModePath : realPath; +#if NET_4_6 + ToggleAssemblies(path, assemblies20, false); + ToggleAssemblies(path, assemblies45, true); +#else + ToggleAssemblies(path, assemblies45, false); + ToggleAssemblies(path, assemblies20, true); +#endif + } + + private static void ToggleAssemblies(string path, string[] assemblies, bool enable) + { + foreach (var file in assemblies) + { + var filepath = path + file; + PluginImporter importer = AssetImporter.GetAtPath(filepath) as PluginImporter; + if (importer == null) + { + Debug.LogFormat("GitHub for Unity: Could not find importer for {0}. Some functionality may fail.", filepath); + continue; + } + if (importer.GetCompatibleWithEditor() != enable) + { + importer.SetCompatibleWithEditor(enable); + importer.SaveAndReimport(); + } + } + } + } +} diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.csproj new file mode 100644 index 000000000..50ebe9826 --- /dev/null +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.csproj @@ -0,0 +1,77 @@ + + + + + Debug + AnyCPU + {6B0EAB30-511A-44C1-87FE-D9AB7E34D115} + Library + Properties + GitHub.Unity + ExtensionLoader + v3.5 + 512 + ..\..\..\..\obj\ + ..\..\..\..\obj\ + + + + true + full + false + DEBUG;TRACE;$(BuildDefs) + prompt + 4 + 4 + false + false + true + + + pdbonly + true + TRACE;$(BuildDefs) + prompt + 4 + 4 + Release + false + false + true + + + true + full + false + TRACE;DEBUG;DEVELOPER_BUILD;$(BuildDefs) + prompt + 4 + 4 + false + false + true + + + + + + $(UnityDir)Managed\UnityEditor.dll + False + + + $(UnityDir)Managed\UnityEngine.dll + False + + + + + + + + \ No newline at end of file diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.45.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.45.csproj new file mode 100644 index 000000000..0f2f0f5ad --- /dev/null +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.45.csproj @@ -0,0 +1,226 @@ + + + + + Debug + AnyCPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30B} + Library + Properties + GitHub.Unity + GitHub.Unity.45 + v4.5 + 512 + $(SolutionDir)\unity\TestProject\Assets\Plugins\GitHub\Editor + ..\..\..\obj\ + + + + true + full + false + DEBUG;TRACE;$(BuildDefs);NET_4_6 + prompt + 4 + 4 + false + false + true + + + pdbonly + true + TRACE;$(BuildDefs);NET_4_6 + prompt + 4 + 4 + Release + false + false + true + + + true + full + false + TRACE;DEBUG;DEVELOPER_BUILD;$(BuildDefs);NET_4_6 + prompt + 4 + 4 + false + false + true + + + + + + + + + $(UnityDir)Managed\UnityEditor.dll + False + + + $(UnityDir)Managed\UnityEngine.dll + False + + + + + {b389adaf-62cc-486e-85b4-2d8b078df76B} + GitHub.Api.45 + + + {bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0} + GitHub.Logging + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + eula.txt + PreserveNewest + + + credits.txt + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Properties/AssemblyInfo.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Properties/AssemblyInfo.cs index effeac2f0..a320c4438 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/Properties/AssemblyInfo.cs +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/Properties/AssemblyInfo.cs @@ -2,6 +2,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("GitHub.Api")] -[assembly: AssemblyDescription("GitHub Api")] +[assembly: AssemblyTitle("GitHub.Unity")] +[assembly: AssemblyDescription("GitHub for Unity")] [assembly: Guid("add7a18b-dd2a-4c22-a2c1-488964eff30a")] diff --git a/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj b/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj index c02403ad2..40067b0aa 100644 --- a/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj +++ b/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj @@ -9,9 +9,10 @@ Properties deleteme deleteme - v3.5 + v4.5 512 $(SolutionDir)src\UnityExtension\Assets\Editor\build + true @@ -20,6 +21,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -27,12 +29,20 @@ TRACE prompt 4 + false + + + {b389adaf-62cc-486e-85b4-2d8b078df763} GitHub.Api + + {b389adaf-62cc-486e-85b4-2d8b078df76B} + GitHub.Api.45 + {bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0} GitHub.Logging @@ -41,7 +51,6 @@ $(SolutionDir)\lib\sfw\sfw.net.dll True - diff --git a/src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.csproj b/src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.csproj index 179d6dbe3..35f9b738c 100644 --- a/src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.csproj +++ b/src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.csproj @@ -9,9 +9,10 @@ Properties deleteme deleteme - v3.5 + v4.5 512 build + Release @@ -20,6 +21,7 @@ TRACE prompt 4 + false Debug @@ -28,44 +30,62 @@ TRACE prompt 4 + false {b389adaf-62cc-486e-85b4-2d8b078df763} GitHub.Api + + {b389adaf-62cc-486e-85b4-2d8b078df76b} + GitHub.Api.45 + {bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0} GitHub.Logging + + {add7a18b-dd2a-4c22-a2c1-488964eff30b} + GitHub.Unity.45 + {add7a18b-dd2a-4c22-a2c1-488964eff30a} GitHub.Unity True - - $(SolutionDir)\packages\AsyncBridge.Net35.0.2.3333.0\lib\net35-Client\AsyncBridge.Net35.dll - True - - - $(SolutionDir)\packages\ReadOnlyCollectionInterfaces.1.0.0\lib\NET20\ReadOnlyCollectionsInterfaces.dll + + {add7a18b-dd2a-4c22-a2c1-488964eff30b} + GitHub.Unity True - + $(SolutionDir)\lib\sfw\sfw.net.dll True - - $(SolutionDir)\packages\TaskParallelLibrary.1.0.3333.0\lib\Net35\System.Threading.dll - True - + + ExtensionLoader.cs + PreserveNewest + + + ReadOnlyCollectionsInterfaces.dll + PreserveNewest + + + AsyncBridge.Net35.dll + PreserveNewest + + + System.Threading.dll + PreserveNewest + diff --git a/unity/PackageProject/.gitignore b/unity/PackageProject/.gitignore index 02fb6cbd5..aaecd01aa 100644 --- a/unity/PackageProject/.gitignore +++ b/unity/PackageProject/.gitignore @@ -9,6 +9,7 @@ *.dylib *.so *.bundle +*.cs ProjectVersion.txt Library/ diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/AsyncBridge.Net35.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/AsyncBridge.Net35.dll.meta index 68688858e..1c1d85763 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/AsyncBridge.Net35.dll.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/AsyncBridge.Net35.dll.meta @@ -1,25 +1,34 @@ fileFormatVersion: 2 guid: d516f2a1bec6a9645a084ef8c9237132 timeCreated: 1491391262 -licenseType: Pro +licenseType: Free PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/ExtensionLoader.cs.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/ExtensionLoader.cs.meta new file mode 100644 index 000000000..2060c1819 --- /dev/null +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/ExtensionLoader.cs.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: dae2ecee8a704dd59797e26554ff8606 +timeCreated: 1534504082 +licenseType: Free +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll.mdb.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll.mdb.meta new file mode 100644 index 000000000..d484c54df --- /dev/null +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll.mdb.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 181f65fb096cedd4493bc9971257d8b1 +timeCreated: 1534516893 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll.meta new file mode 100644 index 000000000..3b1911219 --- /dev/null +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.45.dll.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: c743ae24ee231884887054d20ccdd0ab +timeCreated: 1534504082 +licenseType: Free +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.mdb.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.mdb.meta index ce6d7087f..9b74d73ee 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.mdb.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.mdb.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: c5c83d14802e712408f23409f3c59e26 timeCreated: 1493304320 -licenseType: Pro +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.meta index aae704762..d12a12326 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Api.dll.meta @@ -1,25 +1,34 @@ fileFormatVersion: 2 guid: c743ae24ee231884887054d20ccdd0ae timeCreated: 1491391261 -licenseType: Pro +licenseType: Free PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.mdb.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.mdb.meta index 8ce5af844..d51a20eaf 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.mdb.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.mdb.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 guid: 23c8bee69b591054094d32918f98facd timeCreated: 1493304320 -licenseType: Pro +licenseType: Free DefaultImporter: userData: assetBundleName: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.meta index 3d04e1950..46ab48b16 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Logging.dll.meta @@ -1,25 +1,34 @@ fileFormatVersion: 2 guid: 15ca2bebf173f2d4484686a03a45b56d timeCreated: 1491391259 -licenseType: Pro +licenseType: Free PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll.mdb.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll.mdb.meta new file mode 100644 index 000000000..bc30ebed8 --- /dev/null +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll.mdb.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 877ef3585573ce44eab899298be23158 +timeCreated: 1534516893 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll.meta new file mode 100644 index 000000000..1fcd625de --- /dev/null +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.45.dll.meta @@ -0,0 +1,34 @@ +fileFormatVersion: 2 +guid: 68c7e4565cde54155bb78d8e935f1ddb +timeCreated: 1534504082 +licenseType: Free +PluginImporter: + serializedVersion: 2 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.dll.meta index 2187c3a65..a70aca527 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.dll.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/GitHub.Unity.dll.meta @@ -19,7 +19,7 @@ PluginImporter: first: Editor: Editor second: - enabled: 1 + enabled: 0 settings: DefaultValueInitialized: true data: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/ICSharpCode.SharpZipLib.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/ICSharpCode.SharpZipLib.dll.meta index 8abfa3131..cb9cd75f4 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/ICSharpCode.SharpZipLib.dll.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/ICSharpCode.SharpZipLib.dll.meta @@ -1,25 +1,34 @@ fileFormatVersion: 2 guid: ecfb28d906a32914d956497c8d3b3395 timeCreated: 1493304328 -licenseType: Pro +licenseType: Free PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/Mono.Posix.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/Mono.Posix.dll.meta index 7f984fd53..7a71232e5 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/Mono.Posix.dll.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/Mono.Posix.dll.meta @@ -19,7 +19,7 @@ PluginImporter: first: Editor: Editor second: - enabled: 1 + enabled: 0 settings: DefaultValueInitialized: true data: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta index ad958912e..98b231bec 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/ReadOnlyCollectionsInterfaces.dll.meta @@ -1,25 +1,34 @@ fileFormatVersion: 2 guid: 48c22d5d7479fcb49ab3be0cdd2ccec0 timeCreated: 1491391260 -licenseType: Pro +licenseType: Free PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/System.Threading.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/System.Threading.dll.meta index 9f8232768..ea6a32d4c 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/System.Threading.dll.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/System.Threading.dll.meta @@ -1,25 +1,34 @@ fileFormatVersion: 2 guid: 790749ba7e4b18141953e39cb13f1b79 timeCreated: 1491392717 -licenseType: Pro +licenseType: Free PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/unity/PackageProject/Assets/Plugins/GitHub/Editor/sfw.net.dll.meta b/unity/PackageProject/Assets/Plugins/GitHub/Editor/sfw.net.dll.meta index a749fc943..11b151c05 100644 --- a/unity/PackageProject/Assets/Plugins/GitHub/Editor/sfw.net.dll.meta +++ b/unity/PackageProject/Assets/Plugins/GitHub/Editor/sfw.net.dll.meta @@ -1,25 +1,34 @@ fileFormatVersion: 2 guid: f9fc9b08ecd899944adf9860b4abd6b6 timeCreated: 1491392718 -licenseType: Pro +licenseType: Free PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 isOverridable: 0 platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 1 + settings: + DefaultValueInitialized: true + data: + first: + Windows Store Apps: WindowsStoreApps + second: + enabled: 0 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: