new version

Former-commit-id: 47668002fcda2529cb461103139545cbe79c5fff [formerly 085397c] Former-commit-id: abb18c5109b7f3ff67c8ff9a82016394ff5e6f57
OpportunityLiu · Mar 5, 2017 · 362b554 · 362b554
1 parent 148218a
commit 362b554
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 378 deletions.
diff --git a/CleanUp.ps1 b/CleanUp.ps1
@@ -1,7 +1,7 @@
 $folders = Get-ChildItem -Recurse -Depth 1;
 foreach($item in $folders)
 {
-    if($item.Name -eq "obj" -or $item.Name -eq "bin" -or $item.Name -eq "project.lock.json")
+    if($item.Name -eq "obj" -or $item.Name -eq "bin" -or $item.Name -eq "project.lock.json" -or $item.Name -like "*.nuget.*")
     {
         if($item.PSIsContainer)
         {

diff --git a/EhTagTranslator.wiki b/EhTagTranslator.wiki
diff --git a/ExViewer/ExViewer.csproj b/ExViewer/ExViewer.csproj
@@ -281,7 +281,6 @@
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>Strings.tt.cs</LastGenOutput>
     </None>
-    <None Include="Package.StoreAssociation.xml" />
     <Content Include="Images\Light\UserBackground.scale-100.png" />
     <Content Include="Images\Light\UserBackground.scale-200.png" />
     <Content Include="Images\Light\UserBackground.scale-400.png" />

diff --git a/ExViewer/Package.StoreAssociation.xml b/ExViewer/Package.StoreAssociation.xml
diff --git a/ExViewer/Package.appxmanifest b/ExViewer/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" IgnorableNamespaces="uap mp uap3">
-  <Identity Name="2289Opportunity.E-Viewer" Publisher="CN=22AA5D8B-590F-4C7F-807B-5166B66DDBE0" Version="2017.2.25.0" />
+  <Identity Name="2289Opportunity.E-Viewer" Publisher="CN=22AA5D8B-590F-4C7F-807B-5166B66DDBE0" Version="2017.3.5.0" />
   <mp:PhoneIdentity PhoneProductId="b0e97c45-19f9-4a1b-9836-fa1508c91c7e" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>

diff --git a/ExViewer/Views/AddToFavoritesDialog.xaml b/ExViewer/Views/AddToFavoritesDialog.xaml
@@ -55,6 +55,7 @@
                        TextWrapping="WrapWholeWords" 
                        Visibility="{x:Bind tbInfo.Text, Mode=OneWay, Converter={StaticResource EmptyStringToCollapsedConverter}}"/>
             <ProgressBar x:Name="pbLoading"
+                         VerticalAlignment="Top"
                          Visibility="{x:Bind pbLoading.IsIndeterminate, Converter={StaticResource TrueToVisibleConverter}, Mode=OneWay}" />
         </Grid>
     </Grid>

diff --git a/ExViewer/Views/LogOnDialog.xaml b/ExViewer/Views/LogOnDialog.xaml
@@ -204,7 +204,8 @@
                        TextWrapping="WrapWholeWords"
                        Visibility="{x:Bind tb_info.Text, Mode=OneWay, Converter={StaticResource EmptyStringToCollapsedConverter}}" />
             <ProgressBar x:Name="pb_Loading"
-                         Visibility="{x:Bind pb_Loading.IsIndeterminate, Converter={StaticResource TrueToVisibleConverter}, Mode=OneWay}" />
+                         Visibility="{x:Bind pb_Loading.IsIndeterminate, Converter={StaticResource TrueToVisibleConverter}, Mode=OneWay}"
+                         VerticalAlignment="Top" />
         </Grid>
     </StackPanel>
 </ContentDialog>