updated gitignore

Upgraded packages
Rambalac · Apr 7, 2017 · 2ca2159 · 2ca2159
1 parent fd60fb2
commit 2ca2159
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 1,056 deletions.
diff --git a/.gitignore b/.gitignore
@@ -241,3 +241,4 @@ ModelManifest.xml
 # FAKE - F# Make
 .fake/
 Thumbs.db
+*.appx
diff --git a/GMaster.Tests/project.json b/GMaster.Tests/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.1",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.2",
     "xunit": "2.2.0",
     "xunit.core": "2.2.0",
     "xunit.runner.visualstudio": "2.2.0"

diff --git a/GMaster/GMaster.csproj b/GMaster/GMaster.csproj
@@ -98,9 +98,9 @@
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
     <None Include="GMaster_StoreKey.pfx" />
     <None Include="GMaster_TemporaryKey.pfx" />
-    <PRIResource Include="strings\ja\Resources.resw" />
-    <PRIResource Include="strings\ru\Resources.resw" />
     <None Include="project.json" />
+    <PRIResource Include="strings\ru\Resources.resw" />
+    <PRIResource Include="strings\ja\Resources.resw" />
     <PRIResource Include="strings\en-US\Resources.resw" />
   </ItemGroup>
   <ItemGroup>

diff --git a/GMaster/Package.appxmanifest b/GMaster/Package.appxmanifest
@@ -15,7 +15,7 @@
   </Resources>
   <Applications>
     <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="GMaster.App">
-      <uap:VisualElements DisplayName="GMaster" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="Control Lumix camera remotly via WiFi" BackgroundColor="transparent">
+      <uap:VisualElements DisplayName="GMaster" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="Control Panasonic Lumix camera remotly via WiFi" BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\Square71x71Logo.png" Square310x310Logo="Assets\Square310x310Logo.png">
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />