fix: use correct key for destination CurrentSourceInfoKey

Merge pull request #1201 from PepperDash/feature-2.0.0/routing-feedback-manager-nullref
Feature 2.0.0/routing feedback manager nullref
2026-01-27 11:24:55 +00:00 · 2024-10-28 16:41:30 -05:00 · 2024-10-25 08:33:46 -05:00 · 2024-10-18 10:46:05 -05:00 · 2024-08-05 10:40:33 -04:00 · 2024-08-05 10:39:04 -04:00
4 changed files with 63 additions and 58 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -66,6 +66,8 @@ jobs:
      # Build the solutions in the docker image
      - name: Build Solution        
        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m
+      - name: Pack Solution
+        run: dotnet pack .\$($Env:SOLUTION_FILE).sln --configuration $env:BUILD_TYPE --output ./output /p:Version="${{ steps.setVersion.outputs.version }}"
      - name: Create tag for non-rc builds
        if: contains(steps.setVersion.outputs.version, 'alpha')
        run: |
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -37,6 +37,8 @@ jobs:
        run: nuget restore .\$($Env:SOLUTION_FILE).sln
      - name: Build Solution        
        run: msbuild .\$($Env:SOLUTION_FILE).sln /p:Platform="Any CPU" /p:Configuration="Debug" /p:Version="${{ steps.setVersion.outputs.version }}" -m      
+      - name: Pack Solution
+        run: dotnet pack .\$($Env:SOLUTION_FILE).sln --configuration $env:BUILD_TYPE --output ./output /p:Version="${{ steps.setVersion.outputs.version }}"
      - name: Upload Release
        id: create_release
        uses: ncipollo/release-action@v1
--- a/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs
+++ b/src/PepperDash.Essentials.Core/Routing/RoutingFeedbackManager.cs
@@ -175,6 +175,7 @@ namespace PepperDash.Essentials.Core.Routing
            });            

            var source = sourceListItem.Value;
+            var sourceKey = sourceListItem.Key;

            if (source == null)
            {
@@ -194,7 +195,7 @@ namespace PepperDash.Essentials.Core.Routing
            // Debug.LogMessage(Serilog.Events.LogEventLevel.Verbose, "Got Source {source}", this, source);

            destination.CurrentSourceInfo = source;
-            destination.CurrentSourceInfoKey = source.SourceKey;
+            destination.CurrentSourceInfoKey = sourceKey;
        }

        private TieLine GetRootTieLine(TieLine tieLine)
--- a/src/PepperDash.Essentials/PepperDash.Essentials.csproj
+++ b/src/PepperDash.Essentials/PepperDash.Essentials.csproj
@@ -1,58 +1,58 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <ProjectType>Program</ProjectType>
-    <Configurations>Debug;Release;Debug 4.7.2</Configurations>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RootNamespace>PepperDash.Essentials</RootNamespace>
-    <AssemblyName>PepperDashEssentials</AssemblyName>
-    <TargetFrameworks>net472;net6</TargetFrameworks>
-    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
-    <Title>PepperDash Essentials</Title>
-    <PackageId>PepperDashEssentials</PackageId>
-    <Version>2.0.0-local</Version>
-    <InformationalVersion>$(Version)</InformationalVersion>
-    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 4.7.2|AnyCPU'">
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="Example Configuration\EssentialsHuddleSpaceRoom\configurationFile-HuddleSpace-2-Source.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Example Configuration\EssentialsHuddleVtc1Room\configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Example Configuration\SIMPLBridging\configurationFile-dmps3300c-avRouting.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="Example Configuration\SIMPLBridging\SIMPLBridgeExample_configurationFile.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SGD\PepperDash Essentials iPad.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SGD\PepperDash Essentials TSW-560.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SGD\PepperDash Essentials TSW-760.sgd">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.66" />
-    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-424" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
-    <ProjectReference Include="..\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <ProjectType>Program</ProjectType>
+    <Configurations>Debug;Release;Debug 4.7.2</Configurations>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RootNamespace>PepperDash.Essentials</RootNamespace>
+    <AssemblyName>PepperDashEssentials</AssemblyName>
+    <TargetFrameworks>net472;net6</TargetFrameworks>
+    <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <Title>PepperDash Essentials</Title>
+    <PackageId>PepperDashEssentials</PackageId>
+    <Version>2.0.0-local</Version>
+    <InformationalVersion>$(Version)</InformationalVersion>
+    <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 4.7.2|AnyCPU'">
+    <DebugType>full</DebugType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="Example Configuration\EssentialsHuddleSpaceRoom\configurationFile-HuddleSpace-2-Source.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Example Configuration\EssentialsHuddleVtc1Room\configurationFile-mockVideoCodec_din-ap3_-_dm4x1.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Example Configuration\SIMPLBridging\configurationFile-dmps3300c-avRouting.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="Example Configuration\SIMPLBridging\SIMPLBridgeExample_configurationFile.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SGD\PepperDash Essentials iPad.sgd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SGD\PepperDash Essentials TSW-560.sgd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SGD\PepperDash Essentials TSW-760.sgd">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Crestron.SimplSharp.SDK.Program" Version="2.20.66" />
+    <PackageReference Include="PepperDashCore" Version="2.0.0-alpha-424" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PepperDash.Essentials.Core\PepperDash.Essentials.Core.csproj" />
+    <ProjectReference Include="..\PepperDash.Essentials.Devices.Common\PepperDash.Essentials.Devices.Common.csproj" />
+  </ItemGroup>
 </Project>
Author	SHA1	Message	Date
Andrew Welker	590e16298c	fix: use correct key for destination `CurrentSourceInfoKey`	2024-10-28 16:41:30 -05:00
Andrew Welker	1a11e9019c	Merge pull request #1201 from PepperDash/feature-2.0.0/routing-feedback-manager-nullref Feature 2.0.0/routing feedback manager nullref	2024-10-25 08:33:46 -05:00
Andrew Welker	639cd2abfb	Merge pull request #1197 from PepperDash/feature-2.0.0/add-cpz-to-builds Feature 2.0.0/add cpz to builds	2024-10-18 10:46:05 -05:00
jtalborough	778af651d0	feature: adds pack for release builds	2024-08-05 10:40:33 -04:00
jtalborough	2e31719a84	fix: artifact path	2024-08-05 10:39:04 -04:00
jtalborough	a96fb21898	feature: add dotnet pack	2024-08-05 09:52:57 -04:00
jtalborough	3f45372e1e	feature: add cpz test	2024-08-02 15:55:38 -04:00
jtalborough	60dbaf547d	fix: artifact path	2024-08-02 11:00:07 -04:00