Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 25, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a72f1ce
Remove reference to System.Net.Http which has some conflicts on net 4…
claudiamurialdo Jun 24, 2021
1c5c733
Merge branch 'master' into system-net-http
claudiamurialdo Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dotnet/src/dotnetframework/GxClasses/GxClasses.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions dotnet/src/dotnetframework/GxClasses/Helpers/HttpHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
4 changes: 2 additions & 2 deletions dotnet/src/dotnetframework/GxClasses/Services/GXRestServices.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion dotnet/src/dotnetframework/Providers/Storage/GXAzureStorage/GXAzureStorage.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion dotnet/src/dotnetframework/Providers/Storage/GXOpenStack/GXOpenStack.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down