From 898b6b451ceed7470a2a2efcc09a5aa419ca49b5 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Sun, 24 Nov 2019 12:02:07 +0100 Subject: [PATCH 1/8] fix: Newtonsoft.Json, Version=12.0.3 --- .../Fossology.Rest.dotnet.Model.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj b/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj index 9e4126c..cc6d2fc 100644 --- a/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj +++ b/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj @@ -32,7 +32,7 @@ bin\Release\Fossology.Rest.Dotnet.Model.xml - + C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -60,4 +60,4 @@ - \ No newline at end of file + From 07fbf0bd767985d64cefa4394656360f371dfcb0 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Sun, 24 Nov 2019 12:02:56 +0100 Subject: [PATCH 2/8] fix: Newtonsoft.Json, Version=12.0.3 --- Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj b/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj index fc23253..df85395 100644 --- a/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj +++ b/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj @@ -32,7 +32,7 @@ bin\Release\Fossology.Rest.Dotnet.xml - + C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -68,4 +68,4 @@ - \ No newline at end of file + From 5ca3c53e102128b08155e474afb1cc290343e2fa Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Fri, 1 May 2020 12:53:25 +0200 Subject: [PATCH 3/8] fix: no platform for appveyor --- appveyor.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 92c5113..af5c853 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,9 +2,6 @@ version: 1.0.{build} image: Visual Studio 2019 install: - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -platform: - - Win32 - - x64 configuration: - Debug - Release From 14ff817521b89eeefae3fa5b38240337b012bf48 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Fri, 1 May 2020 13:04:40 +0200 Subject: [PATCH 4/8] feat: update Newtonsoft.Json reference --- .../Fossology.Rest.dotnet.Model.csproj | 4 ++-- Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj b/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj index cc6d2fc..9e4126c 100644 --- a/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj +++ b/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj @@ -32,7 +32,7 @@ bin\Release\Fossology.Rest.Dotnet.Model.xml - + C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -60,4 +60,4 @@ - + \ No newline at end of file diff --git a/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj b/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj index d07bcfc..4b395c6 100644 --- a/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj +++ b/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj @@ -32,7 +32,7 @@ bin\Release\Fossology.Rest.Dotnet.xml - + C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll @@ -68,4 +68,4 @@ - + \ No newline at end of file From 23638acb0f47441e4a84791b054dd00f4a4d19a3 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Fri, 1 May 2020 13:10:53 +0200 Subject: [PATCH 5/8] fux: remove HintPaths --- .../Fossology.Rest.dotnet.Model.csproj | 1 - Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj | 4 ---- Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj | 3 --- 3 files changed, 8 deletions(-) diff --git a/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj b/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj index 9e4126c..560517c 100644 --- a/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj +++ b/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj @@ -33,7 +33,6 @@ - C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj b/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj index e98a606..e622a24 100644 --- a/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj +++ b/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj @@ -40,18 +40,14 @@ - C:\home\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll - C:\home\packages\MSTest.TestFramework.2.1.1\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll - C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll - C:\home\packages\Tethys.Logging.Console.1.4.2\lib\netstandard2.0\Tethys.Logging.Console.dll diff --git a/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj b/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj index 4b395c6..4cb06da 100644 --- a/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj +++ b/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj @@ -33,10 +33,8 @@ - C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll - C:\home\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll @@ -48,7 +46,6 @@ - C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll From c4717e6e954729e06e7701837c92d4125237c415 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Fri, 1 May 2020 14:08:32 +0200 Subject: [PATCH 6/8] feat: switch to PackageReferences --- .../Fossology.Rest.dotnet.Model.csproj | 12 ++----- Fossology.Rest.Dotnet.Model/packages.config | 4 --- .../Fossology.Rest.Dotnet.Test.csproj | 31 +++++++------------ Fossology.Rest.Dotnet.Test/packages.config | 7 ----- .../Fossology.Rest.Dotnet.csproj | 9 ++---- FossyApiDemo/FossyApiDemo.csproj | 19 +++--------- FossyApiDemo/packages.config | 5 --- 7 files changed, 22 insertions(+), 65 deletions(-) delete mode 100644 Fossology.Rest.Dotnet.Model/packages.config delete mode 100644 Fossology.Rest.Dotnet.Test/packages.config delete mode 100644 FossyApiDemo/packages.config diff --git a/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj b/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj index 560517c..2db4845 100644 --- a/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj +++ b/Fossology.Rest.Dotnet.Model/Fossology.Rest.dotnet.Model.csproj @@ -32,17 +32,9 @@ bin\Release\Fossology.Rest.Dotnet.Model.xml - - - - - - - - @@ -56,7 +48,9 @@ - + + 12.0.3 + \ No newline at end of file diff --git a/Fossology.Rest.Dotnet.Model/packages.config b/Fossology.Rest.Dotnet.Model/packages.config deleted file mode 100644 index a9de8b5..0000000 --- a/Fossology.Rest.Dotnet.Model/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj b/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj index e622a24..ac0825a 100644 --- a/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj +++ b/Fossology.Rest.Dotnet.Test/Fossology.Rest.Dotnet.Test.csproj @@ -1,6 +1,5 @@  - Debug @@ -39,24 +38,13 @@ 4 - - - - - - - - - - - {510a1d9e-c531-4a0e-a516-6aa0125e4f9b} @@ -67,14 +55,17 @@ Fossology.Rest.Dotnet.Model + + + 2.1.1 + + + 2.1.1 + + + 1.4.2 + + - - - 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}. - - - - - \ No newline at end of file diff --git a/Fossology.Rest.Dotnet.Test/packages.config b/Fossology.Rest.Dotnet.Test/packages.config deleted file mode 100644 index a64da3a..0000000 --- a/Fossology.Rest.Dotnet.Test/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj b/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj index 4cb06da..efe4e36 100644 --- a/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj +++ b/Fossology.Rest.Dotnet/Fossology.Rest.Dotnet.csproj @@ -33,19 +33,16 @@ + C:\home\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll + C:\home\packages\RestSharp.106.10.1\lib\net452\RestSharp.dll - - - - - - + C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll diff --git a/FossyApiDemo/FossyApiDemo.csproj b/FossyApiDemo/FossyApiDemo.csproj index ffa639c..828ee1b 100644 --- a/FossyApiDemo/FossyApiDemo.csproj +++ b/FossyApiDemo/FossyApiDemo.csproj @@ -36,21 +36,8 @@ - - - - - - - - - C:\home\packages\Tethys.Logging.1.4.2\lib\netstandard2.0\Tethys.Logging.dll - - - C:\home\packages\Tethys.Logging.Controls.1.4.2\lib\net461\Tethys.Logging.Controls.dll - @@ -74,7 +61,6 @@ Resources.resx True - SettingsSingleFileGenerator Settings.Designer.cs @@ -102,6 +88,11 @@ Fossology.Rest.Dotnet + + + 1.4.2 + +