Merge branch 'master' into fixes/include-e_sqlite.dll-in-vsix

jcansdale · web-flow · commit eb5d597a239f · 2018-12-06T12:30:59.000Z
diff --git a/src/GitHub.App/Services/RepositoryCloneService.cs b/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)
diff --git a/src/GitHub.App/ViewModels/Dialog/Clone/RepositorySelectViewModel.cs b/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();
diff --git a/src/GitHub.Exports/Models/ViewerRepositoriesModel.cs b/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; }
     }
 }
diff --git a/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj b/src/GitHub.InlineReviews/GitHub.InlineReviews.csproj
@@ -221,13 +221,6 @@
       <SubType>Designer</SubType>
     </VSCTCompile>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="VSPackage.resx">
-      <MergeWithCTO>true</MergeWithCTO>
-      <ManifestResourceName>VSPackage</ManifestResourceName>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <Page Include="Properties\DesignTimeResources.xaml" Condition="'$(DesignTime)'=='true' OR ('$(SolutionPath)'!='' AND Exists('$(SolutionPath)') AND '$(BuildingInsideVisualStudio)'!='true' AND '$(BuildingInsideExpressionBlend)'!='true')">
       <Generator>MSBuild:Compile</Generator>
@@ -267,11 +260,6 @@
       <Generator>MSBuild:Compile</Generator>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\logo_32x32%402x.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
   <ItemGroup>
     <Folder Include="SampleData\" />
   </ItemGroup>
diff --git a/src/GitHub.InlineReviews/Resources/logo_32x32@2x.png b/src/GitHub.InlineReviews/Resources/logo_32x32@2x.png
diff --git a/src/GitHub.InlineReviews/VSPackage.resx b/src/GitHub.InlineReviews/VSPackage.resx
diff --git a/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj b/src/GitHub.VisualStudio/GitHub.VisualStudio.csproj
@@ -166,11 +166,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Resources\preview_200x200.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    <Content Include="Resources\logo_128x128.png">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="Resources\logo_32x32%402x.png">
+    <Content Include="Resources\preview_200x200.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
diff --git a/src/GitHub.VisualStudio/GitHubPackage.cs b/src/GitHub.VisualStudio/GitHubPackage.cs
@@ -28,7 +28,7 @@
 namespace GitHub.VisualStudio
 {
     [PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]
-    [InstalledProductRegistration("#110", "#112", AssemblyVersionInformation.Version, IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", AssemblyVersionInformation.Version)]
     [Guid(Guids.guidGitHubPkgString)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]
diff --git a/src/GitHub.VisualStudio/Resources/logo_128x128.png b/src/GitHub.VisualStudio/Resources/logo_128x128.png
diff --git a/src/GitHub.VisualStudio/Resources/logo_32x32@2x.png b/src/GitHub.VisualStudio/Resources/logo_32x32@2x.png
diff --git a/src/GitHub.VisualStudio/VSPackage.resx b/src/GitHub.VisualStudio/VSPackage.resx
@@ -133,8 +133,4 @@
   <data name="112" xml:space="preserve">
     <value>A Visual Studio Extension that brings the GitHub Flow into Visual Studio.</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="301" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>resources\logo_32x32@2x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
 </root>
diff --git a/src/GitHub.VisualStudio/source.extension.vsixmanifest b/src/GitHub.VisualStudio/source.extension.vsixmanifest
@@ -8,7 +8,7 @@
     <MoreInfo>https://visualstudio.github.com</MoreInfo>
     <License>LICENSE.txt</License>
     <ReleaseNotes>https://visualstudio.github.com/release-notes.html</ReleaseNotes>
-    <Icon>Resources\logo_32x32@2x.png</Icon>
+    <Icon>Resources\logo_128x128.png</Icon>
     <PreviewImage>Resources\preview_200x200.png</PreviewImage>
     <Tags>GitHub;git;open source;source control;branch;pull request;team explorer;commit;publish</Tags>
   </Metadata>

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public async Task<ViewerRepositoriesModel> ReadViewerRepositories(HostAddress ad`
`97`	`97`	`Repositories = viewer.Repositories(null, null, null, null, null, order, affiliation, null, null)`
`98`	`98`	`.AllPages()`
`99`	`99`	`.Select(repositorySelection).ToList(),`
`100`		`- OrganizationRepositories = viewer.Organizations(null, null, null, null).AllPages().Select(org => new`
	`100`	`+ Organizations = viewer.Organizations(null, null, null, null).AllPages().Select(org => new`
`101`	`101`	`{`
`102`	`102`	`org.Login,`
`103`	`103`	`Repositories = org.Repositories(null, null, null, null, null, order, null, null, null)`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ public class ViewerRepositoriesModel`
`7`	`7`	`{`
`8`	`8`	`public string Owner { get; set; }`
`9`	`9`	`public IReadOnlyList<RepositoryListItemModel> Repositories { get; set; }`
`10`		`- public IDictionary<string, IReadOnlyList<RepositoryListItemModel>> OrganizationRepositories { get; set; }`
	`10`	`+ public IDictionary<string, IReadOnlyList<RepositoryListItemModel>> Organizations { get; set; }`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`namespace GitHub.VisualStudio`
`29`	`29`	`{`
`30`	`30`	`[PackageRegistration(UseManagedResourcesOnly = true, AllowsBackgroundLoading = true)]`
`31`		`- [InstalledProductRegistration("#110", "#112", AssemblyVersionInformation.Version, IconResourceID = 400)]`
	`31`	`+ [InstalledProductRegistration("#110", "#112", AssemblyVersionInformation.Version)]`
`32`	`32`	`[Guid(Guids.guidGitHubPkgString)]`
`33`	`33`	`[ProvideMenuResource("Menus.ctmenu", 1)]`
`34`	`34`	`[ProvideAutoLoad(Guids.UIContext_Git, PackageAutoLoadFlags.BackgroundLoad)]`