added the app to the ms store. various store asstes included. the pri…

…ces USD and GST notice displayed in app tier section.
inkton · Nov 14, 2017 · 7a252ea · 7a252ea
1 parent 4a4a303
commit 7a252ea
Show file tree

Hide file tree

Showing 8 changed files with 416 additions and 18 deletions.
diff --git a/Nester/Nester.UWP/Certification-Test-Results.pdf b/Nester/Nester.UWP/Certification-Test-Results.pdf
diff --git a/Nester/Nester.UWP/Nester.UWP.csproj b/Nester/Nester.UWP/Nester.UWP.csproj
@@ -17,11 +17,11 @@
     <EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>Nester.UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>Nester.UWP_StoreKey.pfx</PackageCertificateKeyFile>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
-    <PackageCertificateThumbprint>5ED47AC1D72EC72E6A789FD284F4B96047FF7B72</PackageCertificateThumbprint>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
+    <PackageCertificateThumbprint>5D1F0CC1E77F411A5FEF7D46F2D21F2A9EFB7E68</PackageCertificateThumbprint>
     <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
@@ -97,6 +97,7 @@
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <Content Include="app.config" />
+    <None Include="Nester.UWP_StoreKey.pfx" />
     <None Include="Nester.UWP_TemporaryKey.pfx" />
     <None Include="packages.config" />
     <None Include="project.json" />
@@ -165,6 +166,7 @@
     <Content Include="netherlands.png" />
     <Content Include="notifications24.png" />
     <Content Include="onewayarow.png" />
+    <None Include="Package.StoreAssociation.xml" />
     <Content Include="pluscircle.png" />
     <Content Include="settingsauth32.png" />
     <Content Include="settingshistory32.png" />

diff --git a/Nester/Nester.UWP/Package.StoreAssociation.xml b/Nester/Nester.UWP/Package.StoreAssociation.xml
diff --git a/Nester/Nester.UWP/Package.appxmanifest b/Nester/Nester.UWP/Package.appxmanifest
@@ -1,9 +1,9 @@
 <?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" IgnorableNamespaces="uap mp">
-  <Identity Name="3037acb7-90c6-4ce0-9c3b-6efdd1d05d5c" Publisher="CN=rajitha" Version="1.0.0.0" />
-  <mp:PhoneIdentity PhoneProductId="3037acb7-90c6-4ce0-9c3b-6efdd1d05d5c" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
+  <Identity Name="Inkton.NesterDeploy" Publisher="CN=22E5DD32-E63A-4D77-8B50-F6601C3590EF" Version="1.1.0.0" />
+  <mp:PhoneIdentity PhoneProductId="ffc42229-a460-4a54-ae83-f9a2253c8d68" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
-    <DisplayName>Nester.UWP</DisplayName>
+    <DisplayName>Nester Deploy</DisplayName>
     <PublisherDisplayName>Inkton</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
@@ -15,7 +15,7 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Nester.UWP.App">
-      <uap:VisualElements DisplayName="Nester.UWP" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="Nester.UWP" BackgroundColor="transparent">
+      <uap:VisualElements DisplayName="Nester Deploy" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="Nester.UWP" BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />

diff --git a/Nester/Nester.UWP/Properties/AssemblyInfo.cs b/Nester/Nester.UWP/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.1.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]
 [assembly: ComVisible(false)]
diff --git a/Nester/Nester.UWP/_pkginfo.txt b/Nester/Nester.UWP/_pkginfo.txt
@@ -0,0 +1 @@
+C:\Users\rajitha\Documents\inkton\tools\nester.deploy\Nester\Nester.UWP\AppPackages\Nester.UWP_1.1.0.0\Nester.UWP_1.1.0.0_x64.appxbundle
diff --git a/Nester/Nester/Views/Homesteads/AppSetup/AppTierView.xaml b/Nester/Nester/Views/Homesteads/AppSetup/AppTierView.xaml
@@ -184,16 +184,28 @@
               </ViewCell>
             </DataTemplate>
           </sync:SfListView.ItemTemplate>
+
+          <sync:SfListView.FooterTemplate>
+            <DataTemplate>
+              <Grid HeightRequest="45">
+                <Label Text="{Binding PaymentNotice}" 
+                       Style="{StaticResource nesterInfoLabelMinor}"
+                       Margin="5,0,0,0"
+                       HorizontalOptions="Start"
+                       VerticalOptions="Center"/>
+              </Grid>
+            </DataTemplate>
+          </sync:SfListView.FooterTemplate>      
         </sync:SfListView>
-
-      <StackLayout Orientation="Horizontal">
-        <Label Style="{StaticResource nesterFieldLabel}"
-            Text="MariaDB (MySQL)" HorizontalOptions="Start" VerticalOptions="Center">
-        </Label>
-        <Switch IsToggled="{Binding MariaDBEnabled, Mode=TwoWay}"
-                Scale="0.8" HorizontalOptions="End" VerticalOptions="Center">
-        </Switch>
-      </StackLayout>
+      
+        <StackLayout Orientation="Horizontal">
+          <Label Style="{StaticResource nesterFieldLabel}"
+              Text="MariaDB (MySQL)" HorizontalOptions="Start" VerticalOptions="Center">
+          </Label>
+          <Switch IsToggled="{Binding MariaDBEnabled, Mode=TwoWay}"
+                  Scale="0.8" HorizontalOptions="End" VerticalOptions="Center">
+          </Switch>
+        </StackLayout>
 
     </StackLayout>
 

diff --git a/Nester/Nester/Views/Models/AppViewModel.cs b/Nester/Nester/Views/Models/AppViewModel.cs
@@ -282,6 +282,21 @@ public Admin.AppServiceTier SelectedAppServiceTier
             }
         }
 
+        public string PaymentNotice
+        {
+            get
+            {
+                if (ThisUI.User.TerritoryISOCode == "AU")
+                {
+                    return "The prices are in US Dollars and do not include GST.";
+                }
+                else
+                {
+                    return "The prices are in US Dollars. ";
+                }                
+            }
+        }
+
         #endregion  
 
         #region MariaDB Tier