From 552f176c0ff5d286568937eaaa20d4fba6eb3866 Mon Sep 17 00:00:00 2001 From: Seth Gransky Date: Wed, 28 Dec 2022 17:07:19 -0600 Subject: [PATCH 01/11] RCB-612: Upgrade Newtonsoft Json from 10.0.3 to 13.0.2 in the application only. --- rosette_api/packages.config | 8 ++++---- rosette_api/rosette_api.csproj | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) mode change 100755 => 100644 rosette_api/packages.config diff --git a/rosette_api/packages.config b/rosette_api/packages.config old mode 100755 new mode 100644 index 078edfaf..9892ead6 --- a/rosette_api/packages.config +++ b/rosette_api/packages.config @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/rosette_api/rosette_api.csproj b/rosette_api/rosette_api.csproj index 6e8bb5a2..6509ee57 100644 --- a/rosette_api/rosette_api.csproj +++ b/rosette_api/rosette_api.csproj @@ -41,9 +41,6 @@ - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - @@ -51,6 +48,9 @@ + + ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + From 9589d7b268720e09fe2741f43f54fbc2857f4761 Mon Sep 17 00:00:00 2001 From: Seth Gransky Date: Wed, 28 Dec 2022 17:15:57 -0600 Subject: [PATCH 02/11] RCB-612: Remove invalid tags so project works in latest VS. --- rosette_apiUnitTests/rosette_apiUnitTests.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/rosette_apiUnitTests/rosette_apiUnitTests.csproj b/rosette_apiUnitTests/rosette_apiUnitTests.csproj index d3c8bd7c..531778c2 100644 --- a/rosette_apiUnitTests/rosette_apiUnitTests.csproj +++ b/rosette_apiUnitTests/rosette_apiUnitTests.csproj @@ -11,8 +11,6 @@ rosette_apiUnitTests v4.5.2 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages False From d7934e0a888520f83989a9914f4735c34e115921 Mon Sep 17 00:00:00 2001 From: Seth Gransky Date: Wed, 28 Dec 2022 17:25:17 -0600 Subject: [PATCH 03/11] RCB-612: Align .net framework versions. Upgrade dependencies. All tests are passing. --- rosette_apiUnitTests/packages.config | 26 +++++++-------- .../rosette_apiUnitTests.csproj | 33 ++++++++++--------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/rosette_apiUnitTests/packages.config b/rosette_apiUnitTests/packages.config index 29b78320..efb64b12 100644 --- a/rosette_apiUnitTests/packages.config +++ b/rosette_apiUnitTests/packages.config @@ -1,14 +1,14 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/rosette_apiUnitTests/rosette_apiUnitTests.csproj b/rosette_apiUnitTests/rosette_apiUnitTests.csproj index 531778c2..fb615ee4 100644 --- a/rosette_apiUnitTests/rosette_apiUnitTests.csproj +++ b/rosette_apiUnitTests/rosette_apiUnitTests.csproj @@ -1,6 +1,8 @@  - + + + Debug AnyCPU @@ -9,7 +11,7 @@ Properties rosette_apiUnitTests rosette_apiUnitTests - v4.5.2 + v4.5 512 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages @@ -46,15 +48,6 @@ ..\packages\LinqToExcel.1.11.0\lib\LinqToExcel.dll - - ..\packages\log4net.2.0.8\lib\net45-full\log4net.dll - - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\NUnit.3.8.1\lib\net45\nunit.framework.dll - ..\packages\LinqToExcel.1.11.0\lib\Remotion.dll @@ -64,12 +57,8 @@ ..\packages\LinqToExcel.1.11.0\lib\Remotion.Interfaces.dll - - ..\packages\RichardSzalay.MockHttp.3.2.1\lib\net45\RichardSzalay.MockHttp.dll - - 3.5 @@ -81,6 +70,19 @@ + + ..\packages\log4net.2.0.15\lib\net45\log4net.dll + + + + ..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll + + + ..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll + + + ..\packages\RichardSzalay.MockHttp.6.0.0\lib\net45\RichardSzalay.MockHttp.dll + @@ -136,7 +138,6 @@ 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}. -