diff --git a/.gitmodules b/.gitmodules index 7ae1c4fce..f45ccbee6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "submodules/rothko"] path = submodules/rothko url = https://github.com/shana/Rothko.git -[submodule "submodules/nullguard"] - path = submodules/nullguard - url = https://github.com/shana/NullGuard.git [submodule "submodules/reactiveui"] path = submodules/reactiveui url = https://github.com/shana/ReactiveUI [submodule "submodules/octokit.net"] path = submodules/octokit.net url = https://github.com/shana/Octokit.Net +[submodule "submodules/splat"] + path = submodules/splat + url = https://github.com/shana/splat.git diff --git a/GitHubVS.sln b/GitHubVS.sln index 16c14b9fe..5ef09f3c6 100644 --- a/GitHubVS.sln +++ b/GitHubVS.sln @@ -57,13 +57,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesignTimeStyleHelper", "sr EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "MsiInstaller", "src\MsiInstaller\MsiInstaller.wixproj", "{1ED83084-2A57-4F89-915C-8A2167C0D6BC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NullGuard", "submodules\nullguard\ReferenceAssembly\NullGuard.csproj", "{B5AEB0E8-28F4-4955-A055-9C200F7113F0}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit", "submodules\octokit.net\Octokit\Octokit.csproj", "{08DD4305-7787-4823-A53F-4D0F725A07F3}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Octokit.Reactive", "submodules\octokit.net\Octokit.Reactive\Octokit.Reactive.csproj", "{674B69B8-0780-4D54-AE2B-C15821FA51CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI", "submodules\reactiveui\ReactiveUI\ReactiveUI.csproj", "{464CB812-F99F-401B-BE4C-E8F0515CD19D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactiveUI", "ReactiveUI", "{1E7F7253-A6AF-43C4-A955-37BEDDA01AB9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI_Net45", "submodules\reactiveui\ReactiveUI\ReactiveUI_Net45.csproj", "{1CE2D235-8072-4649-BA5A-CFB1AF8776E0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Splat-Net45", "submodules\splat\Splat\Splat-Net45.csproj", "{252CE1C2-027A-4445-A3C2-E4D6C80A935A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Events_Net45", "submodules\reactiveui\ReactiveUI.Events\ReactiveUI.Events_Net45.csproj", "{600998C4-54DD-4755-BFA8-6F44544D8E2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventBuilder", "submodules\reactiveui\ReactiveUI.Events\EventBuilder.csproj", "{3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -229,18 +235,6 @@ Global {1ED83084-2A57-4F89-915C-8A2167C0D6BC}.Release|Any CPU.ActiveCfg = Release|x86 {1ED83084-2A57-4F89-915C-8A2167C0D6BC}.Release|x86.ActiveCfg = Release|x86 {1ED83084-2A57-4F89-915C-8A2167C0D6BC}.Release|x86.Build.0 = Release|x86 - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Debug|x86.ActiveCfg = Debug|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Debug|x86.Build.0 = Debug|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Publish|Any CPU.ActiveCfg = Release|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Publish|Any CPU.Build.0 = Release|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Publish|x86.ActiveCfg = Release|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Publish|x86.Build.0 = Release|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Release|Any CPU.Build.0 = Release|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Release|x86.ActiveCfg = Release|Any CPU - {B5AEB0E8-28F4-4955-A055-9C200F7113F0}.Release|x86.Build.0 = Release|Any CPU {08DD4305-7787-4823-A53F-4D0F725A07F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {08DD4305-7787-4823-A53F-4D0F725A07F3}.Debug|Any CPU.Build.0 = Debug|Any CPU {08DD4305-7787-4823-A53F-4D0F725A07F3}.Debug|x86.ActiveCfg = Debug|Any CPU @@ -265,18 +259,54 @@ Global {674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|Any CPU.Build.0 = Release|Any CPU {674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|x86.ActiveCfg = Release|Any CPU {674B69B8-0780-4D54-AE2B-C15821FA51CB}.Release|x86.Build.0 = Release|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|x86.ActiveCfg = Debug|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Debug|x86.Build.0 = Debug|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Publish|Any CPU.ActiveCfg = Release|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Publish|Any CPU.Build.0 = Release|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Publish|x86.ActiveCfg = Release|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Publish|x86.Build.0 = Release|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|Any CPU.Build.0 = Release|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|x86.ActiveCfg = Release|Any CPU - {464CB812-F99F-401B-BE4C-E8F0515CD19D}.Release|x86.Build.0 = Release|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Debug|x86.ActiveCfg = Debug|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Debug|x86.Build.0 = Debug|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Publish|Any CPU.ActiveCfg = Release|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Publish|Any CPU.Build.0 = Release|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Publish|x86.ActiveCfg = Release|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Publish|x86.Build.0 = Release|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Release|Any CPU.Build.0 = Release|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Release|x86.ActiveCfg = Release|Any CPU + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0}.Release|x86.Build.0 = Release|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Debug|x86.ActiveCfg = Debug|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Debug|x86.Build.0 = Debug|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Publish|Any CPU.ActiveCfg = Release|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Publish|Any CPU.Build.0 = Release|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Publish|x86.ActiveCfg = Release|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Publish|x86.Build.0 = Release|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Release|Any CPU.Build.0 = Release|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Release|x86.ActiveCfg = Release|Any CPU + {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.Release|x86.Build.0 = Release|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Debug|x86.ActiveCfg = Debug|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Debug|x86.Build.0 = Debug|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Publish|Any CPU.ActiveCfg = Release|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Publish|Any CPU.Build.0 = Release|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Publish|x86.ActiveCfg = Release|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Publish|x86.Build.0 = Release|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Release|Any CPU.Build.0 = Release|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Release|x86.ActiveCfg = Release|Any CPU + {600998C4-54DD-4755-BFA8-6F44544D8E2E}.Release|x86.Build.0 = Release|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Debug|x86.ActiveCfg = Debug|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Debug|x86.Build.0 = Debug|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Publish|Any CPU.ActiveCfg = Release|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Publish|Any CPU.Build.0 = Release|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Publish|x86.ActiveCfg = Release|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Publish|x86.Build.0 = Release|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Release|Any CPU.Build.0 = Release|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Release|x86.ActiveCfg = Release|Any CPU + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -285,9 +315,12 @@ Global {596595A6-2A3C-469E-9386-9E3767D863A5} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD} {4A84E568-CA86-4510-8CD0-90D3EF9B65F9} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} {1ED83084-2A57-4F89-915C-8A2167C0D6BC} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFF} - {B5AEB0E8-28F4-4955-A055-9C200F7113F0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} {08DD4305-7787-4823-A53F-4D0F725A07F3} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} {674B69B8-0780-4D54-AE2B-C15821FA51CB} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} - {464CB812-F99F-401B-BE4C-E8F0515CD19D} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} + {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} + {1CE2D235-8072-4649-BA5A-CFB1AF8776E0} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9} + {252CE1C2-027A-4445-A3C2-E4D6C80A935A} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB8} + {600998C4-54DD-4755-BFA8-6F44544D8E2E} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9} + {3D4AE5F9-A535-4D5C-8F30-1A35D7BA0A3D} = {1E7F7253-A6AF-43C4-A955-37BEDDA01AB9} EndGlobalSection EndGlobal diff --git a/submodules/nullguard b/submodules/nullguard deleted file mode 160000 index 7ac45dc01..000000000 --- a/submodules/nullguard +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7ac45dc017a82a360c598cb4f4f037b8658ede8c diff --git a/submodules/octokit.net b/submodules/octokit.net index 086df730e..199d58d2c 160000 --- a/submodules/octokit.net +++ b/submodules/octokit.net @@ -1 +1 @@ -Subproject commit 086df730e22dac51370e1bed7611eed5d5073dcc +Subproject commit 199d58d2c66696fb30e2a5404c4ee386b03da61c diff --git a/submodules/reactiveui b/submodules/reactiveui index 96c134211..8186d765c 160000 --- a/submodules/reactiveui +++ b/submodules/reactiveui @@ -1 +1 @@ -Subproject commit 96c134211e92abedbb45a2d2c0ac999b06f5b194 +Subproject commit 8186d765cc23c21a6ad9a27bf73af28dd888a6d4 diff --git a/submodules/rothko b/submodules/rothko index 3b26b6743..d60a56bc7 160000 --- a/submodules/rothko +++ b/submodules/rothko @@ -1 +1 @@ -Subproject commit 3b26b67435237e410ef7b2509c491f2ee6cfec37 +Subproject commit d60a56bc7dcd2c5b00490ee27e907663a8d4114b diff --git a/submodules/splat b/submodules/splat new file mode 160000 index 000000000..1c3043617 --- /dev/null +++ b/submodules/splat @@ -0,0 +1 @@ +Subproject commit 1c30436175f61dc4aea415a8dda071bddc5f4d1c