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

Commit 31fa8c7

Browse files
committed
Merge pull request #255 from github/unification
Release 1.0.18.1 with VS "15" support
2 parents 3101518 + 8da8b03 commit 31fa8c7

File tree

125 files changed

+1636
-726
lines changed

Some content is hidden

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

125 files changed

+1636
-726
lines changed

GitHubVS.sln

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Testing_Net45",
109109
EndProject
110110
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackingCollectionTests", "src\TrackingCollectionTests\TrackingCollectionTests.csproj", "{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}"
111111
EndProject
112+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.14", "src\GitHub.TeamFoundation.14\GitHub.TeamFoundation.14.csproj", "{161DBF01-1DBF-4B00-8551-C5C00F26720D}"
113+
EndProject
114+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.15", "src\GitHub.TeamFoundation.15\GitHub.TeamFoundation.15.csproj", "{161DBF01-1DBF-4B00-8551-C5C00F26720E}"
115+
EndProject
116+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.VisualStudio.UI", "src\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj", "{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}"
117+
EndProject
112118
Global
113119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
114120
Debug|Any CPU = Debug|Any CPU
@@ -527,6 +533,54 @@ Global
527533
{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}.Release|x86.Build.0 = Release|Any CPU
528534
{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}.XamlDesign|Any CPU.ActiveCfg = Debug|Any CPU
529535
{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}.XamlDesign|x86.ActiveCfg = Debug|Any CPU
536+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
537+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Debug|Any CPU.Build.0 = Debug|Any CPU
538+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Debug|x86.ActiveCfg = Debug|Any CPU
539+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Debug|x86.Build.0 = Debug|Any CPU
540+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Publish|Any CPU.ActiveCfg = Release|Any CPU
541+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Publish|Any CPU.Build.0 = Release|Any CPU
542+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Publish|x86.ActiveCfg = Release|Any CPU
543+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Publish|x86.Build.0 = Release|Any CPU
544+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Release|Any CPU.ActiveCfg = Release|Any CPU
545+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Release|Any CPU.Build.0 = Release|Any CPU
546+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Release|x86.ActiveCfg = Release|Any CPU
547+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.Release|x86.Build.0 = Release|Any CPU
548+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU
549+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
550+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|x86.ActiveCfg = Release|Any CPU
551+
{161DBF01-1DBF-4B00-8551-C5C00F26720D}.XamlDesign|x86.Build.0 = Release|Any CPU
552+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
553+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Debug|Any CPU.Build.0 = Debug|Any CPU
554+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Debug|x86.ActiveCfg = Debug|Any CPU
555+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Debug|x86.Build.0 = Debug|Any CPU
556+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Publish|Any CPU.ActiveCfg = Release|Any CPU
557+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Publish|Any CPU.Build.0 = Release|Any CPU
558+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Publish|x86.ActiveCfg = Release|Any CPU
559+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Publish|x86.Build.0 = Release|Any CPU
560+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Release|Any CPU.ActiveCfg = Release|Any CPU
561+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Release|Any CPU.Build.0 = Release|Any CPU
562+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Release|x86.ActiveCfg = Release|Any CPU
563+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.Release|x86.Build.0 = Release|Any CPU
564+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU
565+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
566+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|x86.ActiveCfg = Release|Any CPU
567+
{161DBF01-1DBF-4B00-8551-C5C00F26720E}.XamlDesign|x86.Build.0 = Release|Any CPU
568+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
569+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Debug|Any CPU.Build.0 = Debug|Any CPU
570+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Debug|x86.ActiveCfg = Debug|Any CPU
571+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Debug|x86.Build.0 = Debug|Any CPU
572+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Publish|Any CPU.ActiveCfg = Release|Any CPU
573+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Publish|Any CPU.Build.0 = Release|Any CPU
574+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Publish|x86.ActiveCfg = Release|Any CPU
575+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Publish|x86.Build.0 = Release|Any CPU
576+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|Any CPU.ActiveCfg = Release|Any CPU
577+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|Any CPU.Build.0 = Release|Any CPU
578+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|x86.ActiveCfg = Release|Any CPU
579+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.Release|x86.Build.0 = Release|Any CPU
580+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.ActiveCfg = Release|Any CPU
581+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|Any CPU.Build.0 = Release|Any CPU
582+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|x86.ActiveCfg = Release|Any CPU
583+
{D1DFBB0C-B570-4302-8F1E-2E3A19C41961}.XamlDesign|x86.Build.0 = Release|Any CPU
530584
EndGlobalSection
531585
GlobalSection(SolutionProperties) = preSolution
532586
HideSolutionNode = FALSE
1.41 MB
Binary file not shown.
734 KB
Binary file not shown.
1.05 MB
Binary file not shown.
36.3 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

script

src/CredentialManagement/CredentialManagement.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>CredentialManagement</RootNamespace>
1111
<AssemblyName>GitHub.CredentialManagement</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<NuGetPackageImportStamp>
1515
</NuGetPackageImportStamp>

src/DesignTimeStyleHelper/App.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
55
</startup>
6-
</configuration>
6+
</configuration>

src/DesignTimeStyleHelper/DesignTimeStyleHelper.csproj

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>DesignTimeStyleHelper</RootNamespace>
1111
<AssemblyName>DesignTimeStyleHelper</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>
1616
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1717
<OutputPath>bin\$(Configuration)\</OutputPath>
18+
<TargetFrameworkProfile />
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -84,7 +85,7 @@
8485
<Reference Include="PresentationCore" />
8586
<Reference Include="PresentationFramework" />
8687
<Reference Include="Microsoft.TeamFoundation.Git.Provider, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
87-
<HintPath>..\..\lib\Microsoft.TeamFoundation.Git.Provider.dll</HintPath>
88+
<HintPath>..\..\lib\14.0\Microsoft.TeamFoundation.Git.Provider.dll</HintPath>
8889
<Private>True</Private>
8990
</Reference>
9091
</ItemGroup>
@@ -167,6 +168,10 @@
167168
<Project>{e4ed0537-d1d9-44b6-9212-3096d7c3f7a1}</Project>
168169
<Name>GitHub.Exports.Reactive</Name>
169170
</ProjectReference>
171+
<ProjectReference Include="..\GitHub.TeamFoundation.14\GitHub.TeamFoundation.14.csproj">
172+
<Project>{161dbf01-1dbf-4b00-8551-c5c00f26720d}</Project>
173+
<Name>GitHub.TeamFoundation.14</Name>
174+
</ProjectReference>
170175
<ProjectReference Include="..\GitHub.UI.Reactive\GitHub.UI.Reactive.csproj">
171176
<Project>{158b05e8-fdbc-4d71-b871-c96e28d5adf5}</Project>
172177
<Name>GitHub.UI.Reactive</Name>
@@ -175,6 +180,10 @@
175180
<Project>{346384dd-2445-4a28-af22-b45f3957bd89}</Project>
176181
<Name>GitHub.UI</Name>
177182
</ProjectReference>
183+
<ProjectReference Include="..\GitHub.VisualStudio.UI\GitHub.VisualStudio.UI.csproj">
184+
<Project>{d1dfbb0c-b570-4302-8f1e-2e3a19c41961}</Project>
185+
<Name>GitHub.VisualStudio.UI</Name>
186+
</ProjectReference>
178187
<ProjectReference Include="..\GitHub.VisualStudio\GitHub.VisualStudio.csproj">
179188
<Project>{11569514-5ae5-4b5b-92a2-f10b0967de5f}</Project>
180189
<Name>GitHub.VisualStudio</Name>

src/DesignTimeStyleHelper/MainWindow.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:local="clr-namespace:DesignTimeStyleHelper"
88
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
99
xmlns:ctl="clr-namespace:GitHub.VisualStudio.UI.Views.Controls;assembly=GitHub.VisualStudio"
10+
xmlns:views="clr-namespace:GitHub.VisualStudio.UI.Views;assembly=GitHub.VisualStudio.UI"
1011
mc:Ignorable="d"
1112
Title="MainWindow" Height="350" Width="525">
1213
<Window.Resources>
@@ -16,7 +17,7 @@
1617
</Window.Resources>
1718
<StackPanel>
1819
<Border Background="#F5F5F5" >
19-
<gh:GitHubHomeContent x:Name="gitHubHomeSection" Margin="0,10,0,10" />
20+
<views:GitHubHomeContent x:Name="gitHubHomeSection" Margin="0,10,0,10" />
2021
</Border>
2122
<Grid>
2223
<WrapPanel Orientation="Horizontal" Grid.Row="0" Margin="0,0,0,6">

src/DesignTimeStyleHelper/Properties/Resources.Designer.cs

Lines changed: 18 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/DesignTimeStyleHelper/Properties/Settings.Designer.cs

Lines changed: 10 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/GitHub.Api/GitHub.Api.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>GitHub.Api</RootNamespace>
1111
<AssemblyName>GitHub.Api</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<BuildType Condition="Exists('..\..\script\ApiClientConfiguration.cs')">Internal</BuildType>
1515
<OutputPath>bin\$(Configuration)\</OutputPath>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>

src/GitHub.App/Controllers/UIController.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public IObservable<bool> ListenToCompletionState()
152152

153153
void End(bool success)
154154
{
155-
uiProvider.RemoveService(typeof(IConnection));
155+
uiProvider.RemoveService(typeof(IConnection), this);
156156
completion?.OnNext(success);
157157
completion?.OnCompleted();
158158
transition.OnCompleted();
@@ -228,7 +228,7 @@ public void Start([AllowNull] IConnection connection)
228228
if (connection != null)
229229
{
230230
if (currentFlow != UIControllerFlow.Authentication)
231-
uiProvider.AddService(connection);
231+
uiProvider.AddService(this, connection);
232232
else // sanity check: it makes zero sense to pass a connection in when calling the auth flow
233233
Debug.Assert(false, "Calling the auth flow with a connection makes no sense!");
234234

@@ -263,15 +263,15 @@ public void Start([AllowNull] IConnection connection)
263263
if (currentFlow != UIControllerFlow.Authentication)
264264
{
265265
if (loggedin) // register the first available connection so the viewmodel can use it
266-
uiProvider.AddService(c);
266+
uiProvider.AddService(this, c);
267267
else
268268
{
269269
// a connection will be added to the list when auth is done, register it so the next
270270
// viewmodel can use it
271271
connectionAdded = (s, e) =>
272272
{
273273
if (e.Action == NotifyCollectionChangedAction.Add)
274-
uiProvider.AddService(typeof(IConnection), e.NewItems[0]);
274+
uiProvider.AddService(typeof(IConnection), this, e.NewItems[0]);
275275
};
276276
connectionManager.Connections.CollectionChanged += connectionAdded;
277277
}

src/GitHub.App/GitHub.App.csproj

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<ProjectGuid>{1A1DA411-8D1F-4578-80A6-04576BEA2DC5}</ProjectGuid>
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>GitHub</RootNamespace>
10+
<RootNamespace>GitHub.App</RootNamespace>
1111
<AssemblyName>GitHub.App</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<NuGetPackageImportStamp>
@@ -20,6 +20,7 @@
2020
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2121
<BuildType Condition="Exists('..\..\script\ApiClientConfiguration.cs')">Internal</BuildType>
2222
<OutputPath>bin\$(Configuration)\</OutputPath>
23+
<TargetFrameworkProfile />
2324
</PropertyGroup>
2425
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2526
<DebugSymbols>true</DebugSymbols>
@@ -50,14 +51,6 @@
5051
<DelaySign>false</DelaySign>
5152
</PropertyGroup>
5253
<ItemGroup>
53-
<Reference Include="Microsoft.TeamFoundation.Git.Controls, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
54-
<HintPath>..\..\lib\Microsoft.TeamFoundation.Git.Controls.dll</HintPath>
55-
<Private>False</Private>
56-
</Reference>
57-
<Reference Include="Microsoft.TeamFoundation.Git.Provider, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
58-
<HintPath>..\..\lib\Microsoft.TeamFoundation.Git.Provider.dll</HintPath>
59-
<Private>False</Private>
60-
</Reference>
6154
<Reference Include="Microsoft.VisualStudio.ComponentModelHost, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
6255
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
6356
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
@@ -275,7 +268,7 @@
275268
</ItemGroup>
276269
<ItemGroup>
277270
<EmbeddedResource Include="Resources.resx">
278-
<Generator>PublicResXFileCodeGenerator</Generator>
271+
<Generator>ResXFileCodeGenerator</Generator>
279272
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
280273
</EmbeddedResource>
281274
</ItemGroup>

src/GitHub.App/GlobalSuppressions.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
[assembly: SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Scope = "member", Target = "GitHub.ViewModels.CreateRepoViewModel.#ResetState()")]
44
[assembly: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "Git", Scope = "resource", Target = "GitHub.Resources.resources")]
55
[assembly: SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily", Scope = "member", Target = "GitHub.Caches.CredentialCache.#InsertObject`1(System.String,!!0,System.Nullable`1<System.DateTimeOffset>)")]
6+
[assembly: SuppressMessage("Microsoft.Naming", "CA1703:ResourceStringsShouldBeSpelledCorrectly", MessageId = "Git", Scope = "resource", Target = "GitHub.App.Resources.resources")]
67
// This file is used by Code Analysis to maintain SuppressMessage
78
// attributes that are applied to this project.
89
// Project-level suppressions either have no target or are given

0 commit comments

Comments
 (0)