Permalink
Browse files

Migrating to SDK build from single project file. Simplified folder path.

  • Loading branch information...
peterfoot committed Apr 30, 2018
1 parent 94a1c98 commit d0fc38193f0ef86e9e64f898bb534631df682b6b
Showing 340 changed files with 15,161 additions and 2,606 deletions.
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("In The Hand Ltd")]
[assembly: AssemblyProduct("32feet.NET")]
[assembly: AssemblyCopyright("Copyright © 2004-2017")]
[assembly: AssemblyCopyright("Copyright © 2004-2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -33,4 +33,4 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.0.0.0")]
[assembly: AssemblyFileVersion("4.2017.0823.0")]
[assembly: AssemblyFileVersion("4.2018.0430.0")]
@@ -226,6 +226,9 @@
<Link>Moq.dll</Link>
</None>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- 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.

Large diffs are not rendered by default.

Oops, something went wrong.
View
Binary file not shown.
@@ -1,6 +1,6 @@
//-----------------------------------------------------------------------
// <copyright file="Radio.cs" company="In The Hand Ltd">
// Copyright (c) 2017 In The Hand Ltd, All rights reserved.
// Copyright (c) 2017-18 In The Hand Ltd, All rights reserved.
// This source code is licensed under the MIT License - see License.txt
// </copyright>
//-----------------------------------------------------------------------
@@ -31,25 +31,6 @@ namespace InTheHand.Devices.Radios
/// </remarks>
public sealed partial class Radio
{
#if WINDOWS_UWP
private Windows.Devices.Radios.Radio _radio;
private Radio(Windows.Devices.Radios.Radio radio)
{
_radio = radio;
}
public static implicit operator Windows.Devices.Radios.Radio(Radio radio)
{
return radio._radio;
}
public static implicit operator Radio(Windows.Devices.Radios.Radio radio)
{
return new Radio(radio);
}
#endif
/// <summary>
/// A static, asynchronous method that retrieves a collection of <see cref="Radio"/> objects representing radio devices existing on the system.
/// </summary>
@@ -69,15 +50,9 @@ private Radio(Windows.Devices.Radios.Radio radio)
public static async Task<IReadOnlyList<Radio>> GetRadiosAsync()
{
List<Radio> radios = new List<Radio>();
#if WINDOWS_UWP
foreach (Windows.Devices.Radios.Radio r in await Windows.Devices.Radios.Radio.GetRadiosAsync())
{
radios.Add(r);
}
#elif __ANDROID__ || __UNIFIED__ || WIN32 || WINDOWS_PHONE_APP || WINDOWS_PHONE
DoGetRadiosAsync(radios);
#if WINDOWS_UWP || __ANDROID__ || __UNIFIED__ || WIN32 || WINDOWS_PHONE_APP || WINDOWS_PHONE
await DoGetRadiosAsync(radios);
#endif
return radios.AsReadOnly();
}
@@ -96,10 +71,7 @@ public static async Task<IReadOnlyList<Radio>> GetRadiosAsync()
/// </remarks>
public static async Task<RadioAccessStatus> RequestAccessAsync()
{
#if WINDOWS_UWP
return (RadioAccessStatus)((int)await Windows.Devices.Radios.Radio.RequestAccessAsync());
#elif WIN32
#if WINDOWS_UWP || WIN32
return await DoRequestAccessAsync();
#else
@@ -125,13 +97,7 @@ private Radio()
/// </remarks>
public Task<RadioAccessStatus> SetStateAsync(RadioState value)
{
#if WINDOWS_UWP
return Task<RadioAccessStatus>.Run(async ()=>
{
return (RadioAccessStatus)((int)await _radio.SetStateAsync((Windows.Devices.Radios.RadioState)((int)value)));
});
#elif __ANDROID__ || WIN32
#if WINDOWS_UWP || __ANDROID__ || WIN32
return DoSetStateAsync(value);
#else
@@ -159,10 +125,7 @@ public RadioKind Kind
{
get
{
#if WINDOWS_UWP
return (RadioKind)((int)_radio.Kind);
#elif __ANDROID__ || __UNIFIED__ || WIN32 || WINDOWS_APP || WINDOWS_PHONE_APP || WINDOWS_PHONE
#if WINDOWS_UWP || __ANDROID__ || __UNIFIED__ || WIN32 || WINDOWS_APP || WINDOWS_PHONE_APP || WINDOWS_PHONE
return GetKind();
#else
@@ -191,12 +154,8 @@ public string Name
{
get
{
#if WINDOWS_UWP
return _radio.Name;
#elif __ANDROID__ || __UNIFIED__ || WIN32 || WINDOWS_APP || WINDOWS_PHONE_APP || WINDOWS_PHONE
#if WINDOWS_UWP || __ANDROID__ || __UNIFIED__ || WIN32 || WINDOWS_APP || WINDOWS_PHONE_APP || WINDOWS_PHONE
return GetName();
#else
return string.Empty;
#endif
@@ -223,10 +182,7 @@ public RadioState State
{
get
{
#if WINDOWS_UWP
return (RadioState)((int)_radio.State);
#elif __ANDROID__ || __UNIFIED__ || WIN32 || WINDOWS_APP || WINDOWS_PHONE_APP || WINDOWS_PHONE
#if WINDOWS_UWP || __ANDROID__ || __UNIFIED__ || WIN32 || WINDOWS_APP || WINDOWS_PHONE_APP || WINDOWS_PHONE
return GetState();
#else
return RadioState.Unknown;
Oops, something went wrong.

0 comments on commit d0fc381

Please sign in to comment.