More problem fixed

3 months ago · da569562c1
parent 374826c14a
commit da569562c1
7 changed files with 31 additions and 30 deletions
--- a/distribution/docker-build/Dockerfile
+++ b/distribution/docker-build/Dockerfile
@ -1,21 +1,22 @@
-FROM ubuntu:focal AS builder
+FROM ubuntu:jammy AS builder

 ENV DEBIAN_FRONTEND noninteractive 
-ENV MONO_VERSION 5.18
+ENV MONO_VERSION 8.0

 RUN apt-get update && \
    apt-get -y -o Dpkg::Options::="--force-confold" install --no-install-recommends \
        apt-transport-https \
        wget dirmngr gpg gpg-agent \
+        ca-certificates gnupg \
        # add-apt-repository for PPAs
        software-properties-common && \
    rm -rf /var/lib/apt/lists/*
 	
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
-    echo "deb http://download.mono-project.com/repo/debian stable-focal main" > /etc/apt/sources.list.d/mono-official-stable.list && \
+RUN gpg --homedir /tmp --no-default-keyring --keyring /usr/share/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
+    echo "deb [signed-by=/usr/share/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/ubuntu stable-focal main" > /etc/apt/sources.list.d/mono-official-stable.list && \
    apt-get update && apt-get install -y \ 
        devscripts build-essential tofrodos \
-        dh-make dh-systemd \
+        dh-make \
        cli-common-dev \
        mono-complete \
        sqlite3 libcurl4 mediainfo
--- a/docker/tests/mono/complete/Dockerfile
+++ b/docker/tests/mono/complete/Dockerfile
@ -1,11 +1,13 @@
-FROM ubuntu:xenial
+FROM ubuntu:jammy

 ENV DEBIAN_FRONTEND noninteractive
-ARG MONO_VERSION=5.20
-ARG MONO_URL=stable-xenial/snapshots/$MONO_VERSION
+ARG MONO_VERSION=8.0
+ARG MONO_URL=stable-jammy/snapshots/$MONO_VERSION

-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
-    echo "deb http://download.mono-project.com/repo/debian $MONO_URL main" > /etc/apt/sources.list.d/mono-official-stable.list && \
+RUN apt-get update && apt install -y \
+        ca-certificates gnupg \
+    && gpg --homedir /tmp --no-default-keyring --keyring /usr/share/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
+    echo "deb [signed-by=/usr/share/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/ubuntu $MONO_URL main" > /etc/apt/sources.list.d/mono-official-stable.list && \
    apt-get update && apt-get install -y \ 
        tofrodos tzdata \
        mono-complete \
--- a/docker/tests/mono/sonarr/Dockerfile
+++ b/docker/tests/mono/sonarr/Dockerfile
@ -1,13 +1,15 @@
-FROM ubuntu:xenial
+FROM ubuntu:jammy

 ENV DEBIAN_FRONTEND noninteractive
-ARG MONO_VERSION=5.20
-ARG MONO_URL=stable-xenial/snapshots/$MONO_VERSION
+ARG MONO_VERSION=8.0
+ARG MONO_URL=stable-focal/snapshots/$MONO_VERSION

-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
-    echo "deb http://download.mono-project.com/repo/debian $MONO_URL main" > /etc/apt/sources.list.d/mono-official-stable.list && \
+RUN apt-get update && apt install -y \
+        ca-certificates gnupg \
+    && gpg --homedir /tmp --no-default-keyring --keyring /usr/share/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
+    echo "deb [signed-by=/usr/share/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/ubuntu $MONO_URL main" > /etc/apt/sources.list.d/mono-official-stable.list && \
    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 2009837CBFFD68F45BC180471F4F90DE2A9B4BF8 && \
-    echo "deb http://apt.sonarr.tv/ubuntu xenial main" > /etc/apt/sources.list.d/sonarr.list && \
+    echo "deb http://apt.sonarr.tv/ubuntu jammy main" > /etc/apt/sources.list.d/sonarr.list && \
    apt-get update && apt-get install -y \ 
        tofrodos tzdata \
        sonarr \
--- a/docker/tests/run-all.sh
+++ b/docker/tests/run-all.sh
@ -25,20 +25,16 @@ done
 MONO_VERSIONS=""

 # Future versions
-MONO_VERSIONS="$MONO_VERSIONS 6.10=preview-xenial"
+MONO_VERSIONS="$MONO_VERSIONS 8.0=preview-focal"

 # Semi-Supported versions
-MONO_VERSIONS="$MONO_VERSIONS 6.8 6.6 6.4 6.0"
+MONO_VERSIONS="$MONO_VERSIONS 8.0"

 # Supported versions 
-MONO_VERSIONS="$MONO_VERSIONS 5.20 5.18"
+MONO_VERSIONS="$MONO_VERSIONS 8.0"

 # Legacy unsupported versions (but appear to work)
-MONO_VERSIONS="$MONO_VERSIONS 5.16 5.14 5.12"
-
-# Legacy unsupported versions
-MONO_VERSIONS="$MONO_VERSIONS 5.10 5.8 5.4 5.0"
-#MONO_VERSIONS="$MONO_VERSIONS 4.8=stable-wheezy/snapshots/4.8"
+MONO_VERSIONS="$MONO_VERSIONS <8.0"

 if [ "$opt_version" != "" ]; then
    MONO_VERSIONS="$opt_version"
@ -51,7 +47,7 @@ prepOne() {

    MONO_VERSION_SPLIT=(${MONO_VERSION_PAIR//=/ })
    MONO_VERSION=${MONO_VERSION_SPLIT[0]}
-    MONO_URL=${MONO_VERSION_SPLIT[1]:-"stable-xenial/snapshots/$MONO_VERSION"}
+    MONO_URL=${MONO_VERSION_SPLIT[1]:-"stable-focal/snapshots/$MONO_VERSION"}

    echo "Building Test Docker for mono $MONO_VERSION"
    
@ -59,7 +55,7 @@ prepOne() {
        docker build -t sonarr-test-$MONO_VERSION --build-arg MONO_VERSION=$MONO_VERSION --build-arg MONO_URL=$MONO_URL --file mono/complete/Dockerfile mono
    fi

-    if [ "$opt_mode" != "complete" ] && [ "$MONO_VERSION" != "5.0" ]; then    
+    if [ "$opt_mode" != "complete" ] && [ "$MONO_VERSION" != "8.0" ]; then    
        docker build -t sonarr-test-$MONO_VERSION-sonarr --build-arg MONO_VERSION=$MONO_VERSION --build-arg MONO_URL=$MONO_URL --file mono/sonarr/Dockerfile mono
    fi
 }
@ -81,7 +77,7 @@ runOne() {
        docker run $dockerArgs sonarr-test-$MONO_VERSION
    fi

-    if [ "$opt_mode" != "complete" ] && [ "$MONO_VERSION" != "5.0" ]; then   
+    if [ "$opt_mode" != "complete" ] && [ "$MONO_VERSION" != "8.0" ]; then   
        dockerArgs="--rm"
        dockerArgs="$dockerArgs -v /${PWD}/../../_tests_linux:/data/_tests_linux:ro"
        dockerArgs="$dockerArgs -v /${PWD}/../../_output_linux:/data/_output_linux:ro"
--- a/global.json
+++ b/global.json
@ -1,5 +1,5 @@
 {
  "sdk": {
-    "version": "6.0.405"
+    "version": "8.0.201"
  }
 }
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -136,7 +136,7 @@
  </ItemGroup>

  <ItemGroup Condition="'$(TestProject)'=='true' and '$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="coverlet.collector" Version="3.0.4-preview.27.ge7cb7c3b40" />
+    <PackageReference Include="coverlet.collector" Version="6.0.1" />
  </ItemGroup>

  <PropertyGroup Condition="'$(SonarrProject)'=='true' and '$(EnableAnalyzers)'=='false'">
--- a/src/coverlet.runsettings
+++ b/src/coverlet.runsettings
@ -12,7 +12,7 @@
  </DataCollectionRunSettings>
  <InProcDataCollectionRunSettings>
    <InProcDataCollectors>
-      <InProcDataCollector assemblyQualifiedName="Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=1.1.0.0, Culture=neutral, PublicKeyToken=null"
+      <InProcDataCollector assemblyQualifiedName="Coverlet.Collector.DataCollection.CoverletInProcDataCollector, coverlet.collector, Version=6.0.1.0, Culture=neutral, PublicKeyToken=null"
                           friendlyName="XPlat Code Coverage"
                           enabled="True"
                           codebase="coverlet.collector.dll" />