You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by pu...@apache.org on 2012/09/01 04:30:34 UTC
[3/7] wp7 commit: Startup Object not set when changes to namespace
Startup Object not set when changes to namespace
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/commit/e35f30b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/tree/e35f30b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/diff/e35f30b4
Branch: refs/heads/master
Commit: e35f30b4fee52dcc7f372ee092daaefb1107f6a4
Parents: e4126b2
Author: Jesse MacFadyen <pu...@gmail.com>
Authored: Fri Aug 31 18:13:54 2012 -0700
Committer: Jesse MacFadyen <pu...@gmail.com>
Committed: Fri Aug 31 18:13:54 2012 -0700
----------------------------------------------------------------------
framework/Properties/AssemblyInfo.cs | 6 ++--
templates/full/CordovaAppProj.csproj | 4 +-
templates/full/CordovaLib/WP7CordovaClassLib.dll | Bin 162304 -> 162816 bytes
templates/standalone/App.xaml | 2 +-
templates/standalone/App.xaml.cs | 2 +-
templates/standalone/CordovaAppProj.csproj | 5 +--
templates/standalone/CordovaSourceDictionary.xml | 2 +-
templates/standalone/MainPage.xaml | 23 ++--------------
templates/standalone/MainPage.xaml.cs | 2 +-
9 files changed, 14 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/e35f30b4/framework/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/framework/Properties/AssemblyInfo.cs b/framework/Properties/AssemblyInfo.cs
index 40b5794..5896140 100644
--- a/framework/Properties/AssemblyInfo.cs
+++ b/framework/Properties/AssemblyInfo.cs
@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("WP7CordovaClassLib")]
-[assembly: AssemblyDescription("2.0")]
+[assembly: AssemblyDescription("2.1.0rc2")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Apache Cordova")]
[assembly: AssemblyProduct("WP7CordovaClassLib")]
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("2.0.0")]
-[assembly: AssemblyFileVersion("2.0.0")]
+[assembly: AssemblyVersion("2.1.0")]
+[assembly: AssemblyFileVersion("2.1.0")]
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/e35f30b4/templates/full/CordovaAppProj.csproj
----------------------------------------------------------------------
diff --git a/templates/full/CordovaAppProj.csproj b/templates/full/CordovaAppProj.csproj
index 8941a6b..85d1cb4 100644
--- a/templates/full/CordovaAppProj.csproj
+++ b/templates/full/CordovaAppProj.csproj
@@ -74,7 +74,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Net" />
<Reference Include="System.Xml" />
- <Reference Include="WP7CordovaClassLib, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
+ <Reference Include="WP7CordovaClassLib, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
@@ -97,12 +97,12 @@
</ItemGroup>
<ItemGroup>
<Content Include="CordovaSourceDictionary.xml" />
+ <Content Include="www\img\logo.png" />
<Content Include="www\js\index.js" />
<None Include="BuildManifestProcessor.js" />
<Content Include="CordovaLib\WP7CordovaClassLib.dll" />
<Content Include="www\cordova-2.1.0.js" />
<Content Include="www\css\index.css" />
- <Content Include="www\img\cordova.png" />
<Content Include="www\index.html">
<SubType>Designer</SubType>
</Content>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/e35f30b4/templates/full/CordovaLib/WP7CordovaClassLib.dll
----------------------------------------------------------------------
diff --git a/templates/full/CordovaLib/WP7CordovaClassLib.dll b/templates/full/CordovaLib/WP7CordovaClassLib.dll
index 79c534f..c7a66b6 100644
Binary files a/templates/full/CordovaLib/WP7CordovaClassLib.dll and b/templates/full/CordovaLib/WP7CordovaClassLib.dll differ
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/e35f30b4/templates/standalone/App.xaml
----------------------------------------------------------------------
diff --git a/templates/standalone/App.xaml b/templates/standalone/App.xaml
index d37fafa..c342215 100644
--- a/templates/standalone/App.xaml
+++ b/templates/standalone/App.xaml
@@ -17,7 +17,7 @@
under the License.
-->
<Application
- x:Class="GapExample.App"
+ x:Class="CordovaApp.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/e35f30b4/templates/standalone/App.xaml.cs
----------------------------------------------------------------------
diff --git a/templates/standalone/App.xaml.cs b/templates/standalone/App.xaml.cs
index 0b0590d..f874e98 100644
--- a/templates/standalone/App.xaml.cs
+++ b/templates/standalone/App.xaml.cs
@@ -32,7 +32,7 @@ using System.Windows.Shapes;
using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell;
-namespace GapExample
+namespace CordovaApp
{
public partial class App : Application
{
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/e35f30b4/templates/standalone/CordovaAppProj.csproj
----------------------------------------------------------------------
diff --git a/templates/standalone/CordovaAppProj.csproj b/templates/standalone/CordovaAppProj.csproj
index a1d8c71..04e8d36 100644
--- a/templates/standalone/CordovaAppProj.csproj
+++ b/templates/standalone/CordovaAppProj.csproj
@@ -40,8 +40,7 @@
<GenerateSilverlightManifest>true</GenerateSilverlightManifest>
<XapFilename>CordovaApp.xap</XapFilename>
<SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
- <SilverlightAppEntry>
- </SilverlightAppEntry>
+ <SilverlightAppEntry>CordovaApp.App</SilverlightAppEntry>
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
</PropertyGroup>
@@ -165,6 +164,7 @@
</Page>
</ItemGroup>
<ItemGroup>
+ <Content Include="www\img\logo.png" />
<Content Include="www\js\index.js" />
<None Include="VERSION" />
<Resource Include="cordovalib\Images\appbar.back.rest.png" />
@@ -180,7 +180,6 @@
<None Include="BuildManifestProcessor.js" />
<Content Include="www\cordova-2.1.0.js" />
<Content Include="www\css\index.css" />
- <Content Include="www\img\cordova.png" />
<Content Include="www\index.html">
<SubType>Designer</SubType>
</Content>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/e35f30b4/templates/standalone/CordovaSourceDictionary.xml
----------------------------------------------------------------------
diff --git a/templates/standalone/CordovaSourceDictionary.xml b/templates/standalone/CordovaSourceDictionary.xml
index e2ed22f..19fcfd0 100644
--- a/templates/standalone/CordovaSourceDictionary.xml
+++ b/templates/standalone/CordovaSourceDictionary.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This file is auto-generated, do not edit! -jm -->
<CordovaSourceDictionary>
+ <FilePath Value="www\img\logo.png"/>
<FilePath Value="www\js\index.js"/>
<FilePath Value="www\cordova-2.1.0.js"/>
<FilePath Value="www\css\index.css"/>
- <FilePath Value="www\img\cordova.png"/>
<FilePath Value="www\index.html"/>
</CordovaSourceDictionary>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/e35f30b4/templates/standalone/MainPage.xaml
----------------------------------------------------------------------
diff --git a/templates/standalone/MainPage.xaml b/templates/standalone/MainPage.xaml
index df58028..74fa38c 100644
--- a/templates/standalone/MainPage.xaml
+++ b/templates/standalone/MainPage.xaml
@@ -1,23 +1,6 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
+
<phone:PhoneApplicationPage
- x:Class="GapExample.MainPage"
+ x:Class="CordovaApp.MainPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
@@ -37,7 +20,7 @@
</Grid.RowDefinitions>
<my:CordovaView HorizontalAlignment="Stretch"
Margin="0,0,0,0"
- Name="PGView"
+ x:Name="PGView"
VerticalAlignment="Stretch" />
<Image Source="SplashScreenImage.jpg"
x:Name="SplashImage"
http://git-wip-us.apache.org/repos/asf/incubator-cordova-wp7/blob/e35f30b4/templates/standalone/MainPage.xaml.cs
----------------------------------------------------------------------
diff --git a/templates/standalone/MainPage.xaml.cs b/templates/standalone/MainPage.xaml.cs
index 7d12e82..33c8c19 100644
--- a/templates/standalone/MainPage.xaml.cs
+++ b/templates/standalone/MainPage.xaml.cs
@@ -35,7 +35,7 @@ using System.Windows.Resources;
using WP7CordovaClassLib;
-namespace GapExample
+namespace CordovaApp
{
public partial class MainPage : PhoneApplicationPage
{