Skip to content
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.

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

[pull] master from EasyNetQ:master #140

Merged
merged 1 commit into from
Jan 24, 2025
Merged
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>EasyNetQ.Approval.Tests</RootNamespace>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
10 changes: 0 additions & 10 deletions Source/EasyNetQ.ApprovalTests/EasyNetQ.approved.txt
Original file line number Diff line number Diff line change
Expand Up @@ -304,21 +304,17 @@ namespace EasyNetQ
public static EasyNetQ.Consumer.ConsumePipelineBuilder UseScope(this EasyNetQ.Consumer.ConsumePipelineBuilder pipelineBuilder) { }
public static EasyNetQ.IEasyNetQBuilder UseVersionedMessage(this EasyNetQ.IEasyNetQBuilder builder) { }
}
[System.Serializable]
public class EasyNetQException : System.Exception
{
public EasyNetQException() { }
public EasyNetQException(string? message) { }
protected EasyNetQException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
public EasyNetQException(string format, params object?[] args) { }
public EasyNetQException(string? message, System.Exception? inner) { }
}
[System.Serializable]
public class EasyNetQResponderException : EasyNetQ.EasyNetQException
{
public EasyNetQResponderException() { }
public EasyNetQResponderException(string? message) { }
protected EasyNetQResponderException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
public EasyNetQResponderException(string format, params object?[] args) { }
public EasyNetQResponderException(string? message, System.Exception? inner) { }
}
Expand Down Expand Up @@ -1773,28 +1769,22 @@ namespace EasyNetQ.Producer
public EasyNetQ.Producer.IPublishPendingConfirmation CreatePendingConfirmation(RabbitMQ.Client.IModel model) { }
public void Dispose() { }
}
[System.Serializable]
public class PublishInterruptedException : System.Exception
{
public PublishInterruptedException() { }
public PublishInterruptedException(string? message) { }
protected PublishInterruptedException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
public PublishInterruptedException(string? message, System.Exception? inner) { }
}
[System.Serializable]
public class PublishNackedException : System.Exception
{
public PublishNackedException() { }
public PublishNackedException(string? message) { }
protected PublishNackedException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
public PublishNackedException(string? message, System.Exception? inner) { }
}
[System.Serializable]
public class PublishReturnedException : System.Exception
{
public PublishReturnedException() { }
public PublishReturnedException(string? message) { }
protected PublishReturnedException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
public PublishReturnedException(string? message, System.Exception? inner) { }
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
2 changes: 1 addition & 1 deletion Source/EasyNetQ.Examples.Rpc/EasyNetQ.Examples.Rpc.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
4 changes: 2 additions & 2 deletions Source/EasyNetQ.Hosepipe.Tests/EasyNetQ.Hosepipe.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/EasyNetQ.Hosepipe/EasyNetQ.Hosepipe.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>EasyNetQ.Hosepipe</Description>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/EasyNetQ.IntegrationTests/Rpc/Messages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public RabbitResponse(int id) : base(id)
}
}

[Serializable]

public class RequestFailedException : Exception
{
public RequestFailedException()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Description>An adaptor to allow EasyNetQ to use Newtonsoft.Json serializer</Description>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<PackageTags>Newtonsoft;$(PackageTags)</PackageTags>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>An adaptor to allow EasyNetQ to use System.Text.Json serializer</Description>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions Source/EasyNetQ.Tests/EasyNetQ.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
Expand Down
16 changes: 0 additions & 16 deletions Source/EasyNetQ.Tests/SerializationTests.cs

This file was deleted.

2 changes: 1 addition & 1 deletion Source/EasyNetQ/EasyNetQ.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>A nice .NET API for RabbitMQ</Description>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
10 changes: 2 additions & 8 deletions Source/EasyNetQ/EasyNetQException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace EasyNetQ;

[Serializable]

public class EasyNetQException : Exception
{
/// <inheritdoc />
Expand All @@ -16,12 +16,9 @@ public EasyNetQException(string format, params object?[] args) : base(string.For

/// <inheritdoc />
public EasyNetQException(string? message, Exception? inner) : base(message, inner) { }

/// <inheritdoc />
protected EasyNetQException(SerializationInfo info, StreamingContext context) : base(info, context) { }
}

[Serializable]

public class EasyNetQResponderException : EasyNetQException
{
/// <inheritdoc />
Expand All @@ -35,7 +32,4 @@ public EasyNetQResponderException(string format, params object?[] args) : base(f

/// <inheritdoc />
public EasyNetQResponderException(string? message, Exception? inner) : base(message, inner) { }

/// <inheritdoc />
protected EasyNetQResponderException(SerializationInfo info, StreamingContext context) : base(info, context) { }
}
7 changes: 1 addition & 6 deletions Source/EasyNetQ/Producer/PublishInterruptedException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace EasyNetQ.Producer;
/// <summary>
/// This exception indicates that a publish was interrupted(for instance, because of a reconnection)
/// </summary>
[Serializable]

public class PublishInterruptedException : Exception
{
//
Expand All @@ -29,9 +29,4 @@ public PublishInterruptedException(string? message) : base(message)
public PublishInterruptedException(string? message, Exception? inner) : base(message, inner)
{
}

/// <inheritdoc />
protected PublishInterruptedException(SerializationInfo info, StreamingContext context) : base(info, context)
{
}
}
7 changes: 1 addition & 6 deletions Source/EasyNetQ/Producer/PublishNackedException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace EasyNetQ.Producer;
/// <summary>
/// This exception indicates that a message was nacked
/// </summary>
[Serializable]

public class PublishNackedException : Exception
{
//
Expand All @@ -29,9 +29,4 @@ public PublishNackedException(string? message) : base(message)
public PublishNackedException(string? message, Exception? inner) : base(message, inner)
{
}

/// <inheritdoc />
protected PublishNackedException(SerializationInfo info, StreamingContext context) : base(info, context)
{
}
}
7 changes: 1 addition & 6 deletions Source/EasyNetQ/Producer/PublishReturnedException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace EasyNetQ.Producer;
/// <summary>
/// This exception indicates that a message was returned
/// </summary>
[Serializable]

public class PublishReturnedException : Exception
{
//
Expand All @@ -29,9 +29,4 @@ public PublishReturnedException(string? message) : base(message)
public PublishReturnedException(string? message, Exception? inner) : base(message, inner)
{
}

/// <inheritdoc />
protected PublishReturnedException(SerializationInfo info, StreamingContext context) : base(info, context)
{
}
}
Loading