Skip to content

Commit

Permalink
Merge pull request connamara#884 from gbirchmeier/rebase-870-dotnet8
Browse files Browse the repository at this point in the history
[Rebase connamara#870 + more] Update target to net 8.0 + Replace deprecated US timezone (issue connamara#883)
  • Loading branch information
gbirchmeier authored Sep 13, 2024
2 parents e7ab67e + c77856a commit 669c65b
Show file tree
Hide file tree
Showing 29 changed files with 66 additions and 78 deletions.
2 changes: 1 addition & 1 deletion AcceptanceTest/AcceptanceTest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion DDTool/DDTool/DDTool.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion DDTool/UnitTests/UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Executor/Examples.Executor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Executor</RootNamespace>
<AssemblyName>Executor</AssemblyName>
<Copyright>Copyright © Connamara Systems, LLC 2011</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion Examples/FixToJson/Examples.FixToJson.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<Copyright>Copyright © Connamara Systems, LLC 2022</Copyright>
<Company>Connamara Systems, LLC</Company>
Expand Down
2 changes: 1 addition & 1 deletion Examples/JsonToFix/Examples.JsonToFix.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<Copyright>Copyright © Connamara Systems, LLC 2022</Copyright>
<Company>Connamara Systems, LLC</Company>
Expand Down
2 changes: 1 addition & 1 deletion Examples/SimpleAcceptor/Examples.SimpleAcceptor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>SimpleAcceptor</RootNamespace>
<AssemblyName>SimpleAcceptor</AssemblyName>
<Copyright>Copyright © Connamara Systems, LLC 2011</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion Examples/Standalone/SerilogLog/SerilogLog.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

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

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Examples/TradeClient/Examples.TradeClient.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>TradeClient</RootNamespace>
<AssemblyName>TradeClient</AssemblyName>
<Copyright>Copyright © Connamara Systems, LLC 2011</Copyright>
Expand Down
2 changes: 1 addition & 1 deletion Messages/FIX40/QuickFix.FIX40.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<Title>QuickFIX/n FIX4.0 Messages</Title>
<PackageId>QuickFIXn.FIX4.0</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Messages/FIX41/QuickFix.FIX41.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<Title>QuickFIX/n FIX4.1 Messages</Title>
<PackageId>QuickFIXn.FIX4.1</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Messages/FIX42/QuickFix.FIX42.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<Title>QuickFIX/n FIX4.2 Messages</Title>
<PackageId>QuickFIXn.FIX4.2</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Messages/FIX43/QuickFix.FIX43.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<Title>QuickFIX/n FIX4.3 Messages</Title>
<PackageId>QuickFIXn.FIX4.3</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Messages/FIX44/QuickFix.FIX44.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<Title>QuickFIX/n FIX4.4 Messages</Title>
<PackageId>QuickFIXn.FIX4.4</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Messages/FIX50/QuickFix.FIX50.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<Title>QuickFIX/n FIX5.0 Messages</Title>
<PackageId>QuickFIXn.FIX5.0</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Messages/FIX50SP1/QuickFix.FIX50SP1.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<Title>QuickFIX/n FIX5.0 SP1 Messages</Title>
<PackageId>QuickFIXn.FIX5.0SP1</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Messages/FIX50SP2/QuickFix.FIX50SP2.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<Title>QuickFIX/n FIX5.0 SP2 Messages</Title>
<PackageId>QuickFIXn.FIX5.0SP2</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Messages/FIXT11/QuickFix.FIXT11.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
<Title>QuickFIX/n FIXT1.1 Messages</Title>
<PackageId>QuickFIXn.FIXT1.1</PackageId>
Expand Down
7 changes: 0 additions & 7 deletions QuickFIXn/DataDictionary/DictionaryParseException.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace QuickFix
{
Expand All @@ -12,9 +9,5 @@ public DictionaryParseException(string message)
: base(message) { }
public DictionaryParseException(string message, System.Exception inner)
: base(message, inner) { }
protected DictionaryParseException(
System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
: base(info, context) { }
}
}
13 changes: 6 additions & 7 deletions QuickFIXn/DataDictionary/InvalidMessageTypeException.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;

namespace QuickFix
{
[Obsolete("This class will be removed in a future release (because it's unused)")]
public class InvalidMessageTypeException : ApplicationException
{
[Obsolete("This class will be removed in a future release (because it's unused)")]
public InvalidMessageTypeException() { }

[Obsolete("This class will be removed in a future release (because it's unused)")]
public InvalidMessageTypeException(string message)
: base(message) { }

[Obsolete("This class will be removed in a future release (because it's unused)")]
public InvalidMessageTypeException(string message, System.Exception inner)
: base(message, inner) { }
protected InvalidMessageTypeException(
System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
: base(info, context) { }
}
}
12 changes: 8 additions & 4 deletions QuickFIXn/DataDictionary/MissingRequiredFieldException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,22 @@

namespace QuickFix
{
[Obsolete("This class will be removed in a future release (because it's unused)")]
public sealed class MissingRequiredFieldException : ApplicationException
{
[Obsolete("This class will be removed in a future release (because it's unused)")]
public MissingRequiredFieldException() { }

[Obsolete("This class will be removed in a future release (because it's unused)")]
public MissingRequiredFieldException(int field)
: base("Missing required field: " + field.ToString()) { }

[Obsolete("This class will be removed in a future release (because it's unused)")]
public MissingRequiredFieldException(string message)
: base(message) { }

[Obsolete("This class will be removed in a future release (because it's unused)")]
public MissingRequiredFieldException(string message, System.Exception inner)
: base(message, inner) { }
protected MissingRequiredFieldException(
System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
: base(info, context) { }
}
}
11 changes: 1 addition & 10 deletions QuickFIXn/Exceptions.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

using System;
using System;

namespace QuickFix
{
Expand All @@ -16,10 +15,6 @@ public QuickFIXException(string msg)
public QuickFIXException(string msg, System.Exception innerException)
: base(msg, innerException)
{ }

public QuickFIXException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)
: base(info, context)
{ }
}

/// <summary>
Expand Down Expand Up @@ -109,10 +104,6 @@ public InvalidMessage(string msg)
public InvalidMessage(string msg, System.Exception innerException)
: base("Invalid message: " + msg, innerException)
{ }

public InvalidMessage(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context)
: base(info, context)
{ }
}

/// <summary>
Expand Down
6 changes: 0 additions & 6 deletions QuickFIXn/Message/FieldNotFoundException.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,5 @@ public FieldNotFoundException(string message)
public FieldNotFoundException(string message, System.Exception inner)
: base(message, inner)
{ Field = -1; }

protected FieldNotFoundException(
System.Runtime.Serialization.SerializationInfo info,
System.Runtime.Serialization.StreamingContext context)
: base(info, context)
{ }
}
}
2 changes: 1 addition & 1 deletion QuickFIXn/QuickFix.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFramework>net8.0</TargetFramework>
<Title>QuickFIX/n</Title>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateAppxPackageOnBuild>true</GenerateAppxPackageOnBuild>
Expand Down
5 changes: 4 additions & 1 deletion RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ What's New
----------

**CAUTION:**
* **1.13.0 has moved to .NET 8 (as Microsoft is ending .NET 6 support on Nov 12, 2024)
* **There are breaking changes between 1.12 and 1.13! Please review the 1.12.0 notes below.**
* **There are breaking changes between 1.11 and 1.12! Please review the 1.12.0 notes below.**
* **There are breaking changes between 1.10 and 1.11! Please review the 1.11.0 notes below.**


### (next release)
### upcoming v1.13.0

**Breaking changes**
* #883 - Moved to .NET 8
* #878 - corrections to tag 45 "Side" in various DDs (gbirchmeier) - most people won't notice, easy fix if they do
* fix typo in FIX50 and FIX50SP1: `CROSS_SHORT_EXXMPT` fixed to `CROSS_SHORT_EXEMPT`
* correction in FIX41 and FIX42: `D` to `UNDISCLOSED`
Expand Down
Loading

0 comments on commit 669c65b

Please sign in to comment.