84 merge the dll and exe backglass features

.github/workflows/b2s-backglass.yml

@@ -19,8 +19,8 @@ jobs:
           - platform: x86
             config: Release
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           repository: DirectOutput/B2SServerPluginInterface
           path: B2SServerPluginInterface
@@ -53,7 +53,7 @@ jobs:
           VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1)
           TAG="${VERSION}-${SHA7}"
           perl -i -pe"s/AssemblyInformationalVersion\(\".*\"\)/AssemblyInformationalVersion\(\"${TAG}\"\)/g" "${ASSEMBLY_INFO}"
-      - uses: microsoft/setup-msbuild@v1.3
+      - uses: microsoft/setup-msbuild@v2
       - name: Build B2SServerPluginInterface
         run: |
           msbuild B2SServerPluginInterface/B2SServerPluginInterface.sln /t:Rebuild /p:Configuration=${{ matrix.config }}
@@ -101,58 +101,7 @@ jobs:
           cp -r ScreenResTemplates tmp
           cp -r B2STools tmp
           cp b2sbackglassserverregisterapp/ScreenResTemplates.cmd tmp
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
          name: B2SServer-${{ steps.version.outputs.tag }}-${{ matrix.config }}-win-${{ matrix.platform }}
          path: tmp
-
-  build-betterled:
-    if: ${{ false }}  # disable for now
-    name: Build BetterLed # -${{ matrix.config }}-win-${{ matrix.platform }}
-    runs-on: windows-2019
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - platform: x86
-            config: Debug
-          - platform: x86
-            config: Release
-          - platform: x64
-            config: Debug
-          - platform: x64
-            config: Release
-    steps:
-      - uses: actions/checkout@v3
-      - id: version
-        name: Update AssemblyInformationalVersion
-        run: |
-          SHA7="${GITHUB_SHA::7}"
-          ASSEMBLY_INFO="leds/dream7segments/My Project/AssemblyInfo.vb"
-          VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1)
-          TAG="${VERSION}-${SHA7}"
-          perl -i -pe"s/AssemblyInformationalVersion\(\".*\"\)/AssemblyInformationalVersion\(\"${TAG}\"\)/g" "${ASSEMBLY_INFO}"
-          ASSEMBLY_INFO="leds/BetterLed/My Project/AssemblyInfo.vb"
-          VERSION=$(grep -Eo "AssemblyVersion\(.*\)" "${ASSEMBLY_INFO}" | grep -Eo "[0-9\.]+" | tail -1)
-          TAG="${VERSION}-${SHA7}"
-          perl -i -pe"s/AssemblyInformationalVersion\(\".*\"\)/AssemblyInformationalVersion\(\"${TAG}\"\)/g" "${ASSEMBLY_INFO}"
-          echo "tag=${TAG}" >> $GITHUB_OUTPUT
-      - uses: microsoft/[email protected]
-      - name: Build
-        run: |
-          msbuild leds/BetterLed/BetterLed.sln /t:Rebuild /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
-        shell: cmd
-      - name: Bundle
-        run: |
-          mkdir tmp
-          cp leds/BetterLed/bin/${{ matrix.platform }}/${{ matrix.config }}/BetterLed.exe tmp
-          cp leds/BetterLed/bin/${{ matrix.platform }}/${{ matrix.config }}/Dream7Display.dll tmp
-          if [[ "${{ matrix.config }}" == "Debug" ]]; then
-             cp leds/BetterLed/bin/${{ matrix.platform }}/${{ matrix.config }}/BetterLed.pdb tmp
-             cp leds/BetterLed/bin/${{ matrix.platform }}/${{ matrix.config }}/Dream7Display.pdb tmp
-          fi
-          cp license.txt tmp
-      - uses: actions/upload-artifact@v3
-        with:
-         name: BetterLed-${{ steps.version.outputs.tag }}-${{ matrix.config }}-win-${{ matrix.platform }}
-         path: tmp

b2s_screenresidentifier/b2s_screenresidentifier/My Project/AssemblyInfo.vb

@@ -2,33 +2,33 @@
 Imports System.Reflection
 Imports System.Runtime.InteropServices
 
-' Allgemeine Informationen über eine Assembly werden über die folgenden 
-' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-' die mit einer Assembly verknüpft sind.
+' General Information about an assembly is controlled through the following 
+' set of attributes. Change these attribute values to modify the information
+' associated with an assembly.
 
-' Die Werte der Assemblyattribute überprüfen
+' Review the values of the assembly attributes
 
 <Assembly: AssemblyTitle("B2S ScreenRes Identifier")> 
-<Assembly: AssemblyDescription("")> 
-<Assembly: AssemblyCompany("")> 
+<Assembly: AssemblyDescription("Setup your B2S Screen sizes")> 
+<Assembly: AssemblyCompany("Visual Pinball")> 
 <Assembly: AssemblyProduct("B2S ScreenRes Identifier")> 
 <Assembly: AssemblyCopyright("Copyright (c) 2012-2024")> 
 <Assembly: AssemblyTrademark("A Herweh & B2S Team production")> 
 
 <Assembly: ComVisible(False)>
 
-'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
+'The following GUID is for the ID of the typelib if this project is exposed to COM
 <Assembly: Guid("c4de6106-782f-492b-ac8e-f61d295fdb13")> 
 
-' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
+' Version information for an assembly consists of the following four values:
 '
-'      Hauptversion
-'      Nebenversion 
-'      Buildnummer
+'      Major Version
+'      Minor Version 
+'      Build Number
 '      Revision
 '
-' Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
-' übernehmen, indem Sie "*" eingeben:
+' You can specify all the values or you can default the Build and Revision Numbers 
+' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
 <Assembly: AssemblyVersion("2.1.1")> 

b2sbackglassserver/b2sbackglassserver/B2SBackglassServer.vbproj

@@ -116,6 +116,12 @@
     </Compile>
     <Compile Include="Dream7\Segment.vb" />
     <Compile Include="Dream7\SegmentNumber.vb" />
+    <Compile Include="Forms\Background.Designer.vb">
+      <DependentUpon>Background.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Forms\Background.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="Forms\formBackglass.Designer.vb">
       <DependentUpon>formBackglass.vb</DependentUpon>
     </Compile>
@@ -177,6 +183,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Forms\Background.resx">
+      <DependentUpon>Background.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\formBackglass.resx">
       <DependentUpon>formBackglass.vb</DependentUpon>
       <SubType>Designer</SubType>

b2sbackglassserver/b2sbackglassserver/Classes/B2SData.vb

@@ -443,6 +443,18 @@ Public Class B2SData
         End Get
     End Property
 
+    Private Shared _ScoreMaxDigit As Integer = 0
+    Public Shared Property ScoreMaxDigit() As Integer
+        Get
+            Return _ScoreMaxDigit
+        End Get
+        Set(value As Integer)
+            If _ScoreMaxDigit < value Then
+                _ScoreMaxDigit = value
+            End If
+        End Set
+    End Property
+
     Public Shared Property Players() As B2SPlayer = New B2SPlayer()
     Public Shared Property IsAPlayerAdded() As Boolean = False