ElvenMonky · ElvenMonky · Dec 5, 2017 · Dec 6, 2017 · Dec 8, 2017 · Dec 10, 2017
diff --git a/.nuget/AlexaSkillsKit.Lib.nuspec b/.nuget/AlexaSkillsKit.Lib.nuspec
diff --git a/.nuget/pack.cmd b/.nuget/pack.cmd
diff --git a/AlexaSkillsKit.Interfaces.AudioPlayer/AlexaSkillsKit.Interfaces.AudioPlayer.csproj b/AlexaSkillsKit.Interfaces.AudioPlayer/AlexaSkillsKit.Interfaces.AudioPlayer.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.1</TargetFramework>
+    <Product>AlexaSkillsKit</Product>
+    <Copyright>Copyright © 2018 Stefan Negritoiu (FreeBusy) and contributors</Copyright>
+    <Company />
+    <Authors>Stefan Negritoiu (FreeBusy)</Authors>
+    <Owners>Stefan Negritoiu (FreeBusy)</Owners>
+    <Version>2.0.0</Version>
+    <RepositoryUrl>https://github.com/AreYouFreeBusy/AlexaSkillsKit.NET.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <PackageTags>Amazon Alexa Skill Echo Show Speechlet .Net AudioPlayer PlaybackController</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageIconUrl>https://developer.amazon.com/public/binaries/content/gallery/developerportalpublic/solutions/alexa/dp_image_kit_02.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/AreYouFreeBusy/AlexaSkillsKit.NET</PackageProjectUrl>
+    <Description>AudioPlayer and PlaybackController interfaces support for AlexaSkillsKit</Description>
+    <PackageReleaseNotes>
+      2.0.0: Extract AudioPlayer and PlaybackController interfaces to separate library
+    </PackageReleaseNotes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AlexaSkillsKit" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AlexaSkillsKit.Lib\AlexaSkillsKit.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...t.Lib/Interfaces/AudioPlayer/AudioItem.cs → ...lsKit.Interfaces.AudioPlayer/AudioItem.cs b/...t.Lib/Interfaces/AudioPlayer/AudioItem.cs → ...lsKit.Interfaces.AudioPlayer/AudioItem.cs
diff --git a/...Interfaces/AudioPlayer/AudioItemStream.cs → ...Interfaces.AudioPlayer/AudioItemStream.cs b/...Interfaces/AudioPlayer/AudioItemStream.cs → ...Interfaces.AudioPlayer/AudioItemStream.cs
diff --git a/...faces/AudioPlayer/AudioPlayerInterface.cs → ...faces.AudioPlayer/AudioPlayerInterface.cs b/...faces/AudioPlayer/AudioPlayerInterface.cs → ...faces.AudioPlayer/AudioPlayerInterface.cs
diff --git a/...layer/AudioPlayerPlaybackFailedRequest.cs → ...layer/AudioPlayerPlaybackFailedRequest.cs b/...layer/AudioPlayerPlaybackFailedRequest.cs → ...layer/AudioPlayerPlaybackFailedRequest.cs
diff --git a/...erfaces/AudioPlayer/AudioPlayerRequest.cs → ...erfaces.AudioPlayer/AudioPlayerRequest.cs b/...erfaces/AudioPlayer/AudioPlayerRequest.cs → ...erfaces.AudioPlayer/AudioPlayerRequest.cs
@@ -8,9 +8,7 @@ namespace AlexaSkillsKit.Interfaces.AudioPlayer
     /// </summary>
     public class AudioPlayerRequest : ExtendedSpeechletRequest
     {
-        public static readonly string TypeName = "AudioPlayer";
-
-        public AudioPlayerRequest(string subtype, JObject json) : base(TypeName, subtype, json) {
+        public AudioPlayerRequest(string subtype, JObject json) : base(subtype, json) {
             Token = json.Value<string>("token");
             OffsetInMilliseconds = json.Value<long?>("offsetInMilliseconds");
         }

diff --git a/...rfaces/AudioPlayer/AudioPlayerResponse.cs → ...rfaces.AudioPlayer/AudioPlayerResponse.cs b/...rfaces/AudioPlayer/AudioPlayerResponse.cs → ...rfaces.AudioPlayer/AudioPlayerResponse.cs
@@ -1,6 +1,4 @@
-//  Copyright 2015 Stefan Negritoiu (FreeBusy). See LICENSE file for more information.
-
-using AlexaSkillsKit.Interfaces.AudioPlayer.Directives;
+using AlexaSkillsKit.Interfaces.AudioPlayer.Directives;
 using AlexaSkillsKit.Speechlet;
 using System.Collections.Generic;
 

diff --git a/AlexaSkillsKit.Interfaces.AudioPlayer/AudioPlayerSpeechletAsyncWrapper.cs b/AlexaSkillsKit.Interfaces.AudioPlayer/AudioPlayerSpeechletAsyncWrapper.cs
@@ -0,0 +1,22 @@
+using AlexaSkillsKit.Speechlet;
+using System.Threading.Tasks;
+
+namespace AlexaSkillsKit.Interfaces.AudioPlayer
+{
+    public class AudioPlayerSpeechletAsyncWrapper : IAudioPlayerSpeechletAsync
+    {
+        private readonly IAudioPlayerSpeechlet speechlet;
+
+        public AudioPlayerSpeechletAsyncWrapper(IAudioPlayerSpeechlet speechlet) {
+            this.speechlet = speechlet;
+        }
+
+        public async Task<AudioPlayerResponse> OnAudioPlayerAsync(AudioPlayerRequest audioRequest, Context context) {
+            return speechlet.OnAudioPlayer(audioRequest, context);
+        }
+
+        public async Task<AudioPlayerResponse> OnPlaybackControllerAsync(PlaybackControllerRequest playbackRequest, Context context) {
+            return speechlet.OnPlaybackController(playbackRequest, context);
+        }
+    }
+}
diff --git a/AlexaSkillsKit.Interfaces.AudioPlayer/AudioPlayerSpeechletServiceExtensions.cs b/AlexaSkillsKit.Interfaces.AudioPlayer/AudioPlayerSpeechletServiceExtensions.cs
@@ -0,0 +1,33 @@
+using AlexaSkillsKit.Json;
+using AlexaSkillsKit.Speechlet;
+
+namespace AlexaSkillsKit.Interfaces.AudioPlayer
+{
+    public static class AudioPlayerSpeechletServiceExtensions
+    {
+        public static void AddAudioPlayer(this SpeechletService service, IAudioPlayerSpeechlet speechlet) {
+            service.AddAudioPlayer(new AudioPlayerSpeechletAsyncWrapper(speechlet));
+        }
+
+        public static void AddAudioPlayer(this SpeechletService service, IAudioPlayerSpeechletAsync speechlet) {
+            Deserializer<ISpeechletInterface>.RegisterDeserializer("AudioPlayer", AudioPlayerInterface.FromJson);
+
+            SpeechletRequestEnvelope.RequestParser.AddInterface("AudioPlayer", (subtype, json) => {
+                switch (subtype) {
+                    case "PlaybackFailed":
+                        return new AudioPlayerPlaybackFailedRequest(subtype, json);
+                    default:
+                        return new AudioPlayerRequest(subtype, json);
+                }
+            });
+
+            service.AddHandler<AudioPlayerRequest>(
+                async (request, context) => await speechlet.OnAudioPlayerAsync(request, context));
+
+            SpeechletRequestEnvelope.RequestParser.AddInterface("PlaybackController", (subtype, json) => new PlaybackControllerRequest(subtype, json));
+
+            service.AddHandler<PlaybackControllerRequest>(
+                async (request, context) => await speechlet.OnPlaybackControllerAsync(request, context));
+        }
+    }
+}
diff --git a/...ectives/AudioPlayerClearQueueDirective.cs → ...ectives/AudioPlayerClearQueueDirective.cs b/...ectives/AudioPlayerClearQueueDirective.cs → ...ectives/AudioPlayerClearQueueDirective.cs
diff --git a/...Player/Directives/AudioPlayerDirective.cs → ...Player/Directives/AudioPlayerDirective.cs b/...Player/Directives/AudioPlayerDirective.cs → ...Player/Directives/AudioPlayerDirective.cs
diff --git a/...er/Directives/AudioPlayerPlayDirective.cs → ...er/Directives/AudioPlayerPlayDirective.cs b/...er/Directives/AudioPlayerPlayDirective.cs → ...er/Directives/AudioPlayerPlayDirective.cs
diff --git a/...er/Directives/AudioPlayerStopDirective.cs → ...er/Directives/AudioPlayerStopDirective.cs b/...er/Directives/AudioPlayerStopDirective.cs → ...er/Directives/AudioPlayerStopDirective.cs
diff --git a/AlexaSkillsKit.Interfaces.AudioPlayer/IAudioPlayerSpeechlet.cs b/AlexaSkillsKit.Interfaces.AudioPlayer/IAudioPlayerSpeechlet.cs
@@ -0,0 +1,10 @@
+using AlexaSkillsKit.Speechlet;
+
+namespace AlexaSkillsKit.Interfaces.AudioPlayer
+{
+    public interface IAudioPlayerSpeechlet
+    {
+        AudioPlayerResponse OnAudioPlayer(AudioPlayerRequest audioRequest, Context context);
+        AudioPlayerResponse OnPlaybackController(PlaybackControllerRequest playbackRequest, Context context);
+    }
+}
diff --git a/AlexaSkillsKit.Interfaces.AudioPlayer/IAudioPlayerSpeechletAsync.cs b/AlexaSkillsKit.Interfaces.AudioPlayer/IAudioPlayerSpeechletAsync.cs
@@ -0,0 +1,11 @@
+using AlexaSkillsKit.Speechlet;
+using System.Threading.Tasks;
+
+namespace AlexaSkillsKit.Interfaces.AudioPlayer
+{
+    public interface IAudioPlayerSpeechletAsync
+    {
+        Task<AudioPlayerResponse> OnAudioPlayerAsync(AudioPlayerRequest audioRequest, Context context);
+        Task<AudioPlayerResponse> OnPlaybackControllerAsync(PlaybackControllerRequest playbackRequest, Context context);
+    }
+}
diff --git a/.../AudioPlayer/PlaybackControllerRequest.cs → ....AudioPlayer/PlaybackControllerRequest.cs b/.../AudioPlayer/PlaybackControllerRequest.cs → ....AudioPlayer/PlaybackControllerRequest.cs
@@ -8,9 +8,7 @@ namespace AlexaSkillsKit.Interfaces.AudioPlayer
     /// </summary>
     public class PlaybackControllerRequest : ExtendedSpeechletRequest
     {
-        public static readonly string TypeName = "PlaybackController";
-
-        public PlaybackControllerRequest(string subtype, JObject json) : base(TypeName, subtype, json) {
+        public PlaybackControllerRequest(string subtype, JObject json) : base(subtype, json) {
         }
     }
 }
diff --git a/AlexaSkillsKit.Interfaces.Dialog/AlexaSkillsKit.Interfaces.Dialog.csproj b/AlexaSkillsKit.Interfaces.Dialog/AlexaSkillsKit.Interfaces.Dialog.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.1</TargetFramework>
+    <Product>AlexaSkillsKit</Product>
+    <Copyright>Copyright © 2018 Stefan Negritoiu (FreeBusy) and contributors</Copyright>
+    <Company />
+    <Authors>Stefan Negritoiu (FreeBusy)</Authors>
+    <Owners>Stefan Negritoiu (FreeBusy)</Owners>
+    <Version>2.0.0</Version>
+    <RepositoryUrl>https://github.com/AreYouFreeBusy/AlexaSkillsKit.NET.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <PackageTags>Amazon Alexa Skill Echo Show Speechlet .Net Dialog interface</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageIconUrl>https://developer.amazon.com/public/binaries/content/gallery/developerportalpublic/solutions/alexa/dp_image_kit_02.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/AreYouFreeBusy/AlexaSkillsKit.NET</PackageProjectUrl>
+    <Description>Dialog interface support for AlexaSkillsKit</Description>
+    <PackageReleaseNotes>
+      2.0.0: Extract Dialog interface to separate library
+    </PackageReleaseNotes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AlexaSkillsKit" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AlexaSkillsKit.Lib\AlexaSkillsKit.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...irectives/DialogConfirmIntentDirective.cs → ...irectives/DialogConfirmIntentDirective.cs b/...irectives/DialogConfirmIntentDirective.cs → ...irectives/DialogConfirmIntentDirective.cs
diff --git a/.../Directives/DialogConfirmSlotDirective.cs → .../Directives/DialogConfirmSlotDirective.cs b/.../Directives/DialogConfirmSlotDirective.cs → .../Directives/DialogConfirmSlotDirective.cs
diff --git a/...log/Directives/DialogDelegateDirective.cs → ...log/Directives/DialogDelegateDirective.cs b/...log/Directives/DialogDelegateDirective.cs → ...log/Directives/DialogDelegateDirective.cs
diff --git a/...aces/Dialog/Directives/DialogDirective.cs → ...aces.Dialog/Directives/DialogDirective.cs b/...aces/Dialog/Directives/DialogDirective.cs → ...aces.Dialog/Directives/DialogDirective.cs
diff --git a/...g/Directives/DialogElicitSlotDirective.cs → ...g/Directives/DialogElicitSlotDirective.cs b/...g/Directives/DialogElicitSlotDirective.cs → ...g/Directives/DialogElicitSlotDirective.cs
diff --git a/AlexaSkillsKit.Interfaces.Display/AlexaSkillsKit.Interfaces.Display.csproj b/AlexaSkillsKit.Interfaces.Display/AlexaSkillsKit.Interfaces.Display.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.1</TargetFramework>
+    <Product>AlexaSkillsKit</Product>
+    <Copyright>Copyright © 2018 Stefan Negritoiu (FreeBusy) and contributors</Copyright>
+    <Company />
+    <Authors>Stefan Negritoiu (FreeBusy)</Authors>
+    <Owners>Stefan Negritoiu (FreeBusy)</Owners>
+    <Version>2.0.0</Version>
+    <RepositoryUrl>https://github.com/AreYouFreeBusy/AlexaSkillsKit.NET.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <PackageTags>Amazon Alexa Skill Echo Show Speechlet .Net Display interface</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageIconUrl>https://developer.amazon.com/public/binaries/content/gallery/developerportalpublic/solutions/alexa/dp_image_kit_02.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/AreYouFreeBusy/AlexaSkillsKit.NET</PackageProjectUrl>
+    <Description>Display interface support for AlexaSkillsKit</Description>
+    <PackageReleaseNotes>
+      2.0.0: Extract Display interface to separate library
+    </PackageReleaseNotes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AlexaSkillsKit" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AlexaSkillsKit.Lib\AlexaSkillsKit.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...ectives/DisplayRenderTemplateDirective.cs → ...ectives/DisplayRenderTemplateDirective.cs b/...ectives/DisplayRenderTemplateDirective.cs → ...ectives/DisplayRenderTemplateDirective.cs
diff --git a/...faces/Display/Directives/HintDirective.cs → ...faces.Display/Directives/HintDirective.cs b/...faces/Display/Directives/HintDirective.cs → ...faces.Display/Directives/HintDirective.cs
diff --git a/...it.Lib/Interfaces/Display/DisplayImage.cs → ...llsKit.Interfaces.Display/DisplayImage.cs b/...it.Lib/Interfaces/Display/DisplayImage.cs → ...llsKit.Interfaces.Display/DisplayImage.cs
diff --git a/.../Interfaces/Display/DisplayImageSource.cs → ....Interfaces.Display/DisplayImageSource.cs b/.../Interfaces/Display/DisplayImageSource.cs → ....Interfaces.Display/DisplayImageSource.cs
diff --git a/...ib/Interfaces/Display/DisplayInterface.cs → ...it.Interfaces.Display/DisplayInterface.cs b/...ib/Interfaces/Display/DisplayInterface.cs → ...it.Interfaces.Display/DisplayInterface.cs
diff --git a/....Lib/Interfaces/Display/DisplayRequest.cs → ...sKit.Interfaces.Display/DisplayRequest.cs b/....Lib/Interfaces/Display/DisplayRequest.cs → ...sKit.Interfaces.Display/DisplayRequest.cs
@@ -8,9 +8,7 @@ namespace AlexaSkillsKit.Interfaces.Display
     /// </summary>
     public class DisplayRequest : ExtendedSpeechletRequest
     {
-        public static readonly string TypeName = "Display";
-
-        public DisplayRequest(string subtype, JObject json) : base(TypeName, subtype, json) {
+        public DisplayRequest(string subtype, JObject json) : base(subtype, json) {
             Token = json.Value<string>("token");
         }
 

diff --git a/AlexaSkillsKit.Interfaces.Display/DisplaySpeechletAsyncWrapper.cs b/AlexaSkillsKit.Interfaces.Display/DisplaySpeechletAsyncWrapper.cs
@@ -0,0 +1,18 @@
+using AlexaSkillsKit.Speechlet;
+using System.Threading.Tasks;
+
+namespace AlexaSkillsKit.Interfaces.Display
+{
+    public class DisplaySpeechletAsyncWrapper : IDisplaySpeechletAsync
+    {
+        private readonly IDisplaySpeechlet speechlet;
+
+        public DisplaySpeechletAsyncWrapper(IDisplaySpeechlet speechlet) {
+            this.speechlet = speechlet;
+        }
+
+        public async Task<SpeechletResponse> OnDisplayAsync(DisplayRequest displayRequest, Context context) {
+            return speechlet.OnDisplay(displayRequest, context);
+        }
+    }
+}
diff --git a/AlexaSkillsKit.Interfaces.Display/DisplaySpeechletServiceExtensions.cs b/AlexaSkillsKit.Interfaces.Display/DisplaySpeechletServiceExtensions.cs
@@ -0,0 +1,20 @@
+using AlexaSkillsKit.Json;
+using AlexaSkillsKit.Speechlet;
+
+namespace AlexaSkillsKit.Interfaces.Display
+{
+    public static class DisplaySpeechletServiceExtensions
+    {
+        public static void AddDisplay(this SpeechletService service, IDisplaySpeechlet speechlet) {
+            service.AddDisplay(new DisplaySpeechletAsyncWrapper(speechlet));
+        }
+
+        public static void AddDisplay(this SpeechletService service, IDisplaySpeechletAsync speechlet) {
+            Deserializer<ISpeechletInterface>.RegisterDeserializer("Display", DisplayInterface.FromJson);
+
+            SpeechletRequestEnvelope.RequestParser.AddInterface("Display", (subtype, json) => new DisplayRequest(subtype, json));
+
+            service.AddHandler<DisplayRequest>(async (request, context) => await speechlet.OnDisplayAsync(request, context));
+        }
+    }
+}
diff --git a/...Lib/Interfaces/Display/DisplayTemplate.cs → ...Kit.Interfaces.Display/DisplayTemplate.cs b/...Lib/Interfaces/Display/DisplayTemplate.cs → ...Kit.Interfaces.Display/DisplayTemplate.cs
diff --git a/AlexaSkillsKit.Interfaces.Display/IDisplaySpeechlet.cs b/AlexaSkillsKit.Interfaces.Display/IDisplaySpeechlet.cs
@@ -0,0 +1,9 @@
+using AlexaSkillsKit.Speechlet;
+
+namespace AlexaSkillsKit.Interfaces.Display
+{
+    public interface IDisplaySpeechlet
+    {
+        SpeechletResponse OnDisplay(DisplayRequest displayRequest, Context context);
+    }
+}
diff --git a/AlexaSkillsKit.Interfaces.Display/IDisplaySpeechletAsync.cs b/AlexaSkillsKit.Interfaces.Display/IDisplaySpeechletAsync.cs
@@ -0,0 +1,10 @@
+using AlexaSkillsKit.Speechlet;
+using System.Threading.Tasks;
+
+namespace AlexaSkillsKit.Interfaces.Display
+{
+    public interface IDisplaySpeechletAsync
+    {
+        Task<SpeechletResponse> OnDisplayAsync(DisplayRequest displayRequest, Context context);
+    }
+}
diff --git a/...llsKit.Lib/Interfaces/Display/ListItem.cs → ...aSkillsKit.Interfaces.Display/ListItem.cs b/...llsKit.Lib/Interfaces/Display/ListItem.cs → ...aSkillsKit.Interfaces.Display/ListItem.cs
diff --git a/...Kit.Lib/Interfaces/Display/TextContent.cs → ...illsKit.Interfaces.Display/TextContent.cs b/...Kit.Lib/Interfaces/Display/TextContent.cs → ...illsKit.Interfaces.Display/TextContent.cs
diff --git a/...lsKit.Lib/Interfaces/Display/TextField.cs → ...SkillsKit.Interfaces.Display/TextField.cs b/...lsKit.Lib/Interfaces/Display/TextField.cs → ...SkillsKit.Interfaces.Display/TextField.cs
diff --git a/AlexaSkillsKit.Interfaces.VideoApp/AlexaSkillsKit.Interfaces.VideoApp.csproj b/AlexaSkillsKit.Interfaces.VideoApp/AlexaSkillsKit.Interfaces.VideoApp.csproj
@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard1.1</TargetFramework>
+    <Product>AlexaSkillsKit</Product>
+    <Copyright>Copyright © 2018 Stefan Negritoiu (FreeBusy) and contributors</Copyright>
+    <Company />
+    <Authors>Stefan Negritoiu (FreeBusy)</Authors>
+    <Owners>Stefan Negritoiu (FreeBusy)</Owners>
+    <Version>2.0.0</Version>
+    <RepositoryUrl>https://github.com/AreYouFreeBusy/AlexaSkillsKit.NET.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <PackageLicenseUrl>http://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <PackageTags>Amazon Alexa Skill Echo Show Speechlet .Net VideoApp interface</PackageTags>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageIconUrl>https://developer.amazon.com/public/binaries/content/gallery/developerportalpublic/solutions/alexa/dp_image_kit_02.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/AreYouFreeBusy/AlexaSkillsKit.NET</PackageProjectUrl>
+    <Description>VideoApp interface support for AlexaSkillsKit</Description>
+    <PackageReleaseNotes>
+      2.0.0: Extract VideoApp interface to separate library
+    </PackageReleaseNotes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="AlexaSkillsKit" Version="2.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AlexaSkillsKit.Lib\AlexaSkillsKit.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/...App/Directives/VideoAppLaunchDirective.cs → ...App/Directives/VideoAppLaunchDirective.cs b/...App/Directives/VideoAppLaunchDirective.cs → ...App/Directives/VideoAppLaunchDirective.cs
diff --git a/...sKit.Lib/Interfaces/VideoApp/VideoItem.cs → ...killsKit.Interfaces.VideoApp/VideoItem.cs b/...sKit.Lib/Interfaces/VideoApp/VideoItem.cs → ...killsKit.Interfaces.VideoApp/VideoItem.cs
diff --git a/.../Interfaces/VideoApp/VideoItemMetadata.cs → ....Interfaces.VideoApp/VideoItemMetadata.cs b/.../Interfaces/VideoApp/VideoItemMetadata.cs → ....Interfaces.VideoApp/VideoItemMetadata.cs