From 5187bb3add74cc2688a718ecba87823fc189f792 Mon Sep 17 00:00:00 2001 From: Akash Kava <39438041+ackava@users.noreply.github.com> Date: Tue, 1 Jan 2019 22:48:32 +0530 Subject: [PATCH 1/6] Update Job.cs --- Source/Zencoder/Job.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Zencoder/Job.cs b/Source/Zencoder/Job.cs index dc26be9..827ca99 100644 --- a/Source/Zencoder/Job.cs +++ b/Source/Zencoder/Job.cs @@ -51,7 +51,7 @@ public class Job /// Gets or sets the job ID. /// [JsonProperty("id")] - public int Id { get; set; } + public long Id { get; set; } /// /// Gets or sets the job's input media file. From 8e2f7b4d4805fd7e52ca9c70bc39c8d5bee202b3 Mon Sep 17 00:00:00 2001 From: Akash Kava <39438041+ackava@users.noreply.github.com> Date: Tue, 1 Jan 2019 23:07:22 +0530 Subject: [PATCH 2/6] Changed int to long --- .gitignore | 1 + Source/Zencoder/CreateJobResponse.cs | 2 +- Source/Zencoder/HttpPostNotificationJob.cs | 2 +- Source/Zencoder/HttpPostNotificationOutput.cs | 2 +- Source/Zencoder/MediaFile.cs | 2 +- Source/Zencoder/ResponseOutput.cs | 2 +- Source/Zencoder/Zencoder.csproj | 7 +++++-- 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index fc95294..e7b1b97 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ bin/ obj/ TestResults/ Build/ +/Source/.vs/Zencoder/v15/Server/sqlite3 diff --git a/Source/Zencoder/CreateJobResponse.cs b/Source/Zencoder/CreateJobResponse.cs index f471c8b..f348468 100644 --- a/Source/Zencoder/CreateJobResponse.cs +++ b/Source/Zencoder/CreateJobResponse.cs @@ -21,7 +21,7 @@ public class CreateJobResponse : Response /// [JsonProperty("id")] [JsonConverter(typeof(DefaultingIntegerConverter))] - public int Id { get; set; } + public long Id { get; set; } /// /// Gets or sets the response output collection. diff --git a/Source/Zencoder/HttpPostNotificationJob.cs b/Source/Zencoder/HttpPostNotificationJob.cs index 871d386..30cf860 100644 --- a/Source/Zencoder/HttpPostNotificationJob.cs +++ b/Source/Zencoder/HttpPostNotificationJob.cs @@ -19,7 +19,7 @@ public class HttpPostNotificationJob /// Gets or sets the job ID. /// [JsonProperty("id")] - public int Id { get; set; } + public long Id { get; set; } /// /// Gets or sets the job state. diff --git a/Source/Zencoder/HttpPostNotificationOutput.cs b/Source/Zencoder/HttpPostNotificationOutput.cs index cc86364..3ff3166 100644 --- a/Source/Zencoder/HttpPostNotificationOutput.cs +++ b/Source/Zencoder/HttpPostNotificationOutput.cs @@ -19,7 +19,7 @@ public class HttpPostNotificationOutput /// Gets or sets the output's ID. /// [JsonProperty("id")] - public int Id { get; set; } + public long Id { get; set; } /// /// Gets or sets the output's label, if applicable. diff --git a/Source/Zencoder/MediaFile.cs b/Source/Zencoder/MediaFile.cs index 4068348..0714284 100644 --- a/Source/Zencoder/MediaFile.cs +++ b/Source/Zencoder/MediaFile.cs @@ -88,7 +88,7 @@ public abstract class MediaFile /// Gets or sets the file's ID. /// [JsonProperty("id")] - public int Id { get; set; } + public long Id { get; set; } /// /// Gets or sets the file's total bitrate (in Kbps). diff --git a/Source/Zencoder/ResponseOutput.cs b/Source/Zencoder/ResponseOutput.cs index 4bdcedb..2ef6238 100644 --- a/Source/Zencoder/ResponseOutput.cs +++ b/Source/Zencoder/ResponseOutput.cs @@ -20,6 +20,6 @@ public class ResponseOutput /// [JsonProperty("id")] [JsonConverter(typeof(DefaultingIntegerConverter))] - public int Id { get; set; } + public long Id { get; set; } } } diff --git a/Source/Zencoder/Zencoder.csproj b/Source/Zencoder/Zencoder.csproj index deeacd0..1a2a503 100644 --- a/Source/Zencoder/Zencoder.csproj +++ b/Source/Zencoder/Zencoder.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,13 +10,14 @@ Properties Zencoder Zencoder - v3.5 + v4.6.1 512 3.5 + true @@ -27,6 +28,7 @@ prompt 4 bin\Debug\Zencoder.xml + false pdbonly @@ -36,6 +38,7 @@ prompt 4 bin\Release\Zencoder.xml + false From 0650eee419175b8dfa7ea8e961a0a20d64f96cfa Mon Sep 17 00:00:00 2001 From: Akash Kava <39438041+ackava@users.noreply.github.com> Date: Tue, 1 Jan 2019 23:15:15 +0530 Subject: [PATCH 3/6] Added nuspec --- Source/Package.nuspec | 27 +++++++++++++++++++++++++++ Source/Zencoder.sln | 14 ++++++++++---- 2 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 Source/Package.nuspec diff --git a/Source/Package.nuspec b/Source/Package.nuspec new file mode 100644 index 0000000..1938881 --- /dev/null +++ b/Source/Package.nuspec @@ -0,0 +1,27 @@ + + + + NS.Zencoder + $version$ + Zencoder + Akash Kava + Akash Kava + https://github.com/ackava/zencoder-cs/blob/master/LICENSE.txt + https://github.com/ackava/zencoder-cs + false + + Zencoder + + + Zencoder + + + + NeuroSpeech Technologies Pvt Ltd 2016 + en-US + zencoder + + + + + diff --git a/Source/Zencoder.sln b/Source/Zencoder.sln index c8fecb6..d2f48ee 100644 --- a/Source/Zencoder.sln +++ b/Source/Zencoder.sln @@ -1,11 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.168 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3F3CE0C5-A66D-4468-BEF8-CABB6B8DA6D1}" ProjectSection(SolutionItems) = preProject ..\build.proj = ..\build.proj ..\LICENSE.txt = ..\LICENSE.txt LocalTestRun.testrunconfig = LocalTestRun.testrunconfig + Package.nuspec = Package.nuspec ..\README.md = ..\README.md SolutionInfo.cs = SolutionInfo.cs Web.config.template = Web.config.template @@ -17,9 +20,6 @@ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zencoder.Test", "Zencoder.Test\Zencoder.Test.csproj", "{56CB9652-A906-4B54-8D67-70C1DE36EB3D}" EndProject Global - GlobalSection(TestCaseManagementSettings) = postSolution - CategoryFile = Zencoder.vsmdi - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU @@ -37,4 +37,10 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {BB1BC2D1-5E33-4FBF-95B2-6836B947604B} + EndGlobalSection + GlobalSection(TestCaseManagementSettings) = postSolution + CategoryFile = Zencoder.vsmdi + EndGlobalSection EndGlobal From 321219b7466114a09e832ddd03699a4b52f1d3af Mon Sep 17 00:00:00 2001 From: Akash Kava <39438041+ackava@users.noreply.github.com> Date: Tue, 1 Jan 2019 23:18:59 +0530 Subject: [PATCH 4/6] wip --- Source/Zencoder.sln | 6 ------ Source/Zencoder/Zencoder.csproj | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Source/Zencoder.sln b/Source/Zencoder.sln index d2f48ee..3a4c275 100644 --- a/Source/Zencoder.sln +++ b/Source/Zencoder.sln @@ -17,8 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zencoder", "Zencoder\Zencoder.csproj", "{6E47D2CE-D094-4077-9039-3B257DED1C6E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Zencoder.Test", "Zencoder.Test\Zencoder.Test.csproj", "{56CB9652-A906-4B54-8D67-70C1DE36EB3D}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -29,10 +27,6 @@ Global {6E47D2CE-D094-4077-9039-3B257DED1C6E}.Debug|Any CPU.Build.0 = Debug|Any CPU {6E47D2CE-D094-4077-9039-3B257DED1C6E}.Release|Any CPU.ActiveCfg = Release|Any CPU {6E47D2CE-D094-4077-9039-3B257DED1C6E}.Release|Any CPU.Build.0 = Release|Any CPU - {56CB9652-A906-4B54-8D67-70C1DE36EB3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {56CB9652-A906-4B54-8D67-70C1DE36EB3D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {56CB9652-A906-4B54-8D67-70C1DE36EB3D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {56CB9652-A906-4B54-8D67-70C1DE36EB3D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Source/Zencoder/Zencoder.csproj b/Source/Zencoder/Zencoder.csproj index 1a2a503..e79f93d 100644 --- a/Source/Zencoder/Zencoder.csproj +++ b/Source/Zencoder/Zencoder.csproj @@ -10,7 +10,7 @@ Properties Zencoder Zencoder - v4.6.1 + v4.0 512 From cd128678e8f18f5e965ded9a6471291dc8742437 Mon Sep 17 00:00:00 2001 From: Akash Kava <39438041+ackava@users.noreply.github.com> Date: Tue, 1 Jan 2019 23:20:59 +0530 Subject: [PATCH 5/6] fixed source path --- Source/Package.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Package.nuspec b/Source/Package.nuspec index 1938881..791f868 100644 --- a/Source/Package.nuspec +++ b/Source/Package.nuspec @@ -22,6 +22,6 @@ zencoder - + From 4c4fae6290cd3f5650b961d78bee3da441bec6a6 Mon Sep 17 00:00:00 2001 From: Terenzio Pisanelli Date: Thu, 28 Feb 2019 16:12:11 +0100 Subject: [PATCH 6/6] Fixes for JobId: int to long --- Source/Zencoder/JobDetailsRequest.cs | 2 +- Source/Zencoder/Zencoder.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Zencoder/JobDetailsRequest.cs b/Source/Zencoder/JobDetailsRequest.cs index b5a3a46..224b0d8 100644 --- a/Source/Zencoder/JobDetailsRequest.cs +++ b/Source/Zencoder/JobDetailsRequest.cs @@ -41,7 +41,7 @@ public JobDetailsRequest(string apiKey, Uri baseUrl) /// /// Gets or sets the ID of the job to get details for. /// - public int JobId { get; set; } + public long JobId { get; set; } /// /// Gets the concrete URL this request will call. diff --git a/Source/Zencoder/Zencoder.cs b/Source/Zencoder/Zencoder.cs index feacfbf..bd372a9 100644 --- a/Source/Zencoder/Zencoder.cs +++ b/Source/Zencoder/Zencoder.cs @@ -334,7 +334,7 @@ public void DeleteJob(int jobId, Action callback) /// /// The ID of the job to get details for. /// The call response. - public JobDetailsResponse JobDetails(int jobId) + public JobDetailsResponse JobDetails(long jobId) { JobDetailsRequest request = new JobDetailsRequest(this) {