Compare commits

..

1 Commits

Author SHA1 Message Date
Andrew Welker
fab30bf888 fix: remove UpdateDeviceInfo call 2024-05-31 12:26:52 -05:00
5 changed files with 637 additions and 633 deletions

View File

@@ -65,13 +65,13 @@ jobs:
run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt" run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
# Upload the build output as an artifact # Upload the build output as an artifact
- name: Upload Build Output - name: Upload Build Output
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v1
with: with:
name: Build name: Build
path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
# Upload the Version file as an artifact # Upload the Version file as an artifact
- name: Upload version.txt - name: Upload version.txt
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v1
with: with:
name: Version name: Version
path: ${{env.GITHUB_HOME}}\output\version.txt path: ${{env.GITHUB_HOME}}\output\version.txt
@@ -101,18 +101,20 @@ jobs:
runs-on: windows-2019 runs-on: windows-2019
steps: steps:
- name: Download Build Version Info - name: Download Build Version Info
uses: actions/download-artifact@v4 uses: actions/download-artifact@v1
with: with:
name: Version name: Version
- name: Set Version Number - name: Set Version Number
shell: powershell shell: powershell
run: | run: |
$version = Get-Content -Path ./version.txt Get-ChildItem "./Version"
$version = Get-Content -Path ./Version/version.txt
Write-Host "Version: $version" Write-Host "Version: $version"
echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
Remove-Item -Path ./version.txt Remove-Item -Path ./Version/version.txt
Remove-Item -Path ./Version
- name: Download Build output - name: Download Build output
uses: actions/download-artifact@v4 uses: actions/download-artifact@v1
with: with:
name: Build name: Build
path: ./ path: ./

View File

@@ -59,13 +59,13 @@ jobs:
run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt" run: Write-Output "$($Env:VERSION)" | Out-File -FilePath "$($Env:GITHUB_HOME)\output\version.txt"
# Upload the build output as an artifact # Upload the build output as an artifact
- name: Upload Build Output - name: Upload Build Output
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v1
with: with:
name: Build name: Build
path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip path: ./${{ env.SOLUTION_FILE}}-${{ env.VERSION}}.zip
# Upload the Version file as an artifact # Upload the Version file as an artifact
- name: Upload version.txt - name: Upload version.txt
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v1
with: with:
name: Version name: Version
path: ${{env.GITHUB_HOME}}\output\version.txt path: ${{env.GITHUB_HOME}}\output\version.txt
@@ -85,18 +85,20 @@ jobs:
runs-on: windows-2019 runs-on: windows-2019
steps: steps:
- name: Download Build Version Info - name: Download Build Version Info
uses: actions/download-artifact@v4 uses: actions/download-artifact@v1
with: with:
name: Version name: Version
- name: Set Version Number - name: Set Version Number
shell: powershell shell: powershell
run: | run: |
$version = Get-Content -Path ./version.txt Get-ChildItem "./Version"
$version = Get-Content -Path ./Version/version.txt
Write-Host "Version: $version" Write-Host "Version: $version"
echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append echo "VERSION=$version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
Remove-Item -Path ./version.txt Remove-Item -Path ./Version/version.txt
Remove-Item -Path ./Version
- name: Download Build output - name: Download Build output
uses: actions/download-artifact@v4 uses: actions/download-artifact@v1
with: with:
name: Build name: Build
path: ./ path: ./

View File

@@ -83,9 +83,9 @@
<HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath> <HintPath>..\..\..\..\..\..\..\..\..\ProgramData\Crestron\SDK\SSPDevices\Crestron.SimplSharpPro.UI.dll</HintPath>
</Reference> </Reference>
<Reference Include="mscorlib" /> <Reference Include="mscorlib" />
<Reference Include="PepperDash_Core, Version=1.3.3.26212, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="PepperDash_Core, Version=1.2.1.30543, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\PepperDash.Core-1.3.3-hotfix-445\lib\net35\PepperDash_Core.dll</HintPath> <HintPath>..\..\..\packages\PepperDashCore\lib\net35\PepperDash_Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL"> <Reference Include="SimplSharpCustomAttributesInterface, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1099c178b3b54c3b, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>

View File

@@ -40,7 +40,7 @@ namespace PepperDash.Essentials.DM
DeviceInfo = new DeviceInfo(); DeviceInfo = new DeviceInfo();
IsOnline.OutputChange += (currentDevice, args) => { if (args.BoolValue) UpdateDeviceInfo(); }; // IsOnline.OutputChange += (currentDevice, args) => { if (args.BoolValue) UpdateDeviceInfo(); };
} }
protected void LinkDmRmcToApi(DmRmcControllerBase rmc, BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge) protected void LinkDmRmcToApi(DmRmcControllerBase rmc, BasicTriList trilist, uint joinStart, string joinMapKey, EiscApiAdvanced bridge)

View File

@@ -1,3 +1,3 @@
<packages> <packages>
<package id="PepperDashCore" version="1.3.3-hotfix-449" targetFramework="net35" allowedVersions="[1.0,2.0)"/> <package id="PepperDashCore" version="1.3.3-hotfix-390" targetFramework="net35" allowedVersions="[1.0,2.0)"/>
</packages> </packages>