From cb63b124f38ad085fa8913481291ae1f2b200e2f Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sat, 23 Jan 2016 02:30:15 -0600 Subject: [PATCH 1/5] Update NewtonSoft.json the latest version --- SteamBot/packages.config | 2 +- SteamTrade/packages.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SteamBot/packages.config b/SteamBot/packages.config index 37191d6e6..9e920e6f6 100644 --- a/SteamBot/packages.config +++ b/SteamBot/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/SteamTrade/packages.config b/SteamTrade/packages.config index 37191d6e6..c489bbf3e 100644 --- a/SteamTrade/packages.config +++ b/SteamTrade/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file From 423235e406c7106fbc35d44f89f4d840f3da5456 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sat, 23 Jan 2016 02:32:50 -0600 Subject: [PATCH 2/5] Remove Submodule and use NuGet version of SteamAuth instead --- .gitmodules | 3 --- SteamAuth | 1 - SteamBot.sln | 10 ++-------- SteamBot/ExampleBot.csproj | 10 +++------- SteamTrade/SteamTrade.csproj | 11 ++++++++--- SteamTrade/packages.config | 1 + 6 files changed, 14 insertions(+), 22 deletions(-) delete mode 100644 .gitmodules delete mode 160000 SteamAuth diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 2f894ece8..000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "SteamAuth"] - path = SteamAuth - url = https://github.com/geel9/SteamAuth diff --git a/SteamAuth b/SteamAuth deleted file mode 160000 index c4745e365..000000000 --- a/SteamAuth +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4745e365b91205d3b86f3b69e0981da31ee9c44 diff --git a/SteamBot.sln b/SteamBot.sln index b0134db4a..4a0ab481e 100644 --- a/SteamBot.sln +++ b/SteamBot.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.30501.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleBot", "SteamBot\ExampleBot.csproj", "{E81DED36-EDF5-41A5-8666-A3A0C581762F}" EndProject @@ -14,8 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C8129C .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamAuth", "SteamAuth\SteamAuth\SteamAuth.csproj", "{5AD0934E-F6C4-4AE5-83AF-C788313B2A87}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -30,10 +28,6 @@ Global {6CEC0333-81EB-40EE-85D1-941363626FC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {6CEC0333-81EB-40EE-85D1-941363626FC7}.Release|Any CPU.ActiveCfg = Release|Any CPU {6CEC0333-81EB-40EE-85D1-941363626FC7}.Release|Any CPU.Build.0 = Release|Any CPU - {5AD0934E-F6C4-4AE5-83AF-C788313B2A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5AD0934E-F6C4-4AE5-83AF-C788313B2A87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5AD0934E-F6C4-4AE5-83AF-C788313B2A87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5AD0934E-F6C4-4AE5-83AF-C788313B2A87}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SteamBot/ExampleBot.csproj b/SteamBot/ExampleBot.csproj index 4d10ef680..917869f80 100644 --- a/SteamBot/ExampleBot.csproj +++ b/SteamBot/ExampleBot.csproj @@ -38,9 +38,9 @@ true - - False - ..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll + True False @@ -92,10 +92,6 @@ - - {5ad0934e-f6c4-4ae5-83af-c788313b2a87} - SteamAuth - {6CEC0333-81EB-40EE-85D1-941363626FC7} SteamTrade diff --git a/SteamTrade/SteamTrade.csproj b/SteamTrade/SteamTrade.csproj index 1ad4d7f44..76b1a606a 100644 --- a/SteamTrade/SteamTrade.csproj +++ b/SteamTrade/SteamTrade.csproj @@ -36,12 +36,17 @@ false - - ..\packages\Newtonsoft.Json.6.0.7\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll + True ..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll + + ..\packages\SteamAuth.1.0.0\lib\net45\SteamAuth.dll + True + ..\packages\SteamKit2.1.6.2\lib\net40\SteamKit2.dll @@ -74,4 +79,4 @@ - + \ No newline at end of file diff --git a/SteamTrade/packages.config b/SteamTrade/packages.config index c489bbf3e..04dea9325 100644 --- a/SteamTrade/packages.config +++ b/SteamTrade/packages.config @@ -2,5 +2,6 @@ + \ No newline at end of file From 034b11c56c6f176ccbcbfb0cd469fd4f9400216c Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Sat, 23 Jan 2016 18:54:26 -0600 Subject: [PATCH 3/5] Whoops, include SteamAuth in ExampleBot project as well --- SteamBot/ExampleBot.csproj | 4 ++++ SteamBot/packages.config | 1 + 2 files changed, 5 insertions(+) diff --git a/SteamBot/ExampleBot.csproj b/SteamBot/ExampleBot.csproj index 917869f80..12311f172 100644 --- a/SteamBot/ExampleBot.csproj +++ b/SteamBot/ExampleBot.csproj @@ -46,6 +46,10 @@ False ..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll + + ..\packages\SteamAuth.1.0.0\lib\net45\SteamAuth.dll + True + False ..\packages\SteamKit2.1.6.2\lib\net40\SteamKit2.dll diff --git a/SteamBot/packages.config b/SteamBot/packages.config index 9e920e6f6..661998a04 100644 --- a/SteamBot/packages.config +++ b/SteamBot/packages.config @@ -2,5 +2,6 @@ + \ No newline at end of file From 482084f587b5f269d5582b2526583ef3c01fcd11 Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Tue, 26 Jan 2016 18:15:10 -0600 Subject: [PATCH 4/5] Update SteamAuth to latest version --- SteamBot/ExampleBot.csproj | 4 ++-- SteamBot/packages.config | 2 +- SteamTrade/SteamTrade.csproj | 4 ++-- SteamTrade/packages.config | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SteamBot/ExampleBot.csproj b/SteamBot/ExampleBot.csproj index 12311f172..c920af64a 100644 --- a/SteamBot/ExampleBot.csproj +++ b/SteamBot/ExampleBot.csproj @@ -46,8 +46,8 @@ False ..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll - - ..\packages\SteamAuth.1.0.0\lib\net45\SteamAuth.dll + + ..\packages\SteamAuth.1.0.1\lib\net45\SteamAuth.dll True diff --git a/SteamBot/packages.config b/SteamBot/packages.config index 661998a04..cb85b60b4 100644 --- a/SteamBot/packages.config +++ b/SteamBot/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/SteamTrade/SteamTrade.csproj b/SteamTrade/SteamTrade.csproj index 76b1a606a..61fe8fb95 100644 --- a/SteamTrade/SteamTrade.csproj +++ b/SteamTrade/SteamTrade.csproj @@ -43,8 +43,8 @@ ..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll - - ..\packages\SteamAuth.1.0.0\lib\net45\SteamAuth.dll + + ..\packages\SteamAuth.1.0.1\lib\net45\SteamAuth.dll True diff --git a/SteamTrade/packages.config b/SteamTrade/packages.config index 04dea9325..cde28eb5b 100644 --- a/SteamTrade/packages.config +++ b/SteamTrade/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file From 0d3961ddd732bf4547adc152b656b9960573793c Mon Sep 17 00:00:00 2001 From: BlueRaja Date: Tue, 26 Jan 2016 18:17:43 -0600 Subject: [PATCH 5/5] Revert VisualStudioVersion upgrade (comment on PR #913) --- SteamBot.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SteamBot.sln b/SteamBot.sln index 4a0ab481e..fa454aeef 100644 --- a/SteamBot.sln +++ b/SteamBot.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio Express 2013 for Windows Desktop +VisualStudioVersion = 12.0.30501.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleBot", "SteamBot\ExampleBot.csproj", "{E81DED36-EDF5-41A5-8666-A3A0C581762F}" EndProject