Merge branch 'master' into fixes/annotations-metrics

Author: StanleyGoldman

src/GitHub.App/Services/RepositoryCloneService.cs

@@ -97,7 +97,7 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad
                         Repositories = viewer.Repositories(null, null, null, null, null, order, affiliation, null, null)
                             .AllPages()
                             .Select(repositorySelection).ToList(),
-                        OrganizationRepositories = viewer.Organizations(null, null, null, null).AllPages().Select(org => new
+                        Organizations = viewer.Organizations(null, null, null, null).AllPages().Select(org => new
                         {
                             org.Login,
                             Repositories = org.Repositories(null, null, null, null, null, order, null, null, null)

src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs

@@ -117,7 +117,7 @@ public async Task Activate()
                     .Where(r => r.Owner != results.Owner)
                     .OrderBy(r => r.Owner)
                     .Select(x => new RepositoryItemViewModel(x, "Collaborator repositories"));
-                var orgRepositories = results.OrganizationRepositories
+                var orgRepositories = results.Organizations
                     .OrderBy(x => x.Key)
                     .SelectMany(x => x.Value.Select(y => new RepositoryItemViewModel(y, x.Key)));
                 Items = yourRepositories.Concat(collaboratorRepositories).Concat(orgRepositories).ToList();

src/GitHub.Exports/Models/ViewerRepositoriesModel.cs

@@ -7,6 +7,6 @@ public class ViewerRepositoriesModel
     {
         public string Owner { get; set; }
         public IReadOnlyList<RepositoryListItemModel> Repositories { get; set; }
-        public IDictionary<string, IReadOnlyList<RepositoryListItemModel>> OrganizationRepositories { get; set; }
+        public IDictionary<string, IReadOnlyList<RepositoryListItemModel>> Organizations { get; set; }
     }
 }

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -428,11 +428,19 @@
   <PropertyGroup>
     <UseCodebase>true</UseCodebase>
   </PropertyGroup>
+  <ItemGroup>
+    <!-- Include a reference to this package so that x86|x64\e_sqlite3.dll are copied to the output directory -->
+    <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3">
+      <Version>1.1.11</Version>
+    </PackageReference>
+  </ItemGroup>
   <!-- Include required NuGet dependencies-->
   <Target Name="IncludeNuGetPackageReferences" AfterTargets="GetVsixSourceItems">
     <ItemGroup>
       <VSIXSourceItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' == 'System.ValueTuple'" />
       <VSIXSourceItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' == 'Newtonsoft.Json'" />
+      <VSIXSourceItem VSIXSubPath="x86" Include="@(Content)" Condition="'%(Content.Link)' == 'x86\e_sqlite3.dll'" />
+      <VSIXSourceItem VSIXSubPath="x64" Include="@(Content)" Condition="'%(Content.Link)' == 'x64\e_sqlite3.dll'" />
     </ItemGroup>
   </Target>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />