From 8fe2277c6d320f08271d906cc2e2f62477664ab8 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 29 Jun 2017 16:43:03 -0400 Subject: [PATCH 01/16] Moving ReadOnlyCollection to a different namespace --- submodules/octokit.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/octokit.net b/submodules/octokit.net index 85c30a2c2..c906fd70a 160000 --- a/submodules/octokit.net +++ b/submodules/octokit.net @@ -1 +1 @@ -Subproject commit 85c30a2c2bb152008720b3465fe46597172cc831 +Subproject commit c906fd70a850f0f6e05bb060409f260d2c9c2c4b From ab4cafb8dadecfc47a4f04f543701bdf08559424 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 29 Jun 2017 19:32:06 -0400 Subject: [PATCH 02/16] Changing the source of the submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 6200267e9..e376edbab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ 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 + url = https://github.com/github-for-unity/octokit.net.git [submodule "submodules/dotnet-httpclient35"] path = submodules/dotnet-httpclient35 url = https://github.com/shana/dotnet-httpClient35 From 7b2bc7292b3d82bf206de8f08aa4bb13af599b58 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 29 Jun 2017 20:44:49 -0400 Subject: [PATCH 03/16] Updating submodule and changeset --- .gitmodules | 2 +- submodules/octokit.net | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e376edbab..668a6a62a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = git@github.com:github-for-unity/UnityBuildScripts [submodule "submodules/octokit.net"] path = submodules/octokit.net - url = https://github.com/github-for-unity/octokit.net.git + url = https://github.com/github-for-unity/octokit.net [submodule "submodules/dotnet-httpclient35"] path = submodules/dotnet-httpclient35 url = https://github.com/shana/dotnet-httpClient35 diff --git a/submodules/octokit.net b/submodules/octokit.net index c906fd70a..f66a377f4 160000 --- a/submodules/octokit.net +++ b/submodules/octokit.net @@ -1 +1 @@ -Subproject commit c906fd70a850f0f6e05bb060409f260d2c9c2c4b +Subproject commit f66a377f4bac880aac2fa1706fbd66f4a978138f From a14edba8b090e893b31d543470d74d6e3bf76705 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 29 Jun 2017 20:45:46 -0400 Subject: [PATCH 04/16] Updating submodule location --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 668a6a62a..26f3559f5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = git@github.com:github-for-unity/UnityBuildScripts [submodule "submodules/octokit.net"] path = submodules/octokit.net - url = https://github.com/github-for-unity/octokit.net + url = https://github.com/github-for-unity/octokit.net.git [submodule "submodules/dotnet-httpclient35"] path = submodules/dotnet-httpclient35 - url = https://github.com/shana/dotnet-httpClient35 + url = https://github.com/github-for-unity/dotnet-httpClient35 From a89bf5c9db9ea3ae527332b99898134a148f19d6 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 29 Jun 2017 20:48:13 -0400 Subject: [PATCH 05/16] Last update --- submodules/octokit.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/octokit.net b/submodules/octokit.net index f66a377f4..34828e44c 160000 --- a/submodules/octokit.net +++ b/submodules/octokit.net @@ -1 +1 @@ -Subproject commit f66a377f4bac880aac2fa1706fbd66f4a978138f +Subproject commit 34828e44cd510d16aa4184ce1a89c708d65c98a8 From 7db26fdbccd64a8c2c680e6253dece83a9e600f3 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 29 Jun 2017 21:20:13 -0400 Subject: [PATCH 06/16] Updating gitmodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 26f3559f5..ff0bd4518 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = git@github.com:github-for-unity/UnityBuildScripts [submodule "submodules/octokit.net"] path = submodules/octokit.net - url = https://github.com/github-for-unity/octokit.net.git + url = https://github.com/github-for-unity/octokit.net [submodule "submodules/dotnet-httpclient35"] path = submodules/dotnet-httpclient35 url = https://github.com/github-for-unity/dotnet-httpClient35 From af21dcf3ce5f65cbda05118e06a0ec10b2570ca1 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Thu, 29 Jun 2017 21:40:30 -0400 Subject: [PATCH 07/16] Updating module --- submodules/octokit.net | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/octokit.net b/submodules/octokit.net index 34828e44c..0c7c67c74 160000 --- a/submodules/octokit.net +++ b/submodules/octokit.net @@ -1 +1 @@ -Subproject commit 34828e44cd510d16aa4184ce1a89c708d65c98a8 +Subproject commit 0c7c67c743998961b1f1daaaed52a12109358c25 From 38de5bf8e1f3f6ad0dd19dd101504527ce199976 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Fri, 30 Jun 2017 11:28:41 -0400 Subject: [PATCH 08/16] Removing submodules --- .gitmodules | 6 --- GitHub.Unity.sln | 31 ---------------- src/GitHub.Api/GitHub.Api.csproj | 12 ------ .../Editor/GitHub.Unity/GitHub.Unity.csproj | 8 ---- .../CopyLibrariesToDevelopmentFolder.csproj | 12 ------ .../CopyLibrariesToPackageProject.csproj | 37 +++---------------- src/tests/UnitTests/UnitTests.csproj | 8 ---- submodules/dotnet-httpclient35 | 1 - submodules/octokit.net | 1 - 9 files changed, 5 insertions(+), 111 deletions(-) delete mode 160000 submodules/dotnet-httpclient35 delete mode 160000 submodules/octokit.net diff --git a/.gitmodules b/.gitmodules index ff0bd4518..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/github-for-unity/octokit.net -[submodule "submodules/dotnet-httpclient35"] - path = submodules/dotnet-httpclient35 - url = https://github.com/github-for-unity/dotnet-httpClient35 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/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj index 995e310dd..5a884efb1 100644 --- a/src/GitHub.Api/GitHub.Api.csproj +++ b/src/GitHub.Api/GitHub.Api.csproj @@ -244,18 +244,6 @@ - - {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..ab42af8f8 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj @@ -125,14 +125,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/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj b/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj index 1db9838f4..936a5d99c 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 diff --git a/src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.csproj b/src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.csproj index 9935c0bd6..3d6802778 100644 --- a/src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.csproj +++ b/src/packaging/CopyLibrariesToPackageProject/CopyLibrariesToPackageProject.csproj @@ -30,18 +30,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 @@ -131,33 +119,18 @@ - + - + - - - - + + - + - diff --git a/src/tests/UnitTests/UnitTests.csproj b/src/tests/UnitTests/UnitTests.csproj index 4b9a58073..9630e13d2 100644 --- a/src/tests/UnitTests/UnitTests.csproj +++ b/src/tests/UnitTests/UnitTests.csproj @@ -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 0c7c67c74..000000000 --- a/submodules/octokit.net +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0c7c67c743998961b1f1daaaed52a12109358c25 From dbd40c8b4866c37d9e5435e0bde3b669ba119a1e Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Fri, 30 Jun 2017 12:40:16 -0400 Subject: [PATCH 09/16] Adding DLLs --- lib/octokit.net/Octokit-Extensions35.dll | 3 +++ lib/octokit.net/Octokit-Extensions35.pdb | 3 +++ lib/octokit.net/Octokit.dll | 3 +++ lib/octokit.net/Octokit.pdb | 3 +++ lib/system.net.http_35/System.Net.Http.dll | 3 +++ lib/system.net.http_35/System.Net.Http.pdb | 3 +++ 6 files changed, 18 insertions(+) create mode 100644 lib/octokit.net/Octokit-Extensions35.dll create mode 100644 lib/octokit.net/Octokit-Extensions35.pdb create mode 100644 lib/octokit.net/Octokit.dll create mode 100644 lib/octokit.net/Octokit.pdb create mode 100644 lib/system.net.http_35/System.Net.Http.dll create mode 100644 lib/system.net.http_35/System.Net.Http.pdb diff --git a/lib/octokit.net/Octokit-Extensions35.dll b/lib/octokit.net/Octokit-Extensions35.dll new file mode 100644 index 000000000..c23a27aff --- /dev/null +++ b/lib/octokit.net/Octokit-Extensions35.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ae00f182512e168b04e4b37b5b8df13834ceb375bf1c02f2f98d0f80c1f281b +size 4096 diff --git a/lib/octokit.net/Octokit-Extensions35.pdb b/lib/octokit.net/Octokit-Extensions35.pdb new file mode 100644 index 000000000..614683d8e --- /dev/null +++ b/lib/octokit.net/Octokit-Extensions35.pdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46f7b53e5fd368e3bd17368593cb1c058230c2c56bb85dc68f093b5353217423 +size 11776 diff --git a/lib/octokit.net/Octokit.dll b/lib/octokit.net/Octokit.dll new file mode 100644 index 000000000..e800a2727 --- /dev/null +++ b/lib/octokit.net/Octokit.dll @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:42bcae1226a85845d182552c2f7fbe4291eb1bce7ce592e55197a0a0b7f452b9 +size 797696 diff --git a/lib/octokit.net/Octokit.pdb b/lib/octokit.net/Octokit.pdb new file mode 100644 index 000000000..a2ebe36ee --- /dev/null +++ b/lib/octokit.net/Octokit.pdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ac6813373e2f0e6620136865fd5d5dbdc25c5ff0e8f8a6f4555834ebca7cccf +size 2084352 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..4ae27b8e5 --- /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:d260a11ea58869d49027034bc4f90edefd9d2b3b9109eb3d7ac0cf6f50e73c0e +size 132608 diff --git a/lib/system.net.http_35/System.Net.Http.pdb b/lib/system.net.http_35/System.Net.Http.pdb new file mode 100644 index 000000000..4d56e9eee --- /dev/null +++ b/lib/system.net.http_35/System.Net.Http.pdb @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4dbf1d544a49351aff50c37c4066a2f0e7d6154c58484c809bc5edcb3eaeec15 +size 390656 From 5ab2a5db0d4c8ebcad714f76ab6753e20f983972 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Fri, 30 Jun 2017 12:57:45 -0400 Subject: [PATCH 10/16] Modifying project files --- src/GitHub.Api/GitHub.Api.csproj | 9 +++++++++ .../Assets/Editor/GitHub.Unity/GitHub.Unity.csproj | 9 +++++++++ src/tests/IntegrationTests/IntegrationTests.csproj | 11 +++++++++++ src/tests/UnitTests/UnitTests.csproj | 9 +++++++++ 4 files changed, 38 insertions(+) diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj index 5a884efb1..c56bfe8bd 100644 --- a/src/GitHub.Api/GitHub.Api.csproj +++ b/src/GitHub.Api/GitHub.Api.csproj @@ -69,6 +69,12 @@ $(SolutionDir)lib\Mono.Security.dll + + ..\..\lib\octokit.net\Octokit.dll + + + ..\..\lib\octokit.net\Octokit-Extensions35.dll + $(SolutionDir)packages\Rackspace.Threading.2.0.0-alpha001\lib\net35-client\Rackspace.Threading.dll True @@ -83,6 +89,9 @@ + + ..\..\lib\system.net.http_35\System.Net.Http.dll + $(SolutionDir)packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll True diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj index ab42af8f8..391dbec62 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj @@ -54,12 +54,21 @@ False $(SolutionDir)\lib\Mono.Security.dll + + ..\..\..\..\..\lib\octokit.net\Octokit.dll + + + ..\..\..\..\..\lib\octokit.net\Octokit-Extensions35.dll + $(SolutionDir)\packages\Rackspace.Threading.2.0.0-alpha001\lib\net35-client\Rackspace.Threading.dll True + + ..\..\..\..\..\lib\system.net.http_35\System.Net.Http.dll + $(SolutionDir)\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll True diff --git a/src/tests/IntegrationTests/IntegrationTests.csproj b/src/tests/IntegrationTests/IntegrationTests.csproj index f41a22288..c8020786e 100644 --- a/src/tests/IntegrationTests/IntegrationTests.csproj +++ b/src/tests/IntegrationTests/IntegrationTests.csproj @@ -54,12 +54,23 @@ $(SolutionDir)packages\NUnit.2.6.4\lib\nunit.framework.dll True + + False + ..\..\..\lib\octokit.net\Octokit.dll + + + ..\..\..\lib\octokit.net\Octokit-Extensions35.dll + $(SolutionDir)packages\Rackspace.Threading.2.0.0-alpha001\lib\net35-client\Rackspace.Threading.dll True + + False + ..\..\..\lib\system.net.http_35\System.Net.Http.dll + $(SolutionDir)packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll True diff --git a/src/tests/UnitTests/UnitTests.csproj b/src/tests/UnitTests/UnitTests.csproj index 9630e13d2..7c0479cf7 100644 --- a/src/tests/UnitTests/UnitTests.csproj +++ b/src/tests/UnitTests/UnitTests.csproj @@ -58,12 +58,21 @@ $(SolutionDir)packages\NUnit.2.6.4\lib\nunit.framework.dll True + + ..\..\..\lib\octokit.net\Octokit.dll + + + ..\..\..\lib\octokit.net\Octokit-Extensions35.dll + $(SolutionDir)packages\Rackspace.Threading.2.0.0-alpha001\lib\net35-client\Rackspace.Threading.dll True + + ..\..\..\lib\system.net.http_35\System.Net.Http.dll + $(SolutionDir)packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll True From 292ad5afd070df0a2583437f9fc6eda7076671ce Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Fri, 30 Jun 2017 13:42:07 -0400 Subject: [PATCH 11/16] Creating an internal solution to build from local projects --- GitHub.Unity.Internal.sln | 141 ++++++++++++++++++ src/GitHub.Api/GitHub.Api.csproj | 41 +++-- .../Editor/GitHub.Unity/GitHub.Unity.csproj | 41 +++-- .../IntegrationTests/IntegrationTests.csproj | 49 ++++-- src/tests/UnitTests/UnitTests.csproj | 41 +++-- 5 files changed, 272 insertions(+), 41 deletions(-) create mode 100644 GitHub.Unity.Internal.sln diff --git a/GitHub.Unity.Internal.sln b/GitHub.Unity.Internal.sln new file mode 100644 index 000000000..d0a1133b9 --- /dev/null +++ b/GitHub.Unity.Internal.sln @@ -0,0 +1,141 @@ + +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}") = "Octokit-Extensions35", "..\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj", "{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}" +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 + {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 + {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} + {EB4B074E-62A7-4F1D-8F95-E64B7AEA0236} = {5C9C1D3B-0740-4EF3-A374-CCCD67FB6E48} + {9862694D-E4FA-418B-8692-A0280FEDDF36} = {C6854BB9-D594-46B0-9E10-72607CC97E77} + EndGlobalSection +EndGlobal diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj index c56bfe8bd..8e1fcbb27 100644 --- a/src/GitHub.Api/GitHub.Api.csproj +++ b/src/GitHub.Api/GitHub.Api.csproj @@ -11,6 +11,7 @@ GitHub.Api v3.5 512 + Internal Internal bin\$(Configuration)\ @@ -69,12 +70,6 @@ $(SolutionDir)lib\Mono.Security.dll - - ..\..\lib\octokit.net\Octokit.dll - - - ..\..\lib\octokit.net\Octokit-Extensions35.dll - $(SolutionDir)packages\Rackspace.Threading.2.0.0-alpha001\lib\net35-client\Rackspace.Threading.dll True @@ -89,9 +84,6 @@ - - ..\..\lib\system.net.http_35\System.Net.Http.dll - $(SolutionDir)packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll True @@ -252,6 +244,37 @@ 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 + + + + + + + $(SolutionDir)lib\octokit.net\Octokit.dll + + + $(SolutionDir)octokit.net\Octokit-Extensions35\bin\Debug\Octokit-Extensions35.dll + + + $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll + + + + {bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0} diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj index 391dbec62..02045ebe4 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj @@ -12,6 +12,7 @@ GitHub.Unity v3.5 512 + Internal Internal $(SolutionDir)\unity\TestProject\Assets\Editor\ ..\..\..\obj\ @@ -54,21 +55,12 @@ False $(SolutionDir)\lib\Mono.Security.dll - - ..\..\..\..\..\lib\octokit.net\Octokit.dll - - - ..\..\..\..\..\lib\octokit.net\Octokit-Extensions35.dll - $(SolutionDir)\packages\Rackspace.Threading.2.0.0-alpha001\lib\net35-client\Rackspace.Threading.dll True - - ..\..\..\..\..\lib\system.net.http_35\System.Net.Http.dll - $(SolutionDir)\packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll True @@ -133,6 +125,37 @@ Designer + + + + + {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 + + + + + + + $(SolutionDir)lib\octokit.net\Octokit.dll + + + $(SolutionDir)octokit.net\Octokit-Extensions35\bin\Debug\Octokit-Extensions35.dll + + + $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll + + + + {b389adaf-62cc-486e-85b4-2d8b078df763} diff --git a/src/tests/IntegrationTests/IntegrationTests.csproj b/src/tests/IntegrationTests/IntegrationTests.csproj index c8020786e..6c40b45a7 100644 --- a/src/tests/IntegrationTests/IntegrationTests.csproj +++ b/src/tests/IntegrationTests/IntegrationTests.csproj @@ -11,6 +11,7 @@ IntegrationTests v3.5 512 + Internal $(SolutionDir)build\$(AssemblyName) @@ -54,23 +55,12 @@ $(SolutionDir)packages\NUnit.2.6.4\lib\nunit.framework.dll True - - False - ..\..\..\lib\octokit.net\Octokit.dll - - - ..\..\..\lib\octokit.net\Octokit-Extensions35.dll - $(SolutionDir)packages\Rackspace.Threading.2.0.0-alpha001\lib\net35-client\Rackspace.Threading.dll True - - False - ..\..\..\lib\system.net.http_35\System.Net.Http.dll - $(SolutionDir)packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll True @@ -95,12 +85,43 @@ + + + + + {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 + + + + + + + $(SolutionDir)lib\octokit.net\Octokit.dll + + + $(SolutionDir)octokit.net\Octokit-Extensions35\bin\Debug\Octokit-Extensions35.dll + + + $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll + + + + - + {b389adaf-62cc-486e-85b4-2d8b078df763} GitHub.Api - + {bb6a8eda-15d8-471b-a6ed-ee551e0b3ba0} GitHub.Logging @@ -108,7 +129,7 @@ {66a1d219-f61d-4ae4-9bd7-aaeb97276fff} TestUtils - + {add7a18b-dd2a-4c22-a2c1-488964eff30a} GitHub.Unity diff --git a/src/tests/UnitTests/UnitTests.csproj b/src/tests/UnitTests/UnitTests.csproj index 7c0479cf7..0b80b0edb 100644 --- a/src/tests/UnitTests/UnitTests.csproj +++ b/src/tests/UnitTests/UnitTests.csproj @@ -12,6 +12,7 @@ UnitTests v3.5 512 + Internal $(SolutionDir)build\$(AssemblyName) @@ -58,21 +59,12 @@ $(SolutionDir)packages\NUnit.2.6.4\lib\nunit.framework.dll True - - ..\..\..\lib\octokit.net\Octokit.dll - - - ..\..\..\lib\octokit.net\Octokit-Extensions35.dll - $(SolutionDir)packages\Rackspace.Threading.2.0.0-alpha001\lib\net35-client\Rackspace.Threading.dll True - - ..\..\..\lib\system.net.http_35\System.Net.Http.dll - $(SolutionDir)packages\TaskParallelLibrary.1.0.2856.0\lib\Net35\System.Threading.dll True @@ -113,6 +105,37 @@ + + + + + {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 + + + + + + + $(SolutionDir)lib\octokit.net\Octokit.dll + + + $(SolutionDir)octokit.net\Octokit-Extensions35\bin\Debug\Octokit-Extensions35.dll + + + $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll + + + + {B389ADAF-62CC-486E-85B4-2D8B078DF763} From 4e69b2835493e171a98c212d51c90cf86ab93416 Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Fri, 30 Jun 2017 13:46:57 -0400 Subject: [PATCH 12/16] Fixing mistake in project files --- src/GitHub.Api/GitHub.Api.csproj | 2 +- .../Assets/Editor/GitHub.Unity/GitHub.Unity.csproj | 2 +- src/tests/IntegrationTests/IntegrationTests.csproj | 2 +- src/tests/UnitTests/UnitTests.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj index 8e1fcbb27..b014c0d62 100644 --- a/src/GitHub.Api/GitHub.Api.csproj +++ b/src/GitHub.Api/GitHub.Api.csproj @@ -267,7 +267,7 @@ $(SolutionDir)lib\octokit.net\Octokit.dll - $(SolutionDir)octokit.net\Octokit-Extensions35\bin\Debug\Octokit-Extensions35.dll + $(SolutionDir)lib\octokit.net\Octokit-Extensions35.dll $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj index 02045ebe4..3c1e58a93 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj @@ -148,7 +148,7 @@ $(SolutionDir)lib\octokit.net\Octokit.dll - $(SolutionDir)octokit.net\Octokit-Extensions35\bin\Debug\Octokit-Extensions35.dll + $(SolutionDir)lib\octokit.net\Octokit-Extensions35.dll $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll diff --git a/src/tests/IntegrationTests/IntegrationTests.csproj b/src/tests/IntegrationTests/IntegrationTests.csproj index 6c40b45a7..009719cd9 100644 --- a/src/tests/IntegrationTests/IntegrationTests.csproj +++ b/src/tests/IntegrationTests/IntegrationTests.csproj @@ -108,7 +108,7 @@ $(SolutionDir)lib\octokit.net\Octokit.dll - $(SolutionDir)octokit.net\Octokit-Extensions35\bin\Debug\Octokit-Extensions35.dll + $(SolutionDir)lib\octokit.net\Octokit-Extensions35.dll $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll diff --git a/src/tests/UnitTests/UnitTests.csproj b/src/tests/UnitTests/UnitTests.csproj index 0b80b0edb..3e4022db9 100644 --- a/src/tests/UnitTests/UnitTests.csproj +++ b/src/tests/UnitTests/UnitTests.csproj @@ -128,7 +128,7 @@ $(SolutionDir)lib\octokit.net\Octokit.dll - $(SolutionDir)octokit.net\Octokit-Extensions35\bin\Debug\Octokit-Extensions35.dll + $(SolutionDir)lib\octokit.net\Octokit-Extensions35.dll $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll From a044b197cf0bdc1819862e15d46b4b6a351dd2ac Mon Sep 17 00:00:00 2001 From: Stanley Goldman Date: Fri, 30 Jun 2017 13:56:30 -0400 Subject: [PATCH 13/16] Update how-to-build.md --- docs/contributing/how-to-build.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/docs/contributing/how-to-build.md b/docs/contributing/how-to-build.md index 578a422e6..576b5c4d9 100644 --- a/docs/contributing/how-to-build.md +++ b/docs/contributing/how-to-build.md @@ -29,16 +29,6 @@ The `GitHub.Unity.sln` solution includes several projects: ## 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 - -``` -git lfs clone https://github.com/github-for-unity/Unity -cd Unity -git submodule init -git submodule deinit script -git submodule update -``` - ### Visual Studio To build with Visual Studio 2015 open the solution file `GitHub.Unity.sln`. Select `Build Solution` in the `Build` menu. From e8ff209cd83084b70616266c0f252ec39cd83111 Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Mon, 3 Jul 2017 14:32:49 +0200 Subject: [PATCH 14/16] Consolidate custom build targets into separate files VS loves to screw around with the csproj format, so move all the custom rules into separate files that it can't screw around with. This also gives the added benefit of shutting up the warning about duplicate AssemblyVersionInformation types, because apparently VS doesn't show files that are included for compilation from external targets files but it still includes them in the compilation (bug? feature? shrug) Add instructions for the GitHub.Unity.OctokitDebugging solution Add mono-built versions of octokit and dotnet-http. Octokit: 0.23.0.1 dotnet-httpClient35: 3.5.0.0 (3.5.22000.1-gfu) --- .gitignore | 3 +- ...l.sln => GitHub.Unity.OctokitDebugging.sln | 9 --- GitHub.Unity.v3.ncrunchsolution | 1 - build.sh | 4 +- common/build.targets | 57 +++++++++++++++ common/packaging.targets | 72 +++++++++++++++++++ common/unitylocation.props | 15 ---- docs/contributing/how-to-build.md | 6 ++ lib/octokit.net/Octokit-Extensions35.dll | 3 - lib/octokit.net/Octokit-Extensions35.pdb | 3 - lib/octokit.net/Octokit.dll | 4 +- lib/octokit.net/Octokit.dll.mdb | 3 + lib/octokit.net/Octokit.pdb | 3 - lib/octokit.net/version.txt | 1 + lib/system.net.http_35/System.Net.Http.dll | 4 +- .../System.Net.Http.dll.mdb | 3 + lib/system.net.http_35/System.Net.Http.pdb | 3 - lib/system.net.http_35/version.txt | 1 + package.sh | 4 +- src/GitHub.Api/Authentication/LoginManager.cs | 2 - src/GitHub.Api/GitHub.Api.csproj | 61 ++++------------ .../Editor/GitHub.Unity/GitHub.Unity.csproj | 50 ++----------- .../CopyLibrariesToDevelopmentFolder.csproj | 3 + .../CopyLibrariesToPackageProject.csproj | 34 +-------- .../IntegrationTests/IntegrationTests.csproj | 33 +-------- .../Properties/AssemblyInfo.cs | 36 +--------- .../UnitTests/Properties/AssemblyInfo.cs | 35 +-------- src/tests/UnitTests/UnitTests.csproj | 34 +-------- .../GitHub/Octokit-Extensions35.dll.mdb.meta | 8 --- .../GitHub/Octokit-Extensions35.dll.meta | 25 ------- 30 files changed, 182 insertions(+), 338 deletions(-) rename GitHub.Unity.Internal.sln => GitHub.Unity.OctokitDebugging.sln (92%) create mode 100644 common/build.targets create mode 100644 common/packaging.targets delete mode 100644 common/unitylocation.props delete mode 100644 lib/octokit.net/Octokit-Extensions35.dll delete mode 100644 lib/octokit.net/Octokit-Extensions35.pdb create mode 100644 lib/octokit.net/Octokit.dll.mdb delete mode 100644 lib/octokit.net/Octokit.pdb create mode 100644 lib/octokit.net/version.txt create mode 100644 lib/system.net.http_35/System.Net.Http.dll.mdb delete mode 100644 lib/system.net.http_35/System.Net.Http.pdb create mode 100644 lib/system.net.http_35/version.txt delete mode 100644 unity/PackageProject/Assets/Editor/GitHub/Octokit-Extensions35.dll.mdb.meta delete mode 100644 unity/PackageProject/Assets/Editor/GitHub/Octokit-Extensions35.dll.meta 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/GitHub.Unity.Internal.sln b/GitHub.Unity.OctokitDebugging.sln similarity index 92% rename from GitHub.Unity.Internal.sln rename to GitHub.Unity.OctokitDebugging.sln index d0a1133b9..8d9cef6c2 100644 --- a/GitHub.Unity.Internal.sln +++ b/GitHub.Unity.OctokitDebugging.sln @@ -33,8 +33,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "octokit", "octokit", "{5C9C 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}") = "Octokit-Extensions35", "..\octokit.net\Octokit-Extensions35\Octokit-Extensions35.csproj", "{EB4B074E-62A7-4F1D-8F95-E64B7AEA0236}" -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 @@ -110,12 +108,6 @@ Global {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 - {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 {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 @@ -135,7 +127,6 @@ Global {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} - {EB4B074E-62A7-4F1D-8F95-E64B7AEA0236} = {5C9C1D3B-0740-4EF3-A374-CCCD67FB6E48} {9862694D-E4FA-418B-8692-A0280FEDDF36} = {C6854BB9-D594-46B0-9E10-72607CC97E77} EndGlobalSection EndGlobal 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 a380ea2a2..666a3c55b 100644 --- a/docs/contributing/how-to-build.md +++ b/docs/contributing/how-to-build.md @@ -61,3 +61,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-Extensions35.dll b/lib/octokit.net/Octokit-Extensions35.dll deleted file mode 100644 index c23a27aff..000000000 --- a/lib/octokit.net/Octokit-Extensions35.dll +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ae00f182512e168b04e4b37b5b8df13834ceb375bf1c02f2f98d0f80c1f281b -size 4096 diff --git a/lib/octokit.net/Octokit-Extensions35.pdb b/lib/octokit.net/Octokit-Extensions35.pdb deleted file mode 100644 index 614683d8e..000000000 --- a/lib/octokit.net/Octokit-Extensions35.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46f7b53e5fd368e3bd17368593cb1c058230c2c56bb85dc68f093b5353217423 -size 11776 diff --git a/lib/octokit.net/Octokit.dll b/lib/octokit.net/Octokit.dll index e800a2727..ebbe72d0b 100644 --- a/lib/octokit.net/Octokit.dll +++ b/lib/octokit.net/Octokit.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42bcae1226a85845d182552c2f7fbe4291eb1bce7ce592e55197a0a0b7f452b9 -size 797696 +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/Octokit.pdb b/lib/octokit.net/Octokit.pdb deleted file mode 100644 index a2ebe36ee..000000000 --- a/lib/octokit.net/Octokit.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9ac6813373e2f0e6620136865fd5d5dbdc25c5ff0e8f8a6f4555834ebca7cccf -size 2084352 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 index 4ae27b8e5..ae8fbae89 100644 --- a/lib/system.net.http_35/System.Net.Http.dll +++ b/lib/system.net.http_35/System.Net.Http.dll @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d260a11ea58869d49027034bc4f90edefd9d2b3b9109eb3d7ac0cf6f50e73c0e -size 132608 +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/System.Net.Http.pdb b/lib/system.net.http_35/System.Net.Http.pdb deleted file mode 100644 index 4d56e9eee..000000000 --- a/lib/system.net.http_35/System.Net.Http.pdb +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dbf1d544a49351aff50c37c4066a2f0e7d6154c58484c809bc5edcb3eaeec15 -size 390656 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 b014c0d62..18383dd54 100644 --- a/src/GitHub.Api/GitHub.Api.csproj +++ b/src/GitHub.Api/GitHub.Api.csproj @@ -1,6 +1,7 @@  + Debug AnyCPU @@ -11,8 +12,6 @@ GitHub.Api v3.5 512 - Internal - Internal bin\$(Configuration)\ 6 @@ -203,8 +202,6 @@ - - @@ -223,55 +220,25 @@ - - - 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 - + + Metrics\MetricsService.cs + + + Properties\ApplicationInfo_Local.cs + - - $(SolutionDir)lib\octokit.net\Octokit.dll - - - $(SolutionDir)lib\octokit.net\Octokit-Extensions35.dll - - - $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll - + + Properties\ApplicationInfo_Local.cs-example + + + Properties\ApplicationInfo_Local.cs + diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj b/src/UnityExtension/Assets/Editor/GitHub.Unity/GitHub.Unity.csproj index 3c1e58a93..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,8 +11,6 @@ GitHub.Unity v3.5 512 - Internal - Internal $(SolutionDir)\unity\TestProject\Assets\Editor\ ..\..\..\obj\ @@ -47,9 +44,7 @@ $(SolutionDir)common\GitHub.ruleset 4 - - Debug - + False @@ -82,18 +77,10 @@ - - Metrics\MetricsInitialization.cs - - - Properties\SolutionInfo.cs - - - @@ -118,43 +105,18 @@ - - GitHub.ruleset - Designer - - - - {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 - + + + + Metrics\MetricsInitialization.cs + - - - - $(SolutionDir)lib\octokit.net\Octokit.dll - - - $(SolutionDir)lib\octokit.net\Octokit-Extensions35.dll - - - $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll - - - diff --git a/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj b/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj index 936a5d99c..4763b982b 100644 --- a/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj +++ b/src/packaging/CopyLibrariesToDevelopmentFolder/CopyLibrariesToDevelopmentFolder.csproj @@ -71,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 009719cd9..c593e8df7 100644 --- a/src/tests/IntegrationTests/IntegrationTests.csproj +++ b/src/tests/IntegrationTests/IntegrationTests.csproj @@ -1,6 +1,7 @@  + Debug AnyCPU @@ -11,7 +12,6 @@ IntegrationTests v3.5 512 - Internal $(SolutionDir)build\$(AssemblyName) @@ -85,37 +85,6 @@ - - - - - {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 - - - - - - - $(SolutionDir)lib\octokit.net\Octokit.dll - - - $(SolutionDir)lib\octokit.net\Octokit-Extensions35.dll - - - $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll - - - - {b389adaf-62cc-486e-85b4-2d8b078df763} 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 3e4022db9..5c7f6c0d9 100644 --- a/src/tests/UnitTests/UnitTests.csproj +++ b/src/tests/UnitTests/UnitTests.csproj @@ -1,7 +1,7 @@  - + Debug AnyCPU @@ -12,7 +12,6 @@ UnitTests v3.5 512 - Internal $(SolutionDir)build\$(AssemblyName) @@ -105,37 +104,6 @@ - - - - - {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 - - - - - - - $(SolutionDir)lib\octokit.net\Octokit.dll - - - $(SolutionDir)lib\octokit.net\Octokit-Extensions35.dll - - - $(SolutionDir)lib\system.net.http_35\System.Net.Http.dll - - - - {B389ADAF-62CC-486E-85B4-2D8B078DF763} 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: From 508da2cad3958d50d1b6abd1c524feb6cf136c78 Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Mon, 3 Jul 2017 15:37:15 +0200 Subject: [PATCH 15/16] Don't need these anymore --- .../Assets/Editor/GitHub/Octokit.dll.mdb.meta | 8 -------- .../Assets/Editor/GitHub/System.Net.Http.dll.mdb.meta | 8 -------- 2 files changed, 16 deletions(-) delete mode 100644 unity/PackageProject/Assets/Editor/GitHub/Octokit.dll.mdb.meta delete mode 100644 unity/PackageProject/Assets/Editor/GitHub/System.Net.Http.dll.mdb.meta 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: From c367e44e52fa96a310bfd9cf7e76ca1368e3dc48 Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Mon, 3 Jul 2017 16:02:00 +0200 Subject: [PATCH 16/16] Some more instructions so people don't get confused about errors --- docs/contributing/how-to-build.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/contributing/how-to-build.md b/docs/contributing/how-to-build.md index 666a3c55b..597a624aa 100644 --- a/docs/contributing/how-to-build.md +++ b/docs/contributing/how-to-build.md @@ -26,6 +26,13 @@ Clone the repository and its submodules in a git GUI client that supports Git LF git lfs clone https://github.com/github-for-unity/Unity ``` +*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 +``` + ### Important pre-build steps To be able to authenticate in GitHub for Unity, you'll need to: