Skip to content

Commit

Permalink
Merge pull request #5 from PepperDash/feature/fix-builds
Browse files Browse the repository at this point in the history
Feature/fix builds
  • Loading branch information
jtalborough authored Jan 31, 2024
2 parents 2f60570 + d905562 commit 574f684
Show file tree
Hide file tree
Showing 25 changed files with 198 additions and 237 deletions.
38 changes: 0 additions & 38 deletions .github/scripts/GenerateVersionNumber.ps1

This file was deleted.

40 changes: 0 additions & 40 deletions .github/scripts/UpdateAssemblyVersion.ps1

This file was deleted.

41 changes: 0 additions & 41 deletions .github/scripts/ZipBuildOutput.ps1

This file was deleted.

102 changes: 0 additions & 102 deletions .github/workflows/docker.yml

This file was deleted.

22 changes: 22 additions & 0 deletions .github/workflows/essentialsplugins-betabuilds-caller.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Beta Build

on:
push:
branches-ignore:
- "main"

workflow_dispatch:
inputs:
branch:
description: 'Branch to build'
required: true
type: string

jobs:
call-workflow:
uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-builds.yml@main
secrets: inherit
with:
branch: ${{ github.ref_name }}
default-branch: "main"

26 changes: 26 additions & 0 deletions .github/workflows/essentialsplugins-releasebuilds-caller.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@

name: Release Build

on:
release:
types:
- released
branches:
- "main"

workflow_dispatch:
inputs:
branch:
description: 'Branch to build'
required: true
type: string

jobs:
call-workflow:
uses: PepperDash/workflow-templates/.github/workflows/essentialsplugins-builds.yml@main
secrets: inherit
with:
branch: "main"
default-branch: "main"


1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ PDT.PanasonicDisplay.EPI/obj/Debug/PDT.PanasonicDisplay.EPI.dll
PDT.PanasonicDisplay.EPI/obj/Debug/PDT.PanasonicDisplay.EPI.csproj.FileListAbsolute.txt
PDT.PanasonicDisplay.EPI/bin/Debug/
PDT.PanasonicDisplay.EPI/bin/Release/
packages/
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "EssentialsBuilds"]
path = EssentialsBuilds
url=https://github.com/PepperDash/Essentials-Builds.git
1 change: 0 additions & 1 deletion EssentialsBuilds
Submodule EssentialsBuilds deleted from e9f64d
2 changes: 2 additions & 0 deletions GetNugetPackages.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@Echo ON
nuget install .\packages.config -OutputDirectory .\packages -excludeVersion
21 changes: 21 additions & 0 deletions PDT.PanasonicDisplay.EPI/PDT-Panasonic-Display-Epi.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<package >
<metadata>
<id>PepperDash.Essentials.Plugin.PanasonicDispaly</id>
<version>1.0.0</version>
<title>Panasonic Dispaly Plugin</title>
<authors>PepperDash Technologies</authors>
<owners>pepperdash</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<projectUrl>https://github.com/PepperDash/PanasonicDisplay.EPI</projectUrl>
<copyright>Copyright 2021</copyright>
<description>Extron Dmp DSP plugin used with PepperDash Essentials SIMPL# Pro application to expose functionality in SIMPL Windows using bridges.</description>
<tags>crestron 3series 4series</tags>
<repository type="git" url="https://github.com/PepperDash/epi-extron-dmp"/>
</metadata>
<files>
<file src="**" target="lib\net35"/>
<file src="**" target="lib\net47"/>
</files>
</package>
21 changes: 13 additions & 8 deletions PDT.PanasonicDisplay.EPI/PDT.PanasonicDisplay.EPI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,26 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.DeviceSupport.dll</HintPath>
</Reference>
<Reference Include="Essentials Devices Common, Version=1.9.6.35019, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\PepperDashEssentials\lib\net35\Essentials Devices Common.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="PepperDashEssentials, Version=1.4.19.29953, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="PepperDashEssentials, Version=1.9.6.35026, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\EssentialsBuilds\PepperDashEssentials.dll</HintPath>
<HintPath>..\packages\PepperDashEssentials\lib\net35\PepperDashEssentials.dll</HintPath>
</Reference>
<Reference Include="PepperDash_Core, Version=1.0.20.28344, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="PepperDash_Core, Version=1.1.0.33266, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\EssentialsBuilds\PepperDash_Core.dll</HintPath>
<HintPath>..\packages\PepperDashEssentials\lib\net35\PepperDash_Core.dll</HintPath>
</Reference>
<Reference Include="PepperDash_Essentials_Core, Version=1.4.19.29946, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="PepperDash_Essentials_Core, Version=1.9.6.35015, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\EssentialsBuilds\PepperDash_Essentials_Core.dll</HintPath>
<HintPath>..\packages\PepperDashEssentials\lib\net35\PepperDash_Essentials_Core.dll</HintPath>
</Reference>
<Reference Include="PepperDash_Essentials_DM, Version=1.3.7177.29951, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="PepperDash_Essentials_DM, Version=1.9.6.35022, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\EssentialsBuilds\PepperDash_Essentials_DM.dll</HintPath>
<HintPath>..\packages\PepperDashEssentials\lib\net35\PepperDash_Essentials_DM.dll</HintPath>
</Reference>
<Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -101,6 +105,7 @@
<ItemGroup>
<Compile Include="PanasonicDisplay.cs" />
<Compile Include="PanasonicDisplayConfigObject.cs" />
<Compile Include="PanasonicDisplayJoinMap.cs" />
<Compile Include="PluginFactory.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<None Include="Properties\ControlSystem.cfg" />
Expand Down
Binary file modified PDT.PanasonicDisplay.EPI/PDT.PanasonicDisplay.EPI.suo
Binary file not shown.
Binary file modified PDT.PanasonicDisplay.EPI/PDT.PanasonicDisplay.projectinfo
Binary file not shown.
Loading

0 comments on commit 574f684

Please sign in to comment.