feat: simplifies IHasOsd ShowWebView method signature

Merge branch 'development' into feature-2.0.0/IHasOsd
Merge pull request #1220 from PepperDash/get-beta-build
2026-02-06 16:25:01 +00:00 · 2025-03-18 12:35:13 -04:00 · 2025-03-12 13:29:00 -05:00 · 2025-03-12 12:27:31 -06:00 · 2025-03-12 13:23:40 -05:00 · 2025-03-12 14:14:11 -04:00
6 changed files with 47 additions and 18 deletions
--- a/README.md
+++ b/README.md
@@ -60,4 +60,4 @@ For detailed documentation, see the [Wiki](https://github.com/PepperDash/Essenti

 ## How-To (Getting Started)

-See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)
+See [Getting Started](https://github.com/PepperDash/Essentials/wiki/Get-started#how-to-get-started)
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,26 +1,41 @@
 <Project>
  <ItemGroup>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cpz" Condition="$(ProjectType) == 'Program'">
+    <None Include="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" Condition="$(ProjectType) == 'Program'">
      <Pack>true</Pack>
      <PackagePath>build;</PackagePath>
    </None>
-    <None Include="$(PackageOutputPath)\$(AssemblyName)\*.cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
+    <None Include="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz" Condition="$(ProjectType) == 'ProgramLibrary'">
      <Pack>true</Pack>
      <PackagePath>build;</PackagePath>
    </None>
  </ItemGroup>
-  <Target Name="Create CPLZ" AfterTargets="Build; AfterRebuild" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''">
+  <PropertyGroup Condition="$(ProjectType) == 'ProgramLibrary'">
+    <FileName>$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz</FileName>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(ProjectType) == 'Program'">
+    <FileName>$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz</FileName>
+  </PropertyGroup>
+  <Target Name="DeleteCPLZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != '' And Exists($(FileName))">
+    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz">
+      <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
+    </Delete>
+    <Message Text="Deleted files: '@(DeletedList)'" />
+  </Target>
+  <Target Name="CreateCPLZ" AfterTargets="Build" Condition="$(ProjectType) == 'ProgramLibrary' And $(TargetDir) != ''" DependsOnTargets="DeleteCPLZ">
    <Message Text="Creating CPLZ $(TargetDir)"></Message>
-    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />
-    <MakeDir Directories="$(PackageOutputPath)\$(AssemblyName)" Condition="!Exists('$(PackageOutputPath)\$(AssemblyName)')" />
-    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>    
+    <MakeDir Directories="$(PackageOutputPath)" Condition="!Exists($(PackageOutputPath))" />    
+    <ZipDirectory SourceDirectory="$(TargetDir)" DestinationFile="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz" Overwrite="true"/>
+    <Copy SourceFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cplz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cplz" />
  </Target>
-  <Target Name="Copy CPZ NET6" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' == 'net6.0' ) Or ( '$(TargetFramework)' == 'net8.0' ))">
-    <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+  <Target Name="DeleteCPZ" BeforeTargets="PreBuildEvent" Condition="$(ProjectType) == 'Program' And $(TargetDir) != '' And Exists($(FileName))">
+    <Delete Files="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz">
+      <Output TaskParameter="DeletedFiles" ItemName="DeletedList"/>
+    </Delete>
+    <Message Text="Deleted files: '@(DeletedList)'" />
  </Target>
-  <Target Name="Copy CPZ NET47" AfterTargets="SimplSharpPostProcess47" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
+  <Target Name="Copy CPZ" AfterTargets="SimplSharpPostProcess" Condition="($(ProjectType) == 'Program' And ( '$(TargetFramework)' != 'net6.0' ) And ( '$(TargetFramework)' != 'net8.0' ))">
    <Message Text="Copying CPZ"></Message>
-    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(PackageOutputPath)\$(AssemblyName)\$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Move SourceFiles="$(TargetDir)$(TargetName).cpz" DestinationFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" />
+    <Copy SourceFiles="$(TargetDir)$(TargetName).$(Version).$(TargetFramework).cpz" DestinationFiles="$(PackageOutputPath)\$(TargetName).$(Version).$(TargetFramework).cpz" />
  </Target>
 </Project>
--- a/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasWebView.cs
+++ b/src/PepperDash.Essentials.Core/DeviceTypeInterfaces/IHasWebView.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace PepperDash.Essentials.Core.DeviceTypeInterfaces
+{
+    public interface IHasWebView
+    {
+        void ShowWebView(string url, string mode, string title, string target);
+        void HideWebView();
+    }
+}
--- a/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
+++ b/src/PepperDash.Essentials.Core/PepperDash.Essentials.Core.csproj
@@ -25,8 +25,8 @@
    <DebugType>pdbonly</DebugType>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.66" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-451" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="PepperDashCore" Version="2.0.1" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Crestron\CrestronGenericBaseDevice.cs.orig" />
--- a/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
+++ b/src/PepperDash.Essentials.Devices.Common/PepperDash.Essentials.Devices.Common.csproj
@@ -29,7 +29,7 @@
    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.20.66" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-451" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.ProgramLibrary" Version="2.21.90" />
+    <PackageReference Include="PepperDashCore" Version="2.0.1" />
  </ItemGroup>
 </Project>
--- a/src/PepperDash.Essentials/PepperDash.Essentials.csproj
+++ b/src/PepperDash.Essentials/PepperDash.Essentials.csproj
@@ -48,8 +48,8 @@
    </None>
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.66" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-451" />
+    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.21.90" />
+    <PackageReference Include="PepperDashCore" Version="2.0.1" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
Author	SHA1	Message	Date
aknous	46887579e4	feat: simplifies IHasOsd ShowWebView method signature	2025-03-18 12:35:13 -04:00
Andrew Welker	b095d926d2	Merge branch 'development' into feature-2.0.0/IHasOsd	2025-03-12 13:29:00 -05:00
Neil Dorin	6333443ecb	Merge pull request #1220 from PepperDash/get-beta-build	2025-03-12 12:27:31 -06:00
Andrew Welker	51414e7d26	chore(force-patch): increment patch version	2025-03-12 13:23:40 -05:00
aknous	7cebf861cc	build(force-patch): force rebuild	2025-03-12 14:14:11 -04:00
aknous	2e0b003118	build(force-patch): force build	2025-03-12 13:31:54 -04:00
aknous	bada7e3a25	feat: renames interface	2025-03-12 11:00:44 -04:00
aknous	67a7422cd0	feat: adds IHasOSD interface	2025-03-11 23:33:59 -04:00
Andrew Welker	3222c73282	Merge pull request #1218 from PepperDash/update-dev Update dev	2025-03-07 11:43:16 -06:00
Andrew Welker	5df7b57c43	Merge pull request #1217 from PepperDash/release Essentials 2.0.0	2025-03-07 11:25:39 -06:00
Andrew Welker	7631c7a8a1	build(force-patch): update PD Core to 2.0.1	2025-03-06 13:53:41 -06:00
Andrew Welker	16e2529378	feat: update to PD Core 2.0.0	2025-03-06 10:04:19 -06:00
Andrew Welker	8f485071c6	chore(force-patch): increment patch version	2025-03-05 18:51:59 -06:00
Andrew Welker	4eabd82878	build(force-update): fix build targets to handle files correctly	2025-03-05 18:50:40 -06:00
Andrew Welker	edfe77cd02	build(force-patch): update PD Core & Crestron libraries	2025-03-05 17:37:48 -06:00
Andrew Welker	fd593d7117	Merge pull request #1216 from PepperDash/release-2.0.0 Merge 2.0.0 stuff into development	2025-03-05 13:51:28 -06:00
Neil Dorin	428f9f34bd	Merge pull request #1187 from PepperDash/hotfix/add-hdcp-control-to-airmedia main <- hotfix/add-hdcp-control-to-airmedia	2024-05-16 11:29:07 -06:00