Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Support ref\out params, exceptions. Works with legacy SOAP\WCF-clients.

The following frameworks are supported:

- .NET 8.0 (using ASP.NET Core 8.0)
- .NET 9.0 (using ASP.NET Core 9.0)
- .NET Core 3.1 (using ASP.NET Core 3.1)
- .NET Standard 2.0-2.1 (using ASP.NET Core 2.1)

Expand Down
73 changes: 73 additions & 0 deletions SoapCore.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.2.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5D20AA90-6969-D8BD-9DCD-8634F4692FDA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoapCore.Tests", "src\SoapCore.Tests\SoapCore.Tests.csproj", "{792F2D88-944E-D858-B188-8D099968D8F8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoapCore.Benchmark", "src\SoapCore.Benchmark\SoapCore.Benchmark.csproj", "{F78D5E08-56A4-AF93-AE96-D4F968C0F4EB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoapCore", "src\SoapCore\SoapCore.csproj", "{BE4773A0-6CDA-F20C-91C5-C459CD9B01DA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceReferenceClient", "samples\ServiceReferenceClient\ServiceReferenceClient.csproj", "{B4B7EC2F-C2AC-3040-81D3-AC626C35691E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "samples\Server\Server.csproj", "{E1838AF0-3C46-A86C-5BEF-DDA6BE89D32F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Models", "samples\Models\Models.csproj", "{C1C55718-4B21-2F2D-5F8D-E7859EF52C42}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "samples\Client\Client.csproj", "{2A625F63-23A0-539C-6B20-551900FCE074}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{792F2D88-944E-D858-B188-8D099968D8F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{792F2D88-944E-D858-B188-8D099968D8F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{792F2D88-944E-D858-B188-8D099968D8F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{792F2D88-944E-D858-B188-8D099968D8F8}.Release|Any CPU.Build.0 = Release|Any CPU
{F78D5E08-56A4-AF93-AE96-D4F968C0F4EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F78D5E08-56A4-AF93-AE96-D4F968C0F4EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F78D5E08-56A4-AF93-AE96-D4F968C0F4EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F78D5E08-56A4-AF93-AE96-D4F968C0F4EB}.Release|Any CPU.Build.0 = Release|Any CPU
{BE4773A0-6CDA-F20C-91C5-C459CD9B01DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE4773A0-6CDA-F20C-91C5-C459CD9B01DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE4773A0-6CDA-F20C-91C5-C459CD9B01DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE4773A0-6CDA-F20C-91C5-C459CD9B01DA}.Release|Any CPU.Build.0 = Release|Any CPU
{B4B7EC2F-C2AC-3040-81D3-AC626C35691E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B4B7EC2F-C2AC-3040-81D3-AC626C35691E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B4B7EC2F-C2AC-3040-81D3-AC626C35691E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B4B7EC2F-C2AC-3040-81D3-AC626C35691E}.Release|Any CPU.Build.0 = Release|Any CPU
{E1838AF0-3C46-A86C-5BEF-DDA6BE89D32F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E1838AF0-3C46-A86C-5BEF-DDA6BE89D32F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E1838AF0-3C46-A86C-5BEF-DDA6BE89D32F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E1838AF0-3C46-A86C-5BEF-DDA6BE89D32F}.Release|Any CPU.Build.0 = Release|Any CPU
{C1C55718-4B21-2F2D-5F8D-E7859EF52C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C1C55718-4B21-2F2D-5F8D-E7859EF52C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C1C55718-4B21-2F2D-5F8D-E7859EF52C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C1C55718-4B21-2F2D-5F8D-E7859EF52C42}.Release|Any CPU.Build.0 = Release|Any CPU
{2A625F63-23A0-539C-6B20-551900FCE074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2A625F63-23A0-539C-6B20-551900FCE074}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2A625F63-23A0-539C-6B20-551900FCE074}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2A625F63-23A0-539C-6B20-551900FCE074}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{792F2D88-944E-D858-B188-8D099968D8F8} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{F78D5E08-56A4-AF93-AE96-D4F968C0F4EB} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{BE4773A0-6CDA-F20C-91C5-C459CD9B01DA} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
{B4B7EC2F-C2AC-3040-81D3-AC626C35691E} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
{E1838AF0-3C46-A86C-5BEF-DDA6BE89D32F} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
{C1C55718-4B21-2F2D-5F8D-E7859EF52C42} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
{2A625F63-23A0-539C-6B20-551900FCE074} = {5D20AA90-6969-D8BD-9DCD-8634F4692FDA}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {26206D9E-146E-4EA4-80CB-EF074CA59CB6}
EndGlobalSection
EndGlobal
4 changes: 2 additions & 2 deletions samples/Client/Client.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.ServiceModel.Http" Version="4.8.1" />
<PackageReference Include="System.ServiceModel.Http" Version="8.1.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/Server/Server.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"System.Xml.XmlDocument, {System.Xml.XmlDocument, 4.3.0}"
],
"sync": true,
"targetFramework": "net8.0",
"targetFramework": "net9.0",
"typeReuseMode": "All"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/SoapCore.Benchmark/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
namespace SoapCore.Benchmark
{
[MemoryDiagnoser]
[SimpleJob(RuntimeMoniker.Net80, baseline: true, iterationCount: 20)]
[SimpleJob(RuntimeMoniker.Net90, baseline: true, iterationCount: 20)]
//[SimpleJob(RuntimeMoniker.NetCoreApp31, iterationCount: 20)]
public class EchoBench
{
Expand Down
6 changes: 3 additions & 3 deletions src/SoapCore.Benchmark/SoapCore.Benchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net8.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net9.0</TargetFrameworks>
<CodeAnalysisRuleSet>..\SoapCore.ruleset</CodeAnalysisRuleSet>
<NoWin32Manifest>true</NoWin32Manifest>
<LangVersion>8</LangVersion>
Expand All @@ -12,8 +12,8 @@
<ItemGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.32" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework) == 'net8.0'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.13" />
<ItemGroup Condition="$(TargetFramework) == 'net9.0'">
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/SoapCore.Tests/SoapCore.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;</TargetFrameworks>
<TargetFrameworks>net9.0;</TargetFrameworks>
<CodeAnalysisRuleSet>..\SoapCore.ruleset</CodeAnalysisRuleSet>
<IsPackable>false</IsPackable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand All @@ -16,10 +16,10 @@
<ItemGroup>
<AdditionalFiles Include="stylecop.json" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework) == 'net8.0'">
<ItemGroup Condition="$(TargetFramework) == 'net9.0'">
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.2" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.13" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
Expand Down
2 changes: 1 addition & 1 deletion src/SoapCore/HeadersHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static string GetSoapAction(HttpContext httpContext, ref Message message)

if (soapAction.IsEmpty)
{
#if NET8_0_OR_GREATER
#if NET9_0_OR_GREATER

foreach (var item in httpContext.Request.Headers["Content-Type"])
{
Expand Down
4 changes: 2 additions & 2 deletions src/SoapCore/SoapCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Description>SOAP protocol middleware for ASP.NET Core</Description>
<Version>1.2.1.8</Version>
<Authors>Digital Design</Authors>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;netcoreapp3.1;</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net9.0;netcoreapp3.1;</TargetFrameworks>
<PackageId>SoapCore</PackageId>
<PackageTags>SOAP;ASP.NET Core</PackageTags>
<PackageProjectUrl>https://github.com/DigDes/SoapCore</PackageProjectUrl>
Expand Down Expand Up @@ -40,7 +40,7 @@
<PackageReference Include="System.CodeDom" Version="4.7.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.10.3" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework) == 'net8.0'">
<ItemGroup Condition="$(TargetFramework) == 'net9.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="System.CodeDom" Version="9.0.2" />
<PackageReference Include="System.ServiceModel.Http" Version="8.1.1" />
Expand Down
2 changes: 1 addition & 1 deletion src/SoapCore/SoapCoreOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class SoapCoreOptions
{
private bool? _indentWsdl = null;

#if NET8_0_OR_GREATER
#if NET9_0_OR_GREATER
/// <summary>
/// Gets or sets the Path of the Service
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/SoapCore/SoapEndpointMiddleware.cs
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@ private Message CreateErrorResponseMessage(
}
else if (exception is OperationCanceledException)
{
#if NET8_0_OR_GREATER
#if NET9_0_OR_GREATER
status = StatusCodes.Status499ClientClosedRequest;
#else
status = StatusCodes.Status408RequestTimeout;
Expand Down
2 changes: 1 addition & 1 deletion src/SoapCore/XDocumentXmlReader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ protected override void Dispose(bool disposing)
base.Dispose(disposing);
}

#if NET8_0_OR_GREATER
#if NET9_0_OR_GREATER
private static byte[] ConvertHexStringToBytes(string hexString) => Convert.FromHexString(hexString);
#else
private static byte[] ConvertHexStringToBytes(string hexString)
Expand Down
2 changes: 1 addition & 1 deletion src/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.100",
"version": "9.0.100",
"rollForward": "latestMajor"
}
}