diff --git a/GitHubVS.sln b/GitHubVS.sln index a2b1e6437..e8f713dd0 100644 --- a/GitHubVS.sln +++ b/GitHubVS.sln @@ -96,6 +96,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Splat-Portable", "submodule EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CredentialManagement", "src\CredentialManagement\CredentialManagement.csproj", "{41A47C5B-C606-45B4-B83C-22B9239E4DA0}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Testing_Net45", "submodules\reactiveui\ReactiveUI.Testing\ReactiveUI.Testing_Net45.csproj", "{DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -371,6 +373,18 @@ Global {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.Release|Any CPU.Build.0 = Release|Any CPU {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.Release|x86.ActiveCfg = Release|Any CPU {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.Release|x86.Build.0 = Release|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Debug|x86.ActiveCfg = Debug|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Debug|x86.Build.0 = Debug|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Publish|Any CPU.ActiveCfg = Release|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Publish|Any CPU.Build.0 = Release|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Publish|x86.ActiveCfg = Release|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Publish|x86.Build.0 = Release|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Release|Any CPU.Build.0 = Release|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Release|x86.ActiveCfg = Release|Any CPU + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -394,5 +408,6 @@ Global {1E7F7253-A6AF-43C4-A955-37BEDDA01AF9} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} {252CE1C2-027A-4445-A3C2-E4D6C80A935A} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AF9} {0EC8DBA1-D745-4EE5-993A-6026440EC3BF} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AF9} + {DD99FD0F-82F6-4C30-930E-4A1D0DF01D65} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9} EndGlobalSection EndGlobal diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index a76c58875..6efc39462 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -36,11 +36,16 @@ ..\..\lib\LibGit2Sharp.dll + + ..\..\packages\Rx-Testing.2.2.5\lib\net45\Microsoft.Reactive.Testing.dll + True + False ..\..\lib\Microsoft.TeamFoundation.Git.Controls.dll + @@ -159,6 +164,10 @@ {08dd4305-7787-4823-a53f-4d0f725a07f3} Octokit + + {dd99fd0f-82f6-4c30-930e-4a1d0df01d65} + ReactiveUI.Testing_Net45 + {1ce2d235-8072-4649-ba5a-cfb1af8776e0} ReactiveUI_Net45 diff --git a/src/UnitTests/packages.config b/src/UnitTests/packages.config index 6cd2be6ef..1d65ffab8 100644 --- a/src/UnitTests/packages.config +++ b/src/UnitTests/packages.config @@ -1,17 +1,18 @@  - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/submodules/reactiveui b/submodules/reactiveui index 254c9ac15..04ed59da4 160000 --- a/submodules/reactiveui +++ b/submodules/reactiveui @@ -1 +1 @@ -Subproject commit 254c9ac15764d758c5e67a3dcab74a359b19c8eb +Subproject commit 04ed59da4a5c971f71e27f177961f7afc41b2439