Skip to content
This repository has been archived by the owner on Apr 18, 2019. It is now read-only.

Commit

Permalink
Merge pull request #24 from purplecabbage/RenameNamespace
Browse files Browse the repository at this point in the history
renamed namespace to NOT include device OS version number 7
  • Loading branch information
purplecabbage committed Dec 4, 2012
2 parents 755025a + 29fc3f5 commit 5112135
Show file tree
Hide file tree
Showing 46 changed files with 361 additions and 77 deletions.
4 changes: 2 additions & 2 deletions example/CordovaExample.csproj
Expand Up @@ -171,9 +171,9 @@
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\framework\WP7CordovaClassLib.csproj">
<ProjectReference Include="..\framework\WPCordovaClassLib.csproj">
<Project>{FC6A1A70-892D-46AD-9E4A-9793F72AF780}</Project>
<Name>WP7CordovaClassLib</Name>
<Name>WPCordovaClassLib</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
Expand Down
6 changes: 3 additions & 3 deletions example/CordovaExample.sln
@@ -1,9 +1,9 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010 Express for Windows Phone
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CordovaExample", "CordovaExample.csproj", "{0C6DFC84-A3BE-4581-BAAD-85B8CCC17FF8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WP7CordovaClassLib", "..\framework\WP7CordovaClassLib.csproj", "{FC6A1A70-892D-46AD-9E4A-9793F72AF780}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPCordovaClassLib", "..\framework\WPCordovaClassLib.csproj", "{FC6A1A70-892D-46AD-9E4A-9793F72AF780}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion example/MainPage.xaml
Expand Up @@ -30,7 +30,7 @@
Background="Black"
SupportedOrientations="PortraitOrLandscape" Orientation="Portrait"
shell:SystemTray.IsVisible="True" d:DesignHeight="768" d:DesignWidth="480"
xmlns:my="clr-namespace:WP7CordovaClassLib;assembly=WP7CordovaClassLib">
xmlns:my="clr-namespace:WPCordovaClassLib;assembly=WPCordovaClassLib">
<Grid x:Name="LayoutRoot" Background="Transparent" HorizontalAlignment="Stretch">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
Expand Down
6 changes: 3 additions & 3 deletions example/Plugins/Calculator.cs
Expand Up @@ -18,9 +18,9 @@
*/

using System.Runtime.Serialization;
using WP7CordovaClassLib.Cordova;
using WP7CordovaClassLib.Cordova.Commands;
using WP7CordovaClassLib.Cordova.JSON;
using WPCordovaClassLib.Cordova;
using WPCordovaClassLib.Cordova.Commands;
using WPCordovaClassLib.Cordova.JSON;

namespace Cordova.Extension.Commands
{
Expand Down
10 changes: 5 additions & 5 deletions framework/Properties/AssemblyInfo.cs
Expand Up @@ -5,11 +5,11 @@
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("WP7CordovaClassLib")]
[assembly: AssemblyDescription("2.2.0")]
[assembly: AssemblyTitle("WPCordovaClassLib")]
[assembly: AssemblyDescription("2.3.0")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Apache Cordova")]
[assembly: AssemblyProduct("WP7CordovaClassLib")]
[assembly: AssemblyProduct("WPCordovaClassLib")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
Expand All @@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.2.0")]
[assembly: AssemblyFileVersion("2.2.0")]
[assembly: AssemblyVersion("2.3.0")]
[assembly: AssemblyFileVersion("2.3.0")]
284 changes: 284 additions & 0 deletions framework/WPCordovaClassLib.csproj
@@ -0,0 +1,284 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
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.
-->
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{FC6A1A70-892D-46AD-9E4A-9793F72AF780}</ProjectGuid>
<ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>WPCordovaClassLib</RootNamespace>
<AssemblyName>WPCordovaClassLib</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SilverlightVersion>$(TargetFrameworkVersion)</SilverlightVersion>
<TargetFrameworkProfile>WindowsPhone71</TargetFrameworkProfile>
<TargetFrameworkIdentifier>Silverlight</TargetFrameworkIdentifier>
<SilverlightApplication>false</SilverlightApplication>
<ValidateXaml>true</ValidateXaml>
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Bin\Debug</OutputPath>
<DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE;CORDOVA_CLASSLIB</DefineConstants>
<NoStdLib>true</NoStdLib>
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Bin\Release</OutputPath>
<DefineConstants>TRACE;DEBUG;SILVERLIGHT;WINDOWS_PHONE;CORDOVA_CLASSLIB</DefineConstants>
<NoStdLib>true</NoStdLib>
<NoConfig>true</NoConfig>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>
</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Devices.Sensors" />
<Reference Include="Microsoft.Phone" />
<Reference Include="Microsoft.Phone.Interop" />
<Reference Include="Microsoft.Xna.Framework" />
<Reference Include="System.Device" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Servicemodel" />
<Reference Include="System.Servicemodel.Web" />
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="System.Net" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\templates\standalone\cordovalib\BrowserMouseHelper.cs">
<Link>CordovaLib\BrowserMouseHelper.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\CommandFactory.cs">
<Link>CordovaLib\CommandFactory.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\Accelerometer.cs">
<Link>CordovaLib\Commands\Accelerometer.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\AudioFormatsHelper.cs">
<Link>CordovaLib\Commands\AudioFormatsHelper.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\AudioPlayer.cs">
<Link>CordovaLib\Commands\AudioPlayer.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\BaseCommand.cs">
<Link>CordovaLib\Commands\BaseCommand.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\Battery.cs">
<Link>CordovaLib\Commands\Battery.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\Camera.cs">
<Link>CordovaLib\Commands\Camera.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\Capture.cs">
<Link>CordovaLib\Commands\Capture.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\Compass.cs">
<Link>CordovaLib\Commands\Compass.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\Contacts.cs">
<Link>CordovaLib\Commands\Contacts.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\DebugConsole.cs">
<Link>CordovaLib\Commands\DebugConsole.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\Device.cs">
<Link>CordovaLib\Commands\Device.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\File.cs">
<Link>CordovaLib\Commands\File.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\FileTransfer.cs">
<Link>CordovaLib\Commands\FileTransfer.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\GeoLocation.cs">
<Link>CordovaLib\Commands\GeoLocation.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\ImageExifHelper.cs">
<Link>CordovaLib\Commands\ImageExifHelper.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\Media.cs">
<Link>CordovaLib\Commands\Media.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\MimeTypeMapper.cs">
<Link>CordovaLib\Commands\MimeTypeMapper.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\NetworkStatus.cs">
<Link>CordovaLib\Commands\NetworkStatus.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\Commands\Notification.cs">
<Link>CordovaLib\Commands\Notification.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\CordovaCommandCall.cs">
<Link>CordovaLib\CordovaCommandCall.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\CordovaView.xaml.cs">
<Link>CordovaLib\CordovaView.xaml.cs</Link>
<DependentUpon>CordovaView.xaml</DependentUpon>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\DOMStorageHelper.cs">
<Link>CordovaLib\DOMStorageHelper.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\JSON\JsonHelper.cs">
<Link>CordovaLib\JSON\JsonHelper.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\NativeExecution.cs">
<Link>CordovaLib\NativeExecution.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\OrientationHelper.cs">
<Link>CordovaLib\OrientationHelper.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\PluginResult.cs">
<Link>CordovaLib\PluginResult.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\ScriptCallback.cs">
<Link>CordovaLib\ScriptCallback.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\UI\AudioCaptureTask.cs">
<Link>CordovaLib\UI\AudioCaptureTask.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\UI\AudioRecorder.xaml.cs">
<Link>CordovaLib\UI\AudioRecorder.xaml.cs</Link>
<DependentUpon>AudioRecorder.xaml</DependentUpon>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\UI\ImageCapture.xaml.cs">
<Link>CordovaLib\UI\ImageCapture.xaml.cs</Link>
<DependentUpon>ImageCapture.xaml</DependentUpon>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\UI\NotificationBox.xaml.cs">
<Link>CordovaLib\UI\NotificationBox.xaml.cs</Link>
<DependentUpon>NotificationBox.xaml</DependentUpon>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\UI\VideoCaptureTask.cs">
<Link>CordovaLib\UI\VideoCaptureTask.cs</Link>
</Compile>
<Compile Include="..\templates\standalone\cordovalib\UI\VideoRecorder.xaml.cs">
<Link>CordovaLib\UI\VideoRecorder.xaml.cs</Link>
<DependentUpon>VideoRecorder.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Resource Include="..\templates\standalone\cordovalib\Images\appbar.back.rest.png">
<Link>CordovaLib\Images\appbar.back.rest.png</Link>
</Resource>
<Resource Include="..\templates\standalone\cordovalib\Images\appbar.close.rest.png">
<Link>CordovaLib\Images\appbar.close.rest.png</Link>
</Resource>
<Resource Include="..\templates\standalone\cordovalib\Images\appbar.feature.video.rest.png">
<Link>CordovaLib\Images\appbar.feature.video.rest.png</Link>
</Resource>
<Resource Include="..\templates\standalone\cordovalib\Images\appbar.next.rest.png">
<Link>CordovaLib\Images\appbar.next.rest.png</Link>
</Resource>
<Resource Include="..\templates\standalone\cordovalib\Images\appbar.save.rest.png">
<Link>CordovaLib\Images\appbar.save.rest.png</Link>
</Resource>
<Resource Include="..\templates\standalone\cordovalib\Images\appbar.stop.rest.png">
<Link>CordovaLib\Images\appbar.stop.rest.png</Link>
</Resource>
<Content Include="..\templates\standalone\cordovalib\resources\notification-beep.wav">
<Link>CordovaLib\resources\notification-beep.wav</Link>
</Content>
<Content Include="Images\appbar.back.rest.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\appbar.close.rest.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\appbar.feature.video.rest.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\appbar.next.rest.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Images\appbar.stop.rest.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Images\appbar.save.rest.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
</ItemGroup>
<ItemGroup>
<Resource Include="resources\notification-beep.wav" />
</ItemGroup>
<ItemGroup>
<Page Include="..\templates\standalone\cordovalib\CordovaView.xaml">
<Link>CordovaLib\CordovaView.xaml</Link>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="..\templates\standalone\cordovalib\UI\AudioRecorder.xaml">
<Link>CordovaLib\UI\AudioRecorder.xaml</Link>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="..\templates\standalone\cordovalib\UI\ImageCapture.xaml">
<Link>CordovaLib\UI\ImageCapture.xaml</Link>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="..\templates\standalone\cordovalib\UI\NotificationBox.xaml">
<Link>CordovaLib\UI\NotificationBox.xaml</Link>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="..\templates\standalone\cordovalib\UI\VideoRecorder.xaml">
<Link>CordovaLib\UI\VideoRecorder.xaml</Link>
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets" />
<ProjectExtensions />
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
2 changes: 1 addition & 1 deletion templates/standalone/cordovalib/BrowserMouseHelper.cs
Expand Up @@ -26,7 +26,7 @@
using System;
using System.Collections.Generic;

namespace WP7CordovaClassLib
namespace WPCordovaClassLib
{

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions templates/standalone/cordovalib/CommandFactory.cs
Expand Up @@ -23,11 +23,11 @@
using System.Windows.Media.Animation;
using System.Windows.Shapes;
using System.Collections.Generic;
using WP7CordovaClassLib.Cordova.Commands;
using WPCordovaClassLib.Cordova.Commands;
using System.Reflection;
using System.Diagnostics;

namespace WP7CordovaClassLib.Cordova
namespace WPCordovaClassLib.Cordova
{
/// <summary>
/// Provides functionality to create phone gap command by name.
Expand All @@ -39,7 +39,7 @@ public static class CommandFactory
/// </summary>
private static readonly string CustomPluginNamespacePrefix = "Cordova.Extension.Commands.";

private static readonly string BaseCommandNamespacePrefix = "WP7CordovaClassLib.Cordova.Commands.";
private static readonly string BaseCommandNamespacePrefix = "WPCordovaClassLib.Cordova.Commands.";

/// <summary>
/// Cache instantiated commands in a map.
Expand Down
2 changes: 1 addition & 1 deletion templates/standalone/cordovalib/Commands/Accelerometer.cs
Expand Up @@ -21,7 +21,7 @@
using System.Globalization;
using System.Diagnostics;

namespace WP7CordovaClassLib.Cordova.Commands
namespace WPCordovaClassLib.Cordova.Commands
{
/// <summary>
/// Captures device motion in the x, y, and z direction.
Expand Down

0 comments on commit 5112135

Please sign in to comment.