From 2f083ebc5638c8fafc87ce4e6716b783a83ec9ed Mon Sep 17 00:00:00 2001
From: Arne Stenmanns <stenmannsar@outlook.de>
Date: Mon, 10 Apr 2017 14:14:23 +0200
Subject: [PATCH] Add Device location Api

---
 Alexa.NET.sln                    |  9 +++------
 Alexa.NET/Alexa.NET.csproj       | 27 +++++++++++++++++++++++++++
 Alexa.NET/Alexa.NET.xproj        | 21 ---------------------
 Alexa.NET/Request/Device.cs      |  3 +++
 Alexa.NET/Request/Permissions.cs | 10 ++++++++++
 Alexa.NET/Request/System.cs      |  3 +++
 Alexa.NET/Request/User.cs        |  3 +++
 Alexa.NET/project.json           | 32 --------------------------------
 global.json                      |  6 ------
 9 files changed, 49 insertions(+), 65 deletions(-)
 create mode 100644 Alexa.NET/Alexa.NET.csproj
 delete mode 100644 Alexa.NET/Alexa.NET.xproj
 create mode 100644 Alexa.NET/Request/Permissions.cs
 delete mode 100644 Alexa.NET/project.json
 delete mode 100644 global.json

diff --git a/Alexa.NET.sln b/Alexa.NET.sln
index 7bbcb0d..aacc648 100644
--- a/Alexa.NET.sln
+++ b/Alexa.NET.sln
@@ -1,14 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FF85BDE3-45A9-44DB-951B-960ADAA73ED7}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-	EndProjectSection
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Alexa.NET", "Alexa.NET\Alexa.NET.xproj", "{C5D40122-BB51-40D8-8934-0468BCC6C92B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Alexa.NET", "Alexa.NET\Alexa.NET.csproj", "{C5D40122-BB51-40D8-8934-0468BCC6C92B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Alexa.NET/Alexa.NET.csproj b/Alexa.NET/Alexa.NET.csproj
new file mode 100644
index 0000000..3a557f0
--- /dev/null
+++ b/Alexa.NET/Alexa.NET.csproj
@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>A simple .NET Core library for handling Alexa Skill request/responses.</Description>
+    <AssemblyTitle>Alexa.NET</AssemblyTitle>
+    <VersionPrefix>1.0.0-beta-6</VersionPrefix>
+    <Authors>Tim Heuer</Authors>
+    <TargetFramework>netstandard1.6</TargetFramework>
+    <AssemblyName>Alexa.NET</AssemblyName>
+    <PackageId>Alexa.NET</PackageId>
+    <PackageTags>amazon;alexa;echo;dot;echo dot;skills</PackageTags>
+    <PackageReleaseNotes>Added AskWithCard options</PackageReleaseNotes>
+    <PackageProjectUrl>https://github.com/timheuer/alexa-skills-dotnet</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/timheuer/alexa-skills-dotnet/blob/master/LICENSE</PackageLicenseUrl>
+    <RepositoryUrl>https://github.com/timheuer/alexa-skills-dotnet</RepositoryUrl>
+    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/Alexa.NET/Alexa.NET.xproj b/Alexa.NET/Alexa.NET.xproj
deleted file mode 100644
index e32a488..0000000
--- a/Alexa.NET/Alexa.NET.xproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>c5d40122-bb51-40d8-8934-0468bcc6c92b</ProjectGuid>
-    <RootNamespace>Alexa.NET</RootNamespace>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
diff --git a/Alexa.NET/Request/Device.cs b/Alexa.NET/Request/Device.cs
index 4b24d55..8b5f6ca 100644
--- a/Alexa.NET/Request/Device.cs
+++ b/Alexa.NET/Request/Device.cs
@@ -8,6 +8,9 @@ namespace Alexa.NET.Request
 {
     public class Device
     {
+        [JsonProperty("deviceId")]
+        public string DeviceID { get; set; }
+
         [JsonProperty("supportedInterfaces")]
         public Dictionary<string, object> SupportedInterfaces { get; set; }
 
diff --git a/Alexa.NET/Request/Permissions.cs b/Alexa.NET/Request/Permissions.cs
new file mode 100644
index 0000000..13493a8
--- /dev/null
+++ b/Alexa.NET/Request/Permissions.cs
@@ -0,0 +1,10 @@
+using Newtonsoft.Json;
+
+namespace Alexa.NET.Request
+{
+    public class Permissions
+    {
+        [JsonProperty("consentToken")]
+        public string ConsentToken { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Alexa.NET/Request/System.cs b/Alexa.NET/Request/System.cs
index 1a347cf..7e3e0ff 100644
--- a/Alexa.NET/Request/System.cs
+++ b/Alexa.NET/Request/System.cs
@@ -8,6 +8,9 @@ namespace Alexa.NET.Request
 {
     public class AlexaSystem
     {
+        [JsonProperty("apiEndpoint")]
+        public string ApiEndpoint { get; set; }
+
         [JsonProperty("application")]
         public Application Application { get; set; }
 
diff --git a/Alexa.NET/Request/User.cs b/Alexa.NET/Request/User.cs
index 1f468f6..a0dbd83 100644
--- a/Alexa.NET/Request/User.cs
+++ b/Alexa.NET/Request/User.cs
@@ -9,5 +9,8 @@ public class User
 
         [JsonProperty("accessToken")]
         public string AccessToken { get; set; }
+
+        [JsonProperty("permissions")]
+        public Permissions Permissions { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Alexa.NET/project.json b/Alexa.NET/project.json
deleted file mode 100644
index d8a9e3e..0000000
--- a/Alexa.NET/project.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "name": "Alexa.NET",
-  "title": "Alexa.NET",
-  "version": "1.0.0-beta-6",
-  "authors": [ "Tim Heuer" ],
-  "description": "A simple .NET Core library for handling Alexa Skill request/responses.",
-
-  "dependencies": {
-    "NETStandard.Library": "1.6.0",
-    "Newtonsoft.Json": "9.0.1"
-  },
-
-  "frameworks": {
-    "netstandard1.6": {
-      "imports": "dnxcore50"
-    }
-  },
-
-  "packOptions": {
-    "summary": "A simple .NET Core library for handling Alexa Skill request/responses.",
-    "licenseUrl": "https://github.com/timheuer/alexa-skills-dotnet/blob/master/LICENSE",
-    "projectUrl": "https://github.com/timheuer/alexa-skills-dotnet",
-
-    "owners": [
-      "Tim Heuer"
-    ],
-    "repository": { "url": "https://github.com/timheuer/alexa-skills-dotnet" },
-    "requireLicenseAcceptance": false,
-    "tags": [ "amazon", "alexa", "echo", "dot", "echo dot", "skills" ],
-    "releaseNotes": "Added AskWithCard options"
-  }
-}
diff --git a/global.json b/global.json
deleted file mode 100644
index 9d09ab5..0000000
--- a/global.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "projects": [ "src", "test" ],
-  "sdk": {
-    "version": "1.0.0-preview2-003131"
-  }
-}