Skip to content
This repository has been archived by the owner on Mar 3, 2020. It is now read-only.

Commit

Permalink
Merge pull request #67 from soninaren/master
Browse files Browse the repository at this point in the history 
Updating Managed QuickStart dependencies
  • Loading branch information
@phvannor
phvannor committed Nov 11, 2015
2 parents d15e9aa + 4fa3815 commit 18b2014
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 44 deletions.
9 changes: 1 addition & 8 deletions client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.Shared/App.xaml.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,7 @@ namespace ZUMOAPPNAME
/// </summary>
/// <param name="e">Details about the launch request and process.</param>
protected override void OnLaunched(LaunchActivatedEventArgs e)
{

#if DEBUG
if (System.Diagnostics.Debugger.IsAttached)
{
this.DebugSettings.EnableFrameRateCounter = true;
}
#endif
{

Frame rootFrame = Window.Current.Content as Frame;

Expand Down
12 changes: 6 additions & 6 deletions client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.Windows/ZUMOAPPNAME.Windows.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,13 @@
<HintPath>..\..\packages\WindowsAzure.MobileServices.<#= ManagedSDKVersion #>\lib\netcore45\Microsoft.WindowsAzure.Mobile.Ext.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.6.0.1\lib\netcore45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\netcore45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.15\lib\win8\System.Net.Http.Extensions.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\win8\System.Net.Http.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Primitives">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.15\lib\win8\System.Net.Http.Primitives.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\win8\System.Net.Http.Primitives.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand All @@ -161,10 +161,10 @@
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" />
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.10\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
<Error Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
</Target>
<!-- 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.
Expand Down
8 changes: 4 additions & 4 deletions client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.Windows/packages.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<#@parameter type="System.String" name="ManagedSDKVersion"#>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl" version="1.1.3" targetFramework="win81" />
<package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="win81" />
<package id="Microsoft.Net.Http" version="2.2.15" targetFramework="win81" />
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="win81" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="win81" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="win81" />
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="win81" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="win81" />
<package id="WindowsAzure.MobileServices" version="<#= ManagedSDKVersion #>" targetFramework="win81" />
</packages>
7 changes: 5 additions & 2 deletions client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.WindowsPhone/ZUMOAPPNAME.WindowsPhone.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,13 @@
<HintPath>..\..\packages\WindowsAzure.MobileServices.<#= ManagedSDKVersion #>\lib\wpa81\Microsoft.WindowsAzure.Mobile.Ext.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\..\packages\Newtonsoft.Json.6.0.3\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Extensions">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.19\lib\wpa81\System.Net.Http.Extensions.dll</HintPath>
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\wpa81\System.Net.Http.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.Primitives">
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.28\lib\wpa81\System.Net.Http.Primitives.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions client/windows-universal-cs/ZUMOAPPNAME/ZUMOAPPNAME.WindowsPhone/packages.tt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<#@parameter type="System.String" name="ManagedSDKVersion"#>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl" version="1.1.7" targetFramework="wpa81" />
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="wpa81" />
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="wpa81" />
<package id="Microsoft.Net.Http" version="2.2.19" targetFramework="wpa81" />
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="wpa81" />
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="wpa81" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="wpa81" />
<package id="WindowsAzure.MobileServices" version="<#= ManagedSDKVersion #>" targetFramework="wpa81" />
</packages>
7 changes: 0 additions & 7 deletions client/xamarin.forms/WinApp/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@ public App()
protected override void OnLaunched(LaunchActivatedEventArgs e)
{

#if DEBUG
if (System.Diagnostics.Debugger.IsAttached)
{
this.DebugSettings.EnableFrameRateCounter = true;
}
#endif

Frame rootFrame = Window.Current.Content as Frame;

// Do not repeat app initialization when the Window already has content,
Expand Down
6 changes: 0 additions & 6 deletions client/xamarin.forms/WinPhone81/App.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ public App()
/// <param name="e">Details about the launch request and process.</param>
protected override void OnLaunched(LaunchActivatedEventArgs e)
{
#if DEBUG
if (System.Diagnostics.Debugger.IsAttached)
{
this.DebugSettings.EnableFrameRateCounter = true;
}
#endif

Frame rootFrame = Window.Current.Content as Frame;

Expand Down
8 changes: 0 additions & 8 deletions client/xamarin.forms/ZUMOAPPNAME/TodoItem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ public class TodoItem
{
string id;
string name;
string notes;
bool done;

[JsonProperty(PropertyName = "id")]
Expand All @@ -25,13 +24,6 @@ public string Name
set { name = value;}
}

[JsonProperty(PropertyName = "notes")]
public string Notes
{
get { return notes; }
set { notes = value;}
}

[JsonProperty(PropertyName = "complete")]
public bool Done
{
Expand Down

0 comments on commit 18b2014

Please sign in to comment.