Merge pull request #2017 from casz/fix/newtonsoft.json-usage

remove usage of Newtonsoft.Json
GitTools · Jan 20, 2020 · d84c116 · d84c116
2 parents c855918 + ecc92e2
commit d84c116
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/src/GitVersionCore/BuildServers/AppVeyor.cs b/src/GitVersionCore/BuildServers/AppVeyor.cs
@@ -2,7 +2,6 @@
 using System.Net.Http;
 using GitVersion.OutputVariables;
 using GitVersion.Logging;
-using Newtonsoft.Json;
 using System.Text;
 
 namespace GitVersion.BuildServers
@@ -23,12 +22,9 @@ public override string GenerateSetVersionMessage(VersionVariables variables)
 
             using var httpClient = GetHttpClient();
 
-            var body = new
-            {
-                version = $"{variables.FullSemVer}.build.{buildNumber}",
-            };
+            var body = $"{{\"version\":\"{variables.FullSemVer}.build.{buildNumber}\"}}";
 
-            var stringContent = new StringContent(JsonConvert.SerializeObject(body), Encoding.UTF8, "application/json");
+            var stringContent = new StringContent(body, Encoding.UTF8, "application/json");
             var response = httpClient.PutAsync("api/build", stringContent).GetAwaiter().GetResult();
             response.EnsureSuccessStatusCode();
 
@@ -39,13 +35,9 @@ public override string[] GenerateSetParameterMessage(string name, string value)
         {
             var httpClient = GetHttpClient();
 
-            var body = new
-            {
-                name = $"GitVersion_{name}",
-                value = $"{value}"
-            };
+            var body = $"{{\"name\": \"GitVersion_{name}\",\"value\": \"{value}\"}}";
 
-            var stringContent = new StringContent(JsonConvert.SerializeObject(body), Encoding.UTF8, "application/json");
+            var stringContent = new StringContent(body, Encoding.UTF8, "application/json");
             var response = httpClient.PostAsync("api/build/variables", stringContent).GetAwaiter().GetResult();
             response.EnsureSuccessStatusCode();
 

diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
@@ -25,7 +25,6 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="Newtonsoft.Json" Version="$(PackageVersion_NewtonsoftJson)" />
         <PackageReference Include="System.Net.Requests" Version="4.3.0" />
     </ItemGroup>
 

diff --git a/src/GitVersionTask/nuget-files.props b/src/GitVersionTask/nuget-files.props
@@ -17,7 +17,6 @@
 
         <None Include="$(CorePublish)/GitVersion*"                   Pack="true" PackagePath="$(CoreTarget)" />
         <None Include="$(CorePublish)/LibGit2Sharp.dll"              Pack="true" PackagePath="$(CoreTarget)" />
-        <None Include="$(CorePublish)/Newtonsoft.Json.dll"           Pack="true" PackagePath="$(CoreTarget)" />
         <None Include="$(CorePublish)/YamlDotNet.dll"                Pack="true" PackagePath="$(CoreTarget)" />
         <None Include="$(CorePublish)/Microsoft.Extensions*"         Pack="true" PackagePath="$(CoreTarget)" />