Merge pull request #5973 from crobibero/legacy-ci-apiclient

Kill the CI

(cherry picked from commit d655145867)
Signed-off-by: Joshua M. Boniface <joshua@boniface.me>

.ci/azure-pipelines-api-client.yml

@@ -1,59 +0,0 @@
-parameters:
-  - name: LinuxImage
-    type: string
-    default: "ubuntu-latest"
-  - name: GeneratorVersion
-    type: string
-    default: "5.0.1"
-
-jobs:
-- job: GenerateApiClients
-  displayName: 'Generate Api Clients'
-  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/v')
-  dependsOn: Test
-
-  pool:
-    vmImage: "${{ parameters.LinuxImage }}"
-
-  steps:
-    - task: DownloadPipelineArtifact@2
-      displayName: 'Download OpenAPI Spec Artifact'
-      inputs:
-        source: 'current'
-        artifact: "OpenAPI Spec"
-        path: "$(System.ArtifactsDirectory)/openapispec"
-        runVersion: "latest"
-
-    - task: CmdLine@2
-      displayName: 'Download OpenApi Generator'
-      inputs:
-        script: "wget https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/${{ parameters.GeneratorVersion }}/openapi-generator-cli-${{ parameters.GeneratorVersion }}.jar -O openapi-generator-cli.jar"
-
-## Authenticate with npm registry
-    - task: npmAuthenticate@0
-      inputs:
-        workingFile: ./.npmrc
-        customEndpoint: 'jellyfin-bot for NPM'
-
-## Generate npm api client
-    - task: CmdLine@2
-      displayName: 'Build stable typescript axios client'
-      inputs:
-        script: "bash ./apiclient/templates/typescript/axios/generate.sh $(System.ArtifactsDirectory)"
-
-## Run npm install
-    - task: Npm@1
-      displayName: 'Install npm dependencies'
-      inputs:
-        command: install
-        workingDir: ./apiclient/generated/typescript/axios
-
-## Publish npm packages
-    - task: Npm@1
-      displayName: 'Publish stable typescript axios client'
-      inputs:
-        command: custom
-        customCommand: publish --access public
-        publishRegistry: useExternalRegistry
-        publishEndpoint: 'jellyfin-bot for NPM'
-        workingDir: ./apiclient/generated/typescript/axios

.ci/azure-pipelines.yml

@@ -61,6 +61,3 @@ jobs:
 
 - ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master')) }}:
   - template: azure-pipelines-package.yml
-
-- ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), startsWith(variables['Build.SourceBranch'], 'refs/heads/master')) }}:
-  - template: azure-pipelines-api-client.yml

Emby.Naming/Emby.Naming.csproj

@@ -33,7 +33,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Naming</PackageId>
-    <VersionPrefix>10.7.3</VersionPrefix>
+    <VersionPrefix>10.7.4</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

Jellyfin.Data/Jellyfin.Data.csproj

@@ -19,7 +19,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Data</PackageId>
-    <VersionPrefix>10.7.3</VersionPrefix>
+    <VersionPrefix>10.7.4</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

MediaBrowser.Common/MediaBrowser.Common.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Common</PackageId>
-    <VersionPrefix>10.7.3</VersionPrefix>
+    <VersionPrefix>10.7.4</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Controller</PackageId>
-    <VersionPrefix>10.7.3</VersionPrefix>
+    <VersionPrefix>10.7.4</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

MediaBrowser.Model/Dlna/ContainerProfile.cs

@@ -9,13 +9,11 @@ namespace MediaBrowser.Model.Dlna
 {
     public class ContainerProfile
     {
-        [Required]
         [XmlAttribute("type")]
         public DlnaProfileType Type { get; set; }
 
         public ProfileCondition[]? Conditions { get; set; } = Array.Empty<ProfileCondition>();
 
-        [Required]
         [XmlAttribute("container")]
         public string Container { get; set; } = string.Empty;
 

MediaBrowser.Model/Dlna/DirectPlayProfile.cs

@@ -16,7 +16,6 @@ namespace MediaBrowser.Model.Dlna
         [XmlAttribute("videoCodec")]
         public string? VideoCodec { get; set; }
 
-        [Required]
         [XmlAttribute("type")]
         public DlnaProfileType Type { get; set; }
 

MediaBrowser.Model/Dlna/TranscodingProfile.cs

@@ -8,23 +8,18 @@ namespace MediaBrowser.Model.Dlna
 {
     public class TranscodingProfile
     {
-        [Required]
         [XmlAttribute("container")]
         public string Container { get; set; } = string.Empty;
 
-        [Required]
         [XmlAttribute("type")]
         public DlnaProfileType Type { get; set; }
 
-        [Required]
         [XmlAttribute("videoCodec")]
         public string VideoCodec { get; set; } = string.Empty;
 
-        [Required]
         [XmlAttribute("audioCodec")]
         public string AudioCodec { get; set; } = string.Empty;
 
-        [Required]
         [XmlAttribute("protocol")]
         public string Protocol { get; set; } = string.Empty;
 

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -8,7 +8,7 @@
   <PropertyGroup>
     <Authors>Jellyfin Contributors</Authors>
     <PackageId>Jellyfin.Model</PackageId>
-    <VersionPrefix>10.7.3</VersionPrefix>
+    <VersionPrefix>10.7.4</VersionPrefix>
     <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
     <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
   </PropertyGroup>

SharedVersion.cs

@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("10.7.3")]
+[assembly: AssemblyVersion("10.7.4")]
-[assembly: AssemblyFileVersion("10.7.3")]
+[assembly: AssemblyFileVersion("10.7.4")]

apiclient/.openapi-generator-ignore

@@ -1,2 +0,0 @@
-# Prevent generator from creating these files:
-git_push.sh

apiclient/templates/typescript/axios/generate.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-artifactsDirectory="${1}"
-
-java -jar openapi-generator-cli.jar generate \
-    --input-spec ${artifactsDirectory}/openapispec/openapi.json \
-    --generator-name typescript-axios \
-    --output ./apiclient/generated/typescript/axios  \
-    --template-dir ./apiclient/templates/typescript/axios \
-    --ignore-file-override ./apiclient/.openapi-generator-ignore \
-    --additional-properties=useSingleRequestParameter="true",withSeparateModelsAndApi="true",modelPackage="models",apiPackage="api",npmName="axios"

apiclient/templates/typescript/axios/package.mustache

@@ -1,30 +0,0 @@
-{
-  "name": "@jellyfin/client-axios",
-  "version": "10.7.0{{snapshotVersion}}",
-  "description": "Jellyfin api client using axios",
-  "author": "Jellyfin Contributors",
-  "keywords": [
-    "axios",
-    "typescript",
-    "jellyfin"
-  ],
-  "license": "GPL-3.0-only",
-  "main": "./dist/index.js",
-  "typings": "./dist/index.d.ts",
-  "scripts": {
-    "build": "tsc --outDir dist/",
-    "prepublishOnly": "npm run build"
-  },
-  "dependencies": {
-    "axios": "^0.19.2"
-  },
-  "devDependencies": {
-    "@types/node": "^12.11.5",
-    "typescript": "^3.6.4"
-  }{{#npmRepository}},{{/npmRepository}}
-{{#npmRepository}}
-  "publishConfig": {
-    "registry": "{{npmRepository}}"
-  }
-{{/npmRepository}}
-}

build.yaml

@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin"
-version: "10.7.3"
+version: "10.7.4"
 packages:
   - debian.amd64
   - debian.arm64

debian/changelog

@@ -1,3 +1,9 @@
+jellyfin-server (10.7.4-1) unstable; urgency=medium
+
+  * New upstream version 10.7.4; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.7.4
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Tue, 04 May 2021 21:15:42 -0400
+
 jellyfin-server (10.7.3-1) unstable; urgency=medium
 
   * New upstream version 10.7.3; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.7.3

debian/metapackage/jellyfin

@@ -5,7 +5,7 @@ Homepage: https://jellyfin.org
 Standards-Version: 3.9.2
 
 Package: jellyfin
-Version: 10.7.3
+Version: 10.7.4
 Maintainer: Jellyfin Packaging Team <packaging@jellyfin.org>
 Depends: jellyfin-server, jellyfin-web
 Description: Provides the Jellyfin Free Software Media System

fedora/jellyfin.spec

@@ -7,7 +7,7 @@
 %endif
 
 Name:           jellyfin
-Version:        10.7.3
+Version:        10.7.4
 Release:        1%{?dist}
 Summary:        The Free Software Media System
 License:        GPLv3
@@ -138,6 +138,8 @@ fi
 
 %changelog
 * Tue May 04 2021 Jellyfin Packaging Team <packaging@jellyfin.org>
+- New upstream version 10.7.4; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.7.4
+* Tue May 04 2021 Jellyfin Packaging Team <packaging@jellyfin.org>
 - New upstream version 10.7.3; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.7.3
 * Sun Apr 11 2021 Jellyfin Packaging Team <packaging@jellyfin.org>
 - New upstream version 10.7.2; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.7.2

tests/Jellyfin.Dlna.Tests/DlnaManagerTests.cs

@@ -19,9 +19,10 @@ namespace Jellyfin.Dlna.Tests
             var fileSystem = new Mock<IFileSystem>();
             var appPaths = new Mock<IApplicationPaths>();
             var loggerFactory = new Mock<ILoggerFactory>();
+            var jsonSerializer = new Mock<IJsonSerializer>();
             var appHost = new Mock<IServerApplicationHost>();
 
-            return new DlnaManager(xmlSerializer.Object, fileSystem.Object, appPaths.Object, loggerFactory.Object, appHost.Object);
+            return new DlnaManager(xmlSerializer.Object, fileSystem.Object, appPaths.Object, loggerFactory.Object, jsonSerializer.Object, appHost.Object);
         }
 
         [Fact]