WeCode 2.2 Pre-Release(Emergency Fix)

Merge pull request #11 from patrick330602/test
wedotstudio · Jul 22, 2016 · bfff21b · bfff21b
2 parents bebf556 + 84197d5
commit bfff21b
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 50 deletions.
diff --git a/Core/Core.csproj b/Core/Core.csproj
@@ -114,8 +114,6 @@
     <Compile Include="Generator.cs" />
     <Compile Include="Network.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ViewModel\ResponsiveGridView.cs" />
-    <Compile Include="ViewModel\ShellViewModel.cs" />
     <Compile Include="DataModel\Update.cs" />
     <EmbeddedResource Include="Properties\Core.rd.xml" />
   </ItemGroup>

diff --git a/Core/ViewModel/ResponsiveGridView.cs b/Core/ViewModel/ResponsiveGridView.cs
diff --git a/Developer Hub For UWP/Developer Hub For UWP.csproj b/Developer Hub For UWP/Developer Hub For UWP.csproj
@@ -20,7 +20,7 @@
     <PackageCertificateKeyFile>Developer Hub For UWP_StoreKey.pfx</PackageCertificateKeyFile>
     <PackageCertificateThumbprint>D8C3E2F12520697A7E2D8D7AB8CA28809A664A2C</PackageCertificateThumbprint>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <AppxBundle>Auto</AppxBundle>
+    <AppxBundle>Always</AppxBundle>
     <AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
@@ -175,6 +175,7 @@
     <Compile Include="Pages\Page5.xaml.cs">
       <DependentUpon>Page5.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Presentation\ShellViewModel.cs" />
     <Compile Include="Shell.xaml.cs">
       <DependentUpon>Shell.xaml</DependentUpon>
     </Compile>

diff --git a/Developer Hub For UWP/Package.appxmanifest b/Developer Hub For UWP/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" IgnorableNamespaces="uap mp">
-  <Identity Name="56367PatrickWu.DeveloperToolsForUWP" Publisher="CN=C71A2322-7B67-48A9-A85E-8DDCE68FA3A7" Version="2.0.11.0" />
+  <Identity Name="56367PatrickWu.DeveloperToolsForUWP" Publisher="CN=C71A2322-7B67-48A9-A85E-8DDCE68FA3A7" Version="2.2.0.0" />
   <mp:PhoneIdentity PhoneProductId="f3aebb25-64ee-47a8-874d-938ab7cb5362" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ms-resource:AppName</DisplayName>

diff --git a/Core/ViewModel/ShellViewModel.cs → ...ub For UWP/Presentation/ShellViewModel.cs b/Core/ViewModel/ShellViewModel.cs → ...ub For UWP/Presentation/ShellViewModel.cs
@@ -4,7 +4,7 @@
 using System.Windows.Input;
 using Windows.UI.Xaml;
 
-namespace Core.ViewModel
+namespace Developer_Hub_For_UWP.Presentation
 {
     public class ShellViewModel : NotifyPropertyChanged
     {

diff --git a/Developer Hub For UWP/Shell.xaml.cs b/Developer Hub For UWP/Shell.xaml.cs
@@ -4,7 +4,6 @@
 using Developer_Hub_For_UWP.Pages;
 using Core.Network;
 using Core.DataModel;
-using Core.ViewModel;
 using Windows.UI.ViewManagement;
 using Windows.UI;
 using Windows.System;
@@ -15,7 +14,7 @@
 using Newtonsoft.Json;
 using Windows.Networking.Connectivity;
 using Windows.Storage;
-using System.IO;
+using Developer_Hub_For_UWP.Presentation;
 
 namespace Developer_Hub_For_UWP
 {
@@ -70,7 +69,7 @@ public Shell()
                 TransferToStorage();
             }
             //if update
-            else if(_localSettings.Containers["Settings"].Values["Version"] != "020200")
+            else if((string)_localSettings.Containers["Settings"].Values["Version"] != "020200")
             {
                 _localSettings.Containers["Settings"].Values["Version"] = "020200";
                 _localSettings.Containers["Settings"].Values["IsUpdatePopupDisabled"] = false;

diff --git a/Developer Hub For UWP/_language-zh-hans.appx b/Developer Hub For UWP/_language-zh-hans.appx
diff --git a/Developer Hub For UWP/_language-zh-hant.appx b/Developer Hub For UWP/_language-zh-hant.appx
diff --git a/Developer Hub For UWP/_pkginfo.txt b/Developer Hub For UWP/_pkginfo.txt
@@ -1 +1 @@
-C:\Files\Documents\Projects\Application\WeCode\Developer Hub For UWP\AppPackages\Developer Hub For UWP_2.0.0.0\Developer Hub For UWP_2.0.0.0_x86_x64.appxbundle
+P:\Application\WeCode\Developer Hub For UWP\AppPackages\Developer Hub For UWP_2.2.0.0\Developer Hub For UWP_2.2.0.0_x86_x64.appxbundle
diff --git a/Developer Hub For UWP/_scale-100.appx b/Developer Hub For UWP/_scale-100.appx
diff --git a/Developer Hub For UWP/_scale-125.appx b/Developer Hub For UWP/_scale-125.appx
diff --git a/Developer Hub For UWP/_scale-150.appx b/Developer Hub For UWP/_scale-150.appx
diff --git a/Developer Hub For UWP/_scale-400.appx b/Developer Hub For UWP/_scale-400.appx