From b4b910b047ac96405d7e1d773e25f1c7afa021c4 Mon Sep 17 00:00:00 2001 From: "Todd A. Wood" Date: Wed, 20 Sep 2017 09:37:23 -0500 Subject: [PATCH 1/3] Revert "added conditional HintPaths" This reverts commit 566b117cadc7a5b1ef6e360502f8f430b0479fb0. --- WebAppGraphAPI/WebAppGraphAPI.csproj | 86 ++++++++++------------------ 1 file changed, 30 insertions(+), 56 deletions(-) diff --git a/WebAppGraphAPI/WebAppGraphAPI.csproj b/WebAppGraphAPI/WebAppGraphAPI.csproj index e754295..13f7cd3 100644 --- a/WebAppGraphAPI/WebAppGraphAPI.csproj +++ b/WebAppGraphAPI/WebAppGraphAPI.csproj @@ -43,73 +43,58 @@ False - $(SolutionDir)\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - $(Root)\CxCache\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll + ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll False - $(SolutionDir)\packages\Microsoft.Azure.ActiveDirectory.GraphClient.2.0.6\lib\portable-net40+wp8+win8+MonoAndroid10+MonoTouch10+WindowsPhoneApp81\Microsoft.Azure.ActiveDirectory.GraphClient.dll - $(Root)\CxCache\Microsoft.Azure.ActiveDirectory.GraphClient.2.0.6\lib\portable-net40+wp8+win8+MonoAndroid10+MonoTouch10+WindowsPhoneApp81\Microsoft.Azure.ActiveDirectory.GraphClient.dll + ..\packages\Microsoft.Azure.ActiveDirectory.GraphClient.2.0.6\lib\portable-net40+wp8+win8+MonoAndroid10+MonoTouch10+WindowsPhoneApp81\Microsoft.Azure.ActiveDirectory.GraphClient.dll False - $(SolutionDir)\packages\Microsoft.Data.Edm.5.6.3\lib\net40\Microsoft.Data.Edm.dll - $(Root)\CxCache\Microsoft.Data.Edm.5.6.3\lib\net40\Microsoft.Data.Edm.dll + ..\packages\Microsoft.Data.Edm.5.6.3\lib\net40\Microsoft.Data.Edm.dll False - $(SolutionDir)\packages\Microsoft.Data.OData.5.6.3\lib\net40\Microsoft.Data.OData.dll - $(Root)\CxCache\Microsoft.Data.OData.5.6.3\lib\net40\Microsoft.Data.OData.dll + ..\packages\Microsoft.Data.OData.5.6.3\lib\net40\Microsoft.Data.OData.dll False - $(SolutionDir)\packages\Microsoft.Data.Services.Client.5.6.3\lib\net40\Microsoft.Data.Services.Client.dll - $(Root)\CxCache\Microsoft.Data.Services.Client.5.6.3\lib\net40\Microsoft.Data.Services.Client.dll + ..\packages\Microsoft.Data.Services.Client.5.6.3\lib\net40\Microsoft.Data.Services.Client.dll - - False - $(SolutionDir)\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.9.10826.1824\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll - $(Root)\CxCache\Microsoft.IdentityModel.Clients.ActiveDirectory.2.9.10826.1824\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll + + ..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll + True - - False - $(SolutionDir)\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.9.10826.1824\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll - $(Root)\CxCache\Microsoft.IdentityModel.Clients.ActiveDirectory.2.9.10826.1824\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll + + ..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.3.13.5\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll + True False - $(SolutionDir)\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.0\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - $(Root)\CxCache\Microsoft.IdentityModel.Protocol.Extensions.1.0.0\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll + ..\packages\Microsoft.IdentityModel.Protocol.Extensions.1.0.0\lib\net45\Microsoft.IdentityModel.Protocol.Extensions.dll - $(SolutionDir)\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll - $(Root)\CxCache\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll + ..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll - $(SolutionDir)\packages\Microsoft.Owin.Host.SystemWeb.3.0.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - $(Root)\CxCache\Microsoft.Owin.Host.SystemWeb.3.0.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll + ..\packages\Microsoft.Owin.Host.SystemWeb.3.0.0\lib\net45\Microsoft.Owin.Host.SystemWeb.dll - $(SolutionDir)\packages\Microsoft.Owin.Security.3.0.0\lib\net45\Microsoft.Owin.Security.dll - $(Root)\CxCache\Microsoft.Owin.Security.3.0.0\lib\net45\Microsoft.Owin.Security.dll + ..\packages\Microsoft.Owin.Security.3.0.0\lib\net45\Microsoft.Owin.Security.dll - $(SolutionDir)\packages\Microsoft.Owin.Security.Cookies.3.0.0\lib\net45\Microsoft.Owin.Security.Cookies.dll - $(Root)\CxCache\Microsoft.Owin.Security.Cookies.3.0.0\lib\net45\Microsoft.Owin.Security.Cookies.dll + ..\packages\Microsoft.Owin.Security.Cookies.3.0.0\lib\net45\Microsoft.Owin.Security.Cookies.dll - $(SolutionDir)\packages\Microsoft.Owin.Security.OpenIdConnect.3.0.0\lib\net45\Microsoft.Owin.Security.OpenIdConnect.dll - $(Root)\CxCache\Microsoft.Owin.Security.OpenIdConnect.3.0.0\lib\net45\Microsoft.Owin.Security.OpenIdConnect.dll + ..\packages\Microsoft.Owin.Security.OpenIdConnect.3.0.0\lib\net45\Microsoft.Owin.Security.OpenIdConnect.dll - $(SolutionDir)\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll - $(Root)\CxCache\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll False - $(SolutionDir)\packages\Owin.1.0\lib\net40\Owin.dll - $(Root)\CxCache\Owin.1.0\lib\net40\Owin.dll + ..\packages\Owin.1.0\lib\net40\Owin.dll @@ -118,14 +103,12 @@ False - $(SolutionDir)\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll - $(Root)\CxCache\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll + ..\packages\System.IdentityModel.Tokens.Jwt.4.0.0\lib\net45\System.IdentityModel.Tokens.Jwt.dll False - $(SolutionDir)\packages\System.Spatial.5.6.3\lib\net40\System.Spatial.dll - $(Root)\CxCache\System.Spatial.5.6.3\lib\net40\System.Spatial.dll + ..\packages\System.Spatial.5.6.3\lib\net40\System.Spatial.dll @@ -135,38 +118,31 @@ False - $(SolutionDir)\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll - $(Root)\CxCache\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll False - $(SolutionDir)\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll - $(Root)\CxCache\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll + ..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll False - $(SolutionDir)\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll - $(Root)\CxCache\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll + ..\packages\Microsoft.AspNet.Web.Optimization.1.1.3\lib\net40\System.Web.Optimization.dll False - $(SolutionDir)\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll - $(Root)\CxCache\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll + ..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll False - $(SolutionDir)\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll - $(Root)\CxCache\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll False - $(SolutionDir)\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll - $(Root)\CxCache\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll False - $(SolutionDir)\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll - $(Root)\CxCache\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll + ..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll @@ -179,8 +155,7 @@ True - $(SolutionDir)\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - $(Root)\CxCache\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -188,8 +163,7 @@ False - $(SolutionDir)\packages\WebGrease.1.6.0\lib\WebGrease.dll - $(Root)\CxCache\WebGrease.1.6.0\lib\WebGrease.dll + ..\packages\WebGrease.1.6.0\lib\WebGrease.dll From a73aafb7573ff903be3dac214550917f8290d25e Mon Sep 17 00:00:00 2001 From: "Todd A. Wood" Date: Wed, 20 Sep 2017 09:57:55 -0500 Subject: [PATCH 2/3] Fix broken Microsoft.Azure.ActiveDirectory.GraphClient reference --- WebAppGraphAPI/WebAppGraphAPI.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/WebAppGraphAPI/WebAppGraphAPI.csproj b/WebAppGraphAPI/WebAppGraphAPI.csproj index 13f7cd3..d1a2421 100644 --- a/WebAppGraphAPI/WebAppGraphAPI.csproj +++ b/WebAppGraphAPI/WebAppGraphAPI.csproj @@ -45,9 +45,8 @@ False ..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll - - False - ..\packages\Microsoft.Azure.ActiveDirectory.GraphClient.2.0.6\lib\portable-net40+wp8+win8+MonoAndroid10+MonoTouch10+WindowsPhoneApp81\Microsoft.Azure.ActiveDirectory.GraphClient.dll + + ..\packages\Microsoft.Azure.ActiveDirectory.GraphClient.2.1.1\lib\portable-net4+sl5+win+wpa+wp8\Microsoft.Azure.ActiveDirectory.GraphClient.dll From d26b6749caf2157e97c2c6c8a0f8bfe7927192a9 Mon Sep 17 00:00:00 2001 From: "Todd A. Wood" Date: Wed, 20 Sep 2017 09:58:18 -0500 Subject: [PATCH 3/3] added user specific .vs directory to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 7dbfb69..807d798 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.suo *.user *.sln.docstates +.vs/ # Build results [Dd]ebug/