diff --git a/GitTfs.Setup/GitTfs.Setup.csproj b/GitTfs.Setup/GitTfs.Setup.csproj index 88f9cad4..5ee31379 100644 --- a/GitTfs.Setup/GitTfs.Setup.csproj +++ b/GitTfs.Setup/GitTfs.Setup.csproj @@ -110,7 +110,7 @@ - + ..\packages\WixSharp\lib\Microsoft.Deployment.WindowsInstaller.dll diff --git a/GitTfs.Vs2015/GitTfs.Vs2015.csproj b/GitTfs.Vs2015/GitTfs.Vs2015.csproj index 1643fed0..c94638bd 100644 --- a/GitTfs.Vs2015/GitTfs.Vs2015.csproj +++ b/GitTfs.Vs2015/GitTfs.Vs2015.csproj @@ -110,7 +110,7 @@ --> - + ..\packages\Microsoft.AspNet.WebApi.Client\lib\net45\System.Net.Http.Formatting.dll @@ -121,7 +121,7 @@ - + ..\packages\Microsoft.AspNet.WebApi.Core\lib\net45\System.Web.Http.dll @@ -132,7 +132,7 @@ - + ..\packages\Microsoft.TeamFoundationServer.ExtendedClient\lib\net45\Microsoft.TeamFoundation.Build.Client.dll @@ -168,7 +168,7 @@ - + ..\packages\Microsoft.VisualStudio.Services.Client\lib\net45\Microsoft.TeamFoundation.Common.dll @@ -189,7 +189,7 @@ - + ..\packages\Microsoft.VisualStudio.Services.InteractiveClient\lib\net45\Microsoft.VisualStudio.Services.Client.dll @@ -200,16 +200,7 @@ - - - - ..\packages\Newtonsoft.Json\lib\net40\Newtonsoft.Json.dll - True - True - - - - + ..\packages\Newtonsoft.Json\lib\net45\Newtonsoft.Json.dll @@ -219,5 +210,16 @@ + + + + + ..\packages\System.IdentityModel.Tokens.Jwt\lib\net451\System.IdentityModel.Tokens.Jwt.dll + True + True + + + + \ No newline at end of file diff --git a/GitTfs/GitTfs.csproj b/GitTfs/GitTfs.csproj index 87e22694..9aaae588 100644 --- a/GitTfs/GitTfs.csproj +++ b/GitTfs/GitTfs.csproj @@ -290,7 +290,7 @@ --> - + ..\packages\LibGit2Sharp\lib\net40\LibGit2Sharp.dll @@ -301,16 +301,7 @@ - - - - ..\packages\NLog\lib\net40\NLog.dll - True - True - - - - + ..\packages\NLog\lib\net45\NLog.dll diff --git a/GitTfsTest/GitTfsTest.csproj b/GitTfsTest/GitTfsTest.csproj index 866c8f55..59976757 100644 --- a/GitTfsTest/GitTfsTest.csproj +++ b/GitTfsTest/GitTfsTest.csproj @@ -196,7 +196,7 @@ - + <__paket__xunit_runner_visualstudio_props>net20\xunit.runner.visualstudio @@ -219,7 +219,7 @@ --> - + ..\packages\LibGit2Sharp\lib\net40\LibGit2Sharp.dll @@ -230,16 +230,7 @@ - - - - ..\packages\NLog\lib\net40\NLog.dll - True - True - - - - + ..\packages\NLog\lib\net45\NLog.dll @@ -250,7 +241,7 @@ - + ..\packages\xunit.abstractions\lib\net35\xunit.abstractions.dll @@ -261,10 +252,10 @@ - + - ..\packages\xunit.assert\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll + ..\packages\xunit.assert\lib\netstandard1.1\xunit.assert.dll True True @@ -272,10 +263,10 @@ - + - ..\packages\xunit.extensibility.core\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll + ..\packages\xunit.extensibility.core\lib\netstandard1.1\xunit.core.dll True True @@ -283,10 +274,10 @@ - + - ..\packages\xunit.extensibility.execution\lib\net45\xunit.execution.desktop.dll + ..\packages\xunit.extensibility.execution\lib\net452\xunit.execution.desktop.dll True True diff --git a/paket.dependencies b/paket.dependencies index 0dd67cde..2cb0e7a6 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -1,4 +1,4 @@ -framework: auto-detect +framework: net452 source https://www.nuget.org/api/v2/ //If you plan to update this file, you must first absolutly read our documentation on the subject @@ -8,8 +8,8 @@ source https://www.nuget.org/api/v2/ nuget nlog nuget NuGet.CommandLine nuget LibGit2Sharp -nuget Microsoft.TeamFoundationServer.Client -nuget Microsoft.TeamFoundationServer.ExtendedClient +nuget Microsoft.TeamFoundationServer.Client ~> 14.0 +nuget Microsoft.TeamFoundationServer.ExtendedClient ~> 14.0 nuget WixSharp 1.0.22.3 framework: >= net40 nuget xunit nuget xunit.assert diff --git a/paket.lock b/paket.lock index dc8783d7..6c39d17b 100644 --- a/paket.lock +++ b/paket.lock @@ -1,18 +1,22 @@ -FRAMEWORK: NET40, NET45 +FRAMEWORK: NET452 NUGET remote: https://www.nuget.org/api/v2 LibGit2Sharp (0.23.1) LibGit2Sharp.NativeBinaries (1.0.164) LibGit2Sharp.NativeBinaries (1.0.164) Microsoft.AspNet.WebApi.Client (5.2.3) - Newtonsoft.Json (>= 6.0.4) - framework: net45 + Newtonsoft.Json (>= 6.0.4) Microsoft.AspNet.WebApi.Core (5.2.3) Microsoft.AspNet.WebApi.Client (>= 5.2.3) - Microsoft.IdentityModel.Clients.ActiveDirectory (3.13.5) + Microsoft.IdentityModel.Clients.ActiveDirectory (3.13.9) + Microsoft.IdentityModel.Logging (1.1.3) + Microsoft.IdentityModel.Tokens (5.1.3) + Microsoft.IdentityModel.Logging (>= 1.1.3) + Newtonsoft.Json (>= 9.0.1) Microsoft.TeamFoundationServer.Client (14.102) - Microsoft.AspNet.WebApi.Client (>= 5.2.2) - framework: net45 - Microsoft.VisualStudio.Services.Client (14.102) - framework: net45 - Newtonsoft.Json (>= 6.0.8) - framework: net45 + Microsoft.AspNet.WebApi.Client (>= 5.2.2) + Microsoft.VisualStudio.Services.Client (14.102) + Newtonsoft.Json (>= 6.0.8) Microsoft.TeamFoundationServer.ExtendedClient (14.102) Microsoft.AspNet.WebApi.Client (>= 5.2.2) Microsoft.AspNet.WebApi.Core (>= 5.2.2) @@ -23,34 +27,35 @@ NUGET Newtonsoft.Json (>= 6.0.8) System.IdentityModel.Tokens.Jwt (>= 4.0) Microsoft.VisualStudio.Services.Client (14.102) - Microsoft.AspNet.WebApi.Client (>= 5.2.2) - framework: net45 - Newtonsoft.Json (>= 6.0.8) - framework: net45 + Microsoft.AspNet.WebApi.Client (>= 5.2.2) + Newtonsoft.Json (>= 6.0.8) Microsoft.VisualStudio.Services.InteractiveClient (14.102) - Microsoft.AspNet.WebApi.Client (>= 5.2.2) - framework: net45 - Microsoft.IdentityModel.Clients.ActiveDirectory (>= 2.16.204221202) - framework: net45 - Microsoft.VisualStudio.Services.Client (14.102) - framework: net45 - Newtonsoft.Json (>= 6.0.8) - framework: net45 - System.IdentityModel.Tokens.Jwt (>= 4.0) - framework: net45 - WindowsAzure.ServiceBus (>= 2.5.1) - framework: net45 + Microsoft.AspNet.WebApi.Client (>= 5.2.2) + Microsoft.IdentityModel.Clients.ActiveDirectory (>= 2.16.204221202) + Microsoft.VisualStudio.Services.Client (14.102) + Newtonsoft.Json (>= 6.0.8) + System.IdentityModel.Tokens.Jwt (>= 4.0) + WindowsAzure.ServiceBus (>= 2.5.1) MSBuildTasks (1.4.0.45) - Newtonsoft.Json (9.0.1) - NLog (4.3.10) - NuGet.CommandLine (3.4.3) - System.IdentityModel.Tokens.Jwt (5.0) - WindowsAzure.ServiceBus (3.4) - framework: net45 + Newtonsoft.Json (10.0.2) + NLog (4.4.5) + NuGet.CommandLine (3.5) + System.IdentityModel.Tokens.Jwt (5.1.3) + Microsoft.IdentityModel.Tokens (>= 5.1.3) + WindowsAzure.ServiceBus (4.0) WixSharp (1.0.22.3) - xunit (2.1) - xunit.assert (2.1) - xunit.core (2.1) - xunit.abstractions (2.0) - framework: net45 - xunit.assert (2.1) - xunit.core (2.1) - xunit.extensibility.core (2.1) - framework: net45 - xunit.extensibility.execution (2.1) - framework: net45 - xunit.extensibility.core (2.1) - framework: net45 - xunit.abstractions (2.0) - xunit.extensibility.execution (2.1) - framework: net45 - xunit.extensibility.core (2.1) - framework: net45 - xunit.runner.console (2.1) - xunit.runner.msbuild (2.1) - xunit.runner.visualstudio (2.1) + xunit (2.2) + xunit.assert (2.2) + xunit.core (2.2) + xunit.abstractions (2.0.1) + xunit.assert (2.2) + xunit.core (2.2) + xunit.extensibility.core (2.2) + xunit.extensibility.execution (2.2) + xunit.extensibility.core (2.2) + xunit.abstractions (>= 2.0.1) + xunit.extensibility.execution (2.2) + xunit.extensibility.core (2.2) + xunit.runner.console (2.2) + xunit.runner.msbuild (2.2) + xunit.runner.visualstudio (2.2)