Skip to content

Commit

Permalink
Updated Fody, YLAD, and rebuilt against the Windows Phone 7.8 SDK.
Browse files Browse the repository at this point in the history
  • Loading branch information
Zhaph committed Sep 14, 2013
1 parent c29e06b commit 86874aa
Show file tree
Hide file tree
Showing 20 changed files with 233 additions and 74 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Expand Up @@ -8,3 +8,5 @@ _ReSharper*
*.user
*.suo
packages/*
_UpgradeReport_Files
UpgradeLog*
7 changes: 3 additions & 4 deletions DoodleCycle/Content/About/AboutStyles.xaml
Expand Up @@ -3,8 +3,7 @@
xmlns:System="clr-namespace:System;assembly=mscorlib"
xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
xmlns:controls="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
xmlns:controls2="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls"
xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit">
xmlns:controls2="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls">

<!-- About Page -->
<Style x:Key="AboutPageStyle"
Expand All @@ -25,7 +24,7 @@
1.) A reference to the Microsoft.Phone.Controls.Toolkit assembly from the toolkit
2.) A namespace declaration to this ResourceDictionary: xmlns:toolkit="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone.Controls.Toolkit
3.) Replace the normal PhoneApplicationFrame with a TransitionFrame in App.xaml.cs -->
<Setter Property="toolkit:TransitionService.NavigationInTransition">
<!--<Setter Property="toolkit:TransitionService.NavigationInTransition">
<Setter.Value>
<toolkit:NavigationInTransition>
<toolkit:NavigationInTransition.Backward>
Expand All @@ -48,7 +47,7 @@
</toolkit:NavigationOutTransition.Forward>
</toolkit:NavigationOutTransition>
</Setter.Value>
</Setter>
</Setter>-->
</Style>

<!-- Pivot control and items -->
Expand Down
2 changes: 1 addition & 1 deletion DoodleCycle/Content/About/Data.xml
Expand Up @@ -23,7 +23,7 @@
AdditionalNotes="This app requires access to location services, to provide details of distance of speed. We never send these details off your phone. Aggregate statistics of rides are stored locally on your phone. While in trial mode rides are limited to 15 minutes." />
<Items>
<!-- Create a MainItem entry to configure the front page -->
<!-- The Titll attribute defines the title of the pivot item -->
<!-- The Titel attribute defines the title of the pivot item -->
<!-- The Label (and review buttong content) attributes can override the default values to what you like, and also help with localization -->
<!-- By default, the "Buy this app!" button is only shown when the app runs in trial mode (more on trial mode and how to configure YLAD accordingly here:
http://ylad.codeplex.com/documentation). Explicitly set any of the button contents to an empty string to override the default behavior, and remove the button from the page. -->
Expand Down
65 changes: 39 additions & 26 deletions DoodleCycle/DoodleCycle.csproj
Expand Up @@ -27,6 +27,7 @@
<ThrowErrorsInValidation>true</ThrowErrorsInValidation>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<FodyPath>..\packages\Fody.1.17.4.0</FodyPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -50,38 +51,47 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="DH.Scrypt">
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.2\lib\sl4-windowsphone71\DH.Scrypt.dll</HintPath>
<Reference Include="DH.Scrypt, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.4\lib\sl4-windowsphone71\DH.Scrypt.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Phone" />
<Reference Include="Microsoft.Phone.Controls" />
<Reference Include="Microsoft.Phone.Controls.Toolkit">
<HintPath>..\packages\SilverlightToolkitWP.4.2011.12.14\lib\sl4-windowsphone71\Microsoft.Phone.Controls.Toolkit.dll</HintPath>
<Reference Include="Microsoft.Phone.Controls.Toolkit, Version=7.0.1.0, Culture=neutral, PublicKeyToken=b772ad94eb9ca604, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\WPtoolkit.4.2013.08.16\lib\sl4-windowsphone71\Microsoft.Phone.Controls.Toolkit.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Phone.Interop" />
<Reference Include="NorthernLights.Controls">
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.2\lib\sl4-windowsphone71\NorthernLights.Controls.dll</HintPath>
<Reference Include="NorthernLights.Controls, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.4\lib\sl4-windowsphone71\NorthernLights.Controls.dll</HintPath>
</Reference>
<Reference Include="NorthernLights.Core">
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.2\lib\sl4-windowsphone71\NorthernLights.Core.dll</HintPath>
<Reference Include="NorthernLights.Core, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.4\lib\sl4-windowsphone71\NorthernLights.Core.dll</HintPath>
</Reference>
<Reference Include="NorthernLights.Encryption">
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.2\lib\sl4-windowsphone71\NorthernLights.Encryption.dll</HintPath>
<Reference Include="NorthernLights.Encryption, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.4\lib\sl4-windowsphone71\NorthernLights.Encryption.dll</HintPath>
</Reference>
<Reference Include="NorthernLights.LittleWatson">
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.2\lib\sl4-windowsphone71\NorthernLights.LittleWatson.dll</HintPath>
<Reference Include="NorthernLights.LittleWatson, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.4\lib\sl4-windowsphone71\NorthernLights.LittleWatson.dll</HintPath>
</Reference>
<Reference Include="NorthernLights.PersistentVariables">
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.2\lib\sl4-windowsphone71\NorthernLights.PersistentVariables.dll</HintPath>
<Reference Include="NorthernLights.PersistentVariables, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.4\lib\sl4-windowsphone71\NorthernLights.PersistentVariables.dll</HintPath>
</Reference>
<Reference Include="NorthernLights.StateVariables">
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.2\lib\sl4-windowsphone71\NorthernLights.StateVariables.dll</HintPath>
<Reference Include="NorthernLights.StateVariables, Version=2.0.4.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NorthernLightsWP7Toolkit.2.0.4\lib\sl4-windowsphone71\NorthernLights.StateVariables.dll</HintPath>
</Reference>
<Reference Include="PropertyChanged">
<HintPath>..\packages\PropertyChanged.Fody.1.25.0.0\Lib\SL40-WP71\PropertyChanged.dll</HintPath>
<HintPath>..\packages\PropertyChanged.Fody.1.41.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\PropertyChanged.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="PropertyChanging">
<HintPath>..\packages\PropertyChanging.Fody.1.13.0.0\Lib\SL40-WP71\PropertyChanging.dll</HintPath>
<HintPath>..\packages\PropertyChanging.Fody.1.25.3\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\PropertyChanging.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System.Data.Linq" />
<Reference Include="System.Device" />
Expand All @@ -91,10 +101,12 @@
<Reference Include="System.Net" />
<Reference Include="System.Xml" />
<Reference Include="mscorlib.extensions" />
<Reference Include="YourLastAboutDialog">
<HintPath>..\packages\YLAD.2.0.0\lib\sl40-wp71\YourLastAboutDialog.dll</HintPath>
</Reference>
<None Include="Fody.targets" />
<None Include="FodyWeavers.xml" />
<Reference Include="YourLastAboutDialog, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\YLAD.2.1.0\lib\wp71\YourLastAboutDialog.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
Expand Down Expand Up @@ -125,6 +137,11 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</ApplicationDefinition>
<Content Include="Toolkit.Content\ApplicationBar.Add.png" />
<Content Include="Toolkit.Content\ApplicationBar.Cancel.png" />
<Content Include="Toolkit.Content\ApplicationBar.Check.png" />
<Content Include="Toolkit.Content\ApplicationBar.Delete.png" />
<Content Include="Toolkit.Content\ApplicationBar.Select.png" />
<Page Include="AppPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down Expand Up @@ -174,10 +191,6 @@
<Content Include="DoodleCycleBackground-Dark.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Toolkit.Content\ApplicationBar.Cancel.png" />
<Content Include="Toolkit.Content\ApplicationBar.Check.png" />
<Content Include="Toolkit.Content\ApplicationBar.Delete.png" />
<Content Include="Toolkit.Content\ApplicationBar.Select.png" />
<Content Include="SplashScreenImage.jpg" />
</ItemGroup>
<ItemGroup />
Expand All @@ -192,5 +205,5 @@
-->
<ProjectExtensions />
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<Import Project="$(SolutionDir)\Tools\Fody\Fody.targets" />
<Import Project="Fody.targets" />
</Project>
89 changes: 89 additions & 0 deletions DoodleCycle/Fody.targets
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Choose>
<When Condition="$(NCrunchOriginalSolutionDir) != '' And $(NCrunchOriginalSolutionDir) != '*Undefined*'">
<PropertyGroup>
<FodySolutionDir>$(NCrunchOriginalSolutionDir)</FodySolutionDir>
</PropertyGroup>
</When>
<When Condition="$(SolutionDir) != '' And $(SolutionDir) != '*Undefined*'">
<PropertyGroup>
<FodySolutionDir>$(SolutionDir)</FodySolutionDir>
</PropertyGroup>
</When>
<When Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">
<PropertyGroup>
<FodySolutionDir>$(MSBuildProjectDirectory)\..\</FodySolutionDir>
</PropertyGroup>
</When>
</Choose>
<Choose>
<When Condition="$(KeyOriginatorFile) != '' And $(KeyOriginatorFile) != '*Undefined*'">
<PropertyGroup>
<FodyKeyFilePath>$(KeyOriginatorFile)</FodyKeyFilePath>
</PropertyGroup>
</When>
<When Condition="$(AssemblyOriginatorKeyFile) != '' And $(AssemblyOriginatorKeyFile) != '*Undefined*'">
<PropertyGroup>
<FodyKeyFilePath>$(AssemblyOriginatorKeyFile)</FodyKeyFilePath>
</PropertyGroup>
</When>
<Otherwise >
<PropertyGroup>
<FodyKeyFilePath></FodyKeyFilePath>
</PropertyGroup>
</Otherwise>
</Choose>
<PropertyGroup>
<IntermediateDir>$(ProjectDir)$(IntermediateOutputPath)</IntermediateDir>
<FodyMessageImportance Condition="$(FodyMessageImportance) == '' Or $(FodyMessageImportance) == '*Undefined*'">Low</FodyMessageImportance>
<FodySignAssembly Condition="$(FodySignAssembly) == '' Or $(FodySignAssembly) == '*Undefined*'">$(SignAssembly)</FodySignAssembly>
<FodyPath Condition="$(FodyPath) == '' Or $(FodyPath) == '*Undefined*'">$(MSBuildThisFileDirectory)</FodyPath>
</PropertyGroup>
<UsingTask
TaskName="Fody.WeavingTask"
AssemblyFile="$(FodyPath)\Fody.dll" />
<Target
AfterTargets="AfterCompile"
Name="WinFodyTarget"
Condition=" '$(OS)' == 'Windows_NT'">

<Fody.WeavingTask
AssemblyPath="@(IntermediateAssembly)"
IntermediateDir="$(IntermediateDir)"
KeyFilePath="$(FodyKeyFilePath)"
MessageImportance="$(FodyMessageImportance)"
ProjectDirectory="$(ProjectDir)"
SolutionDir="$(FodySolutionDir)"
References="@(ReferencePath)"
SignAssembly="$(FodySignAssembly)"
ReferenceCopyLocalPaths="@(ReferenceCopyLocalPaths)"
DefineConstants="$(DefineConstants)"
/>
</Target>

<Target
AfterTargets="AfterBuild"
Name="NonWinFodyTarget"
Condition=" '$(OS)' != 'Windows_NT'">
<Fody.WeavingTask
AssemblyPath="$(TargetPath)"
IntermediateDir="$(IntermediateDir)"
KeyFilePath="$(FodyKeyFilePath)"
MessageImportance="$(FodyMessageImportance)"
ProjectDirectory="$(ProjectDir)"
SolutionDir="$(FodySolutionDir)"
References="@(ReferencePath)"
SignAssembly="$(FodySignAssembly)"
ReferenceCopyLocalPaths="$(ReferenceCopyLocalPaths)"
DefineConstants="$(DefineConstants)"
/>
</Target>


<!--Support for ncrunch-->
<ItemGroup>
<None Include="$(FodyPath)\*.*" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions DoodleCycle/FodyWeavers.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<Weavers>
<PropertyChanged/>
<PropertyChanging/>
<PropertyChanging />
<PropertyChanged />
</Weavers>
3 changes: 3 additions & 0 deletions DoodleCycle/README_FIRST.txt
@@ -0,0 +1,3 @@
For the Windows Phone toolkit make sure that you have
marked the icons in the "Toolkit.Content" folder as content. That way they
can be used as the icons for the ApplicationBar control.
Binary file added DoodleCycle/Toolkit.Content/ApplicationBar.Add.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 6 additions & 5 deletions DoodleCycle/packages.config
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Fody" version="1.17.4.0" targetFramework="wp71" />
<package id="MetroGridHelper" version="1.11" targetFramework="sl40-wp71" />
<package id="NorthernLightsWP7Toolkit" version="2.0.2" targetFramework="sl40-wp71" />
<package id="PropertyChanged.Fody" version="1.25.0.0" targetFramework="sl40-wp71" />
<package id="PropertyChanging.Fody" version="1.13.0.0" targetFramework="sl40-wp71" />
<package id="SilverlightToolkitWP" version="4.2011.12.14" targetFramework="sl40-wp71" />
<package id="YLAD" version="2.0.0" targetFramework="sl40-wp71" />
<package id="NorthernLightsWP7Toolkit" version="2.0.4" targetFramework="wp71" />
<package id="PropertyChanged.Fody" version="1.41.0.0" targetFramework="wp71" />
<package id="PropertyChanging.Fody" version="1.25.3" targetFramework="wp71" />
<package id="WPtoolkit" version="4.2013.08.16" targetFramework="wp71" />
<package id="YLAD" version="2.1.0" targetFramework="wp71" />
</packages>
Binary file modified Tools/Fody/Fody.dll
Binary file not shown.
Binary file modified Tools/Fody/Fody.pdb
Binary file not shown.

0 comments on commit 86874aa

Please sign in to comment.