Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit bb7c672

Browse files
committed
Resolve merge conflicts
2 parents a2cc5e8 + 72057eb commit bb7c672

File tree

210 files changed

+5251
-3076
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+5251
-3076
lines changed

GitHubVS.sln

Lines changed: 107 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{72036B62-2
1313
README.md = README.md
1414
EndProjectSection
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "test\UnitTests\UnitTests.csproj", "{596595A6-2A3C-469E-9386-9E3767D863A5}"
17-
EndProject
1816
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI", "src\GitHub.UI\GitHub.UI.csproj", "{346384DD-2445-4A28-AF22-B45F3957BD89}"
1917
EndProject
2018
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI.Reactive", "src\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj", "{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}"
@@ -26,6 +24,9 @@ EndProject
2624
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.App", "src\GitHub.App\GitHub.App.csproj", "{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}"
2725
EndProject
2826
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Submodules", "Submodules", "{1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}"
27+
ProjectSection(SolutionItems) = preProject
28+
test\UnitTests\Args.cs = test\UnitTests\Args.cs
29+
EndProjectSection
2930
EndProject
3031
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1}"
3132
ProjectSection(SolutionItems) = preProject
@@ -112,6 +113,22 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetricsServer", "test\Metri
112113
EndProject
113114
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetricsTests", "test\MetricsTests\MetricsTests\MetricsTests.csproj", "{09313E65-7ADB-48C1-AD3A-572020C5BDCB}"
114115
EndProject
116+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Api.UnitTests", "test\GitHub.Api.UnitTests\GitHub.Api.UnitTests.csproj", "{EFDE0798-ACDB-431D-B7F1-548A7231C853}"
117+
EndProject
118+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.App.UnitTests", "test\GitHub.App.UnitTests\GitHub.App.UnitTests.csproj", "{3525D819-6AEC-4879-89FB-56B41F026571}"
119+
EndProject
120+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Exports.UnitTests", "test\GitHub.Exports.UnitTests\GitHub.Exports.UnitTests.csproj", "{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}"
121+
EndProject
122+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Exports.Reactive.UnitTests", "test\GitHub.Exports.Reactive.UnitTests\GitHub.Exports.Reactive.UnitTests.csproj", "{C59868FC-D8BC-4D47-B4F3-16908D2641C6}"
123+
EndProject
124+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Extensions.UnitTests", "test\GitHub.Extensions.UnitTests\GitHub.Extensions.UnitTests.csproj", "{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}"
125+
EndProject
126+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Primitives.UnitTests", "test\GitHub.Primitives.UnitTests\GitHub.Primitives.UnitTests.csproj", "{E687457A-BEDC-422D-8D9D-2DA58099EBBA}"
127+
EndProject
128+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.UnitTests", "test\GitHub.TeamFoundation.UnitTests\GitHub.TeamFoundation.UnitTests.csproj", "{93778A89-3E58-4853-B772-948EBB3F17BE}"
129+
EndProject
130+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.UnitTests", "test\GitHub.VisualStudio.UnitTests\GitHub.VisualStudio.UnitTests.csproj", "{8B14F90B-0781-465D-AB94-19C8C56E3A94}"
131+
EndProject
115132
Global
116133
GlobalSection(SolutionConfigurationPlatforms) = preSolution
117134
Debug|Any CPU = Debug|Any CPU
@@ -131,16 +148,6 @@ Global
131148
{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.Release|Any CPU.Build.0 = Release|Any CPU
132149
{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.ReleaseWithoutVsix|Any CPU.ActiveCfg = ReleaseWithoutVsix|Any CPU
133150
{11569514-5AE5-4B5B-92A2-F10B0967DE5F}.ReleaseWithoutVsix|Any CPU.Build.0 = ReleaseWithoutVsix|Any CPU
134-
{596595A6-2A3C-469E-9386-9E3767D863A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
135-
{596595A6-2A3C-469E-9386-9E3767D863A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
136-
{596595A6-2A3C-469E-9386-9E3767D863A5}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
137-
{596595A6-2A3C-469E-9386-9E3767D863A5}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
138-
{596595A6-2A3C-469E-9386-9E3767D863A5}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
139-
{596595A6-2A3C-469E-9386-9E3767D863A5}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
140-
{596595A6-2A3C-469E-9386-9E3767D863A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
141-
{596595A6-2A3C-469E-9386-9E3767D863A5}.Release|Any CPU.Build.0 = Release|Any CPU
142-
{596595A6-2A3C-469E-9386-9E3767D863A5}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
143-
{596595A6-2A3C-469E-9386-9E3767D863A5}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
144151
{346384DD-2445-4A28-AF22-B45F3957BD89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
145152
{346384DD-2445-4A28-AF22-B45F3957BD89}.Debug|Any CPU.Build.0 = Debug|Any CPU
146153
{346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU
@@ -441,12 +448,91 @@ Global
441448
{09313E65-7ADB-48C1-AD3A-572020C5BDCB}.Release|Any CPU.Build.0 = Release|Any CPU
442449
{09313E65-7ADB-48C1-AD3A-572020C5BDCB}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
443450
{09313E65-7ADB-48C1-AD3A-572020C5BDCB}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
451+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
452+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.Debug|Any CPU.Build.0 = Debug|Any CPU
453+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
454+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
455+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
456+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
457+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.Release|Any CPU.ActiveCfg = Release|Any CPU
458+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.Release|Any CPU.Build.0 = Release|Any CPU
459+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
460+
{EFDE0798-ACDB-431D-B7F1-548A7231C853}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
461+
{3525D819-6AEC-4879-89FB-56B41F026571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
462+
{3525D819-6AEC-4879-89FB-56B41F026571}.Debug|Any CPU.Build.0 = Debug|Any CPU
463+
{3525D819-6AEC-4879-89FB-56B41F026571}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
464+
{3525D819-6AEC-4879-89FB-56B41F026571}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
465+
{3525D819-6AEC-4879-89FB-56B41F026571}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
466+
{3525D819-6AEC-4879-89FB-56B41F026571}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
467+
{3525D819-6AEC-4879-89FB-56B41F026571}.Release|Any CPU.ActiveCfg = Release|Any CPU
468+
{3525D819-6AEC-4879-89FB-56B41F026571}.Release|Any CPU.Build.0 = Release|Any CPU
469+
{3525D819-6AEC-4879-89FB-56B41F026571}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
470+
{3525D819-6AEC-4879-89FB-56B41F026571}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
471+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
472+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.Debug|Any CPU.Build.0 = Debug|Any CPU
473+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
474+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
475+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
476+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
477+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.Release|Any CPU.ActiveCfg = Release|Any CPU
478+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.Release|Any CPU.Build.0 = Release|Any CPU
479+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
480+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
481+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
482+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
483+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
484+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
485+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
486+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
487+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
488+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.Release|Any CPU.Build.0 = Release|Any CPU
489+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
490+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
491+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
492+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.Debug|Any CPU.Build.0 = Debug|Any CPU
493+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
494+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
495+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
496+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
497+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.Release|Any CPU.ActiveCfg = Release|Any CPU
498+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.Release|Any CPU.Build.0 = Release|Any CPU
499+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
500+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
501+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
502+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
503+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
504+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
505+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
506+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
507+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
508+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.Release|Any CPU.Build.0 = Release|Any CPU
509+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
510+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
511+
{93778A89-3E58-4853-B772-948EBB3F17BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
512+
{93778A89-3E58-4853-B772-948EBB3F17BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
513+
{93778A89-3E58-4853-B772-948EBB3F17BE}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
514+
{93778A89-3E58-4853-B772-948EBB3F17BE}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
515+
{93778A89-3E58-4853-B772-948EBB3F17BE}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
516+
{93778A89-3E58-4853-B772-948EBB3F17BE}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
517+
{93778A89-3E58-4853-B772-948EBB3F17BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
518+
{93778A89-3E58-4853-B772-948EBB3F17BE}.Release|Any CPU.Build.0 = Release|Any CPU
519+
{93778A89-3E58-4853-B772-948EBB3F17BE}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
520+
{93778A89-3E58-4853-B772-948EBB3F17BE}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
521+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
522+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.Debug|Any CPU.Build.0 = Debug|Any CPU
523+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
524+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
525+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
526+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
527+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.Release|Any CPU.ActiveCfg = Release|Any CPU
528+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.Release|Any CPU.Build.0 = Release|Any CPU
529+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
530+
{8B14F90B-0781-465D-AB94-19C8C56E3A94}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
444531
EndGlobalSection
445532
GlobalSection(SolutionProperties) = preSolution
446533
HideSolutionNode = FALSE
447534
EndGlobalSection
448535
GlobalSection(NestedProjects) = preSolution
449-
{596595A6-2A3C-469E-9386-9E3767D863A5} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
450536
{8E1F1B4E-AEA2-4AB1-8F73-423A903550A1} = {7B6C5F8D-14B3-443D-B044-0E209AE12BDF}
451537
{1E7F7253-A6AF-43C4-A955-37BEDDA01AC0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
452538
{08DD4305-7787-4823-A53F-4D0F725A07F3} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AC0}
@@ -467,6 +553,14 @@ Global
467553
{C2D88962-BD6B-4F11-B914-535B38377962} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
468554
{14FDEE91-7301-4247-846C-049647BF8E99} = {C2D88962-BD6B-4F11-B914-535B38377962}
469555
{09313E65-7ADB-48C1-AD3A-572020C5BDCB} = {C2D88962-BD6B-4F11-B914-535B38377962}
556+
{EFDE0798-ACDB-431D-B7F1-548A7231C853} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
557+
{3525D819-6AEC-4879-89FB-56B41F026571} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
558+
{94509FCB-6C97-4ED6-AED6-6E74AB3CA336} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
559+
{C59868FC-D8BC-4D47-B4F3-16908D2641C6} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
560+
{DE704BBB-6EC6-4173-B695-D9EBF5AEB092} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
561+
{E687457A-BEDC-422D-8D9D-2DA58099EBBA} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
562+
{93778A89-3E58-4853-B772-948EBB3F17BE} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
563+
{8B14F90B-0781-465D-AB94-19C8C56E3A94} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
470564
EndGlobalSection
471565
GlobalSection(ExtensibilityGlobals) = postSolution
472566
SolutionGuid = {556014CF-5B35-4CE5-B3EF-6AB0007001AC}
-161 KB
Binary file not shown.
176 KB
Binary file not shown.

scripts/test.ps1

Lines changed: 47 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,22 +37,64 @@ if (!$?) {
3737
$exitcode = 1
3838
}
3939

40-
Write-Output "Running GitHub.UI.UnitTests..."
41-
Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config
40+
Write-Output "Running GitHub.Api.UnitTests..."
41+
Run-NUnit test GitHub.Api.UnitTests $TimeoutDuration $config
4242
if (!$?) {
4343
$exitcode = 2
4444
}
4545

46-
Write-Output "Running UnitTests..."
47-
Run-NUnit test UnitTests $TimeoutDuration $config
46+
Write-Output "Running GitHub.App.UnitTests..."
47+
Run-NUnit test GitHub.App.UnitTests $TimeoutDuration $config
4848
if (!$?) {
4949
$exitcode = 3
5050
}
5151

52+
Write-Output "Running GitHub.Exports.Reactive.UnitTests..."
53+
Run-NUnit test GitHub.Exports.Reactive.UnitTests $TimeoutDuration $config
54+
if (!$?) {
55+
$exitcode = 4
56+
}
57+
58+
Write-Output "Running GitHub.Exports.UnitTests..."
59+
Run-NUnit test GitHub.Exports.UnitTests $TimeoutDuration $config
60+
if (!$?) {
61+
$exitcode = 5
62+
}
63+
64+
Write-Output "Running GitHub.Extensions.UnitTests..."
65+
Run-NUnit test GitHub.Extensions.UnitTests $TimeoutDuration $config
66+
if (!$?) {
67+
$exitcode = 6
68+
}
69+
70+
Write-Output "Running GitHub.Primitives.UnitTests..."
71+
Run-NUnit test GitHub.Primitives.UnitTests $TimeoutDuration $config
72+
if (!$?) {
73+
$exitcode = 7
74+
}
75+
76+
Write-Output "Running GitHub.TeamFoundation.UnitTests..."
77+
Run-NUnit test GitHub.TeamFoundation.UnitTests $TimeoutDuration $config
78+
if (!$?) {
79+
$exitcode = 8
80+
}
81+
82+
Write-Output "Running GitHub.UI.UnitTests..."
83+
Run-NUnit test GitHub.UI.UnitTests $TimeoutDuration $config
84+
if (!$?) {
85+
$exitcode = 9
86+
}
87+
88+
Write-Output "Running GitHub.VisualStudio.UnitTests..."
89+
Run-NUnit test GitHub.VisualStudio.UnitTests $TimeoutDuration $config
90+
if (!$?) {
91+
$exitcode = 10
92+
}
93+
5294
Write-Output "Running GitHub.InlineReviews.UnitTests..."
5395
Run-NUnit test GitHub.InlineReviews.UnitTests $TimeoutDuration $config
5496
if (!$?) {
55-
$exitcode = 4
97+
$exitcode = 11
5698
}
5799

58100
if ($exitcode -ne 0) {

src/GitHub.Api/GitHub.Api.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
54-
<Reference Include="Octokit.GraphQL, Version=0.0.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\Octokit.GraphQL.0.0.2-alpha\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
54+
<Reference Include="Octokit.GraphQL, Version=0.0.4.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
55+
<HintPath>..\..\packages\Octokit.GraphQL.0.0.4-alpha\lib\netstandard1.1\Octokit.GraphQL.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
58-
<Reference Include="Octokit.GraphQL.Core, Version=0.0.2.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\Octokit.GraphQL.0.0.2-alpha\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
58+
<Reference Include="Octokit.GraphQL.Core, Version=0.0.4.0, Culture=neutral, PublicKeyToken=0be8860aee462442, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\Octokit.GraphQL.0.0.4-alpha\lib\netstandard1.1\Octokit.GraphQL.Core.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
6262
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">

src/GitHub.Api/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
4-
<package id="Octokit.GraphQL" version="0.0.2-alpha" targetFramework="net461" />
4+
<package id="Octokit.GraphQL" version="0.0.4-alpha" targetFramework="net461" />
55
<package id="Serilog" version="2.5.0" targetFramework="net461" />
66
</packages>

src/GitHub.App/Factories/ModelServiceFactory.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ namespace GitHub.Factories
1616
public sealed class ModelServiceFactory : IModelServiceFactory, IDisposable
1717
{
1818
readonly IApiClientFactory apiClientFactory;
19-
readonly IGraphQLClientFactory graphQLClientFactory;
2019
readonly IHostCacheFactory hostCacheFactory;
2120
readonly IAvatarProvider avatarProvider;
2221
readonly Dictionary<IConnection, ModelService> cache = new Dictionary<IConnection, ModelService>();
@@ -25,12 +24,10 @@ public sealed class ModelServiceFactory : IModelServiceFactory, IDisposable
2524
[ImportingConstructor]
2625
public ModelServiceFactory(
2726
IApiClientFactory apiClientFactory,
28-
IGraphQLClientFactory graphQLClientFactory,
2927
IHostCacheFactory hostCacheFactory,
3028
IAvatarProvider avatarProvider)
3129
{
3230
this.apiClientFactory = apiClientFactory;
33-
this.graphQLClientFactory = graphQLClientFactory;
3431
this.hostCacheFactory = hostCacheFactory;
3532
this.avatarProvider = avatarProvider;
3633
}
@@ -47,7 +44,6 @@ public async Task<IModelService> CreateAsync(IConnection connection)
4744
{
4845
result = new ModelService(
4946
await apiClientFactory.Create(connection.HostAddress),
50-
await graphQLClientFactory.CreateConnection(connection.HostAddress),
5147
await hostCacheFactory.Create(connection.HostAddress),
5248
avatarProvider);
5349
result.InsertUser(AccountCacheItem.Create(connection.User));

0 commit comments

Comments
 (0)