Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"rollForward": false
},
"husky": {
"version": "0.8.0",
"version": "0.9.1",
"commands": [
"husky"
],
Expand Down
4 changes: 2 additions & 2 deletions CreateMatrix/CreateMatrix.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<VerifyReferenceAotCompatibility>true</VerifyReferenceAotCompatibility>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageReference Include="Serilog" Version="4.3.1" />
<PackageReference Include="System.CommandLine" Version="2.0.3" />
<PackageReference Include="System.CommandLine" Version="2.0.5" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="CreateMatrixTests" />
Expand Down
4 changes: 1 addition & 3 deletions CreateMatrix/Extensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ internal bool LogAndHandle(

internal static class StringBuilderExtensions
{
private const string CrLf = "\r\n";

extension(StringBuilder sb)
{
internal StringBuilder AppendLineCrlf(string? value = null)
Expand All @@ -39,7 +37,7 @@ internal StringBuilder AppendLineCrlf(string? value = null)
_ = sb.Append(value);
}

return sb.Append(CrLf);
return sb.Append("\r\n");
}
}
}
14 changes: 7 additions & 7 deletions Docker/DWSpectrum-LSIO.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
# Labels
ARG LABEL_NAME="DWSpectrum-LSIO"
ARG LABEL_DESCRIPTION="DW Spectrum IPVMS"
ARG LABEL_VERSION="6.1.0.42176"
ARG LABEL_VERSION="6.1.1.42624"

# Download URL and version
# Current values are defined by the build pipeline
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.0.42176"
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.1.42624"

# Used for ${COMPANY_NAME} setting the server user and install directory
ARG RUNTIME_NAME="digitalwatchdog"
Expand All @@ -34,8 +34,8 @@ ARG \
# Platform of the node performing the build
BUILDPLATFORM

# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive
# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive

# Media server user and directory name
ENV COMPANY_NAME=${RUNTIME_NAME}
Expand All @@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
# Download the installer file
WORKDIR /temp
RUN /bin/bash -euo pipefail -c '\
DEB_FILE="./vms_server.deb"; \
DEB_FILE="./vms_server.deb"; \
TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
Expand Down
14 changes: 7 additions & 7 deletions Docker/DWSpectrum.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base:ubuntu-noble
# Labels
ARG LABEL_NAME="DWSpectrum"
ARG LABEL_DESCRIPTION="DW Spectrum IPVMS"
ARG LABEL_VERSION="6.1.0.42176"
ARG LABEL_VERSION="6.1.1.42624"

# Download URL and version
# Current values are defined by the build pipeline
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.0.42176"
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.1.42624"

# Used for ${COMPANY_NAME} setting the server user and install directory
ARG RUNTIME_NAME="digitalwatchdog"
Expand All @@ -34,8 +34,8 @@ ARG \
# Platform of the node performing the build
BUILDPLATFORM

# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive
# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive

# Media server user and directory name
ENV COMPANY_NAME=${RUNTIME_NAME}
Expand All @@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
# Download the installer file
WORKDIR /temp
RUN /bin/bash -euo pipefail -c '\
DEB_FILE="./vms_server.deb"; \
DEB_FILE="./vms_server.deb"; \
TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
Expand Down
14 changes: 7 additions & 7 deletions Docker/NxGo-LSIO.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
# Labels
ARG LABEL_NAME="NxGo-LSIO"
ARG LABEL_DESCRIPTION="Nx Go VMS"
ARG LABEL_VERSION="6.1.0.42176"
ARG LABEL_VERSION="6.1.1.42624"

# Download URL and version
# Current values are defined by the build pipeline
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.0.42176"
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.1.42624"

# Used for ${COMPANY_NAME} setting the server user and install directory
ARG RUNTIME_NAME="networkoptix"
Expand All @@ -34,8 +34,8 @@ ARG \
# Platform of the node performing the build
BUILDPLATFORM

# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive
# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive

# Media server user and directory name
ENV COMPANY_NAME=${RUNTIME_NAME}
Expand All @@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
# Download the installer file
WORKDIR /temp
RUN /bin/bash -euo pipefail -c '\
DEB_FILE="./vms_server.deb"; \
DEB_FILE="./vms_server.deb"; \
TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
Expand Down
14 changes: 7 additions & 7 deletions Docker/NxGo.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base:ubuntu-noble
# Labels
ARG LABEL_NAME="NxGo"
ARG LABEL_DESCRIPTION="Nx Go VMS"
ARG LABEL_VERSION="6.1.0.42176"
ARG LABEL_VERSION="6.1.1.42624"

# Download URL and version
# Current values are defined by the build pipeline
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.0.42176"
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.1.42624"

# Used for ${COMPANY_NAME} setting the server user and install directory
ARG RUNTIME_NAME="networkoptix"
Expand All @@ -34,8 +34,8 @@ ARG \
# Platform of the node performing the build
BUILDPLATFORM

# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive
# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive

# Media server user and directory name
ENV COMPANY_NAME=${RUNTIME_NAME}
Expand All @@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
# Download the installer file
WORKDIR /temp
RUN /bin/bash -euo pipefail -c '\
DEB_FILE="./vms_server.deb"; \
DEB_FILE="./vms_server.deb"; \
TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
Expand Down
14 changes: 7 additions & 7 deletions Docker/NxMeta-LSIO.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
# Labels
ARG LABEL_NAME="NxMeta-LSIO"
ARG LABEL_DESCRIPTION="Nx Meta VMS"
ARG LABEL_VERSION="6.1.0.42176"
ARG LABEL_VERSION="6.1.1.42624"

# Download URL and version
# Current values are defined by the build pipeline
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.0.42176"
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.1.42624"

# Used for ${COMPANY_NAME} setting the server user and install directory
ARG RUNTIME_NAME="networkoptix-metavms"
Expand All @@ -34,8 +34,8 @@ ARG \
# Platform of the node performing the build
BUILDPLATFORM

# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive
# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive

# Media server user and directory name
ENV COMPANY_NAME=${RUNTIME_NAME}
Expand All @@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
# Download the installer file
WORKDIR /temp
RUN /bin/bash -euo pipefail -c '\
DEB_FILE="./vms_server.deb"; \
DEB_FILE="./vms_server.deb"; \
TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
Expand Down
14 changes: 7 additions & 7 deletions Docker/NxMeta.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base:ubuntu-noble
# Labels
ARG LABEL_NAME="NxMeta"
ARG LABEL_DESCRIPTION="Nx Meta VMS"
ARG LABEL_VERSION="6.1.0.42176"
ARG LABEL_VERSION="6.1.1.42624"

# Download URL and version
# Current values are defined by the build pipeline
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.0.42176"
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.1.42624"

# Used for ${COMPANY_NAME} setting the server user and install directory
ARG RUNTIME_NAME="networkoptix-metavms"
Expand All @@ -34,8 +34,8 @@ ARG \
# Platform of the node performing the build
BUILDPLATFORM

# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive
# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive

# Media server user and directory name
ENV COMPANY_NAME=${RUNTIME_NAME}
Expand All @@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
# Download the installer file
WORKDIR /temp
RUN /bin/bash -euo pipefail -c '\
DEB_FILE="./vms_server.deb"; \
DEB_FILE="./vms_server.deb"; \
TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
Expand Down
14 changes: 7 additions & 7 deletions Docker/NxWitness-LSIO.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
# Labels
ARG LABEL_NAME="NxWitness-LSIO"
ARG LABEL_DESCRIPTION="Nx Witness VMS"
ARG LABEL_VERSION="6.1.0.42176"
ARG LABEL_VERSION="6.1.1.42624"

# Download URL and version
# Current values are defined by the build pipeline
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.0.42176"
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.1.42624"

# Used for ${COMPANY_NAME} setting the server user and install directory
ARG RUNTIME_NAME="networkoptix"
Expand All @@ -34,8 +34,8 @@ ARG \
# Platform of the node performing the build
BUILDPLATFORM

# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive
# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive

# Media server user and directory name
ENV COMPANY_NAME=${RUNTIME_NAME}
Expand All @@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
# Download the installer file
WORKDIR /temp
RUN /bin/bash -euo pipefail -c '\
DEB_FILE="./vms_server.deb"; \
DEB_FILE="./vms_server.deb"; \
TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
Expand Down
14 changes: 7 additions & 7 deletions Docker/NxWitness.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base:ubuntu-noble
# Labels
ARG LABEL_NAME="NxWitness"
ARG LABEL_DESCRIPTION="Nx Witness VMS"
ARG LABEL_VERSION="6.1.0.42176"
ARG LABEL_VERSION="6.1.1.42624"

# Download URL and version
# Current values are defined by the build pipeline
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.0.42176"
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.1.42624"

# Used for ${COMPANY_NAME} setting the server user and install directory
ARG RUNTIME_NAME="networkoptix"
Expand All @@ -34,8 +34,8 @@ ARG \
# Platform of the node performing the build
BUILDPLATFORM

# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive
# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive

# Media server user and directory name
ENV COMPANY_NAME=${RUNTIME_NAME}
Expand All @@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
# Download the installer file
WORKDIR /temp
RUN /bin/bash -euo pipefail -c '\
DEB_FILE="./vms_server.deb"; \
DEB_FILE="./vms_server.deb"; \
TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
Expand Down
14 changes: 7 additions & 7 deletions Docker/WisenetWAVE-LSIO.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
# Labels
ARG LABEL_NAME="WisenetWAVE-LSIO"
ARG LABEL_DESCRIPTION="Wisenet WAVE VMS"
ARG LABEL_VERSION="6.1.0.42176"
ARG LABEL_VERSION="6.1.1.42624"

# Download URL and version
# Current values are defined by the build pipeline
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.0.42176"
ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_x64.zip"
ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_arm64.zip"
ARG DOWNLOAD_VERSION="6.1.1.42624"

# Used for ${COMPANY_NAME} setting the server user and install directory
ARG RUNTIME_NAME="hanwha"
Expand All @@ -34,8 +34,8 @@ ARG \
# Platform of the node performing the build
BUILDPLATFORM

# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive
# Prevent EULA and confirmation prompts in installers
ARG DEBIAN_FRONTEND=noninteractive

# Media server user and directory name
ENV COMPANY_NAME=${RUNTIME_NAME}
Expand All @@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
# Download the installer file
WORKDIR /temp
RUN /bin/bash -euo pipefail -c '\
DEB_FILE="./vms_server.deb"; \
DEB_FILE="./vms_server.deb"; \
TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
Expand Down
Loading
Loading