diff --git a/Directory.Build.Props b/Directory.Build.Props new file mode 100644 index 0000000000..274882efc9 --- /dev/null +++ b/Directory.Build.Props @@ -0,0 +1,8 @@ + + + GitHub Extension for Visual Studio + 2.5.6.0 + Copyright © GitHub, Inc. 2014-2018 + 7.3 + + \ No newline at end of file diff --git a/GitHubVS.sln b/GitHubVS.sln index 97eeb887a0..ea1817b322 100644 --- a/GitHubVS.sln +++ b/GitHubVS.sln @@ -17,11 +17,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI", "src\GitHub.UI\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI.Reactive", "src\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj", "{158B05E8-FDBC-4D71-B871-C96E28D5ADF5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Extensions", "src\GitHub.Extensions\GitHub.Extensions.csproj", "{6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Extensions", "src\GitHub.Extensions\GitHub.Extensions.csproj", "{6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Extensions.Reactive", "src\GitHub.Extensions.Reactive\GitHub.Extensions.Reactive.csproj", "{6559E128-8B40-49A5-85A8-05565ED0C7E3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Extensions.Reactive", "src\GitHub.Extensions.Reactive\GitHub.Extensions.Reactive.csproj", "{6559E128-8B40-49A5-85A8-05565ED0C7E3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.App", "src\GitHub.App\GitHub.App.csproj", "{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.App", "src\GitHub.App\GitHub.App.csproj", "{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Submodules", "Submodules", "{1E7F7253-A6AF-43C4-A955-37BEDDA01AB8}" ProjectSection(SolutionItems) = preProject @@ -53,11 +53,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{7B6C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8A7DA2E7-262B-4581-807A-1C45CE79CDFD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Exports", "src\GitHub.Exports\GitHub.Exports.csproj", "{9AEA02DB-02B5-409C-B0CA-115D05331A6B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Exports", "src\GitHub.Exports\GitHub.Exports.csproj", "{9AEA02DB-02B5-409C-B0CA-115D05331A6B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Api", "src\GitHub.Api\GitHub.Api.csproj", "{B389ADAF-62CC-486E-85B4-2D8B078DF763}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Api", "src\GitHub.Api\GitHub.Api.csproj", "{B389ADAF-62CC-486E-85B4-2D8B078DF763}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Exports.Reactive", "src\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj", "{E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Exports.Reactive", "src\GitHub.Exports.Reactive\GitHub.Exports.Reactive.csproj", "{E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Octokit", "Octokit", "{1E7F7253-A6AF-43C4-A955-37BEDDA01AC0}" EndProject @@ -81,27 +81,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Splat", "Splat", "{1E7F7253 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}") = "CredentialManagement", "src\CredentialManagement\CredentialManagement.csproj", "{41A47C5B-C606-45B4-B83C-22B9239E4DA0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CredentialManagement", "src\CredentialManagement\CredentialManagement.csproj", "{41A47C5B-C606-45B4-B83C-22B9239E4DA0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackingCollectionTests", "test\TrackingCollectionTests\TrackingCollectionTests.csproj", "{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrackingCollectionTests", "test\TrackingCollectionTests\TrackingCollectionTests.csproj", "{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.14", "src\GitHub.TeamFoundation.14\GitHub.TeamFoundation.14.csproj", "{161DBF01-1DBF-4B00-8551-C5C00F26720D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.15", "src\GitHub.TeamFoundation.15\GitHub.TeamFoundation.15.csproj", "{161DBF01-1DBF-4B00-8551-C5C00F26720E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.UI", "src\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj", "{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.VisualStudio.UI", "src\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj", "{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.StartPage", "src\GitHub.StartPage\GitHub.StartPage.csproj", "{50E277B8-8580-487A-8F8E-5C3B9FBF0F77}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI.UnitTests", "test\GitHub.UI.UnitTests\GitHub.UI.UnitTests.csproj", "{110B206F-8554-4B51-BF86-94DAA32F5E26}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.UI.UnitTests", "test\GitHub.UI.UnitTests\GitHub.UI.UnitTests.csproj", "{110B206F-8554-4B51-BF86-94DAA32F5E26}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.InlineReviews", "src\GitHub.InlineReviews\GitHub.InlineReviews.csproj", "{7F5ED78B-74A3-4406-A299-70CFB5885B8B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.InlineReviews.UnitTests", "test\GitHub.InlineReviews.UnitTests\GitHub.InlineReviews.UnitTests.csproj", "{17EB676B-BB91-48B5-AA59-C67695C647C2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.InlineReviews.UnitTests", "test\GitHub.InlineReviews.UnitTests\GitHub.InlineReviews.UnitTests.csproj", "{17EB676B-BB91-48B5-AA59-C67695C647C2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Logging", "src\GitHub.Logging\GitHub.Logging.csproj", "{8D73575A-A89F-47CC-B153-B47DD06837F0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Logging", "src\GitHub.Logging\GitHub.Logging.csproj", "{8D73575A-A89F-47CC-B153-B47DD06837F0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Services.Vssdk", "src\GitHub.Services.Vssdk\GitHub.Services.Vssdk.csproj", "{2D3D2834-33BE-45CA-B3CC-12F853557D7B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Services.Vssdk", "src\GitHub.Services.Vssdk\GitHub.Services.Vssdk.csproj", "{2D3D2834-33BE-45CA-B3CC-12F853557D7B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Metrics", "Metrics", "{C2D88962-BD6B-4F11-B914-535B38377962}" EndProject @@ -109,21 +109,19 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetricsServer", "test\Metri EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MetricsTests", "test\MetricsTests\MetricsTests\MetricsTests.csproj", "{09313E65-7ADB-48C1-AD3A-572020C5BDCB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Api.UnitTests", "test\GitHub.Api.UnitTests\GitHub.Api.UnitTests.csproj", "{EFDE0798-ACDB-431D-B7F1-548A7231C853}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Api.UnitTests", "test\GitHub.Api.UnitTests\GitHub.Api.UnitTests.csproj", "{EFDE0798-ACDB-431D-B7F1-548A7231C853}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.App.UnitTests", "test\GitHub.App.UnitTests\GitHub.App.UnitTests.csproj", "{3525D819-6AEC-4879-89FB-56B41F026571}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.App.UnitTests", "test\GitHub.App.UnitTests\GitHub.App.UnitTests.csproj", "{3525D819-6AEC-4879-89FB-56B41F026571}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Exports.UnitTests", "test\GitHub.Exports.UnitTests\GitHub.Exports.UnitTests.csproj", "{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Exports.UnitTests", "test\GitHub.Exports.UnitTests\GitHub.Exports.UnitTests.csproj", "{94509FCB-6C97-4ED6-AED6-6E74AB3CA336}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Exports.Reactive.UnitTests", "test\GitHub.Exports.Reactive.UnitTests\GitHub.Exports.Reactive.UnitTests.csproj", "{C59868FC-D8BC-4D47-B4F3-16908D2641C6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Extensions.UnitTests", "test\GitHub.Extensions.UnitTests\GitHub.Extensions.UnitTests.csproj", "{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.Extensions.UnitTests", "test\GitHub.Extensions.UnitTests\GitHub.Extensions.UnitTests.csproj", "{DE704BBB-6EC6-4173-B695-D9EBF5AEB092}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.Primitives.UnitTests", "test\GitHub.Primitives.UnitTests\GitHub.Primitives.UnitTests.csproj", "{E687457A-BEDC-422D-8D9D-2DA58099EBBA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.TeamFoundation.UnitTests", "test\GitHub.TeamFoundation.UnitTests\GitHub.TeamFoundation.UnitTests.csproj", "{93778A89-3E58-4853-B772-948EBB3F17BE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.UnitTests", "test\GitHub.TeamFoundation.UnitTests\GitHub.TeamFoundation.UnitTests.csproj", "{93778A89-3E58-4853-B772-948EBB3F17BE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.UnitTests", "test\GitHub.VisualStudio.UnitTests\GitHub.VisualStudio.UnitTests.csproj", "{8B14F90B-0781-465D-AB94-19C8C56E3A94}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitHub.VisualStudio.UnitTests", "test\GitHub.VisualStudio.UnitTests\GitHub.VisualStudio.UnitTests.csproj", "{8B14F90B-0781-465D-AB94-19C8C56E3A94}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -146,8 +144,8 @@ Global {11569514-5AE5-4B5B-92A2-F10B0967DE5F}.ReleaseWithoutVsix|Any CPU.Build.0 = ReleaseWithoutVsix|Any CPU {346384DD-2445-4A28-AF22-B45F3957BD89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {346384DD-2445-4A28-AF22-B45F3957BD89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {346384DD-2445-4A28-AF22-B45F3957BD89}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {346384DD-2445-4A28-AF22-B45F3957BD89}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {346384DD-2445-4A28-AF22-B45F3957BD89}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {346384DD-2445-4A28-AF22-B45F3957BD89}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -156,8 +154,8 @@ Global {346384DD-2445-4A28-AF22-B45F3957BD89}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -166,8 +164,8 @@ Global {158B05E8-FDBC-4D71-B871-C96E28D5ADF5}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -176,8 +174,8 @@ Global {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {6559E128-8B40-49A5-85A8-05565ED0C7E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6559E128-8B40-49A5-85A8-05565ED0C7E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6559E128-8B40-49A5-85A8-05565ED0C7E3}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {6559E128-8B40-49A5-85A8-05565ED0C7E3}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {6559E128-8B40-49A5-85A8-05565ED0C7E3}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {6559E128-8B40-49A5-85A8-05565ED0C7E3}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {6559E128-8B40-49A5-85A8-05565ED0C7E3}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {6559E128-8B40-49A5-85A8-05565ED0C7E3}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {6559E128-8B40-49A5-85A8-05565ED0C7E3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -186,8 +184,8 @@ Global {6559E128-8B40-49A5-85A8-05565ED0C7E3}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -196,8 +194,8 @@ Global {1A1DA411-8D1F-4578-80A6-04576BEA2DC5}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -206,8 +204,8 @@ Global {9AEA02DB-02B5-409C-B0CA-115D05331A6B}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B389ADAF-62CC-486E-85B4-2D8B078DF763}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {B389ADAF-62CC-486E-85B4-2D8B078DF763}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF763}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {B389ADAF-62CC-486E-85B4-2D8B078DF763}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {B389ADAF-62CC-486E-85B4-2D8B078DF763}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -216,8 +214,8 @@ Global {B389ADAF-62CC-486E-85B4-2D8B078DF763}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -296,8 +294,8 @@ Global {252CE1C2-027A-4445-A3C2-E4D6C80A935A}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {41A47C5B-C606-45B4-B83C-22B9239E4DA0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -336,8 +334,8 @@ Global {161DBF01-1DBF-4B00-8551-C5C00F26720E}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -386,8 +384,8 @@ Global {17EB676B-BB91-48B5-AA59-C67695C647C2}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {8D73575A-A89F-47CC-B153-B47DD06837F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D73575A-A89F-47CC-B153-B47DD06837F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU {8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU {8D73575A-A89F-47CC-B153-B47DD06837F0}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {8D73575A-A89F-47CC-B153-B47DD06837F0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -396,10 +394,10 @@ Global {8D73575A-A89F-47CC-B153-B47DD06837F0}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.DebugCodeAnalysis|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.DebugCodeAnalysis|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU - {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.DebugWithoutVsix|Any CPU.ActiveCfg = DebugCodeAnalysis|Any CPU - {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.DebugWithoutVsix|Any CPU.Build.0 = DebugCodeAnalysis|Any CPU + {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU + {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU + {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU + {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.Release|Any CPU.ActiveCfg = Release|Any CPU {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.Release|Any CPU.Build.0 = Release|Any CPU {2D3D2834-33BE-45CA-B3CC-12F853557D7B}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU @@ -474,16 +472,6 @@ Global {DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.Release|Any CPU.Build.0 = Release|Any CPU {DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU {DE704BBB-6EC6-4173-B695-D9EBF5AEB092}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.Release|Any CPU.Build.0 = Release|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU {93778A89-3E58-4853-B772-948EBB3F17BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {93778A89-3E58-4853-B772-948EBB3F17BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {93778A89-3E58-4853-B772-948EBB3F17BE}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU @@ -532,7 +520,6 @@ Global {94509FCB-6C97-4ED6-AED6-6E74AB3CA336} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD} {C59868FC-D8BC-4D47-B4F3-16908D2641C6} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD} {DE704BBB-6EC6-4173-B695-D9EBF5AEB092} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD} - {E687457A-BEDC-422D-8D9D-2DA58099EBBA} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD} {93778A89-3E58-4853-B772-948EBB3F17BE} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD} {8B14F90B-0781-465D-AB94-19C8C56E3A94} = {8A7DA2E7-262B-4581-807A-1C45CE79CDFD} EndGlobalSection diff --git a/global.json b/global.json new file mode 100644 index 0000000000..e620a36770 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "msbuild-sdks": { + "MSBuild.Sdk.Extras": "1.6.52" + } +} \ No newline at end of file diff --git a/scripts/Bump-Version.ps1 b/scripts/Bump-Version.ps1 index 33a89cac8c..f9918f1892 100644 --- a/scripts/Bump-Version.ps1 +++ b/scripts/Bump-Version.ps1 @@ -53,6 +53,7 @@ if ($Trace) { Set-PSDebug -Trace 1 } . $scriptsDirectory\Modules\Vsix.ps1 | out-null . $scriptsDirectory\Modules\SolutionInfo.ps1 | out-null . $scriptsDirectory\Modules\AppVeyor.ps1 | out-null +. $scriptsDirectory\Modules\DirectoryBuildProps.ps1 | out-null if ($NewVersion -eq $null) { if (!$BumpMajor -and !$BumpMinor -and !$BumpPatch -and !$BumpBuild){ diff --git a/scripts/modules.ps1 b/scripts/modules.ps1 index ae41440ab3..cd61409ce1 100644 --- a/scripts/modules.ps1 +++ b/scripts/modules.ps1 @@ -126,8 +126,8 @@ New-Module -ScriptBlock { $msbuild = Find-MSBuild - Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=14.0 $flag1 $flag2" - Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=14.0 $flag1 $flag2 } + Write-Host "$msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2" + Run-Command -Fatal { & $msbuild $solution /target:$target /property:Configuration=$configuration /p:DeployExtension=false /verbosity:minimal /p:VisualStudioVersion=15.0 $flag1 $flag2 } } Export-ModuleMember -Function Find-MSBuild,Build-Solution diff --git a/scripts/modules/DirectoryBuildProps.ps1 b/scripts/modules/DirectoryBuildProps.ps1 new file mode 100644 index 0000000000..811ff3d19f --- /dev/null +++ b/scripts/modules/DirectoryBuildProps.ps1 @@ -0,0 +1,24 @@ +Set-StrictMode -Version Latest + +New-Module -ScriptBlock { + function Get-DirectoryBuildPropsPath { + Join-Path $rootDirectory Directory.Build.Props + } + + function Get-DirectoryBuildProps { + $xmlLines = Get-Content (Get-DirectoryBuildPropsPath) -encoding UTF8 + [xml] $xmlLines + } + + function Write-DirectoryBuildProps([System.Version]$version) { + + $document = Get-DirectoryBuildProps + + $numberOfReplacements = 0 + $document.Project.PropertyGroup.Version = $version.ToString() + + $document.Save((Get-DirectoryBuildPropsPath)) + } + + Export-ModuleMember -Function Write-DirectoryBuildProps +} \ No newline at end of file diff --git a/scripts/modules/Versioning.ps1 b/scripts/modules/Versioning.ps1 index 22f94a8656..e7f2efad7a 100644 --- a/scripts/modules/Versioning.ps1 +++ b/scripts/modules/Versioning.ps1 @@ -42,6 +42,7 @@ New-Module -ScriptBlock { Write-VersionVsixManifest $version Write-VersionSolutionInfo $version Write-VersionAppVeyor $version + Write-DirectoryBuildProps $version Push-Location $rootDirectory New-Item -Type Directory -ErrorAction SilentlyContinue build | out-null Set-Content build\version $version diff --git a/src/CredentialManagement/CredentialManagement.csproj b/src/CredentialManagement/CredentialManagement.csproj index 07648cf7aa..6a950433d1 100644 --- a/src/CredentialManagement/CredentialManagement.csproj +++ b/src/CredentialManagement/CredentialManagement.csproj @@ -1,85 +1,12 @@ - - - + - Debug - AnyCPU - {41A47C5B-C606-45B4-B83C-22B9239E4DA0} - Library - Properties - CredentialManagement - GitHub.CredentialManagement - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + net461 - - - - - - - - - - - - Properties\SolutionInfo.cs - - - - - - - - + - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - + - - - \ No newline at end of file + diff --git a/src/CredentialManagement/Properties/AssemblyInfo.cs b/src/CredentialManagement/Properties/AssemblyInfo.cs deleted file mode 100644 index b58b8183dd..0000000000 --- a/src/CredentialManagement/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("GitHub.CredentialManagement")] -[assembly: AssemblyDescription("GitHub CredentialManagement")] -[assembly: Guid("41a47c5b-c606-45b4-b83c-22b9239e4da0")] diff --git a/src/GitHub.Api/GitHub.Api.csproj b/src/GitHub.Api/GitHub.Api.csproj index 28f1263421..bccfa3c2b5 100644 --- a/src/GitHub.Api/GitHub.Api.csproj +++ b/src/GitHub.Api/GitHub.Api.csproj @@ -1,132 +1,33 @@ - - - + - Debug - AnyCPU - {B389ADAF-62CC-486E-85B4-2D8B078DF763} - Library - Properties - GitHub.Api - GitHub.Api - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + net461 + - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll - - - ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll - - - ..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll - True - - - - - - - - - - - - - - + + + + ApiClientConfiguration_User.cs - - - - - - - - - - - - - - - Properties\SolutionInfo.cs - + - - + + + - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {41a47c5b-c606-45b4-b83c-22b9239e4da0} - CredentialManagement - - - {9aea02db-02b5-409c-b0ca-115d05331a6b} - GitHub.Exports - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - - - {8d73575a-a89f-47cc-b153-b47dd06837f0} - GitHub.Logging - + + + + + + - + + + - - - \ No newline at end of file + diff --git a/src/GitHub.Api/Properties/AssemblyInfo.cs b/src/GitHub.Api/Properties/AssemblyInfo.cs deleted file mode 100644 index 637b41cdbe..0000000000 --- a/src/GitHub.Api/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("GitHub.Api")] -[assembly: AssemblyDescription("GitHub Api")] -[assembly: Guid("b389adaf-62cc-486e-85b4-2d8b078df763")] diff --git a/src/GitHub.Api/packages.config b/src/GitHub.Api/packages.config deleted file mode 100644 index c6373f1d86..0000000000 --- a/src/GitHub.Api/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/GitHub.App/GitHub.App.csproj b/src/GitHub.App/GitHub.App.csproj index 18a58a0710..3f60d278c6 100644 --- a/src/GitHub.App/GitHub.App.csproj +++ b/src/GitHub.App/GitHub.App.csproj @@ -1,446 +1,70 @@ - - - - + - Debug - AnyCPU - {1A1DA411-8D1F-4578-80A6-04576BEA2DC5} - Library - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Properties - GitHub.App - GitHub.App - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + net461 + + - - False - - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll - True - - - ..\..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Editor.14.3.25407\lib\net45\Microsoft.VisualStudio.Editor.dll - True - - - ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6072\lib\net11\Microsoft.VisualStudio.Shell.Interop.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30320\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61031\lib\net20\Microsoft.VisualStudio.Shell.Interop.11.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30111\lib\net20\Microsoft.VisualStudio.Shell.Interop.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6071\lib\net11\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50728\lib\net11\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - False - ..\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll - - - ..\..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll - True - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll - - - ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll - - - - - ..\..\packages\Rothko.0.0.3-ghfvs\lib\net45\rothko.dll - True - - - ..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll - True - - - ..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\lib\net45\SQLitePCL.raw.dll - True - - - ..\..\packages\Stateless.2.5.56.0\lib\portable-net40+sl50+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10\Stateless.dll - True - - - - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll - True - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - True - True + + + Resources.resx + True + True - - - - - - - - - - - - - - - - - - - - Properties\SolutionInfo.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Designer - - - - - {241c47df-ca8e-4296-aa03-2c48bb646abd} - Akavache.Sqlite3 - False - - - {b4e665e5-6caf-4414-a6e2-8de1c3bcf203} - Akavache_Net45 - False - - - {674b69b8-0780-4d54-ae2b-c15821fa51cb} - Octokit.Reactive - - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {41a47c5b-c606-45b4-b83c-22b9239e4da0} - CredentialManagement - - - {B389ADAF-62CC-486E-85B4-2D8B078DF763} - GitHub.Api - - - {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} - GitHub.Exports.Reactive - - - {9aea02db-02b5-409c-b0ca-115d05331a6b} - GitHub.Exports - True - - - {6559e128-8b40-49a5-85a8-05565ed0c7e3} - GitHub.Extensions.Reactive - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - - - {8d73575a-a89f-47cc-b153-b47dd06837f0} - GitHub.Logging - - - {2D3D2834-33BE-45CA-B3CC-12F853557D7B} - GitHub.Services.Vssdk - - - {158b05e8-fdbc-4d71-b871-c96e28d5adf5} - GitHub.UI.Reactive - - - - + + PublicResXFileCodeGenerator Resources.Designer.cs - Designer + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - \ No newline at end of file + diff --git a/src/GitHub.App/Models/IHttpListenerContext.cs b/src/GitHub.App/Models/IHttpListenerContext.cs deleted file mode 100644 index 2cf98860f4..0000000000 --- a/src/GitHub.App/Models/IHttpListenerContext.cs +++ /dev/null @@ -1,154 +0,0 @@ -using System; -using System.Threading.Tasks; - -namespace GitHub.App.Models -{ - public interface IHttpListenerContext - { - // - // Summary: - // Gets the System.Net.HttpListenerRequest that represents a client's request for - // a resource. - // - // Returns: - // An System.Net.HttpListenerRequest object that represents the client request. - public HttpListenerRequest Request { get; } - - // - // Summary: - // Gets the System.Net.HttpListenerResponse object that will be sent to the client - // in response to the client's request. - // - // Returns: - // An System.Net.HttpListenerResponse object used to send a response back to the - // client. - public HttpListenerResponse Response { get; } - - // - // Summary: - // Gets an object used to obtain identity, authentication information, and security - // roles for the client whose request is represented by this System.Net.HttpListenerContext - // object. - // - // Returns: - // An System.Security.Principal.IPrincipal object that describes the client, or - // null if the System.Net.HttpListener that supplied this System.Net.HttpListenerContext - // does not require authentication. - public IPrincipal User { get; } - - // - // Summary: - // Accept a WebSocket connection as an asynchronous operation. - // - // Parameters: - // subProtocol: - // The supported WebSocket sub-protocol. - // - // Returns: - // Returns System.Threading.Tasks.Task`1.The task object representing the asynchronous - // operation. The System.Threading.Tasks.Task`1.Result property on the task object - // returns an System.Net.WebSockets.HttpListenerWebSocketContext object. - // - // Exceptions: - // T:System.ArgumentException: - // subProtocol is an empty string-or- subProtocol contains illegal characters. - // - // T:System.Net.WebSockets.WebSocketException: - // An error occurred when sending the response to complete the WebSocket handshake. - public Task AcceptWebSocketAsync(string subProtocol); - // - // Summary: - // Accept a WebSocket connection specifying the supported WebSocket sub-protocol - // and WebSocket keep-alive interval as an asynchronous operation. - // - // Parameters: - // subProtocol: - // The supported WebSocket sub-protocol. - // - // keepAliveInterval: - // The WebSocket protocol keep-alive interval in milliseconds. - // - // Returns: - // Returns System.Threading.Tasks.Task`1.The task object representing the asynchronous - // operation. The System.Threading.Tasks.Task`1.Result property on the task object - // returns an System.Net.WebSockets.HttpListenerWebSocketContext object. - // - // Exceptions: - // T:System.ArgumentException: - // subProtocol is an empty string-or- subProtocol contains illegal characters. - // - // T:System.ArgumentOutOfRangeException: - // keepAliveInterval is too small. - // - // T:System.Net.WebSockets.WebSocketException: - // An error occurred when sending the response to complete the WebSocket handshake. - public Task AcceptWebSocketAsync(string subProtocol, TimeSpan keepAliveInterval); - // - // Summary: - // Accept a WebSocket connection specifying the supported WebSocket sub-protocol, - // receive buffer size, and WebSocket keep-alive interval as an asynchronous operation. - // - // Parameters: - // subProtocol: - // The supported WebSocket sub-protocol. - // - // receiveBufferSize: - // The receive buffer size in bytes. - // - // keepAliveInterval: - // The WebSocket protocol keep-alive interval in milliseconds. - // - // Returns: - // Returns System.Threading.Tasks.Task`1.The task object representing the asynchronous - // operation. The System.Threading.Tasks.Task`1.Result property on the task object - // returns an System.Net.WebSockets.HttpListenerWebSocketContext object. - // - // Exceptions: - // T:System.ArgumentException: - // subProtocol is an empty string-or- subProtocol contains illegal characters. - // - // T:System.ArgumentOutOfRangeException: - // keepAliveInterval is too small.-or- receiveBufferSize is less than 16 bytes-or- - // receiveBufferSize is greater than 64K bytes. - // - // T:System.Net.WebSockets.WebSocketException: - // An error occurred when sending the response to complete the WebSocket handshake. - public Task AcceptWebSocketAsync(string subProtocol, int receiveBufferSize, TimeSpan keepAliveInterval); - // - // Summary: - // Accept a WebSocket connection specifying the supported WebSocket sub-protocol, - // receive buffer size, WebSocket keep-alive interval, and the internal buffer as - // an asynchronous operation. - // - // Parameters: - // subProtocol: - // The supported WebSocket sub-protocol. - // - // receiveBufferSize: - // The receive buffer size in bytes. - // - // keepAliveInterval: - // The WebSocket protocol keep-alive interval in milliseconds. - // - // internalBuffer: - // An internal buffer to use for this operation. - // - // Returns: - // Returns System.Threading.Tasks.Task`1.The task object representing the asynchronous - // operation. The System.Threading.Tasks.Task`1.Result property on the task object - // returns an System.Net.WebSockets.HttpListenerWebSocketContext object. - // - // Exceptions: - // T:System.ArgumentException: - // subProtocol is an empty string-or- subProtocol contains illegal characters. - // - // T:System.ArgumentOutOfRangeException: - // keepAliveInterval is too small.-or- receiveBufferSize is less than 16 bytes-or- - // receiveBufferSize is greater than 64K bytes. - // - // T:System.Net.WebSockets.WebSocketException: - // An error occurred when sending the response to complete the WebSocket handshake. - [EditorBrowsable(EditorBrowsableState.Never)] - public Task AcceptWebSocketAsync(string subProtocol, int receiveBufferSize, TimeSpan keepAliveInterval, ArraySegment internalBuffer); - } -} diff --git a/src/GitHub.App/Properties/AssemblyInfo.cs b/src/GitHub.App/Properties/AssemblyInfo.cs index 78e12d3418..5c7470009c 100644 --- a/src/GitHub.App/Properties/AssemblyInfo.cs +++ b/src/GitHub.App/Properties/AssemblyInfo.cs @@ -1,10 +1,4 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using System.Windows.Markup; - -[assembly: AssemblyTitle("GitHub.App")] -[assembly: AssemblyDescription("Provides the view models for the GitHub for Visual Studio extension")] -[assembly: Guid("a8b9a236-d238-4733-b116-716872a1e8e0")] +using System.Windows.Markup; [assembly: XmlnsDefinition("/~https://github.com/github/VisualStudio", "GitHub.SampleData")] [assembly: XmlnsDefinition("/~https://github.com/github/VisualStudio", "GitHub.ViewModels")] diff --git a/src/GitHub.App/ViewModels/PullRequestFileViewModel.cs b/src/GitHub.App/ViewModels/PullRequestFileViewModel.cs deleted file mode 100644 index 97e2f31582..0000000000 --- a/src/GitHub.App/ViewModels/PullRequestFileViewModel.cs +++ /dev/null @@ -1,35 +0,0 @@ -namespace GitHub.ViewModels -{ - /// - /// A file node in a pull request changes tree. - /// - public class PullRequestFileViewModel : IPullRequestFileViewModel - { - /// - /// Initializes a new instance of the class. - /// - /// The path to the file, relative to the repository. - /// The way the file was changed. - public PullRequestFileViewModel(string path, FileChangeType changeType) - { - ChangeType = changeType; - FileName = System.IO.Path.GetFileName(path); - Path = path; - } - - /// - /// Gets the type of change that was made to the file. - /// - public FileChangeType ChangeType { get; } - - /// - /// Gets the name of the file without path information. - /// - public string FileName { get; } - - /// - /// Gets the path to the file, relative to the root of the repository. - /// - public string Path { get; } - } -} diff --git a/src/GitHub.App/packages.config b/src/GitHub.App/packages.config deleted file mode 100644 index f531b14594..0000000000 --- a/src/GitHub.App/packages.config +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj index 1c26c0e103..ab89cb5562 100644 --- a/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj +++ b/src/GitHub.Exports.Reactive/GitHub.Exports.Reactive.csproj @@ -1,312 +1,32 @@ - - - - + - Debug - AnyCPU - {E4ED0537-D1D9-44B6-9212-3096D7C3F7A1} - Library - Properties + net461 GitHub - GitHub.Exports.Reactive - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + + - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll - True - - - ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Threading.14.1.111\lib\net45\Microsoft.VisualStudio.Threading.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll - True - - - - - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll - True - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Properties\SolutionInfo.cs - - - - - - - - - - - - - - - - - Designer - + + + + + + + + + - - {b4e665e5-6caf-4414-a6e2-8de1c3bcf203} - Akavache_Net45 - False - - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {B389ADAF-62CC-486E-85B4-2D8B078DF763} - GitHub.Api - - - {9aea02db-02b5-409c-b0ca-115d05331a6b} - GitHub.Exports - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - - - {8d73575a-a89f-47cc-b153-b47dd06837f0} - GitHub.Logging - + + - - - - - 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}. - - - - - \ No newline at end of file + diff --git a/src/GitHub.Exports.Reactive/Properties/AssemblyInfo.cs b/src/GitHub.Exports.Reactive/Properties/AssemblyInfo.cs index 9cbe24857f..c79269fb29 100644 --- a/src/GitHub.Exports.Reactive/Properties/AssemblyInfo.cs +++ b/src/GitHub.Exports.Reactive/Properties/AssemblyInfo.cs @@ -1,10 +1,4 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using System.Windows.Markup; - -[assembly: AssemblyTitle("GitHub.Exports.Reactive")] -[assembly: AssemblyDescription("GitHub interfaces for mef exports with reactive dependencies")] -[assembly: Guid("e4ed0537-d1d9-44b6-9212-3096d7c3f7a1")] +using System.Windows.Markup; [assembly: XmlnsDefinition("/~https://github.com/github/VisualStudio", "GitHub.ViewModels")] [assembly: XmlnsDefinition("/~https://github.com/github/VisualStudio", "GitHub.ViewModels.Dialog")] diff --git a/src/GitHub.Exports.Reactive/packages.config b/src/GitHub.Exports.Reactive/packages.config deleted file mode 100644 index de7191228b..0000000000 --- a/src/GitHub.Exports.Reactive/packages.config +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/GitHub.Exports/GitHub.Exports.csproj b/src/GitHub.Exports/GitHub.Exports.csproj index a148a9adf0..9461bb6f40 100644 --- a/src/GitHub.Exports/GitHub.Exports.csproj +++ b/src/GitHub.Exports/GitHub.Exports.csproj @@ -1,346 +1,41 @@ - - - - + - Debug - AnyCPU - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - Library - Properties + net461 GitHub - GitHub.Exports - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + + - - False - - - false - - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Interop.1.15.103\lib\net35\Microsoft.VisualStudio.Setup.Configuration.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll - True - - - - - ..\..\packages\Rothko.0.0.3-ghfvs\lib\net45\rothko.dll - True - - - ..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll - True - - - - - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Properties\settings.json - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Properties\SolutionInfo.cs - - - Designer - - - - - - - True - True - IPackageSettings.tt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - True - - - {8d73575a-a89f-47cc-b153-b47dd06837f0} - GitHub.Logging - - - - - TextTemplatingFileGenerator - IPackageSettings.cs - - - - + + + + - + + + + + + + + + + + + + + + + - - - - - 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}. - - - - - \ No newline at end of file + diff --git a/src/GitHub.Exports/Properties/AssemblyInfo.cs b/src/GitHub.Exports/Properties/AssemblyInfo.cs deleted file mode 100644 index a36a1082dc..0000000000 --- a/src/GitHub.Exports/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("GitHub.Exports")] -[assembly: AssemblyDescription("GitHub interfaces for mef exports")] -[assembly: Guid("9aea02db-02b5-409c-b0ca-115d05331a6b")] diff --git a/src/GitHub.Exports/UI/IDialogView.cs b/src/GitHub.Exports/UI/IDialogView.cs deleted file mode 100644 index eebbf85f66..0000000000 --- a/src/GitHub.Exports/UI/IDialogView.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace GitHub.UI -{ - public interface IDialogView : IView, IHasDone, IHasCancel - { - IObservable IsBusy { get; } - } - - public interface ICanLoad - { - IObservable Load { get; } - } -} diff --git a/src/GitHub.Exports/packages.config b/src/GitHub.Exports/packages.config deleted file mode 100644 index 7be8f695d2..0000000000 --- a/src/GitHub.Exports/packages.config +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/GitHub.Extensions.Reactive/GitHub.Extensions.Reactive.csproj b/src/GitHub.Extensions.Reactive/GitHub.Extensions.Reactive.csproj index 513b10e112..e35ce689eb 100644 --- a/src/GitHub.Extensions.Reactive/GitHub.Extensions.Reactive.csproj +++ b/src/GitHub.Extensions.Reactive/GitHub.Extensions.Reactive.csproj @@ -1,116 +1,20 @@ - - - + - Debug - AnyCPU - {6559E128-8B40-49A5-85A8-05565ED0C7E3} - Library - Properties - GitHub.Extensions.Reactive - GitHub.Extensions.Reactive - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + net461 + GitHub + + - - - - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll - True - - - - - - - Properties\SolutionInfo.cs - - - - - - - - - + + + + + - - {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - - - {8d73575a-a89f-47cc-b153-b47dd06837f0} - GitHub.Logging - + + - - - \ No newline at end of file + diff --git a/src/GitHub.Extensions.Reactive/Properties/AssemblyInfo.cs b/src/GitHub.Extensions.Reactive/Properties/AssemblyInfo.cs deleted file mode 100644 index 7cae481efd..0000000000 --- a/src/GitHub.Extensions.Reactive/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("GitHub.Extensions.Reactive")] -[assembly: AssemblyDescription("Provides useful Rx based extension and utility methods common to the needs of GitHub applications")] -[assembly: Guid("73e49b11-0bd0-4984-b9a8-3e7edceb071e")] diff --git a/src/GitHub.Extensions.Reactive/packages.config b/src/GitHub.Extensions.Reactive/packages.config deleted file mode 100644 index 00e9d82f18..0000000000 --- a/src/GitHub.Extensions.Reactive/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/GitHub.Extensions/GitHub.Extensions.csproj b/src/GitHub.Extensions/GitHub.Extensions.csproj index 89d0090a7a..15f475fd17 100644 --- a/src/GitHub.Extensions/GitHub.Extensions.csproj +++ b/src/GitHub.Extensions/GitHub.Extensions.csproj @@ -1,51 +1,11 @@ - - - + - Debug - AnyCPU - {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78} - Library - Properties - GitHub.Extensions - GitHub.Extensions - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + net461 + GitHub + + ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll @@ -63,44 +23,16 @@ - - - - - - - - Properties\SolutionInfo.cs - - - - - - - - - - - + + + + - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {8d73575a-a89f-47cc-b153-b47dd06837f0} - GitHub.Logging - + + + - - - \ No newline at end of file + diff --git a/src/GitHub.Extensions/Properties/AssemblyInfo.cs b/src/GitHub.Extensions/Properties/AssemblyInfo.cs deleted file mode 100644 index 0ca1c011c4..0000000000 --- a/src/GitHub.Extensions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,6 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("GitHub.Extensions")] -[assembly: AssemblyDescription("Provides useful extension and utility methods common to the needs of GitHub applications")] -[assembly: Guid("3bf91177-3d16-425d-9c62-50a86cf26298")] diff --git a/src/GitHub.Extensions/packages.config b/src/GitHub.Extensions/packages.config deleted file mode 100644 index b8376bd218..0000000000 --- a/src/GitHub.Extensions/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj index cfa47b0078..198d33a3b0 100644 --- a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj +++ b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj @@ -366,8 +366,17 @@ ..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll True - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + True + + + ..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.dll + True + + + ..\..\packages\Octokit.GraphQL.0.1.0-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll + True ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll diff --git a/src/GitHub.InlineReviews/Services/CommentService.cs b/src/GitHub.InlineReviews/Services/CommentService.cs index 566c4b764e..c9e25148a2 100644 --- a/src/GitHub.InlineReviews/Services/CommentService.cs +++ b/src/GitHub.InlineReviews/Services/CommentService.cs @@ -1,4 +1,5 @@ using System.ComponentModel.Composition; +using System.Globalization; using System.Windows.Forms; namespace GitHub.InlineReviews.Services @@ -9,11 +10,17 @@ public class CommentService:ICommentService { public bool ConfirmCommentDelete() { + var options = CultureInfo.CurrentUICulture.TextInfo.IsRightToLeft ? + MessageBoxOptions.RtlReading | MessageBoxOptions.RightAlign : + 0; + return MessageBox.Show( VisualStudio.UI.Resources.DeleteCommentConfirmation, VisualStudio.UI.Resources.DeleteCommentConfirmationCaption, MessageBoxButtons.YesNo, - MessageBoxIcon.Question) == DialogResult.Yes; + MessageBoxIcon.Question, + MessageBoxDefaultButton.Button1, + options) == DialogResult.Yes; } } } \ No newline at end of file diff --git a/src/GitHub.Logging/GitHub.Logging.csproj b/src/GitHub.Logging/GitHub.Logging.csproj index 952eef5f75..56453f6b30 100644 --- a/src/GitHub.Logging/GitHub.Logging.csproj +++ b/src/GitHub.Logging/GitHub.Logging.csproj @@ -1,100 +1,17 @@ - - - + - Debug - AnyCPU - {8D73575A-A89F-47CC-B153-B47DD06837F0} - Library - Properties + net461 GitHub - GitHub.Logging - 7.3 - v4.6.1 - 512 - - ..\common\GitHubVS.ruleset - true - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - true - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ + + - - ..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll - True - - - ..\..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll - True - - - ..\..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll - True - - - ..\..\packages\Serilog.Sinks.File.3.2.0\lib\net45\Serilog.Sinks.File.dll - True - - - - - - - - - - - - - Properties\SolutionInfo.cs - - - - - - - - - - - - + + + + + + - - - \ No newline at end of file + diff --git a/src/GitHub.Logging/Properties/AssemblyInfo.cs b/src/GitHub.Logging/Properties/AssemblyInfo.cs deleted file mode 100644 index 748cab9da4..0000000000 --- a/src/GitHub.Logging/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle("GitHub.Logging")] -[assembly: AssemblyDescription("")] \ No newline at end of file diff --git a/src/GitHub.Logging/packages.config b/src/GitHub.Logging/packages.config deleted file mode 100644 index faa0a313a0..0000000000 --- a/src/GitHub.Logging/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/GitHub.Services.Vssdk/GitHub.Services.Vssdk.csproj b/src/GitHub.Services.Vssdk/GitHub.Services.Vssdk.csproj index b580a56a0a..00ccb68d77 100644 --- a/src/GitHub.Services.Vssdk/GitHub.Services.Vssdk.csproj +++ b/src/GitHub.Services.Vssdk/GitHub.Services.Vssdk.csproj @@ -1,161 +1,16 @@ - - - + - Debug - AnyCPU - {2D3D2834-33BE-45CA-B3CC-12F853557D7B} - Library - Properties - GitHub.Services.Vssdk - GitHub.Services.Vssdk - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true + net461 - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ - - - - ..\..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.14.3.25407\lib\Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime.dll - True - - - ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.14.3.25407\lib\Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Threading.14.1.111\lib\net45\Microsoft.VisualStudio.Threading.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll - True - - - - - - + + + - - Properties\SolutionInfo.cs - - - - - + + - - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - GitHub.Exports - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - + + - - - - \ No newline at end of file + diff --git a/src/GitHub.Services.Vssdk/Properties/AssemblyInfo.cs b/src/GitHub.Services.Vssdk/Properties/AssemblyInfo.cs deleted file mode 100644 index 08f1d22c43..0000000000 --- a/src/GitHub.Services.Vssdk/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,4 +0,0 @@ -using System.Reflection; - -[assembly: AssemblyTitle("GitHub.Services.Vssdk")] -[assembly: AssemblyDescription("Abstractions for the VSSDK")] \ No newline at end of file diff --git a/src/GitHub.Services.Vssdk/packages.config b/src/GitHub.Services.Vssdk/packages.config deleted file mode 100644 index 8ec99b891b..0000000000 --- a/src/GitHub.Services.Vssdk/packages.config +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/GitHub.TeamFoundation.14/RegistryHelper.cs b/src/GitHub.TeamFoundation.14/RegistryHelper.cs index 92e2526761..f4fa44eb31 100644 --- a/src/GitHub.TeamFoundation.14/RegistryHelper.cs +++ b/src/GitHub.TeamFoundation.14/RegistryHelper.cs @@ -9,6 +9,7 @@ using GitHub.Services; using Microsoft.Win32; using Serilog; +using static System.FormattableString; namespace GitHub.TeamFoundation { @@ -18,7 +19,7 @@ internal class RegistryHelper static RegistryKey OpenGitKey(string path) { - var keyName = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\TeamFoundation\\GitSourceControl\\{path}"; + var keyName = Invariant($"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\TeamFoundation\\GitSourceControl\\{path}"); return Registry.CurrentUser.OpenSubKey(keyName, true); } @@ -64,7 +65,7 @@ internal static string PokeTheRegistryForLocalClonePath() const string MRUKeyPath = "MRUSettingsLocalProjectLocationEntries"; internal static string SetDefaultProjectPath(string path) { - var newProjectDialogKeyPath = $"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\NewProjectDialog"; + var newProjectDialogKeyPath = Invariant($"Software\\Microsoft\\VisualStudio\\{MajorVersion}.0\\NewProjectDialog"); var old = String.Empty; try diff --git a/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs b/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs index 318ddf3c47..593a9f6a53 100644 --- a/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs +++ b/src/GitHub.TeamFoundation.14/Services/TeamExplorerServices.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel.Composition; +using System.Diagnostics.CodeAnalysis; using System.Windows.Input; using GitHub.Extensions; using GitHub.VisualStudio.TeamExplorer.Sync; @@ -19,7 +20,7 @@ public class TeamExplorerServices : ITeamExplorerServices /// that instances of this type cannot be created if the TeamFoundation dlls are not available /// (otherwise we'll have multiple instances of ITeamExplorerServices exports, and that would be Bad(tm)) /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] + [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")] ITeamExplorerNotificationManager manager; [ImportingConstructor] @@ -31,14 +32,14 @@ public TeamExplorerServices(IGitHubServiceProvider serviceProvider) public void ShowConnectPage() { var te = serviceProvider.TryGetService(); - var foo = te.NavigateToPage(new Guid(TeamExplorerPageIds.Connect), null); + te.NavigateToPage(new Guid(TeamExplorerPageIds.Connect), null); } public void ShowPublishSection() { var te = serviceProvider.TryGetService(); - var foo = te.NavigateToPage(new Guid(TeamExplorerPageIds.GitCommits), null); - var publish = foo?.GetSection(new Guid(GitHubPublishSection.GitHubPublishSectionId)) as GitHubPublishSection; + var page = te.NavigateToPage(new Guid(TeamExplorerPageIds.GitCommits), null); + var publish = page?.GetSection(new Guid(GitHubPublishSection.GitHubPublishSectionId)) as GitHubPublishSection; publish?.Connect(); } diff --git a/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj b/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj index 9d3d489032..6c0d56ab0c 100644 --- a/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj +++ b/src/GitHub.UI.Reactive/GitHub.UI.Reactive.csproj @@ -1,195 +1,27 @@ - - - + - Debug - AnyCPU - {158B05E8-FDBC-4D71-B871-C96E28D5ADF5} - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties + net461 GitHub - GitHub.UI.Reactive - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + true + + - - - - - - ..\..\packages\Ix_Experimental-Main.1.1.10823\lib\Net4\System.Interactive.dll - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll - True - - - - - - + + + - - - TwoFactorInput.xaml - - - - - - Properties\SolutionInfo.cs - - - - - - - - - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - - - - + + + + - - {600998c4-54dd-4755-bfa8-6f44544d8e2e} - ReactiveUI.Events_Net45 - - - {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} - GitHub.Exports.Reactive - - - {9aea02db-02b5-409c-b0ca-115d05331a6b} - GitHub.Exports - - - {6559E128-8B40-49A5-85A8-05565ED0C7E3} - GitHub.Extensions.Reactive - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - - - {8d73575a-a89f-47cc-b153-b47dd06837f0} - GitHub.Logging - - - {346384DD-2445-4A28-AF22-B45F3957BD89} - GitHub.UI - + - - \ No newline at end of file diff --git a/src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs b/src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs index 37e833d006..bea18cb67f 100644 --- a/src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs +++ b/src/GitHub.UI.Reactive/Properties/AssemblyInfo.cs @@ -1,12 +1,6 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using System.Windows; +using System.Windows; using System.Windows.Markup; -[assembly: AssemblyTitle("GitHub.UI.Reactive")] -[assembly: AssemblyDescription("GitHub flavored WPF styles and controls that require Rx and RxUI")] -[assembly: Guid("885a491c-1d13-49e7-baa6-d61f424befcb")] - [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, diff --git a/src/GitHub.UI/GitHub.UI.csproj b/src/GitHub.UI/GitHub.UI.csproj index 041f14a08d..3ce65912d3 100644 --- a/src/GitHub.UI/GitHub.UI.csproj +++ b/src/GitHub.UI/GitHub.UI.csproj @@ -1,298 +1,36 @@ - - - + - Debug - AnyCPU - {346384DD-2445-4A28-AF22-B45F3957BD89} - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - Library - Properties - GitHub.UI - GitHub.UI - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + net461 + true + + - - ..\..\packages\Expression.Blend.Sdk.WPF.1.0.1\lib\net45\Microsoft.Expression.Interactions.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - + - - ..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll - True - - - - - ..\..\packages\Expression.Blend.Sdk.WPF.1.0.1\lib\net45\System.Windows.Interactivity.dll - True - - - - - - - + - - - - - - True - True - OcticonPaths.resx - - - - - Spinner.xaml - - - - - - - - - - - - - - - - - - - - True + + AutomationIDs.resx True - Resources.resx - - True - True - AutomationIDs.resx - - - - - - - Properties\SolutionInfo.cs - - - - - - - - - - HorizontalShadowDivider.xaml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - - - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - - - MSBuild:Compile - Designer - - - - - Designer - ResXFileCodeGenerator - OcticonPaths.Designer.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - + + PublicResXFileCodeGenerator AutomationIDs.Designer.cs + - - {9aea02db-02b5-409c-b0ca-115d05331a6b} - GitHub.Exports - - - {6AFE2E2D-6DB0-4430-A2EA-F5F5388D2F78} - GitHub.Extensions - - - {8d73575a-a89f-47cc-b153-b47dd06837f0} - GitHub.Logging - + + - + - - \ No newline at end of file diff --git a/src/GitHub.UI/Properties/AssemblyInfo.cs b/src/GitHub.UI/Properties/AssemblyInfo.cs index d4827fb54e..0f58c5b5c5 100644 --- a/src/GitHub.UI/Properties/AssemblyInfo.cs +++ b/src/GitHub.UI/Properties/AssemblyInfo.cs @@ -1,12 +1,6 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using System.Windows; +using System.Windows; using System.Windows.Markup; -[assembly: AssemblyTitle("GitHub.UI")] -[assembly: AssemblyDescription("GitHub flavored WPF styles and controls")] -[assembly: Guid("f3cec21e-6a86-43ae-97a6-a274fa31efbe")] - [assembly: ThemeInfo( ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located //(used if a resource is not found in the page, diff --git a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj index 3e15e52e4e..96356ce104 100644 --- a/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj +++ b/src/GitHub.VisualStudio.UI/GitHub.VisualStudio.UI.csproj @@ -1,275 +1,26 @@ - - - + - Debug - AnyCPU - {D1DFBB0C-B570-4302-8F1E-2E3A19C41961} - Library - Properties - GitHub.VisualStudio.UI - GitHub.VisualStudio.UI - 7.3 - v4.6.1 - 512 - ..\common\GitHubVS.ruleset - true - true - - - true - full - false - DEBUG;TRACE - prompt - 4 - false - bin\Debug\ - - - true - full - false - CODE_ANALYSIS;DEBUG;TRACE - prompt - 4 - true - bin\Debug\ - - - pdbonly - true - TRACE - prompt - 4 - true - bin\Release\ + net461 + true + + - - ..\..\packages\Markdig.Signed.0.13.0\lib\net40\Markdig.dll - True - - - ..\..\packages\Markdig.Wpf.Signed.0.2.1\lib\net452\Markdig.Wpf.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - True - + - - - - - - - - - - - + - - - - - - - - - Resources.resx - True - True - - - - - AccountAvatar.xaml - - - InfoPanel.xaml - - - - GitHubConnectContent.xaml - - - GitHubHomeContent.xaml - - - GitHubInvitationContent.xaml - - - Properties\SolutionInfo.cs - - - - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {1CE2D235-8072-4649-BA5A-CFB1AF8776E0} - ReactiveUI_Net45 - - - {1a1da411-8d1f-4578-80a6-04576bea2dc5} - GitHub.App - - - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - GitHub.Exports - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - - - {8d73575a-a89f-47cc-b153-b47dd06837f0} - GitHub.Logging - - - {346384dd-2445-4a28-af22-b45f3957bd89} - GitHub.UI - + + + + - - PublicResXFileCodeGenerator - Resources.Designer.cs - Designer - + + - - - - - 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}. - - - \ No newline at end of file diff --git a/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs b/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs index 0d5801ea70..42ad4ae77e 100644 --- a/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs +++ b/src/GitHub.VisualStudio.UI/Properties/AssemblyInfo.cs @@ -1,11 +1,4 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -using System.Windows.Markup; - -[assembly: AssemblyTitle("GitHub.VisualStudio.UI")] -[assembly: AssemblyDescription("GitHub.VisualStudio.UI")] -[assembly: Guid("d1dfbb0c-b570-4302-8f1e-2e3a19c41961")] +using System.Windows.Markup; [assembly: XmlnsDefinition("/~https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI")] [assembly: XmlnsDefinition("/~https://github.com/github/VisualStudio", "GitHub.VisualStudio.UI.Controls")] diff --git a/src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs b/src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs index 0ec4ed1bfd..0ec8ab282d 100644 --- a/src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs +++ b/src/GitHub.VisualStudio/Commands/GoToSolutionOrPullRequestFileCommand.cs @@ -237,7 +237,7 @@ bool TryNavigateFromHistoryFile(IVsTextView sourceView) if (teamExplorerContext.Value.ActiveRepository?.LocalPath is string repositoryDir && FindObjectishForTFSTempFile(sourceView) is string objectish) { - var (commitSha, blobPath) = gitHubContextService.Value.ResolveBlobFromHistory(repositoryDir, objectish); + var (_, blobPath) = gitHubContextService.Value.ResolveBlobFromHistory(repositoryDir, objectish); if (blobPath is string) { var workingFile = Path.Combine(repositoryDir, blobPath); diff --git a/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs b/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs index 23e64442e5..04e469ffc6 100644 --- a/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs +++ b/src/GitHub.VisualStudio/Commands/OpenFromUrlCommand.cs @@ -20,7 +20,6 @@ public class OpenFromUrlCommand : VsCommand, IOpenFromUrlCommand { readonly Lazy gitHubContextService; readonly Lazy repositoryCloneService; - readonly Lazy pullRequestEditorService; readonly Lazy teamExplorerContext; readonly Lazy gitHubToolWindowManager; readonly Lazy dte; @@ -40,14 +39,12 @@ public class OpenFromUrlCommand : VsCommand, IOpenFromUrlCommand public OpenFromUrlCommand( Lazy gitHubContextService, Lazy repositoryCloneService, - Lazy pullRequestEditorService, Lazy teamExplorerContext, [Import(typeof(SVsServiceProvider))] IServiceProvider serviceProvider) : base(CommandSet, CommandId) { this.gitHubContextService = gitHubContextService; this.repositoryCloneService = repositoryCloneService; - this.pullRequestEditorService = pullRequestEditorService; this.teamExplorerContext = teamExplorerContext; this.serviceProvider = serviceProvider; dte = new Lazy(() => (DTE)serviceProvider.GetService(typeof(DTE))); diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj index 31e465d154..2fb65d716f 100644 --- a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj +++ b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj @@ -247,8 +247,9 @@ ..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll True - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll + + ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll + True ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll @@ -264,6 +265,15 @@ ..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll True + + ..\..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll + + + ..\..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll + + + ..\..\packages\Serilog.Sinks.File.3.2.0\lib\net45\Serilog.Sinks.File.dll + ..\..\packages\SQLitePCL.raw_basic.0.7.3.0-vs2012\lib\net45\SQLitePCL.raw.dll True @@ -604,8 +614,8 @@ Designer - Designer MSBuild:Compile + Designer MSBuild:Compile @@ -652,8 +662,8 @@ Designer - Designer MSBuild:Compile + Designer diff --git a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs b/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs index 6ddf3b4b70..7f41b7fa1d 100644 --- a/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs +++ b/src/GitHub.VisualStudio/Views/GitHubPane/PullRequestListView.xaml.cs @@ -17,6 +17,7 @@ namespace GitHub.VisualStudio.Views.GitHubPane { + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable")] [ExportViewFor(typeof(IPullRequestListViewModel))] [PartCreationPolicy(CreationPolicy.NonShared)] public partial class PullRequestListView : UserControl diff --git a/src/GitHub.VisualStudio/packages.config b/src/GitHub.VisualStudio/packages.config index c9fd83b206..25b3a34c75 100644 --- a/src/GitHub.VisualStudio/packages.config +++ b/src/GitHub.VisualStudio/packages.config @@ -46,6 +46,9 @@ + + + diff --git a/test/GitHub.Api.UnitTests/GitHub.Api.UnitTests.csproj b/test/GitHub.Api.UnitTests/GitHub.Api.UnitTests.csproj index 2474ea6e02..ea3e2c0cdb 100644 --- a/test/GitHub.Api.UnitTests/GitHub.Api.UnitTests.csproj +++ b/test/GitHub.Api.UnitTests/GitHub.Api.UnitTests.csproj @@ -1,124 +1,16 @@ - - - + - Debug - AnyCPU - {EFDE0798-ACDB-431D-B7F1-548A7231C853} - Library - Properties - GitHub.Api.UnitTests - GitHub.Api.UnitTests - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + net461 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - False - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - ..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll - True - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - - - - - - - - - - - - SplatModeDetectorSetUp.cs - - - - - - - - + - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {b389adaf-62cc-486e-85b4-2d8b078df763} - GitHub.Api - - - {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} - GitHub.Exports.Reactive - - - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - GitHub.Exports - - - {7f5ed78b-74a3-4406-a299-70cfb5885b8b} - GitHub.InlineReviews - + + + + - - Designer - + + - - - \ No newline at end of file + diff --git a/test/GitHub.Api.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.Api.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index e40839b161..0000000000 --- a/test/GitHub.Api.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.Api.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("UnitTestProject1")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("efde0798-acdb-431d-b7f1-548a7231c853")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/GitHub.Api.UnitTests/SimpleApiClientTests.cs b/test/GitHub.Api.UnitTests/SimpleApiClientTests.cs index 34679192a8..6f3e4c250f 100644 --- a/test/GitHub.Api.UnitTests/SimpleApiClientTests.cs +++ b/test/GitHub.Api.UnitTests/SimpleApiClientTests.cs @@ -9,7 +9,7 @@ public class SimpleApiClientTests { - public class TheCtor : TestBaseClass + public class TheCtor { public void Throws() { diff --git a/test/GitHub.App.UnitTests/GitHub.App.UnitTests.csproj b/test/GitHub.App.UnitTests/GitHub.App.UnitTests.csproj index 72d56259cc..e7413bb3d9 100644 --- a/test/GitHub.App.UnitTests/GitHub.App.UnitTests.csproj +++ b/test/GitHub.App.UnitTests/GitHub.App.UnitTests.csproj @@ -1,150 +1,18 @@ - - - + - Debug - AnyCPU - {3525D819-6AEC-4879-89FB-56B41F026571} - Library - Properties - GitHub.App.UnitTests - GitHub.App.UnitTests - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net461 + - - False - ..\..\packages\EnvDTE.8.0.0\lib\net10\EnvDTE.dll - True - - - ..\..\packages\Rx-Testing.2.2.5-custom\lib\net45\Microsoft.Reactive.Testing.dll - True - - - ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll - True - - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - False - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll - - - ..\..\packages\Microsoft.VisualStudio.Validation.15.3.15\lib\net45\Microsoft.VisualStudio.Validation.dll - - - ..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - True - - - ..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll - True - - - ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.dll - - - ..\..\packages\Octokit.GraphQL.0.1.1-beta\lib\netstandard1.1\Octokit.GraphQL.Core.dll - - - - - ..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll - True - - - ..\..\packages\Rothko.0.0.3-ghfvs\lib\net45\rothko.dll - True - - - True - ..\..\packages\stdole.7.0.3300\lib\net10\stdole.dll - True - - - - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - - - + + + - - SplatModeDetectorSetUp.cs - + @@ -153,104 +21,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - {B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203} - Akavache_Net45 - - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {b389adaf-62cc-486e-85b4-2d8b078df763} - GitHub.Api - - - {1A1DA411-8D1F-4578-80A6-04576BEA2DC5} - GitHub.App - - - {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} - GitHub.Exports.Reactive - - - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - GitHub.Exports - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - + + - - PreserveNewest - - + + + + - - - - 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}. - - - - - \ No newline at end of file + diff --git a/test/GitHub.App.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.App.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 1e26caae28..0000000000 --- a/test/GitHub.App.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.App.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.App.UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3525d819-6aec-4879-89fb-56b41f026571")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/GitHub.Exports.Reactive.UnitTests/Services/PullRequestEditorServiceTests.cs b/test/GitHub.App.UnitTests/Services/PullRequestEditorServiceTests.cs similarity index 100% rename from test/GitHub.Exports.Reactive.UnitTests/Services/PullRequestEditorServiceTests.cs rename to test/GitHub.App.UnitTests/Services/PullRequestEditorServiceTests.cs diff --git a/test/GitHub.App.UnitTests/app.config b/test/GitHub.App.UnitTests/app.config new file mode 100644 index 0000000000..e1367549a4 --- /dev/null +++ b/test/GitHub.App.UnitTests/app.config @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/test/GitHub.Exports.Reactive.UnitTests/GitHub.Exports.Reactive.UnitTests.csproj b/test/GitHub.Exports.Reactive.UnitTests/GitHub.Exports.Reactive.UnitTests.csproj index 2a2ee4a37c..c981c8731f 100644 --- a/test/GitHub.Exports.Reactive.UnitTests/GitHub.Exports.Reactive.UnitTests.csproj +++ b/test/GitHub.Exports.Reactive.UnitTests/GitHub.Exports.Reactive.UnitTests.csproj @@ -1,216 +1,20 @@ - - + - Debug - AnyCPU - {C59868FC-D8BC-4D47-B4F3-16908D2641C6} - Library - Properties - GitHub.Exports.Reactive.UnitTests - GitHub.Exports.Reactive.UnitTests - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + net461 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Rx-Testing.2.2.5-custom\lib\net45\Microsoft.Reactive.Testing.dll - True - - - ..\..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Editor.14.3.25407\lib\net45\Microsoft.VisualStudio.Editor.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Language.Intellisense.14.3.25407\lib\net45\Microsoft.VisualStudio.Language.Intellisense.dll - True - - - ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - ..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll - True - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - - - - - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll - True - - - + - - SplatModeDetectorSetUp.cs - - - - + - - Designer - + + - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {1A1DA411-8D1F-4578-80A6-04576BEA2DC5} - GitHub.App - - - {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} - GitHub.Exports.Reactive - - - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - GitHub.Exports - + + + + - - - - \ No newline at end of file + diff --git a/test/GitHub.Exports.Reactive.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.Exports.Reactive.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 4bc71b7809..0000000000 --- a/test/GitHub.Exports.Reactive.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.Exports.Reactive.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.Exports.Reactive.UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("c59868fc-d8bc-4d47-b4f3-16908d2641c6")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/GitHub.Exports.UnitTests/Args.cs b/test/GitHub.Exports.UnitTests/Args.cs index 2a04705cde..03bc2d7fe3 100644 --- a/test/GitHub.Exports.UnitTests/Args.cs +++ b/test/GitHub.Exports.UnitTests/Args.cs @@ -17,9 +17,7 @@ internal static class Args public static SnapshotPoint SnapshotPoint { get { return Arg.Any(); } } public static NewRepository NewRepository { get { return Arg.Any(); } } public static IAccount Account { get { return Arg.Any(); } } - public static IApiClient ApiClient { get { return Arg.Any(); } } public static IServiceProvider ServiceProvider { get { return Arg.Any(); } } - public static IAvatarProvider AvatarProvider { get { return Arg.Any(); } } public static HostAddress HostAddress { get { return Arg.Any(); } } public static Uri Uri { get { return Arg.Any(); } } public static LibGit2Sharp.IRepository LibGit2Repo { get { return Arg.Any(); } } diff --git a/test/GitHub.Exports.UnitTests/GitHub.Exports.UnitTests.csproj b/test/GitHub.Exports.UnitTests/GitHub.Exports.UnitTests.csproj index bf2224795d..7afb34f2b4 100644 --- a/test/GitHub.Exports.UnitTests/GitHub.Exports.UnitTests.csproj +++ b/test/GitHub.Exports.UnitTests/GitHub.Exports.UnitTests.csproj @@ -1,218 +1,18 @@ - - + - Debug - AnyCPU - {94509FCB-6C97-4ED6-AED6-6E74AB3CA336} - Library - Properties - GitHub.Exports.UnitTests - GitHub.Exports.UnitTests - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + net461 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - False - ..\..\packages\EnvDTE.8.0.0\lib\net10\EnvDTE.dll - - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll - True - - - ..\..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Editor.14.3.25407\lib\net45\Microsoft.VisualStudio.Editor.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Language.Intellisense.14.3.25407\lib\net45\Microsoft.VisualStudio.Language.Intellisense.dll - True - - - ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - False - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - False - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - ..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll - True - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - - - - ..\..\packages\Serilog.2.5.0\lib\net46\Serilog.dll - True - - - ..\..\packages\Rothko.0.0.3-ghfvs\lib\net45\rothko.dll - True - - - - - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - - - - + - - SplatModeDetectorSetUp.cs - - - - - - - - - + - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {1A1DA411-8D1F-4578-80A6-04576BEA2DC5} - GitHub.App - - - {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} - GitHub.Exports.Reactive - - - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - GitHub.Exports - + + - - Designer - + + - - - - \ No newline at end of file + diff --git a/test/GitHub.Exports.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.Exports.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 257eddfa25..0000000000 --- a/test/GitHub.Exports.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.Exports.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.Exports.UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("94509fcb-6c97-4ed6-aed6-6e74ab3ca336")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/GitHub.Exports.UnitTests/Substitutes.cs b/test/GitHub.Exports.UnitTests/Substitutes.cs deleted file mode 100644 index 9792829b8c..0000000000 --- a/test/GitHub.Exports.UnitTests/Substitutes.cs +++ /dev/null @@ -1,203 +0,0 @@ -using GitHub.Authentication; -using GitHub.Models; -using GitHub.Services; -using GitHub.VisualStudio; -using Microsoft.VisualStudio.ComponentModelHost; -using NSubstitute; -using Rothko; -using System; -using System.ComponentModel.Composition; -using System.ComponentModel.Composition.Hosting; -using GitHub.Factories; - -namespace UnitTests -{ - internal static class Substitutes - { - public static T1 For(params object[] constructorArguments) - where T1 : class - where T2 : class - where T3 : class - where T4 : class - { - return (T1)Substitute.For(new Type[4] - { - typeof (T1), - typeof (T2), - typeof (T3), - typeof (T4) - }, constructorArguments); - } - - - // public static IGitRepositoriesExt IGitRepositoriesExt { get { return Substitute.For(); } } - public static IGitService IGitService { get { return Substitute.For(); } } - - public static IVSGitServices IVSGitServices - { - get - { - var ret = Substitute.For(); - ret.GetLocalClonePathFromGitProvider().Returns(@"c:\foo\bar"); - return ret; - } - } - - public static IOperatingSystem OperatingSystem - { - get - { - var ret = Substitute.For(); - // this expansion happens when the GetLocalClonePathFromGitProvider call is setup by default - // see IVSServices property above - ret.Environment.ExpandEnvironmentVariables(Args.String).Returns(x => x[0]); - return ret; - } - } - - public static IViewViewModelFactory ViewViewModelFactory { get { return Substitute.For(); } } - - public static IRepositoryCreationService RepositoryCreationService { get { return Substitute.For(); } } - public static IRepositoryCloneService RepositoryCloneService { get { return Substitute.For(); } } - - public static IConnection Connection { get { return Substitute.For(); } } - public static IConnectionManager ConnectionManager { get { return Substitute.For(); } } - public static IDelegatingTwoFactorChallengeHandler TwoFactorChallengeHandler { get { return Substitute.For(); } } - public static IGistPublishService GistPublishService { get { return Substitute.For(); } } - public static IPullRequestService PullRequestService { get { return Substitute.For(); } } - - /// - /// This returns a service provider with everything mocked except for - /// RepositoryCloneService and RepositoryCreationService, which are real - /// instances. - /// - public static IGitHubServiceProvider ServiceProvider { get { return GetServiceProvider(); } } - - /// - /// This returns a service provider with mocked IRepositoryCreationService and - /// IRepositoryCloneService as well as all other services mocked. The regular - /// GetServiceProvider method (and ServiceProvider property return a IServiceProvider - /// with real RepositoryCloneService and RepositoryCreationService instances. - /// - /// - public static IServiceProvider GetFullyMockedServiceProvider() - { - return GetServiceProvider(RepositoryCloneService, RepositoryCreationService); - } - - /// - /// This returns a service provider with everything mocked except for - /// RepositoryCloneService and RepositoryCreationService, which are real - /// instances. - /// - /// - /// - /// - public static IGitHubServiceProvider GetServiceProvider( - IRepositoryCloneService cloneService = null, - IRepositoryCreationService creationService = null, - IAvatarProvider avatarProvider = null) - { - var ret = Substitute.For(); - - var gitservice = IGitService; - var cm = Substitute.For(); - var cc = new CompositionContainer(CompositionOptions.IsThreadSafe | CompositionOptions.DisableSilentRejection); - cc.ComposeExportedValue(gitservice); - ((IComponentModel)cm).DefaultExportProvider.Returns(cc); - ret.GetService(typeof(SComponentModel)).Returns(cm); - Services.UnitTestServiceProvider = ret; - - var os = OperatingSystem; - var vsgit = IVSGitServices; - var clone = cloneService ?? new RepositoryCloneService(os, vsgit, Substitute.For()); - var create = creationService ?? new RepositoryCreationService(clone); - avatarProvider = avatarProvider ?? Substitute.For(); - //ret.GetService(typeof(IGitRepositoriesExt)).Returns(IGitRepositoriesExt); - ret.GetService(typeof(IGitService)).Returns(gitservice); - ret.GetService(typeof(IVSServices)).Returns(Substitute.For()); - ret.GetService(typeof(IVSGitServices)).Returns(vsgit); - ret.GetService(typeof(IOperatingSystem)).Returns(os); - ret.GetService(typeof(IRepositoryCloneService)).Returns(clone); - ret.GetService(typeof(IRepositoryCreationService)).Returns(create); - ret.GetService(typeof(IViewViewModelFactory)).Returns(ViewViewModelFactory); - ret.GetService(typeof(IConnection)).Returns(Connection); - ret.GetService(typeof(IConnectionManager)).Returns(ConnectionManager); - ret.GetService(typeof(IAvatarProvider)).Returns(avatarProvider); - ret.GetService(typeof(IDelegatingTwoFactorChallengeHandler)).Returns(TwoFactorChallengeHandler); - ret.GetService(typeof(IGistPublishService)).Returns(GistPublishService); - ret.GetService(typeof(IPullRequestService)).Returns(PullRequestService); - return ret; - } - - //public static IGitRepositoriesExt GetGitExt(this IServiceProvider provider) - //{ - // return provider.GetService(typeof(IGitRepositoriesExt)) as IGitRepositoriesExt; - //} - - public static IVSServices GetVSServices(this IServiceProvider provider) - { - return provider.GetService(typeof(IVSServices)) as IVSServices; - } - - public static IVSGitServices GetVSGitServices(this IServiceProvider provider) - { - return provider.GetService(typeof(IVSGitServices)) as IVSGitServices; - } - - public static IGitService GetGitService(this IServiceProvider provider) - { - return provider.GetService(typeof(IGitService)) as IGitService; - } - - public static IOperatingSystem GetOperatingSystem(this IServiceProvider provider) - { - return provider.GetService(typeof(IOperatingSystem)) as IOperatingSystem; - } - - public static IRepositoryCloneService GetRepositoryCloneService(this IServiceProvider provider) - { - return provider.GetService(typeof(IRepositoryCloneService)) as IRepositoryCloneService; - } - - public static IRepositoryCreationService GetRepositoryCreationService(this IServiceProvider provider) - { - return provider.GetService(typeof(IRepositoryCreationService)) as IRepositoryCreationService; - } - - public static IViewViewModelFactory GetExportFactoryProvider(this IServiceProvider provider) - { - return provider.GetService(typeof(IViewViewModelFactory)) as IViewViewModelFactory; - } - - public static IConnection GetConnection(this IServiceProvider provider) - { - return provider.GetService(typeof(IConnection)) as IConnection; - } - - public static IConnectionManager GetConnectionManager(this IServiceProvider provider) - { - return provider.GetService(typeof(IConnectionManager)) as IConnectionManager; - } - - public static IAvatarProvider GetAvatarProvider(this IServiceProvider provider) - { - return provider.GetService(typeof(IAvatarProvider)) as IAvatarProvider; - } - - public static IDelegatingTwoFactorChallengeHandler GetTwoFactorChallengeHandler(this IServiceProvider provider) - { - return provider.GetService(typeof(IDelegatingTwoFactorChallengeHandler)) as IDelegatingTwoFactorChallengeHandler; - } - - public static IGistPublishService GetGistPublishService(this IServiceProvider provider) - { - return provider.GetService(typeof(IGistPublishService)) as IGistPublishService; - } - - public static IPullRequestService GetPullRequestsService(this IServiceProvider provider) - { - return provider.GetService(typeof(IPullRequestService)) as IPullRequestService; - } - } -} diff --git a/test/GitHub.Primitives.UnitTests/UriStringTests.cs b/test/GitHub.Exports.UnitTests/UriStringTests.cs similarity index 100% rename from test/GitHub.Primitives.UnitTests/UriStringTests.cs rename to test/GitHub.Exports.UnitTests/UriStringTests.cs diff --git a/test/GitHub.Extensions.UnitTests/GitHub.Extensions.UnitTests.csproj b/test/GitHub.Extensions.UnitTests/GitHub.Extensions.UnitTests.csproj index 61ccc63438..7049913790 100644 --- a/test/GitHub.Extensions.UnitTests/GitHub.Extensions.UnitTests.csproj +++ b/test/GitHub.Extensions.UnitTests/GitHub.Extensions.UnitTests.csproj @@ -1,137 +1,14 @@ - - + - Debug - AnyCPU - {DE704BBB-6EC6-4173-B695-D9EBF5AEB092} - Library - Properties - GitHub.Extensions.UnitTests - GitHub.Extensions.UnitTests - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - + net461 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Rx-Testing.2.2.5-custom\lib\net45\Microsoft.Reactive.Testing.dll - True - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - - - - - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll - True - - - - - - - SplatModeDetectorSetUp.cs - - - - - - + - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - + + - - Designer - + + - - - - - False - - - False - - - False - - - False - - - - - - - - \ No newline at end of file + diff --git a/test/GitHub.Extensions.UnitTests/GuardTests.cs b/test/GitHub.Extensions.UnitTests/GuardTests.cs index 8690454754..6b007e254f 100644 --- a/test/GitHub.Extensions.UnitTests/GuardTests.cs +++ b/test/GitHub.Extensions.UnitTests/GuardTests.cs @@ -10,7 +10,7 @@ namespace UnitTests.GitHub.Extensions { public class GuardTests { - public class TheArgumentNotNullMethod : TestBaseClass + public class TheArgumentNotNullMethod { [Test] public void ShouldNotThrow() @@ -25,7 +25,7 @@ public void ShouldThrow() } } - public class TheArgumentNonNegativeMethod : TestBaseClass + public class TheArgumentNonNegativeMethod { [Test] public void ShouldNotThrowFor0() @@ -46,7 +46,7 @@ public void ShouldThrowForMinus1() } } - public class TheArgumentNotEmptyStringMethod : TestBaseClass + public class TheArgumentNotEmptyStringMethod { [Test] public void ShouldNotThrowForString() @@ -67,7 +67,7 @@ public void ShouldThrowForNull() } } - public class TheArgumentInRangeMethod : TestBaseClass + public class TheArgumentInRangeMethod { [Test] public void ShouldNotThrowForGreaterThanMinimum() diff --git a/test/GitHub.Extensions.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.Extensions.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 687251f17c..0000000000 --- a/test/GitHub.Extensions.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.Extensions.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.Extensions.UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("de704bbb-6ec6-4173-b695-d9ebf5aeb092")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/GitHub.Extensions.UnitTests/UriExtensionTests.cs b/test/GitHub.Extensions.UnitTests/UriExtensionTests.cs index eb194fb18e..19674bb51c 100644 --- a/test/GitHub.Extensions.UnitTests/UriExtensionTests.cs +++ b/test/GitHub.Extensions.UnitTests/UriExtensionTests.cs @@ -4,7 +4,7 @@ public class UriExtensionTests { - public class TheAppendMethod : TestBaseClass + public class TheAppendMethod { [TestCase("/~https://github.com/foo/bar", "graphs", "/~https://github.com/foo/bar/graphs")] [TestCase("/~https://github.com/foo/bar/", "graphs", "/~https://github.com/foo/bar/graphs")] diff --git a/test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj b/test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj index a9205cdafd..2dcf520b16 100644 --- a/test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj +++ b/test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj @@ -1,195 +1,35 @@ - - + - Debug - AnyCPU - {17EB676B-BB91-48B5-AA59-C67695C647C2} - Library - Properties - GitHub.InlineReviews.UnitTests - GitHub.InlineReviews.UnitTests - v4.6.1 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net461 + - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Language.Intellisense.14.3.25407\lib\net45\Microsoft.VisualStudio.Language.Intellisense.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll - True - - - ..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll - True - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - - - - - ..\..\packages\System.Net.Http.4.1.1\lib\net46\System.Net.Http.dll - True - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll - True - - - ..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - - - ..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - - - ..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - - - - - - SplatModeDetectorSetUp.cs - - - - - - - - - True - True + Resources.resx + True + True - - - - - - - - - - Designer - - - - - {b389adaf-62cc-486e-85b4-2d8b078df763} - GitHub.Api - - - {1a1da411-8d1f-4578-80a6-04576bea2dc5} - GitHub.App - - - {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} - GitHub.Exports.Reactive - - - {9aea02db-02b5-409c-b0ca-115d05331a6b} - GitHub.Exports - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - - - {7f5ed78b-74a3-4406-a299-70cfb5885b8b} - GitHub.InlineReviews - - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {1CE2D235-8072-4649-BA5A-CFB1AF8776E0} - ReactiveUI_Net45 - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - + + + PublicResXFileCodeGenerator + Resources.Designer.cs + + - + + - - ResXFileCodeGenerator - Resources.Designer.cs - + + + - + + + + + - - - \ No newline at end of file + diff --git a/test/GitHub.InlineReviews.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.InlineReviews.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 5a8cdbf1b2..0000000000 --- a/test/GitHub.InlineReviews.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using NUnit.Framework; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.InlineReviews.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.InlineReviews.UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("17eb676b-bb91-48b5-aa59-c67695c647c2")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -[assembly: Timeout(2 /*minutes*/ * 60 * 1000)] diff --git a/test/GitHub.InlineReviews.UnitTests/Properties/Resources.Designer.cs b/test/GitHub.InlineReviews.UnitTests/Properties/Resources.Designer.cs index 40d6b2a39d..94e359b777 100644 --- a/test/GitHub.InlineReviews.UnitTests/Properties/Resources.Designer.cs +++ b/test/GitHub.InlineReviews.UnitTests/Properties/Resources.Designer.cs @@ -19,10 +19,10 @@ namespace GitHub.InlineReviews.UnitTests.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { + public class Resources { private static global::System.Resources.ResourceManager resourceMan; @@ -36,7 +36,7 @@ internal Resources() { /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GitHub.InlineReviews.UnitTests.Properties.Resources", typeof(Resources).Assembly); @@ -51,7 +51,7 @@ internal Resources() { /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -76,7 +76,7 @@ internal Resources() { ///- public class UsageTracker : IUsageTracker ///+ public sealed class UsageTracker : IU [rest of string was truncated]";. /// - internal static string pr_960_diff { + public static string pr_960_diff { get { return ResourceManager.GetString("pr_960_diff", resourceCulture); } diff --git a/test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs b/test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs index e0208d2e7c..7890556476 100644 --- a/test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs +++ b/test/GitHub.InlineReviews.UnitTests/Services/PullRequestSessionManagerTests.cs @@ -30,11 +30,6 @@ public class PullRequestSessionManagerTests const string OwnerCloneUrl = "/~https://github.com/owner/repo"; static readonly ActorModel CurrentUser = new ActorModel { Login = "currentUser" }; - public PullRequestSessionManagerTests() - { - Splat.ModeDetector.Current.SetInUnitTestRunner(true); - } - public class TheConstructor : PullRequestSessionManagerTests { [Test] diff --git a/test/GitHub.Primitives.UnitTests/GitHub.Primitives.UnitTests.csproj b/test/GitHub.Primitives.UnitTests/GitHub.Primitives.UnitTests.csproj deleted file mode 100644 index 9fdcc1a6b6..0000000000 --- a/test/GitHub.Primitives.UnitTests/GitHub.Primitives.UnitTests.csproj +++ /dev/null @@ -1,89 +0,0 @@ - - - - Debug - AnyCPU - {E687457A-BEDC-422D-8D9D-2DA58099EBBA} - Library - Properties - GitHub.Primitives.UnitTests - GitHub.Primitives.UnitTests - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - - - - - - - - - - SplatModeDetectorSetUp.cs - - - - - - - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - GitHub.Exports - - - - - Designer - - - - - - \ No newline at end of file diff --git a/test/GitHub.Primitives.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.Primitives.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 84857e0848..0000000000 --- a/test/GitHub.Primitives.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.Primitives.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.Primitives.UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("e687457a-bedc-422d-8d9d-2da58099ebba")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/GitHub.Primitives.UnitTests/packages.config b/test/GitHub.Primitives.UnitTests/packages.config deleted file mode 100644 index bba46a2bca..0000000000 --- a/test/GitHub.Primitives.UnitTests/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/test/GitHub.TeamFoundation.UnitTests/GitHub.TeamFoundation.UnitTests.csproj b/test/GitHub.TeamFoundation.UnitTests/GitHub.TeamFoundation.UnitTests.csproj index 2dd74a96d8..65d49470f6 100644 --- a/test/GitHub.TeamFoundation.UnitTests/GitHub.TeamFoundation.UnitTests.csproj +++ b/test/GitHub.TeamFoundation.UnitTests/GitHub.TeamFoundation.UnitTests.csproj @@ -1,219 +1,35 @@ - - + - Debug - AnyCPU - {93778A89-3E58-4853-B772-948EBB3F17BE} - Library - Properties - GitHub.TeamFoundation.UnitTests - GitHub.TeamFoundation.UnitTests - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net461 + - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - False - ..\..\lib\14.0\Microsoft.TeamFoundation.Git.Provider.dll - - - ..\..\packages\Rx-Testing.2.2.5-custom\lib\net45\Microsoft.Reactive.Testing.dll - True - - - ..\..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Editor.14.3.25407\lib\net45\Microsoft.VisualStudio.Editor.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Language.Intellisense.14.3.25407\lib\net45\Microsoft.VisualStudio.Language.Intellisense.dll - True - - - ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - False - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - False - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll - - - ..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll - - - ..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll - True - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - + + + - - SplatModeDetectorSetUp.cs - + + - - + + - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - GitHub.Exports - - - {161DBF01-1DBF-4B00-8551-C5C00F26720D} - GitHub.TeamFoundation.14 - + + - - Designer - + + - - - - \ No newline at end of file + diff --git a/test/GitHub.TeamFoundation.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.TeamFoundation.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index ad7f7e7ef1..0000000000 --- a/test/GitHub.TeamFoundation.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.TeamFoundation")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.TeamFoundation")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("93778a89-3e58-4853-b772-948ebb3f17be")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj b/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj index e31a1fb3cc..7ee64ed517 100644 --- a/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj +++ b/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj @@ -1,118 +1,38 @@ - - - + - Debug - AnyCPU - {110B206F-8554-4B51-BF86-94DAA32F5E26} - Library - Properties - GitHub.UI.UnitTests - GitHub.UI.UnitTests - v4.6.1 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net461 + - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll - - - ..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll - True - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - + - - - - + + + + + - - SplatModeDetectorSetUp.cs - + - - - - - - - - - - - Designer - - - - - {d1dfbb0c-b570-4302-8f1e-2e3a19c41961} - GitHub.VisualStudio.UI - - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {158B05E8-FDBC-4D71-B871-C96E28D5ADF5} - GitHub.UI.Reactive - - - {346384dd-2445-4a28-af22-b45f3957bd89} - GitHub.UI - + - - MSBuild:Compile - Designer - + + + + + - + + + + - - - \ No newline at end of file + diff --git a/test/GitHub.UI.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.UI.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 67a96e0acc..0000000000 --- a/test/GitHub.UI.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using NUnit.Framework; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.QuickTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.QuickTests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("110b206f-8554-4b51-bf86-94daa32f5e26")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -[assembly: Timeout(2 /*minutes*/ * 60 * 1000)] diff --git a/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj b/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj index f4c3f87e94..b471c830e4 100644 --- a/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj +++ b/test/GitHub.VisualStudio.UnitTests/GitHub.VisualStudio.UnitTests.csproj @@ -1,301 +1,28 @@ - - + - Debug - AnyCPU - {8B14F90B-0781-465D-AB94-19C8C56E3A94} - Library - Properties - GitHub.VisualStudio.UnitTests - GitHub.VisualStudio.UnitTests - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + net461 + - - ..\..\packages\LibGit2Sharp.0.23.1\lib\net40\LibGit2Sharp.dll - True - - - ..\..\lib\14.0\Microsoft.TeamFoundation.Controls.dll - False - - - ..\..\packages\Rx-Testing.2.2.5-custom\lib\net45\Microsoft.Reactive.Testing.dll - True - - - ..\..\packages\Microsoft.VisualStudio.ComponentModelHost.14.0.25424\lib\net45\Microsoft.VisualStudio.ComponentModelHost.dll - True - - - ..\..\packages\Microsoft.VisualStudio.CoreUtility.14.3.25407\lib\net45\Microsoft.VisualStudio.CoreUtility.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Editor.14.3.25407\lib\net45\Microsoft.VisualStudio.Editor.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Language.Intellisense.14.3.25407\lib\net45\Microsoft.VisualStudio.Language.Intellisense.dll - True - - - ..\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll - True - - - True - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.12.0.12.0.30110\lib\Microsoft.VisualStudio.Shell.Interop.12.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.Data.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Data.dll - False - - - ..\..\packages\Microsoft.VisualStudio.Text.Logic.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.Logic.dll - False - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.14.3.25407\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll - True - - - ..\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Threading.14.1.131\lib\net45\Microsoft.VisualStudio.Threading.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll - True - - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll - - - ..\..\packages\NSubstitute.2.0.3\lib\net45\NSubstitute.dll - True - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - - - ..\..\packages\Octokit.GraphQL.0.0.6-alpha\lib\netstandard1.1\Octokit.GraphQL.dll - - - ..\..\packages\Octokit.GraphQL.0.0.6-alpha\lib\netstandard1.1\Octokit.GraphQL.Core.dll - - - - - ..\..\packages\Rothko.0.0.3-ghfvs\lib\net45\rothko.dll - True - - - - - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll - True - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll - - - - - + - - SplatModeDetectorSetUp.cs - - - - - - + - - - - - - - - - - - + - - {2D3D2834-33BE-45CA-B3CC-12F853557D7B} - GitHub.Services.Vssdk - - - {B4E665E5-6CAF-4414-A6E2-8DE1C3BCF203} - Akavache_Net45 - - - {08dd4305-7787-4823-a53f-4d0f725a07f3} - Octokit - - - {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {b389adaf-62cc-486e-85b4-2d8b078df763} - GitHub.Api - - - {1A1DA411-8D1F-4578-80A6-04576BEA2DC5} - GitHub.App - - - {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} - GitHub.Exports.Reactive - - - {9AEA02DB-02B5-409C-B0CA-115D05331A6B} - GitHub.Exports - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - - - {161DBF01-1DBF-4B00-8551-C5C00F26720D} - GitHub.TeamFoundation.14 - - - {11569514-5ae5-4b5b-92a2-f10b0967de5f} - GitHub.VisualStudio - - - {d1dfbb0c-b570-4302-8f1e-2e3a19c41961} - GitHub.VisualStudio.UI + + TF15 + + - - PreserveNewest - - + + + + - - - - \ No newline at end of file + diff --git a/test/GitHub.VisualStudio.UnitTests/Properties/AssemblyInfo.cs b/test/GitHub.VisualStudio.UnitTests/Properties/AssemblyInfo.cs deleted file mode 100644 index 6e74c893ea..0000000000 --- a/test/GitHub.VisualStudio.UnitTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("GitHub.VisualStudio.UnitTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("GitHub.VisualStudio.UnitTests")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8b14f90b-0781-465d-ab94-19c8c56e3a94")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/GitHub.App.UnitTests/Services/LocalRepositoriesTests.cs b/test/GitHub.VisualStudio.UnitTests/Services/LocalRepositoriesTests.cs similarity index 100% rename from test/GitHub.App.UnitTests/Services/LocalRepositoriesTests.cs rename to test/GitHub.VisualStudio.UnitTests/Services/LocalRepositoriesTests.cs diff --git a/test/TrackingCollectionTests/Properties/AssemblyInfo.cs b/test/TrackingCollectionTests/Properties/AssemblyInfo.cs deleted file mode 100644 index f7baaa48da..0000000000 --- a/test/TrackingCollectionTests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; -using NUnit.Framework; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("TrackingCollectionTests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("TrackingCollectionTests")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("7b835a7d-cf94-45e8-b191-96f5a4fe26a8")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] - -[assembly: Timeout(2 /*minutes*/ * 60 * 1000)] diff --git a/test/TrackingCollectionTests/TrackingCollectionTests.csproj b/test/TrackingCollectionTests/TrackingCollectionTests.csproj index ccd62141fd..6f2eb24aee 100644 --- a/test/TrackingCollectionTests/TrackingCollectionTests.csproj +++ b/test/TrackingCollectionTests/TrackingCollectionTests.csproj @@ -1,143 +1,17 @@ - - + - 14.0 - 12.0 - Debug - AnyCPU - {7B835A7D-CF94-45E8-B191-96F5A4FE26A8} - Library - Properties - TrackingCollectionTests - TrackingCollectionTests - v4.6.1 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - - - + net461 - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - ..\..\packages\NUnit.3.9.0\lib\net45\nunit.framework.dll - - - - ..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll - True - - - ..\..\packages\Rx-Interfaces.2.2.5-custom\lib\net45\System.Reactive.Interfaces.dll - True - - - ..\..\packages\Rx-Linq.2.2.5-custom\lib\net45\System.Reactive.Linq.dll - True - - - ..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll - True - - - ..\..\packages\Rx-XAML.2.2.5-custom\lib\net45\System.Reactive.Windows.Threading.dll - True - - - - - - - - - - + - - SplatModeDetectorSetUp.cs - - - - - - - + + - - Designer - + + - - {1ce2d235-8072-4649-ba5a-cfb1af8776e0} - ReactiveUI_Net45 - - - {252ce1c2-027a-4445-a3c2-e4d6c80a935a} - Splat-Net45 - - - {e4ed0537-d1d9-44b6-9212-3096d7c3f7a1} - GitHub.Exports.Reactive - - - {9aea02db-02b5-409c-b0ca-115d05331a6b} - GitHub.Exports - - - {6afe2e2d-6db0-4430-a2ea-f5f5388d2f78} - GitHub.Extensions - + - - - - - False - - - False - - - False - - - False - - - - - - - - \ No newline at end of file +