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

Commit 73b2275

Browse files
committed
Merge branch 'master' into feature/save-drafts
2 parents b58774f + a9f4336 commit 73b2275

File tree

61 files changed

+777
-670
lines changed

Some content is hidden

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

61 files changed

+777
-670
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
4+
</Settings>
5+
</ProjectConfiguration>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<ProjectConfiguration>
2+
<Settings>
3+
<CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
4+
</Settings>
5+
</ProjectConfiguration>

GitHubVS.sln

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Testing", "submo
131131
EndProject
132132
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Wpf", "submodules\reactiveui\src\ReactiveUI.Wpf\ReactiveUI.Wpf.csproj", "{E899B03C-6E8E-4375-AB65-FC925D721D8B}"
133133
EndProject
134+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InstallAndStart", "test\Launcher\InstallAndStart.csproj", "{79F32BE1-2764-4DBA-97F6-21053DE44270}"
135+
EndProject
134136
Global
135137
GlobalSection(SolutionConfigurationPlatforms) = preSolution
136138
Debug|Any CPU = Debug|Any CPU
@@ -530,6 +532,16 @@ Global
530532
{E899B03C-6E8E-4375-AB65-FC925D721D8B}.Release|Any CPU.Build.0 = Release|Any CPU
531533
{E899B03C-6E8E-4375-AB65-FC925D721D8B}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
532534
{E899B03C-6E8E-4375-AB65-FC925D721D8B}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
535+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
536+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.Debug|Any CPU.Build.0 = Debug|Any CPU
537+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.DebugCodeAnalysis|Any CPU.ActiveCfg = Debug|Any CPU
538+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.DebugCodeAnalysis|Any CPU.Build.0 = Debug|Any CPU
539+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.DebugWithoutVsix|Any CPU.ActiveCfg = Debug|Any CPU
540+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.DebugWithoutVsix|Any CPU.Build.0 = Debug|Any CPU
541+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.Release|Any CPU.ActiveCfg = Release|Any CPU
542+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.Release|Any CPU.Build.0 = Release|Any CPU
543+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.ReleaseWithoutVsix|Any CPU.ActiveCfg = Release|Any CPU
544+
{79F32BE1-2764-4DBA-97F6-21053DE44270}.ReleaseWithoutVsix|Any CPU.Build.0 = Release|Any CPU
533545
EndGlobalSection
534546
GlobalSection(SolutionProperties) = preSolution
535547
HideSolutionNode = FALSE

GitHubVS.v3.ncrunchsolution

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AdditionalFilesToIncludeForSolution>
88
<Value>lib\**.*</Value>
99
</AdditionalFilesToIncludeForSolution>
10-
<AllowParallelTestExecution>False</AllowParallelTestExecution>
10+
<AllowParallelTestExecution>True</AllowParallelTestExecution>
1111
<ProjectConfigStoragePathRelativeToSolutionDir>.ncrunch</ProjectConfigStoragePathRelativeToSolutionDir>
1212
<SolutionConfigured>True</SolutionConfigured>
1313
</Settings>

nuget.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<configuration>
33
<packageSources>
44
<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
5-
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
5+
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
6+
<add key="vsixtesting" value="https://www.myget.org/F/vsixtesting/api/v3/index.json" />
67
<add key="Custom Packages for GHfVS" value="lib" />
78
</packageSources>
89
<activePackageSource>

src/GitHub.App/SampleData/PullRequestDetailViewModelDesigner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public PullRequestDetailViewModelDesigner()
9696

9797
Files = new PullRequestFilesViewModelDesigner();
9898

99-
Checks = new PullRequestCheckViewModelDesigner[0];
99+
Checks = Array.Empty<PullRequestCheckViewModelDesigner>();
100100
}
101101

102102
public PullRequestDetailModel Model { get; }

src/GitHub.App/SampleData/PullRequestUserReviewsViewModelDesigner.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public PullRequestUserReviewsViewModelDesigner()
2727
{
2828
IsExpanded = true,
2929
HasDetails = true,
30-
FileComments = new IPullRequestReviewFileCommentViewModel[0],
30+
FileComments = Array.Empty<IPullRequestReviewFileCommentViewModel>(),
3131
StateDisplay = "approved",
3232
Model = new PullRequestReviewModel
3333
{

src/GitHub.App/Services/ModelService.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ IObservable<IReadOnlyList<IRemoteRepositoryModel>> GetUserRepositories(Repositor
320320
log.Error(e,
321321
"Retrieving {RepositoryType} user repositories failed because user is not stored in the cache",
322322
repositoryType);
323-
return Observable.Return(new IRemoteRepositoryModel[] {});
323+
return Observable.Return(Array.Empty<IRemoteRepositoryModel>());
324324
});
325325
}
326326

@@ -355,7 +355,7 @@ IObservable<IReadOnlyList<IRemoteRepositoryModel>> GetOrganizationRepositories(s
355355
{
356356
log.Error(e, "Retrieveing {Organization} org repositories failed because user is not stored in the cache",
357357
organization);
358-
return Observable.Return(new IRemoteRepositoryModel[] {});
358+
return Observable.Return(Array.Empty<IRemoteRepositoryModel>());
359359
});
360360
}
361361

src/GitHub.App/Services/StandardUserErrors.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public static IObservable<RecoveryOptionResult> ShowUserErrorThatRequiresNavigat
189189

190190
return exception.DisplayErrorMessage(
191191
errorType,
192-
new object[] { },
192+
Array.Empty<object>(),
193193
new[] { OpenBrowser("View Plans", account.Billing()), Cancel });
194194
}
195195

src/GitHub.App/ViewModels/Dialog/RepositoryCreationViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public async Task InitializeAsync(IConnection connection)
182182

183183
accounts = modelService.GetAccounts()
184184
.ObserveOn(RxApp.MainThreadScheduler)
185-
.ToProperty(this, vm => vm.Accounts, initialValue: new ReadOnlyCollection<IAccount>(new IAccount[] { }));
185+
.ToProperty(this, vm => vm.Accounts, initialValue: new ReadOnlyCollection<IAccount>(Array.Empty<IAccount>()));
186186

187187
this.WhenAny(x => x.Accounts, x => x.Value)
188188
.Select(accts => accts?.FirstOrDefault())

0 commit comments

Comments
 (0)