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

Commit bcef065

Browse files
grokysgrokys
committed
Remove Rothko submodule.
Usean updated Rothko nuget package. Also had to add an export wrapper as I prefer to define the export in `github/VisualStudio` rather than in our Rothko fork.
1 parent 16ed245 commit bcef065

File tree

14 files changed

+53
-38
lines changed

14 files changed

+53
-38
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@
1212
url = https://github.com/editor-tools/Akavache
1313
[submodule "script"]
1414
path = script
15-
url = [email protected]:github/VisualStudioBuildScripts
16-
[submodule "submodules/Rothko"]
17-
path = submodules/Rothko
18-
url = https://github.com/editor-tools/Rothko.git
15+
url = [email protected]:github/VisualStudioBuildScripts

‎GitHubVS.sln‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.InlineReviews.UnitTe
104104
EndProject
105105
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Logging", "src\GitHub.Logging\GitHub.Logging.csproj", "{8D73575A-A89F-47CC-B153-B47DD06837F0}"
106106
EndProject
107-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Rothko", "Rothko", "{8B9A34C6-0D62-4D49-9606-1AB838923A74}"
108-
EndProject
109-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Rothko", "submodules\Rothko\src\Rothko.csproj", "{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}"
110-
EndProject
111107
Global
112108
GlobalSection(SolutionConfigurationPlatforms) = preSolution
113109
Debug|Any CPU = Debug|Any CPU
@@ -407,16 +403,6 @@ Global
407403
{8D73575A-A89F-47CC-B153-B47DD06837F0}.Release|Any CPU.Build.0 = Release|Any CPU
408404
{8D73575A-A89F-47CC-B153-B47DD06837F0}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
409405
{8D73575A-A89F-47CC-B153-B47DD06837F0}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
410-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
411-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
412-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
413-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
414-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
415-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
416-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
417-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.Release|Any CPU.Build.0 = Release|Any CPU
418-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
419-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
420406
EndGlobalSection
421407
GlobalSection(SolutionProperties) = preSolution
422408
HideSolutionNode = FALSE
@@ -440,7 +426,5 @@ Global
440426
{7B835A7D-CF94-45E8-B191-96F5A4FE26A8} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
441427
{110B206F-8554-4B51-BF86-94DAA32F5E26} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
442428
{17EB676B-BB91-48B5-AA59-C67695C647C2} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
443-
{8B9A34C6-0D62-4D49-9606-1AB838923A74} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
444-
{4A84E568-CA86-4510-8CD0-90D3EF9B65F9} = {8B9A34C6-0D62-4D49-9606-1AB838923A74}
445429
EndGlobalSection
446430
EndGlobal

‎lib/Rothko.0.0.2-ghfvs.nupkg‎

-33.9 KB
Binary file not shown.

‎lib/Rothko.0.0.3-ghfvs.nupkg‎

40.9 KB
Binary file not shown.

‎src/GitHub.App/GitHub.App.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@
8181
</Reference>
8282
<Reference Include="PresentationCore" />
8383
<Reference Include="PresentationFramework" />
84+
<Reference Include="rothko, Version=0.0.3.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
85+
<HintPath>..\..\packages\Rothko.0.0.3-ghfvs\lib\net45\rothko.dll</HintPath>
86+
<Private>True</Private>
87+
</Reference>
8488
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
8589
<HintPath>..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll</HintPath>
8690
<Private>True</Private>
@@ -257,10 +261,6 @@
257261
<Project>{1ce2d235-8072-4649-ba5a-cfb1af8776e0}</Project>
258262
<Name>ReactiveUI_Net45</Name>
259263
</ProjectReference>
260-
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
261-
<Project>{4a84e568-ca86-4510-8cd0-90d3ef9b65f9}</Project>
262-
<Name>Rothko</Name>
263-
</ProjectReference>
264264
<ProjectReference Include="..\..\submodules\splat\Splat\Splat-Net45.csproj">
265265
<Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
266266
<Name>Splat-Net45</Name>

‎src/GitHub.App/Infrastructure/ExportWrappers.cs‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
using System.ComponentModel.Composition;
1+
using System;
2+
using System.Collections.Generic;
3+
using System.ComponentModel.Composition;
4+
using System.Net;
5+
using System.Security.Authentication.ExtendedProtection;
6+
using System.Threading.Tasks;
27
using GitHub.Models;
38
using Octokit;
49
using Octokit.Internal;
10+
using Rothko;
511

612
namespace GitHub.Infrastructure
713
{
@@ -17,6 +23,31 @@ public ExportedHttpClient() :
1723
{}
1824
}
1925

26+
[Export(typeof(IHttpListener))]
27+
public class ExportedHttpListener : IHttpListener
28+
{
29+
readonly IHttpListener inner = new HttpListenerWrapper(new HttpListener());
30+
public AuthenticationSchemes AuthenticationSchemes { get => inner.AuthenticationSchemes; set => inner.AuthenticationSchemes = value; }
31+
public AuthenticationSchemeSelector AuthenticationSchemeSelectorDelegate { get => inner.AuthenticationSchemeSelectorDelegate; set => inner.AuthenticationSchemeSelectorDelegate = value; }
32+
public ServiceNameCollection DefaultServiceNames => inner.DefaultServiceNames;
33+
public ExtendedProtectionPolicy ExtendedProtectionPolicy { get => inner.ExtendedProtectionPolicy; set => inner.ExtendedProtectionPolicy = value; }
34+
public HttpListener.ExtendedProtectionSelector ExtendedProtectionSelectorDelegate { get => inner.ExtendedProtectionSelectorDelegate; set => inner.ExtendedProtectionSelectorDelegate = value; }
35+
public bool IgnoreWriteExceptions { get => inner.IgnoreWriteExceptions; set => inner.IgnoreWriteExceptions = value; }
36+
public bool IsListening => inner.IsListening;
37+
public ICollection<string> Prefixes => inner.Prefixes;
38+
public string Realm { get => inner.Realm; set => inner.Realm = value; }
39+
public HttpListenerTimeoutManager TimeoutManager => inner.TimeoutManager;
40+
public bool UnsafeConnectionNtlmAuthentication { get => inner.UnsafeConnectionNtlmAuthentication; set => inner.UnsafeConnectionNtlmAuthentication = value; }
41+
public void Abort() => inner.Abort();
42+
public IAsyncResult BeginGetContext(AsyncCallback callback, object state) => inner.BeginGetContext(callback, state);
43+
public void Close() => inner.Close();
44+
public IHttpListenerContext EndGetContext(IAsyncResult asyncResult) => inner.EndGetContext(asyncResult);
45+
public IHttpListenerContext GetContext() => inner.GetContext();
46+
public Task<IHttpListenerContext> GetContextAsync() => inner.GetContextAsync();
47+
public void Start() => inner.Start();
48+
public void Stop() => inner.Stop();
49+
}
50+
2051
[Export(typeof(IEnterpriseProbe))]
2152
public class ExportedEnterpriseProbe : EnterpriseProbe
2253
{

‎src/GitHub.App/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net461" />
88
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net461" />
99
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
10+
<package id="Rothko" version="0.0.3-ghfvs" targetFramework="net461" />
1011
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
1112
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />
1213
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net45" />

‎src/GitHub.Exports/GitHub.Exports.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@
116116
</Reference>
117117
<Reference Include="PresentationCore" />
118118
<Reference Include="PresentationFramework" />
119+
<Reference Include="rothko, Version=0.0.3.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
120+
<HintPath>..\..\packages\Rothko.0.0.3-ghfvs\lib\net45\rothko.dll</HintPath>
121+
<Private>True</Private>
122+
</Reference>
119123
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
120124
<HintPath>..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll</HintPath>
121125
<Private>True</Private>
@@ -257,10 +261,6 @@
257261
<Project>{08dd4305-7787-4823-a53f-4d0f725a07f3}</Project>
258262
<Name>Octokit</Name>
259263
</ProjectReference>
260-
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
261-
<Project>{4a84e568-ca86-4510-8cd0-90d3ef9b65f9}</Project>
262-
<Name>Rothko</Name>
263-
</ProjectReference>
264264
<ProjectReference Include="..\GitHub.Extensions\GitHub.Extensions.csproj">
265265
<Project>{6afe2e2d-6db0-4430-a2ea-f5f5388d2f78}</Project>
266266
<Name>GitHub.Extensions</Name>

‎src/GitHub.Exports/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net461" />
1616
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net461" />
1717
<package id="Microsoft.VisualStudio.Threading" version="14.1.131" targetFramework="net461" />
18+
<package id="Rothko" version="0.0.3-ghfvs" targetFramework="net461" />
1819
<package id="Serilog" version="2.5.0" targetFramework="net461" />
1920
<package id="SerilogAnalyzer" version="0.12.0.0" targetFramework="net461" />
2021
<package id="SimpleJson" version="0.38.0" targetFramework="net461" />

‎src/GitHub.VisualStudio/GitHub.VisualStudio.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,10 @@
239239
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
240240
<Private>True</Private>
241241
</Reference>
242+
<Reference Include="rothko, Version=0.0.3.0, Culture=neutral, PublicKeyToken=9f664c41f503810a, processorArchitecture=MSIL">
243+
<HintPath>..\..\packages\Rothko.0.0.3-ghfvs\lib\net45\rothko.dll</HintPath>
244+
<Private>True</Private>
245+
</Reference>
242246
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
243247
<HintPath>..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll</HintPath>
244248
<Private>True</Private>
@@ -596,10 +600,6 @@
596600
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;GetCopyToOutputDirectoryItems;DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIX>
597601
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
598602
</ProjectReference>
599-
<ProjectReference Include="..\..\submodules\Rothko\src\Rothko.csproj">
600-
<Project>{4a84e568-ca86-4510-8cd0-90d3ef9b65f9}</Project>
601-
<Name>Rothko</Name>
602-
</ProjectReference>
603603
<ProjectReference Include="..\..\submodules\splat\Splat\Splat-Net45.csproj">
604604
<Project>{252ce1c2-027a-4445-a3c2-e4d6c80a935a}</Project>
605605
<Name>Splat-Net45</Name>

0 commit comments

Comments
 (0)