From d8314a2db4eab414ef70c1c48804d792b3498f36 Mon Sep 17 00:00:00 2001
From: Jonathan Warrington <jonw@ggbetawerks.com>
Date: Fri, 28 Aug 2020 09:24:47 -0600
Subject: [PATCH] Updating Newtonsoft.Json, and Refit and created a
 dotnetstandard20 library

---
 .gitignore                                    |  3 +++
 PlanGrid.Api.Net45/PlanGrid.Api.Net45.csproj  | 20 +++++++++----------
 PlanGrid.Api.Net45/packages.config            |  4 ++--
 .../PlanGrid.Api.NetStandard20.csproj         | 15 ++++++++++++++
 PlanGrid.Api.Tests/App.config                 | 10 +++++++++-
 PlanGrid.Api.Tests/PlanGrid.Api.Tests.csproj  |  5 ++---
 PlanGrid.Api.Tests/packages.config            |  2 +-
 PlanGrid.Api.sln                              | 16 ++++++++++++---
 PlanGrid.Api.sln.DotSettings                  |  3 +++
 9 files changed, 58 insertions(+), 20 deletions(-)
 create mode 100644 PlanGrid.Api.NetStandard20/PlanGrid.Api.NetStandard20.csproj

diff --git a/.gitignore b/.gitignore
index 961ae9d..5a34ba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@ PlanGrid.Api.Tests/bin/
 PlanGrid.Api.Net45/obj/
 *.user
 PlanGrid.Api.Net45/bin/
+
+/PlanGrid.Api.NetStandard20/bin/
+/PlanGrid.Api.NetStandard20/obj/
diff --git a/PlanGrid.Api.Net45/PlanGrid.Api.Net45.csproj b/PlanGrid.Api.Net45/PlanGrid.Api.Net45.csproj
index 91f7ae6..0fb54f8 100644
--- a/PlanGrid.Api.Net45/PlanGrid.Api.Net45.csproj
+++ b/PlanGrid.Api.Net45/PlanGrid.Api.Net45.csproj
@@ -32,18 +32,19 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Refit, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\refit.2.4.1\lib\Net45\Refit.dll</HintPath>
+    <Reference Include="Refit, Version=4.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Refit.4.4.17\lib\net45\Refit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -59,17 +60,16 @@
   </ItemGroup>
   <Import Project="..\PlanGrid.Api\PlanGrid.Api.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\refit.2.4.1\build\portable-net45+netcore45+wp8+wpa81+monoandroid+xamarin.ios10\refit.targets" Condition="Exists('..\packages\refit.2.4.1\build\portable-net45+netcore45+wp8+wpa81+monoandroid+xamarin.ios10\refit.targets')" />
+  <Target Name="ValidateCopyright" AfterTargets="Compile">
+    <Exec Command="PowerShell.exe -NoProfile -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;&amp; '$(SolutionDir)build\CopyrightCheck.ps1'&quot; '$(ProjectDir)'" />
+  </Target>
+  <Import Project="..\packages\Refit.4.4.17\build\net45\refit.targets" Condition="Exists('..\packages\Refit.4.4.17\build\net45\refit.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\refit.2.4.1\build\portable-net45+netcore45+wp8+wpa81+monoandroid+xamarin.ios10\refit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\refit.2.4.1\build\portable-net45+netcore45+wp8+wpa81+monoandroid+xamarin.ios10\refit.targets'))" />
-  </Target>
-  <Target Name="ValidateCopyright" AfterTargets="Compile">
-    <Exec Command="PowerShell.exe -NoProfile -NonInteractive -ExecutionPolicy Unrestricted -Command &quot;&amp; '$(SolutionDir)build\CopyrightCheck.ps1'&quot; '$(ProjectDir)'" />
+    <Error Condition="!Exists('..\packages\Refit.4.4.17\build\net45\refit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Refit.4.4.17\build\net45\refit.targets'))" />
   </Target>
-  
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/PlanGrid.Api.Net45/packages.config b/PlanGrid.Api.Net45/packages.config
index fa78a26..97da196 100644
--- a/PlanGrid.Api.Net45/packages.config
+++ b/PlanGrid.Api.Net45/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
   <package id="NugetUtilities" version="1.0.16" targetFramework="net45" />
-  <package id="refit" version="2.4.1" targetFramework="net45" />
+  <package id="Refit" version="4.4.17" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/PlanGrid.Api.NetStandard20/PlanGrid.Api.NetStandard20.csproj b/PlanGrid.Api.NetStandard20/PlanGrid.Api.NetStandard20.csproj
new file mode 100644
index 0000000..af329e0
--- /dev/null
+++ b/PlanGrid.Api.NetStandard20/PlanGrid.Api.NetStandard20.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <Import Project="..\PlanGrid.Api\PlanGrid.Api.projitems" Label="Shared" />
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="refit" Version="4.4.17" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/PlanGrid.Api.Tests/App.config b/PlanGrid.Api.Tests/App.config
index 639b40f..2486922 100644
--- a/PlanGrid.Api.Tests/App.config
+++ b/PlanGrid.Api.Tests/App.config
@@ -1,5 +1,13 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <appSettings>
     </appSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/PlanGrid.Api.Tests/PlanGrid.Api.Tests.csproj b/PlanGrid.Api.Tests/PlanGrid.Api.Tests.csproj
index 11283a0..ed55771 100644
--- a/PlanGrid.Api.Tests/PlanGrid.Api.Tests.csproj
+++ b/PlanGrid.Api.Tests/PlanGrid.Api.Tests.csproj
@@ -32,9 +32,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
diff --git a/PlanGrid.Api.Tests/packages.config b/PlanGrid.Api.Tests/packages.config
index 1ed0b5c..f34ced7 100644
--- a/PlanGrid.Api.Tests/packages.config
+++ b/PlanGrid.Api.Tests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/PlanGrid.Api.sln b/PlanGrid.Api.sln
index 076bc26..128b654 100644
--- a/PlanGrid.Api.sln
+++ b/PlanGrid.Api.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlanGrid.Api.Tests", "PlanGrid.Api.Tests\PlanGrid.Api.Tests.csproj", "{A650AA19-DE09-4D8D-965A-7195D41FAE96}"
 EndProject
@@ -9,10 +9,13 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "PlanGrid.Api", "PlanGrid.Ap
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlanGrid.Api.Net45", "PlanGrid.Api.Net45\PlanGrid.Api.Net45.csproj", "{92301982-65EB-42E2-85F4-6691552292F0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlanGrid.Api.NetStandard20", "PlanGrid.Api.NetStandard20\PlanGrid.Api.NetStandard20.csproj", "{E9757663-65CA-45F1-A897-6FB854BA7E91}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		PlanGrid.Api\PlanGrid.Api.projitems*{92301982-65eb-42e2-85f4-6691552292f0}*SharedItemsImports = 4
 		PlanGrid.Api\PlanGrid.Api.projitems*{42b50126-061c-41dc-8544-b1698a30891e}*SharedItemsImports = 13
+		PlanGrid.Api\PlanGrid.Api.projitems*{92301982-65eb-42e2-85f4-6691552292f0}*SharedItemsImports = 4
+		PlanGrid.Api\PlanGrid.Api.projitems*{e9757663-65ca-45f1-a897-6fb854ba7e91}*SharedItemsImports = 5
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -27,8 +30,15 @@ Global
 		{92301982-65EB-42E2-85F4-6691552292F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{92301982-65EB-42E2-85F4-6691552292F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{92301982-65EB-42E2-85F4-6691552292F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9757663-65CA-45F1-A897-6FB854BA7E91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9757663-65CA-45F1-A897-6FB854BA7E91}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9757663-65CA-45F1-A897-6FB854BA7E91}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9757663-65CA-45F1-A897-6FB854BA7E91}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D366217B-0B66-429E-8FA6-41468270D16B}
+	EndGlobalSection
 EndGlobal
diff --git a/PlanGrid.Api.sln.DotSettings b/PlanGrid.Api.sln.DotSettings
index 405a605..3fd5280 100644
--- a/PlanGrid.Api.sln.DotSettings
+++ b/PlanGrid.Api.sln.DotSettings
@@ -105,6 +105,9 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:Boolean x:Key="/Default/Environment/SearchAndNavigation/EnableGotoEverything/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file