fix store name. scrollbar

ridomin · May 15, 2019 · a68977f · a68977f
1 parent 217eebe
commit a68977f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -29,7 +29,7 @@ strategy:
       DistURL: https://not/used
       MsixPublisherId: CN=FD784322-3D44-4DA4-9F73-0E23D5DF0893
       MsixPackageId: 18656RidoMin.MSIXCatalog
-      MsixPackageDisplayName: MSIX Catalog (CD)
+      MsixPackageDisplayName: MSIX Catalog
       MsixManifest: msix.catalog.package.net\package.appxmanifest
       MsixBuildMode: CI
       MsixGenerateAppInstaller: false

diff --git a/msix.catalog.app/Views/AboutPage.xaml b/msix.catalog.app/Views/AboutPage.xaml
@@ -32,8 +32,8 @@
                Source="{Binding AppLogo}" Width="44" Height="44" />-->
 
         <TextBlock Text="MSIX Catalog" Grid.Row="0" FontSize="20" HorizontalAlignment="Left" Margin="5"/>
-
-        <StackPanel Grid.Row="1"  Orientation="Vertical" Margin="10" HorizontalAlignment="Left">
+        <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" CanContentScroll="True" Grid.Row="1">
+            <StackPanel   Orientation="Vertical" Margin="10" HorizontalAlignment="Left">
             <StackPanel Orientation="Vertical" Margin="5">
                 <TextBlock Text="Version: " FontSize="16"/>
                 <TextBlock Text="{Binding VersionString}" FontSize="16" AutomationProperties.AutomationId="LabelVersion"/>
@@ -87,6 +87,6 @@
                 <TextBlock Text="{Binding  Metadata}" />
             </Border>
         </StackPanel>
-
+        </ScrollViewer>
     </Grid>
 </Page>
diff --git a/msix.catalog.lib/ThisAppVersionInfo.cs b/msix.catalog.lib/ThisAppVersionInfo.cs
@@ -112,7 +112,7 @@ public static DateTimeOffset InstalledOn
             }
         }
 
-        public static string DotNetFlavor => typeof(string).Assembly.Location;
+        public static string DotNetFlavor => $"{typeof(object).Assembly.Location} \r\n [{typeof(object).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion}]";
 
         public static string SignatureKind => OSVersionHelper.WindowsVersionHelper.HasPackageIdentity ? Package.Current.SignatureKind.ToString() : "";
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,7 +112,7 @@ public static DateTimeOffset InstalledOn @@
                 }
             }
-            public static string DotNetFlavor => typeof(string).Assembly.Location;
+            public static string DotNetFlavor => $"{typeof(object).Assembly.Location} \r\n [{typeof(object).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion}]";
             public static string SignatureKind => OSVersionHelper.WindowsVersionHelper.HasPackageIdentity ? Package.Current.SignatureKind.ToString() : "";
@@ Expand Down @@