framework and SDK update (#534)

mozts2005 · web-flow · commit 9ffe069f176c · 2021-10-09T01:40:42.000-06:00
* framework and SDK update fixes #527 * Updated to GitVersion.MsBuild * NUnit.Analyzers added debug condition
diff --git a/.gitignore b/.gitignore
@@ -213,3 +213,5 @@ FakesAssemblies/
 /docs/Gemfile.lock
 /ci/SignClient.exe
 /ci/.store/
+/dbgmd-00002.unknown
+/dbgmd-00001.sign
diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml
@@ -1,4 +1,4 @@
-next-version: 3.10.5
+next-version: 3.12.0
 assembly-versioning-scheme: MajorMinorPatch
 mode: ContinuousDeployment
 tag-prefix: '[vV]'
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -42,7 +42,7 @@ jobs:
     displayName: 'Use .NET Core sdk'
     inputs:
       packageType: sdk
-      version: 3.0.103
+      version: 3.1.413
       installationPath: $(Agent.ToolsDirectory)/dotnet
 
   - task: DotNetCoreCLI@2
diff --git a/src/ZendeskApi_v2.Example/ZendeskApi_v2.Example.csproj b/src/ZendeskApi_v2.Example/ZendeskApi_v2.Example.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
diff --git a/src/ZendeskApi_v2/Models/Organizations/Organization.cs b/src/ZendeskApi_v2/Models/Organizations/Organization.cs
@@ -13,22 +13,22 @@ namespace ZendeskApi_v2.Models.Organizations
     public class Organization : IndividualSearchableResponseBase
     {
         [JsonProperty("external_id")]
-        public object ExternalId { get; set; }
+        public string ExternalId { get; set; }
 
         [JsonProperty("name")]
         public string Name { get; set; }
 
         [JsonProperty("domain_names")]
-        public IList<object> DomainNames { get; set; }
+        public IList<string> DomainNames { get; set; }
 
         [JsonProperty("details")]
-        public object Details { get; set; }
+        public string Details { get; set; }
 
         [JsonProperty("notes")]
-        public object Notes { get; set; }
+        public string Notes { get; set; }
 
         [JsonProperty("group_id")]
-        public object GroupId { get; set; }
+        public long? GroupId { get; set; }
 
         [JsonProperty("shared_tickets")]
         public bool SharedTickets { get; set; }
diff --git a/src/ZendeskApi_v2/Models/Requests/Request.cs b/src/ZendeskApi_v2/Models/Requests/Request.cs
@@ -5,25 +5,28 @@
 using Newtonsoft.Json.Converters;
 using System;
 using System.Collections.Generic;
+using System.Runtime.Serialization;
 using ZendeskApi_v2.Models.Shared;
 using ZendeskApi_v2.Models.Tickets;
 
 namespace ZendeskApi_v2.Models.Requests
 {
-
     public enum RequestType
     {
-        none,
-        question,
-        incident,
-        problem,
-        task
+        [EnumMember(Value = "none")]
+        None,
+        [EnumMember(Value = "question")]
+        Question,
+        [EnumMember(Value = "incident")]
+        Incident,
+        [EnumMember(Value = "problem")]
+        Problem,
+        [EnumMember(Value = "task")]
+        Task
     }
 
-
     public class Request
     {
-
         [JsonProperty("url")]
         public string Url { get; set; }
 
@@ -101,7 +104,7 @@ public class Request
         public long TicketFormId { get; set; }
 
         [JsonProperty("recipient")]
-        public string recipient { get; set; }
+        public string Recipient { get; set; }
 
         [JsonProperty("followup_source_id")]
         public string FollowupSourceId { get; set; }
diff --git a/src/ZendeskApi_v2/Models/Shared/Data.cs b/src/ZendeskApi_v2/Models/Shared/Data.cs
@@ -8,49 +8,46 @@ namespace ZendeskApi_v2.Models.Shared
     public class Data
     {
         [JsonProperty("from")]
-        public string from { get; set; }
+        public string From { get; set; }
 
         [JsonProperty("to")]
-        public string to { get; set; }
+        public string To { get; set; }
 
         [JsonProperty("recording_url")]
-        public string recording_url { get; set; }
+        public string RecordingUrl { get; set; }
 
         [JsonProperty("call_id")]
-        public long call_id { get; set; }
+        public long CallId { get; set; }
 
         [JsonProperty("call_duration")]
-        public long call_duration { get; set; }
+        public long CallDuration { get; set; }
 
         [JsonProperty("answered_by_id")]
-        public long? answered_by_id { get; set; }
+        public long? AnsweredById { get; set; }
 
         [JsonProperty("started_at")]
         [JsonConverter(typeof(IsoDateTimeConverter))]
-        public DateTimeOffset? started_at { get; set; }
-
-        [JsonProperty("")]
-        public string MyProperty { get; set; }
+        public DateTimeOffset? StartedAt { get; set; }
 
         [JsonProperty("location")]
-        public string location { get; set; }
+        public string Location { get; set; }
 
         [JsonProperty("author_id")]
-        public long? author_id { get; set; }
+        public long? AuthorId { get; set; }
 
         [JsonProperty("public")]
         public bool? Public { get; set; }
 
         [JsonProperty("brand_id")]
-        public long brand_id { get; set; }
+        public long BrandId { get; set; }
 
         [JsonProperty("via_id")]
-        public long via_id { get; set; }
+        public long ViaId { get; set; }
 
         [JsonProperty("answered_by_name")]
-        public string answered_by_name { get; set; }
+        public string AnsweredByName { get; set; }
 
         [JsonProperty("transcription_status")]
-        public string transcription_status { get; set; }
+        public string TranscriptionStatus { get; set; }
     }
 }
diff --git a/src/ZendeskApi_v2/Requests/Attachments.cs b/src/ZendeskApi_v2/Requests/Attachments.cs
@@ -104,7 +104,7 @@ Upload UploadAttachment(ZenFile file, string token, int? timeout = null)
 
         public bool DeleteUpload(Upload upload)
         {
-            return (upload?.Token == null ? false : GenericDelete($"/uploads/{upload.Token}.json"));
+            return (upload?.Token) != null && GenericDelete($"/uploads/{upload.Token}.json");
         }
 
         public IndividualAttachmentResponse RedactCommentAttachment(long attachmentId, long ticketId, long commentId)
@@ -167,7 +167,7 @@ public async Task<Upload> UploadAttachmentAsync(ZenFile file, string token = "",
 
         public async Task<bool> DeleteUploadAsync(Upload upload)
         {
-            return (upload?.Token == null ? false : await GenericDeleteAsync($"/uploads/{upload.Token}.json"));
+            return (upload?.Token) != null && await GenericDeleteAsync($"/uploads/{upload.Token}.json");
         }
 
         public async Task<ZenFile> DownloadAttachmentAsync(Attachment attachment)
diff --git a/src/ZendeskApi_v2/Serialization/TargetJsonConverter.cs b/src/ZendeskApi_v2/Serialization/TargetJsonConverter.cs
@@ -9,35 +9,22 @@ public class TargetJsonConverter : BaseJsonConverter<BaseTarget>
         protected override BaseTarget Create(Type objectType, JObject jsonObject)
         {
             var typeName = jsonObject["type"].ToString();
-            switch (typeName)
+            return typeName switch
             {
-                case "basecamp_target":
-                    return new BasecampTarget();
-                case "campfire_target":
-                    return new CampfireTarget();
-                case "clickatell_target":
-                    return new ClickatellTarget();
-                case "email_target":
-                    return new EmailTarget();
-                case "flowdock_target":
-                    return new FlowdockTarget();
-                case "get_satisfaction_target":
-                    return new GetSatisfactionTarget();
-                case "jira_target":
-                    return new JiraTarget();
-                case "pivotal_target":
-                    return new PivotalTarget();
-                case "twitter_target":
-                    return new TwitterTarget();
-                case "url_target":
-                    return new URLTarget();
-                case "http_target":
-                    return new HTTPTarget();
-                case "url_target_v2":
-                    return new HTTPTarget();
-                default:
-                    return null;
-            }
+                "basecamp_target" => new BasecampTarget(),
+                "campfire_target" => new CampfireTarget(),
+                "clickatell_target" => new ClickatellTarget(),
+                "email_target" => new EmailTarget(),
+                "flowdock_target" => new FlowdockTarget(),
+                "get_satisfaction_target" => new GetSatisfactionTarget(),
+                "jira_target" => new JiraTarget(),
+                "pivotal_target" => new PivotalTarget(),
+                "twitter_target" => new TwitterTarget(),
+                "url_target" => new URLTarget(),
+                "http_target" => new HTTPTarget(),
+                "url_target_v2" => new HTTPTarget(),
+                _ => null,
+            };
         }
     }
 }
diff --git a/src/ZendeskApi_v2/ZendeskApi_v2.csproj b/src/ZendeskApi_v2/ZendeskApi_v2.csproj
@@ -28,28 +28,33 @@
 
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net462</TargetFrameworks> <!---->
     <NoWarn>1701;1702;NU5105;NU1605;NU1701;$(NoWarn)</NoWarn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='net452'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='net462'">
     <DefineConstants>$(DefineConstants);ASYNC;SYNC</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
     <DefineConstants>$(DefineConstants);ASYNC;SYNC</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersionTask" Version="5.0.1">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+
+    <!--<PackageReference Include="GitVersionTask" Version="5.0.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>-->
     <!--<PackageReference Include="Nerdbank.GitVersioning" Version="3.0.4-beta" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers" />-->
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Net.Http" />
   </ItemGroup>
 
diff --git a/src/global.json b/src/global.json
@@ -1,5 +1,5 @@
 {
-    "sdk": {
-      "version": "3.0.103"
-    }
-  }
+  "sdk": {
+    "version": "3.1.413"
+  }
+}
diff --git a/tests/ZendeskApi_v2.Tests/GlobalSuppressions.cs b/tests/ZendeskApi_v2.Tests/GlobalSuppressions.cs
diff --git a/tests/ZendeskApi_v2.Tests/OrganizationTests.cs b/tests/ZendeskApi_v2.Tests/OrganizationTests.cs
@@ -111,7 +111,7 @@ public void CanGetMultipleOrganizationsByExternalId()
             Assert.That(org.Organization.Id, Is.GreaterThan(0));
             Assert.That(org2.Organization.Id, Is.GreaterThan(0));
 
-            var orgs = Api.Organizations.GetMultipleOrganizationsByExternalIds(new[] { org.Organization.ExternalId.ToString(), org2.Organization.ExternalId.ToString() });
+            var orgs = Api.Organizations.GetMultipleOrganizationsByExternalIds(new[] { org.Organization.ExternalId, org2.Organization.ExternalId });
 
             Assert.That(orgs.Organizations.Count, Is.EqualTo(2));
         }
diff --git a/tests/ZendeskApi_v2.Tests/RequestTests.cs b/tests/ZendeskApi_v2.Tests/RequestTests.cs
@@ -153,13 +153,12 @@ public void CanGetAllSolvedRequestsSorted()
         }
 
         [Test]
-        // [Ignore("")]
         public void CanCreateAndUpdateRequests()
         {
             var req = new Request
             {
                 Subject = "end user request test",
-                Type = RequestType.incident,
+                Type = RequestType.Incident,
                 Comment = new Comment
                 { Body = "end user test", HtmlBody = "end user test with </br> new line", Public = true },
                 Requester = new Requester
@@ -176,7 +175,7 @@ public void CanCreateAndUpdateRequests()
                 Assert.That(res, Is.Not.Null);
                 Assert.That(res.Request, Is.Not.Null);
                 Assert.That(res.Request.Id.HasValue, Is.True);
-                Assert.That(res.Request.Type, Is.EqualTo(RequestType.incident));
+                Assert.That(res.Request.Type, Is.EqualTo(RequestType.Incident));
                 Assert.That(res.Request.Id.Value, Is.GreaterThan(0));
 
                 IndividualUserResponse user = Api.Users.GetUser(res.Request.RequesterId.Value);
@@ -226,7 +225,7 @@ public void CanCreateRequestWithEmailCCs()
             var req = new Request
             {
                 Subject = "end user request test",
-                Type = RequestType.incident,
+                Type = RequestType.Incident,
                 Comment = new Comment
                 { Body = "end user test", HtmlBody = "end user test with </br> new line", Public = true },
                 Requester = new Requester
@@ -245,6 +244,7 @@ public void CanCreateRequestWithEmailCCs()
                 Assert.That(res.Request, Is.Not.Null);
                 Assert.That(res.Request.Id.HasValue, Is.True);
                 Assert.That(res.Request.Id.Value, Is.GreaterThan(0));
+                Assert.That(res.Request.Type, Is.EqualTo(RequestType.Incident));
 
                 IndividualUserResponse user = Api.Users.GetUser(res.Request.RequesterId.Value);
                 Assert.That(user.User.Name, Is.EqualTo("Test Name"));
diff --git a/tests/ZendeskApi_v2.Tests/ZendeskApi_v2.Tests.csproj b/tests/ZendeskApi_v2.Tests/ZendeskApi_v2.Tests.csproj
@@ -1,10 +1,11 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
     <UserSecretsId>411e2606-2274-427d-ad1e-89c0d4bc9f5a</UserSecretsId>
+	<NoWarn>IDE0150;IDE0090</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -13,16 +14,16 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="NUnit" Version="3.13.2" />
-    <!--<PackageReference Include="NUnit.Analyzers" Version="3.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>-->
     <PackageReference Include="NUnit3TestAdapter" Version="4.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
+	<ItemGroup Condition="'$(Configuration)' == 'Debug'">
+		<PackageReference Include="NUnit.Analyzers" Version="3.2.0" PrivateAssets="all" />
+	</ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\src\ZendeskApi_v2\ZendeskApi_v2.csproj" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-next-version: 3.10.5`
	`1`	`+next-version: 3.12.0`
`2`	`2`	`assembly-versioning-scheme: MajorMinorPatch`
`3`	`3`	`mode: ContinuousDeployment`
`4`	`4`	`tag-prefix: '[vV]'`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ Upload UploadAttachment(ZenFile file, string token, int? timeout = null)`
`104`	`104`
`105`	`105`	`public bool DeleteUpload(Upload upload)`
`106`	`106`	`{`
`107`		`- return (upload?.Token == null ? false : GenericDelete($"/uploads/{upload.Token}.json"));`
	`107`	`+ return (upload?.Token) != null && GenericDelete($"/uploads/{upload.Token}.json");`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`public IndividualAttachmentResponse RedactCommentAttachment(long attachmentId, long ticketId, long commentId)`
`@@ -167,7 +167,7 @@ public async Task<Upload> UploadAttachmentAsync(ZenFile file, string token = "",`
`167`	`167`
`168`	`168`	`public async Task<bool> DeleteUploadAsync(Upload upload)`
`169`	`169`	`{`
`170`		`- return (upload?.Token == null ? false : await GenericDeleteAsync($"/uploads/{upload.Token}.json"));`
	`170`	`+ return (upload?.Token) != null && await GenericDeleteAsync($"/uploads/{upload.Token}.json");`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`public async Task<ZenFile> DownloadAttachmentAsync(Attachment attachment)`