diff --git a/.gitignore b/.gitignore index 4c1d27896..5768e921d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,5 @@ _NCrunch_GitHub.Unity *.user .DS_Store build/ -TestResult.xml \ No newline at end of file +TestResult.xml +submodules/ \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 6200267e9..d9e14a3e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,3 @@ [submodule "script"] path = script url = git@github.com:github-for-unity/UnityBuildScripts -[submodule "submodules/octokit.net"] - path = submodules/octokit.net - url = https://github.com/editor-tools/octokit.net.git -[submodule "submodules/dotnet-httpclient35"] - path = submodules/dotnet-httpclient35 - url = https://github.com/shana/dotnet-httpClient35 diff --git a/GitHub.Unity.OctokitDebugging.sln b/GitHub.Unity.OctokitDebugging.sln new file mode 100644 index 000000000..8d9cef6c2 --- /dev/null +++ b/GitHub.Unity.OctokitDebugging.sln @@ -0,0 +1,132 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +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.Api", "src\GitHub.Api\GitHub.Api.csproj", "{B389ADAF-62CC-486E-85B4-2D8B078DF763}" +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}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\tests\UnitTests\UnitTests.csproj", "{69F13D9D-AD56-4EEC-AE10-D528EE23E1A9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests", "src\tests\IntegrationTests\IntegrationTests.csproj", "{1AC3F82E-AEAE-4C84-825C-207BB264FCFA}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D17F1B4C-42DC-4E78-BCEF-9F239A084C4D}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "packaging", "packaging", "{B50B646C-3B86-4BDA-9F2B-766F96608CE0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CopyLibrariesToPackageProject", "src\packaging\CopyLibrariesToPackageProject\CopyLibrariesToPackageProject.csproj", "{7DEF4226-7740-457F-9199-34174C49A978}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUtils", "src\tests\TestUtils\TestUtils.csproj", "{66A1D219-F61D-4AE4-9BD7-AAEB97276FFF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TaskSystem", "src\tests\TaskSystemIntegrationTests\TaskSystem.csproj", "{1A382F40-FD9E-43E1-89C1-320073F35CE9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestApp", "src\tests\TestApp\TestApp.csproj", "{08B87D2A-8CF1-4211-B7AA-5209F00F72F8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-httpclient35", "dotnet-httpclient35", "{C6854BB9-D594-46B0-9E10-72607CC97E77}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "octokit", "octokit", "{5C9C1D3B-0740-4EF3-A374-CCCD67FB6E48}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-35", "..\octokit.net\Octokit\Octokit-35.csproj", "{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http-net_3_5", "..\dotnet-httpclient35\System.Net.Http\System.Net.Http-net_3_5.csproj", "{9862694D-E4FA-418B-8692-A0280FEDDF36}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + dev|Any CPU = dev|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ADD7A18B-DD2A-4C22-A2C1-488964EFF30A}.dev|Any CPU.ActiveCfg = dev|Any CPU + {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 + {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}.dev|Any CPU.ActiveCfg = dev|Any CPU + {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 + {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}.dev|Any CPU.ActiveCfg = dev|Any CPU + {BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.dev|Any CPU.Build.0 = dev|Any CPU + {BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.Release|Any CPU.Build.0 = Release|Any CPU + {44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.dev|Any CPU.ActiveCfg = Debug|Any CPU + {44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.dev|Any CPU.Build.0 = Debug|Any CPU + {44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.Release|Any CPU.Build.0 = Release|Any CPU + {69F13D9D-AD56-4EEC-AE10-D528EE23E1A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69F13D9D-AD56-4EEC-AE10-D528EE23E1A9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69F13D9D-AD56-4EEC-AE10-D528EE23E1A9}.dev|Any CPU.ActiveCfg = Debug|Any CPU + {69F13D9D-AD56-4EEC-AE10-D528EE23E1A9}.dev|Any CPU.Build.0 = Debug|Any CPU + {69F13D9D-AD56-4EEC-AE10-D528EE23E1A9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69F13D9D-AD56-4EEC-AE10-D528EE23E1A9}.Release|Any CPU.Build.0 = Release|Any CPU + {1AC3F82E-AEAE-4C84-825C-207BB264FCFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1AC3F82E-AEAE-4C84-825C-207BB264FCFA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1AC3F82E-AEAE-4C84-825C-207BB264FCFA}.dev|Any CPU.ActiveCfg = Debug|Any CPU + {1AC3F82E-AEAE-4C84-825C-207BB264FCFA}.dev|Any CPU.Build.0 = Debug|Any CPU + {1AC3F82E-AEAE-4C84-825C-207BB264FCFA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1AC3F82E-AEAE-4C84-825C-207BB264FCFA}.Release|Any CPU.Build.0 = Release|Any CPU + {7DEF4226-7740-457F-9199-34174C49A978}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DEF4226-7740-457F-9199-34174C49A978}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DEF4226-7740-457F-9199-34174C49A978}.dev|Any CPU.ActiveCfg = Debug|Any CPU + {7DEF4226-7740-457F-9199-34174C49A978}.dev|Any CPU.Build.0 = Debug|Any CPU + {7DEF4226-7740-457F-9199-34174C49A978}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DEF4226-7740-457F-9199-34174C49A978}.Release|Any CPU.Build.0 = Release|Any CPU + {66A1D219-F61D-4AE4-9BD7-AAEB97276FFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {66A1D219-F61D-4AE4-9BD7-AAEB97276FFF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {66A1D219-F61D-4AE4-9BD7-AAEB97276FFF}.dev|Any CPU.ActiveCfg = Debug|Any CPU + {66A1D219-F61D-4AE4-9BD7-AAEB97276FFF}.dev|Any CPU.Build.0 = Debug|Any CPU + {66A1D219-F61D-4AE4-9BD7-AAEB97276FFF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {66A1D219-F61D-4AE4-9BD7-AAEB97276FFF}.Release|Any CPU.Build.0 = Release|Any CPU + {1A382F40-FD9E-43E1-89C1-320073F35CE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A382F40-FD9E-43E1-89C1-320073F35CE9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A382F40-FD9E-43E1-89C1-320073F35CE9}.dev|Any CPU.ActiveCfg = Debug|Any CPU + {1A382F40-FD9E-43E1-89C1-320073F35CE9}.dev|Any CPU.Build.0 = Debug|Any CPU + {1A382F40-FD9E-43E1-89C1-320073F35CE9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A382F40-FD9E-43E1-89C1-320073F35CE9}.Release|Any CPU.Build.0 = Release|Any CPU + {08B87D2A-8CF1-4211-B7AA-5209F00F72F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08B87D2A-8CF1-4211-B7AA-5209F00F72F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08B87D2A-8CF1-4211-B7AA-5209F00F72F8}.dev|Any CPU.ActiveCfg = Debug|Any CPU + {08B87D2A-8CF1-4211-B7AA-5209F00F72F8}.dev|Any CPU.Build.0 = Debug|Any CPU + {08B87D2A-8CF1-4211-B7AA-5209F00F72F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08B87D2A-8CF1-4211-B7AA-5209F00F72F8}.Release|Any CPU.Build.0 = Release|Any CPU + {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.dev|Any CPU.ActiveCfg = Debug|Any CPU + {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.dev|Any CPU.Build.0 = Debug|Any CPU + {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.Build.0 = Release|Any CPU + {9862694D-E4FA-418B-8692-A0280FEDDF36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9862694D-E4FA-418B-8692-A0280FEDDF36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9862694D-E4FA-418B-8692-A0280FEDDF36}.dev|Any CPU.ActiveCfg = Debug|Any CPU + {9862694D-E4FA-418B-8692-A0280FEDDF36}.dev|Any CPU.Build.0 = Debug|Any CPU + {9862694D-E4FA-418B-8692-A0280FEDDF36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9862694D-E4FA-418B-8692-A0280FEDDF36}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {44257C81-EE4A-4817-9AF4-A26C02AA6DD4} = {B50B646C-3B86-4BDA-9F2B-766F96608CE0} + {69F13D9D-AD56-4EEC-AE10-D528EE23E1A9} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D} + {1AC3F82E-AEAE-4C84-825C-207BB264FCFA} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D} + {7DEF4226-7740-457F-9199-34174C49A978} = {B50B646C-3B86-4BDA-9F2B-766F96608CE0} + {66A1D219-F61D-4AE4-9BD7-AAEB97276FFF} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D} + {1A382F40-FD9E-43E1-89C1-320073F35CE9} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D} + {08B87D2A-8CF1-4211-B7AA-5209F00F72F8} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D} + {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4} = {5C9C1D3B-0740-4EF3-A374-CCCD67FB6E48} + {9862694D-E4FA-418B-8692-A0280FEDDF36} = {C6854BB9-D594-46B0-9E10-72607CC97E77} + EndGlobalSection +EndGlobal diff --git a/GitHub.Unity.sln b/GitHub.Unity.sln index a0ba95294..e5ce29f0a 100644 --- a/GitHub.Unity.sln +++ b/GitHub.Unity.sln @@ -5,20 +5,10 @@ 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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "octokit", "octokit", "{7DB5B8B0-5126-4025-913C-74B090ED625B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-Extensions35", "submodules\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj", "{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit-35", "submodules\octokit.net\Octokit\Octokit-35.csproj", "{49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}" -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.Logging", "src\GitHub.Logging\GitHub.Logging.csproj", "{BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet-httpclient35", "dotnet-httpclient35", "{D0CFD3E7-5B2C-4A54-ABF1-514D06F0747A}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Net.Http-net_3_5", "submodules\dotnet-httpClient35\System.Net.Http\System.Net.Http-net_3_5.csproj", "{9862694D-E4FA-418B-8692-A0280FEDDF36}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CopyLibrariesToDevelopmentFolder", "src\packaging\CopyLibrariesToDevelopmentFolder\CopyLibrariesToDevelopmentFolder.csproj", "{44257C81-EE4A-4817-9AF4-A26C02AA6DD4}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\tests\UnitTests\UnitTests.csproj", "{69F13D9D-AD56-4EEC-AE10-D528EE23E1A9}" @@ -50,18 +40,6 @@ 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 - {EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.dev|Any CPU.ActiveCfg = Debug|Any CPU - {EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.dev|Any CPU.Build.0 = Debug|Any CPU - {EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}.Release|Any CPU.Build.0 = Release|Any CPU - {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.dev|Any CPU.ActiveCfg = Debug|Any CPU - {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.dev|Any CPU.Build.0 = Debug|Any CPU - {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4}.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}.dev|Any CPU.ActiveCfg = dev|Any CPU @@ -74,12 +52,6 @@ Global {BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.dev|Any CPU.Build.0 = dev|Any CPU {BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.Release|Any CPU.ActiveCfg = Release|Any CPU {BB6A8EDA-15D8-471B-A6ED-EE551E0B3BA0}.Release|Any CPU.Build.0 = Release|Any CPU - {9862694D-E4FA-418B-8692-A0280FEDDF36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9862694D-E4FA-418B-8692-A0280FEDDF36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9862694D-E4FA-418B-8692-A0280FEDDF36}.dev|Any CPU.ActiveCfg = Debug|Any CPU - {9862694D-E4FA-418B-8692-A0280FEDDF36}.dev|Any CPU.Build.0 = Debug|Any CPU - {9862694D-E4FA-418B-8692-A0280FEDDF36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9862694D-E4FA-418B-8692-A0280FEDDF36}.Release|Any CPU.Build.0 = Release|Any CPU {44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.Debug|Any CPU.Build.0 = Debug|Any CPU {44257C81-EE4A-4817-9AF4-A26C02AA6DD4}.dev|Any CPU.ActiveCfg = Debug|Any CPU @@ -127,9 +99,6 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {EB4B074E-62A7-4F1D-8F95-E64B7AEA0236} = {7DB5B8B0-5126-4025-913C-74B090ED625B} - {49EF16A2-5ED1-480F-80A1-D1D05D6C1BE4} = {7DB5B8B0-5126-4025-913C-74B090ED625B} - {9862694D-E4FA-418B-8692-A0280FEDDF36} = {D0CFD3E7-5B2C-4A54-ABF1-514D06F0747A} {44257C81-EE4A-4817-9AF4-A26C02AA6DD4} = {B50B646C-3B86-4BDA-9F2B-766F96608CE0} {69F13D9D-AD56-4EEC-AE10-D528EE23E1A9} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D} {1AC3F82E-AEAE-4C84-825C-207BB264FCFA} = {D17F1B4C-42DC-4E78-BCEF-9F239A084C4D} diff --git a/GitHub.Unity.v3.ncrunchsolution b/GitHub.Unity.v3.ncrunchsolution index 5793a81e1..f84c8c6e8 100644 --- a/GitHub.Unity.v3.ncrunchsolution +++ b/GitHub.Unity.v3.ncrunchsolution @@ -3,7 +3,6 @@ True submodules\octokit.net\Octokit\Octokit-35.csproj - submodules\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj src\UnitTests\UnitTests.csproj src\IntegrationTests\IntegrationTests.csproj submodules\dotnet-httpClient35\System.Net.Http\System.Net.Http-net_3_5.csproj diff --git a/build.sh b/build.sh index 0bc39a5b3..222965357 100755 --- a/build.sh +++ b/build.sh @@ -27,9 +27,9 @@ if [ -e "/c/" ]; then fi if [ x"$OS" == x"Windows" ]; then - common/nuget restore + common/nuget restore GitHub.Unity.sln else - nuget restore + nuget restore GitHub.Unity.sln fi xbuild GitHub.Unity.sln /verbosity:normal /property:Configuration=$Configuration /target:$Target || true diff --git a/common/build.targets b/common/build.targets new file mode 100644 index 000000000..f445eb766 --- /dev/null +++ b/common/build.targets @@ -0,0 +1,57 @@ + + + + + OctokitDebugging + Internal + + $(SolutionDir)\script\lib\ + $(SolutionDir)\lib\ + C:\Program Files (x86)\Unity\Editor\Data\Managed\ + \Applications\Unity\Unity.app\Contents\Managed\ + Debug + + + + + + Properties\SolutionInfo.cs + + + Properties\GitHub.ruleset + + + + + + + + + {9862694d-e4fa-418b-8692-a0280feddf36} + System.Net.Http-net_3_5 + + + {49ef16a2-5ed1-480f-80a1-d1d05d6c1be4} + Octokit-35 + + + + + + + $(SolutionDir)lib\octokit.net\Octokit.dll + + + $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll + + + + + + + + Location of Unity dlls is not set. You'll need to install Unity in a known location (the default installation directory for your system), or copy UnityEngine.dll and UnityEditor.dll to the {0}lib folder + + + + \ No newline at end of file diff --git a/common/packaging.targets b/common/packaging.targets new file mode 100644 index 000000000..b19e8dbf8 --- /dev/null +++ b/common/packaging.targets @@ -0,0 +1,72 @@ + + + + + $(SolutionDir)\unity\PackageProject\Assets\Editor\GitHub + $(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(CoreBuildDependsOn); + CopyMainAssembly + + + \ No newline at end of file diff --git a/common/unitylocation.props b/common/unitylocation.props deleted file mode 100644 index 5ccbd6a7f..000000000 --- a/common/unitylocation.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - $(SolutionDir)\script\lib\ - $(SolutionDir)\lib\ - C:\Program Files (x86)\Unity\Editor\Data\Managed\ - \Applications\Unity\Unity.app\Contents\Managed\ - - - - Location of Unity dlls is not set. You'll need to install Unity in a known location (the default installation directory for your system), or copy UnityEngine.dll and UnityEditor.dll to the {0}lib folder - - - - \ No newline at end of file diff --git a/docs/contributing/how-to-build.md b/docs/contributing/how-to-build.md index bd498f402..597a624aa 100644 --- a/docs/contributing/how-to-build.md +++ b/docs/contributing/how-to-build.md @@ -20,14 +20,17 @@ This repository is LFS-enabled. To clone it, you should use a git client that su ## How to Build -Clone the repository and its submodules in a git GUI client that supports Git LFS or via the command line with the following commands +Clone the repository and its submodules in a git GUI client that supports Git LFS, or via the command line with the following command: ``` git lfs clone https://github.com/github-for-unity/Unity -cd Unity -git submodule init +``` + +*Note*: git might complain that it can't checkout the `script` submodule. That submodule is not required for normal builds and you can ignore the error, +or run the following to stop it complaining: + +``` git submodule deinit script -git submodule update ``` ### Important pre-build steps @@ -65,3 +68,9 @@ The `GitHub.Unity.sln` solution includes several projects: - GitHub.Logging: A logging helper library - GitHub.Api: The core of the extension. This project is C#6 and includes async/await threading and other features that Unity cannot currently compile. - GitHub.Unity: Unity-specific code. This project is compilable by Unity + +## Other solutions + +Octokit is normally included as a prebuilt DLL (in the `lib` directory), but when updating Octokit or debugging issues with the 3.5 backport, it can sometimes be handy to reference the project directly. The `GitHub.Unity.OctokitDebugging.sln` solution is a helper solution that includes Octokit and dotnet-httpclient35 as referenced projects instead of prebuilt dlls. + +This solution requires a clone of [https://github.com/github-for-unity/octokit.net](https://github.com/github-for-unity/octokit.net) and [https://github.com/github-for-unity/dotnet-httpclient35](https://github.com/github-for-unity/dotnet-httpclient35) to exist next to your GitHub for Unity checkout. diff --git a/lib/octokit.net/Octokit.dll b/lib/octokit.net/Octokit.dll new file mode 100644 index 000000000..ebbe72d0b --- /dev/null +++ b/lib/octokit.net/Octokit.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8505b576308d2e03e825f94c9e9877c2f264e0ed4ecd8660e11cdcc91833e7b +size 741888 diff --git a/lib/octokit.net/Octokit.dll.mdb b/lib/octokit.net/Octokit.dll.mdb new file mode 100644 index 000000000..5a6a7c643 --- /dev/null +++ b/lib/octokit.net/Octokit.dll.mdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:284a267af8d47b2025e235fab86efbf9d96a4e985885283a5a3a65f27ca32aba +size 283050 diff --git a/lib/octokit.net/version.txt b/lib/octokit.net/version.txt new file mode 100644 index 000000000..abaf5bda9 --- /dev/null +++ b/lib/octokit.net/version.txt @@ -0,0 +1 @@ +0.23.0.1 0.23.0.1-gfu ec0882345e0a2ee4743b84e8471dfa6fa7219ca3 \ No newline at end of file diff --git a/lib/system.net.http_35/System.Net.Http.dll b/lib/system.net.http_35/System.Net.Http.dll new file mode 100644 index 000000000..ae8fbae89 --- /dev/null +++ b/lib/system.net.http_35/System.Net.Http.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a5c3872e7f813ca2f89901ee01ec8d4a9befd2ed340e022593ab1de4161e1795 +size 123904 diff --git a/lib/system.net.http_35/System.Net.Http.dll.mdb b/lib/system.net.http_35/System.Net.Http.dll.mdb new file mode 100644 index 000000000..64a223a2f --- /dev/null +++ b/lib/system.net.http_35/System.Net.Http.dll.mdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4cc3613dff867883414eb77b80f7580b9b6d80d58d5ec843f4f066c02e56bb79 +size 46994 diff --git a/lib/system.net.http_35/version.txt b/lib/system.net.http_35/version.txt new file mode 100644 index 000000000..e0a37b2d2 --- /dev/null +++ b/lib/system.net.http_35/version.txt @@ -0,0 +1 @@ +3.5.0.0 3.5.22000.1-gfu 23c6b1899fd48d2ff16f947fb0a8ce847d10464d \ No newline at end of file diff --git a/package.sh b/package.sh index 99deb9d98..692eb5224 100755 --- a/package.sh +++ b/package.sh @@ -37,9 +37,9 @@ if [ -e "/c/" ]; then fi if [ x"$OS" == x"Windows" ]; then - common/nuget restore + common/nuget restore GitHub.Unity.sln else - nuget restore + nuget restore GitHub.Unity.sln fi xbuild GitHub.Unity.sln /property:Configuration=$Configuration diff --git a/src/GitHub.Api/Authentication/LoginManager.cs b/src/GitHub.Api/Authentication/LoginManager.cs index d9b8a8c76..a9f2703fe 100644 --- a/src/GitHub.Api/Authentication/LoginManager.cs +++ b/src/GitHub.Api/Authentication/LoginManager.cs @@ -2,8 +2,6 @@ using System.Net; using System.Threading.Tasks; using Octokit; -using GitHub.Unity; -using Octokit_Extensions35; namespace GitHub.Unity { diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj index 995e310dd..18383dd54 100644 --- a/src/GitHub.Api/GitHub.Api.csproj +++ b/src/GitHub.Api/GitHub.Api.csproj @@ -1,6 +1,7 @@  + Debug AnyCPU @@ -11,7 +12,6 @@ GitHub.Api v3.5 512 - Internal bin\$(Configuration)\ 6 @@ -202,8 +202,6 @@ - - @@ -222,40 +220,29 @@ + + + + + Metrics\MetricsService.cs + + + Properties\ApplicationInfo_Local.cs + + + + + + + Properties\ApplicationInfo_Local.cs-example + + + Properties\ApplicationInfo_Local.cs + + + + - - Properties\SolutionInfo.cs - - - - - Properties\ApplicationInfo_Local.cs-example - - - Properties\ApplicationInfo_Local.cs - - - - - Metrics\MetricsService.cs - - - Properties\ApplicationInfo_Local.cs - - - - - {9862694D-E4FA-418B-8692-A0280FEDDF36} - System.Net.Http-net_3_5 - - - {eb4b074e-62a7-4f1d-8f95-e64b7aea0236} - Octokit-Extensions35 - - - {49ef16a2-5ed1-480f-80a1-d1d05d6c1be4} - Octokit-35 - {bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0} GitHub.Logging diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj index a6e8b365d..4b7308492 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj @@ -1,7 +1,6 @@  - Debug AnyCPU @@ -12,7 +11,6 @@ GitHub.Unity v3.5 512 - Internal $(SolutionDir)\unity\TestProject\Assets\Editor\ ..\..\..\obj\ @@ -46,9 +44,7 @@ $(SolutionDir)common\GitHub.ruleset 4 - - Debug - + False @@ -81,18 +77,10 @@ - - Metrics\MetricsInitialization.cs - - - Properties\SolutionInfo.cs - - - @@ -117,22 +105,20 @@ - - GitHub.ruleset - Designer + + + + + Metrics\MetricsInitialization.cs + + + + - - {eb4b074e-62a7-4f1d-8f95-e64b7aea0236} - Octokit-Extensions35 - - - {49ef16a2-5ed1-480f-80a1-d1d05d6c1be4} - Octokit-35 - {b389adaf-62cc-486e-85b4-2d8b078df763} GitHub.Api diff --git a/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj b/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj index 1db9838f4..4763b982b 100644 --- a/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj +++ b/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj @@ -29,18 +29,6 @@ 4 - - {9862694d-e4fa-418b-8692-a0280feddf36} - System.Net.Http-net_3_5 - - - {eb4b074e-62a7-4f1d-8f95-e64b7aea0236} - Octokit-Extensions35 - - - {49ef16a2-5ed1-480f-80a1-d1d05d6c1be4} - Octokit-35 - {b389adaf-62cc-486e-85b4-2d8b078df763} GitHub.Api @@ -83,6 +71,9 @@ + + + - - $(SolutionDir)\unity\PackageProject\Assets\Editor\GitHub - $(SolutionDir)..\github-unity-test\GitHubExtensionProject\Assets\Editor\GitHub - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(CoreBuildDependsOn); - CopyMainAssembly - - \ No newline at end of file diff --git a/src/tests/IntegrationTests/IntegrationTests.csproj b/src/tests/IntegrationTests/IntegrationTests.csproj index f41a22288..c593e8df7 100644 --- a/src/tests/IntegrationTests/IntegrationTests.csproj +++ b/src/tests/IntegrationTests/IntegrationTests.csproj @@ -1,6 +1,7 @@  + Debug AnyCPU @@ -85,11 +86,11 @@ - + {b389adaf-62cc-486e-85b4-2d8b078df763} GitHub.Api - + {bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0} GitHub.Logging @@ -97,7 +98,7 @@ {66a1d219-f61d-4ae4-9bd7-aaeb97276fff} TestUtils - + {add7a18b-dd2a-4c22-a2c1-488964eff30a} GitHub.Unity diff --git a/src/tests/IntegrationTests/Properties/AssemblyInfo.cs b/src/tests/IntegrationTests/Properties/AssemblyInfo.cs index 5038081f4..2a7bc4ea0 100644 --- a/src/tests/IntegrationTests/Properties/AssemblyInfo.cs +++ b/src/tests/IntegrationTests/Properties/AssemblyInfo.cs @@ -2,38 +2,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.Api.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.Api.Tests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: AssemblyTitle("IntegrationTests")] +[assembly: AssemblyDescription("GitHub for Unity integration tests")] [assembly: Guid("1ac3f82e-aeae-4c84-825c-207bb264fcfa")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -//Required for NSubstitute -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2", AllInternalsVisible = true)] \ No newline at end of file diff --git a/src/tests/UnitTests/Properties/AssemblyInfo.cs b/src/tests/UnitTests/Properties/AssemblyInfo.cs index d98f2f0ee..b0c2f6f9c 100644 --- a/src/tests/UnitTests/Properties/AssemblyInfo.cs +++ b/src/tests/UnitTests/Properties/AssemblyInfo.cs @@ -1,39 +1,6 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: AssemblyDescription("GitHub for Unity unit tests tests")] [assembly: Guid("69f13d9d-ad56-4eec-ae10-d528ee23e1a9")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -//Required for NSubstitute -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2", AllInternalsVisible = true)] diff --git a/src/tests/UnitTests/UnitTests.csproj b/src/tests/UnitTests/UnitTests.csproj index 4b9a58073..5c7f6c0d9 100644 --- a/src/tests/UnitTests/UnitTests.csproj +++ b/src/tests/UnitTests/UnitTests.csproj @@ -1,7 +1,7 @@  - + Debug AnyCPU @@ -105,14 +105,6 @@ - - {eb4b074e-62a7-4f1d-8f95-e64b7aea0236} - Octokit-Extensions35 - - - {49ef16a2-5ed1-480f-80a1-d1d05d6c1be4} - Octokit-35 - {B389ADAF-62CC-486E-85B4-2D8B078DF763} GitHub.Api diff --git a/submodules/dotnet-httpclient35 b/submodules/dotnet-httpclient35 deleted file mode 160000 index a341780f6..000000000 --- a/submodules/dotnet-httpclient35 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a341780f67fffa0bd4897d1e19c24270a11427ea diff --git a/submodules/octokit.net b/submodules/octokit.net deleted file mode 160000 index 85c30a2c2..000000000 --- a/submodules/octokit.net +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 85c30a2c2bb152008720b3465fe46597172cc831 diff --git a/unity/PackageProject/Assets/Editor/GitHub/Octokit-Extensions35.dll.mdb.meta b/unity/PackageProject/Assets/Editor/GitHub/Octokit-Extensions35.dll.mdb.meta deleted file mode 100644 index 91cfb2d89..000000000 --- a/unity/PackageProject/Assets/Editor/GitHub/Octokit-Extensions35.dll.mdb.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 376ccac306431234cb52fbd46dcbeb28 -timeCreated: 1493304320 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/unity/PackageProject/Assets/Editor/GitHub/Octokit-Extensions35.dll.meta b/unity/PackageProject/Assets/Editor/GitHub/Octokit-Extensions35.dll.meta deleted file mode 100644 index 1229e188a..000000000 --- a/unity/PackageProject/Assets/Editor/GitHub/Octokit-Extensions35.dll.meta +++ /dev/null @@ -1,25 +0,0 @@ -fileFormatVersion: 2 -guid: e1fbf0cc5e44c2245b0ed25ccca00270 -timeCreated: 1491391262 -licenseType: Pro -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - isOverridable: 0 - platformData: - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - DefaultValueInitialized: true - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/unity/PackageProject/Assets/Editor/GitHub/Octokit.dll.mdb.meta b/unity/PackageProject/Assets/Editor/GitHub/Octokit.dll.mdb.meta deleted file mode 100644 index 4c6cb3b16..000000000 --- a/unity/PackageProject/Assets/Editor/GitHub/Octokit.dll.mdb.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a967e869f85569948bbdf851652d77dc -timeCreated: 1493304320 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/unity/PackageProject/Assets/Editor/GitHub/System.Net.Http.dll.mdb.meta b/unity/PackageProject/Assets/Editor/GitHub/System.Net.Http.dll.mdb.meta deleted file mode 100644 index 9393f0b14..000000000 --- a/unity/PackageProject/Assets/Editor/GitHub/System.Net.Http.dll.mdb.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 49277e2cca68aad49bb9cfd59adaf0f0 -timeCreated: 1493304320 -licenseType: Pro -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: