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

Commit 2bc5199

Browse files
shanashana
authored
Merge pull request #596 from github/backport/package-async
Backport to 2.0.15.1: Async Package load
2 parents 5cff6a6 + 27970f5 commit 2bc5199

File tree

86 files changed

+1728
-599
lines changed

Some content is hidden

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

86 files changed

+1728
-599
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -239,4 +239,3 @@ WiX.Toolset.DummyFile.txt
239239
nunit-UnitTests.xml
240240
nunit-TrackingCollectionTests.xml
241241
GitHubVS.sln.DotSettings
242-
**/generated/*.cs

‎.gitmodules

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "submodules/rothko"]
22
path = submodules/rothko
3-
url = https://github.com/Haacked/Rothko.git
3+
url = https://github.com/editor-tools/Rothko.git
44
[submodule "submodules/reactiveui"]
55
path = submodules/reactiveui
66
url = https://github.com/shana/ReactiveUI
@@ -18,4 +18,4 @@
1818
url = [email protected]:github/VisualStudioBuildScripts
1919
[submodule "submodules/externalpackages/StartPage"]
2020
path = submodules/externalpackages/StartPage
21-
url = git@github.com:editor-tools/StartPage.git
21+
url = https://github.com/editor-tools/StartPage.git

‎GitHubVS.sln

+45-20
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
3+
# Visual Studio 15
4+
VisualStudioVersion = 15.0.25824.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio", "src\GitHub.VisualStudio\GitHub.VisualStudio.csproj", "{11569514-5AE5-4B5B-92A2-F10B0967DE5F}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{1BC94B6A-B021-4207-A70E-936EE272AD3E} = {1BC94B6A-B021-4207-A70E-936EE272AD3E}
9+
EndProjectSection
710
EndProject
811
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{72036B62-2FA6-4A22-8B33-69F698A18CF1}"
912
ProjectSection(SolutionItems) = preProject
@@ -81,8 +84,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI_Net45", "submodu
8184
EndProject
8285
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Events_Net45", "submodules\reactiveui\ReactiveUI.Events\ReactiveUI.Events_Net45.csproj", "{600998C4-54DD-4755-BFA8-6F44544D8E2E}"
8386
EndProject
84-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventBuilder", "submodules\reactiveui\ReactiveUI.Events\EventBuilder.csproj", "{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}"
85-
EndProject
8687
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Akavache", "Akavache", "{1E7F7253-A6AF-43C4-A955-37BEDDA01AC9}"
8788
EndProject
8889
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akavache_Net45", "submodules\akavache\Akavache\Akavache_Net45.csproj", "{B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203}"
@@ -109,6 +110,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.15",
109110
EndProject
110111
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.UI", "src\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj", "{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}"
111112
EndProject
113+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Subpackages", "Subpackages", "{7F25BDD5-474F-4EC1-A624-ED946B91F34E}"
114+
EndProject
115+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.StartPage.Preview5", "submodules\externalpackages\StartPage\preview5\GitHub.StartPage.Preview5.csproj", "{1BC94B6A-B021-4207-A70E-936EE272AD3E}"
116+
EndProject
117+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.StartPage.Preview4", "submodules\externalpackages\StartPage\preview4\GitHub.StartPage.Preview4.csproj", "{1BC94B6A-B021-4207-A70E-936EE272AD3D}"
118+
EndProject
112119
Global
113120
GlobalSection(SolutionConfigurationPlatforms) = preSolution
114121
Debug|Any CPU = Debug|Any CPU
@@ -374,21 +381,6 @@ Global
374381
{600998C4-54DD-4755-BFA8-6F44544D8E2E}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
375382
{600998C4-54DD-4755-BFA8-6F44544D8E2E}.XamlDesign|x86.ActiveCfg = Release|Any CPU
376383
{600998C4-54DD-4755-BFA8-6F44544D8E2E}.XamlDesign|x86.Build.0 = Release|Any CPU
377-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Debug|Any CPU.ActiveCfg = Release|Any CPU
378-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Debug|Any CPU.Build.0 = Release|Any CPU
379-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Debug|x86.ActiveCfg = Release|Any CPU
380-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Debug|x86.Build.0 = Release|Any CPU
381-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Publish|Any CPU.ActiveCfg = Release|Any CPU
382-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Publish|x86.ActiveCfg = Release|Any CPU
383-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Publish|x86.Build.0 = Release|Any CPU
384-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
385-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Release|Any CPU.Build.0 = Release|Any CPU
386-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Release|x86.ActiveCfg = Release|Any CPU
387-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Release|x86.Build.0 = Release|Any CPU
388-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU
389-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
390-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.XamlDesign|x86.ActiveCfg = Release|Any CPU
391-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.XamlDesign|x86.Build.0 = Release|Any CPU
392384
{B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203}.Debug|Any CPU.ActiveCfg = Release|Any CPU
393385
{B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203}.Debug|Any CPU.Build.0 = Release|Any CPU
394386
{B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203}.Debug|x86.ActiveCfg = Release|Any CPU
@@ -559,6 +551,38 @@ Global
559551
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.Build.0 = Debug|Any CPU
560552
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|x86.ActiveCfg = Release|Any CPU
561553
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|x86.Build.0 = Release|Any CPU
554+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
555+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
556+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Debug|x86.ActiveCfg = Debug|Any CPU
557+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Debug|x86.Build.0 = Debug|Any CPU
558+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Publish|Any CPU.ActiveCfg = Release|Any CPU
559+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Publish|Any CPU.Build.0 = Release|Any CPU
560+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Publish|x86.ActiveCfg = Release|Any CPU
561+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Publish|x86.Build.0 = Release|Any CPU
562+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
563+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Release|Any CPU.Build.0 = Release|Any CPU
564+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Release|x86.ActiveCfg = Release|Any CPU
565+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.Release|x86.Build.0 = Release|Any CPU
566+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU
567+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
568+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.XamlDesign|x86.ActiveCfg = Release|Any CPU
569+
{1BC94B6A-B021-4207-A70E-936EE272AD3E}.XamlDesign|x86.Build.0 = Release|Any CPU
570+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
571+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
572+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Debug|x86.ActiveCfg = Debug|Any CPU
573+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Debug|x86.Build.0 = Debug|Any CPU
574+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Publish|Any CPU.ActiveCfg = Release|Any CPU
575+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Publish|Any CPU.Build.0 = Release|Any CPU
576+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Publish|x86.ActiveCfg = Release|Any CPU
577+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Publish|x86.Build.0 = Release|Any CPU
578+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
579+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Release|Any CPU.Build.0 = Release|Any CPU
580+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Release|x86.ActiveCfg = Release|Any CPU
581+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.Release|x86.Build.0 = Release|Any CPU
582+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU
583+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
584+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.XamlDesign|x86.ActiveCfg = Release|Any CPU
585+
{1BC94B6A-B021-4207-A70E-936EE272AD3D}.XamlDesign|x86.Build.0 = Release|Any CPU
562586
EndGlobalSection
563587
GlobalSection(SolutionProperties) = preSolution
564588
HideSolutionNode = FALSE
@@ -574,7 +598,6 @@ Global
574598
{1E7F7253-A6AF-43C4-A955-37BEDDA01AB9} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
575599
{1CE2D235-8072-4649-BA5A-CFB1AF8776E0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9}
576600
{600998C4-54DD-4755-BFA8-6F44544D8E2E} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9}
577-
{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9}
578601
{1E7F7253-A6AF-43C4-A955-37BEDDA01AC9} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}
579602
{B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AC9}
580603
{241C47DF-CA8E-4296-AA03-2C48BB646ABD} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AC9}
@@ -584,5 +607,7 @@ Global
584607
{0EC8DBA1-D745-4EE5-993A-6026440EC3BF} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AF9}
585608
{DD99FD0F-82F6-4C30-930E-4A1D0DF01D65} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9}
586609
{7B835A7D-CF94-45E8-B191-96F5A4FE26A8} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD}
610+
{1BC94B6A-B021-4207-A70E-936EE272AD3E} = {7F25BDD5-474F-4EC1-A624-ED946B91F34E}
611+
{1BC94B6A-B021-4207-A70E-936EE272AD3D} = {7F25BDD5-474F-4EC1-A624-ED946B91F34E}
587612
EndGlobalSection
588613
EndGlobal

‎src/CredentialManagement/CredentialManagement.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
<DelaySign>false</DelaySign>
3939
</PropertyGroup>
4040
<ItemGroup>
41-
<Reference Include="NullGuard, Version=1.4.1.0, Culture=neutral, PublicKeyToken=1958ac8092168428, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\NullGuard.Fody.1.4.1\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\NullGuard.dll</HintPath>
43-
<Private>True</Private>
41+
<Reference Include="NullGuard, Version=1.4.6.0, Culture=neutral, PublicKeyToken=1958ac8092168428, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\NullGuard.Fody.1.4.6\Lib\dotnet\NullGuard.dll</HintPath>
43+
<Private>False</Private>
4444
</Reference>
4545
<Reference Include="System" />
4646
<Reference Include="System.Core" />
@@ -79,12 +79,12 @@
7979
</ProjectReference>
8080
</ItemGroup>
8181
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
82-
<Import Project="..\..\packages\Fody.1.28.0\build\Fody.targets" Condition="Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" />
82+
<Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
8383
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8484
<PropertyGroup>
8585
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
8686
</PropertyGroup>
87-
<Error Condition="!Exists('..\..\packages\Fody.1.28.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.28.0\build\Fody.targets'))" />
87+
<Error Condition="!Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
8888
</Target>
8989
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9090
Other similar extension points exist, see Microsoft.Common.targets.

‎src/CredentialManagement/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Fody" version="1.28.0" targetFramework="net452" userInstalled="true" />
4-
<package id="NullGuard.Fody" version="1.4.1" targetFramework="net452" userInstalled="true" />
3+
<package id="Fody" version="1.29.4" targetFramework="net461" userInstalled="true" developmentDependency="true" />
4+
<package id="NullGuard.Fody" version="1.4.6" targetFramework="net461" userInstalled="true" developmentDependency="true" />
55
</packages>

‎src/DesignTimeStyleHelper/DesignTimeStyleHelper.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@
4545
<WarningLevel>4</WarningLevel>
4646
</PropertyGroup>
4747
<ItemGroup>
48-
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
48+
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\VSSDK.ComponentModelHost.12.0.4\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll</HintPath>
50+
<Private>False</Private>
51+
</Reference>
4952
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
5053
<Reference Include="Moq">
5154
<HintPath>..\..\packages\Moq.4.2.1312.1319\lib\net40\Moq.dll</HintPath>

‎src/DesignTimeStyleHelper/MainWindow.xaml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private void twoFactorTester_Click(object sender, RoutedEventArgs e)
4747

4848
void ShowDialog(UIControllerFlow flow)
4949
{
50-
var ui = App.ServiceProvider.GetExportedValue<IUIProvider>();
50+
var ui = App.ServiceProvider.GetService<IUIProvider>();
5151

5252
var factory = ui.GetService<IExportFactoryProvider>();
5353
var d = factory.UIControllerFactory.CreateExport();

‎src/DesignTimeStyleHelper/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
<package id="Rx-Main" version="2.2.5-custom" targetFramework="net45" userInstalled="true" />
88
<package id="Rx-PlatformServices" version="2.2.5-custom" targetFramework="net45" userInstalled="true" />
99
<package id="Rx-XAML" version="2.2.5-custom" targetFramework="net45" userInstalled="true" />
10+
<package id="VSSDK.ComponentModelHost" version="12.0.4" targetFramework="net461" />
1011
</packages>

‎src/GitHub.App/Controllers/UIController.cs

+19
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,12 @@ void ConfigureUIHandlingStates()
366366
.PermitDynamic(Trigger.Cancel, () => Go(Trigger.Cancel))
367367
.PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish));
368368

369+
uiStateMachine.Configure(UIViewType.StartPageClone)
370+
.OnEntry(tr => RunView(UIViewType.StartPageClone, CalculateDirection(tr)))
371+
.PermitDynamic(Trigger.Next, () => Go(Trigger.Next))
372+
.PermitDynamic(Trigger.Cancel, () => Go(Trigger.Cancel))
373+
.PermitDynamic(Trigger.Finish, () => Go(Trigger.Finish));
374+
369375
uiStateMachine.Configure(UIViewType.End)
370376
.OnEntryFrom(Trigger.Cancel, () => End(false))
371377
.OnEntryFrom(Trigger.Next, () => End(true))
@@ -558,6 +564,19 @@ void ConfigureLogicStates()
558564
logic.Configure(UIViewType.End)
559565
.Permit(Trigger.Next, UIViewType.None);
560566
machines.Add(UIControllerFlow.LogoutRequired, logic);
567+
568+
// start page clone flow
569+
logic = new StateMachine<UIViewType, Trigger>(UIViewType.None);
570+
logic.Configure(UIViewType.None)
571+
.Permit(Trigger.Next, UIViewType.StartPageClone)
572+
.Permit(Trigger.Finish, UIViewType.End);
573+
logic.Configure(UIViewType.StartPageClone)
574+
.Permit(Trigger.Next, UIViewType.End)
575+
.Permit(Trigger.Cancel, UIViewType.End)
576+
.Permit(Trigger.Finish, UIViewType.End);
577+
logic.Configure(UIViewType.End)
578+
.Permit(Trigger.Next, UIViewType.None);
579+
machines.Add(UIControllerFlow.StartPageClone, logic);
561580
}
562581

563582
UIControllerFlow SelectActiveFlow()

0 commit comments

Comments
 (0)