Remove reference to System.Net.Http which has some conflicts on net 4.6.2. (#382)

claudiamurialdo · web-flow · commit 021348eb4dc1 · 2021-06-25T11:21:53.000-03:00
diff --git a/dotnet/src/dotnetframework/GxClasses/GxClasses.csproj b/dotnet/src/dotnetframework/GxClasses/GxClasses.csproj
@@ -52,7 +52,6 @@
 		<Reference Include="System.Messaging">
 			<Name>System.Messaging</Name>
 		</Reference>
-		<Reference Include="System.Net.Http" />
 		<Reference Include="System.Runtime.Serialization">
 			<RequiredTargetFramework>3.0</RequiredTargetFramework>
 		</Reference>
diff --git a/dotnet/src/dotnetframework/GxClasses/Helpers/HttpHelper.cs b/dotnet/src/dotnetframework/GxClasses/Helpers/HttpHelper.cs
@@ -64,6 +64,8 @@ public class HttpHelper
 		static readonly ILog log = log4net.LogManager.GetLogger(typeof(GeneXus.Http.HttpHelper));
 		public const string ASPX = ".aspx";
 		public const string GXOBJECT = "/gxobject";
+		public const string HttpPostMethod= "POST";
+		public const string HttpGetMethod = "GET";
 
 		public static void SetResponseStatus(HttpContext httpContext, string statusCode, string statusDescription)
 		{
diff --git a/dotnet/src/dotnetframework/GxClasses/Services/GXRestServices.cs b/dotnet/src/dotnetframework/GxClasses/Services/GXRestServices.cs
@@ -492,11 +492,11 @@ bool IsPost()
 		{
 			if (wcfContext != null)
 			{
-				return HttpMethod.Post.Method == wcfContext.IncomingRequest.Method;
+				return HttpHelper.HttpPostMethod == wcfContext.IncomingRequest.Method;
 			}
 			else if (httpContext != null)
 			{
-				return HttpMethod.Post.Method == httpContext.Request.HttpMethod;
+				return HttpHelper.HttpPostMethod == httpContext.Request.HttpMethod;
 			}
 			else return false;
 		}
diff --git a/dotnet/src/dotnetframework/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj b/dotnet/src/dotnetframework/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj
@@ -17,7 +17,6 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
diff --git a/dotnet/src/dotnetframework/Providers/Storage/GXOpenStack/GXOpenStack.csproj b/dotnet/src/dotnetframework/Providers/Storage/GXOpenStack/GXOpenStack.csproj
@@ -26,7 +26,6 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,8 @@ public class HttpHelper`
`64`	`64`	`static readonly ILog log = log4net.LogManager.GetLogger(typeof(GeneXus.Http.HttpHelper));`
`65`	`65`	`public const string ASPX = ".aspx";`
`66`	`66`	`public const string GXOBJECT = "/gxobject";`
	`67`	`+ public const string HttpPostMethod= "POST";`
	`68`	`+ public const string HttpGetMethod = "GET";`
`67`	`69`
`68`	`70`	`public static void SetResponseStatus(HttpContext httpContext, string statusCode, string statusDescription)`
`69`	`71`	`{`
Original file line number	Diff line number	Diff line change
`@@ -492,11 +492,11 @@ bool IsPost()`
`492`	`492`	`{`
`493`	`493`	`if (wcfContext != null)`
`494`	`494`	`{`
`495`		`- return HttpMethod.Post.Method == wcfContext.IncomingRequest.Method;`
	`495`	`+ return HttpHelper.HttpPostMethod == wcfContext.IncomingRequest.Method;`
`496`	`496`	`}`
`497`	`497`	`else if (httpContext != null)`
`498`	`498`	`{`
`499`		`- return HttpMethod.Post.Method == httpContext.Request.HttpMethod;`
	`499`	`+ return HttpHelper.HttpPostMethod == httpContext.Request.HttpMethod;`
`500`	`500`	`}`
`501`	`501`	`else return false;`
`502`	`502`	`}`