Skip to content

Commit

Permalink
updatend to .NET 8 and C#12
Browse files Browse the repository at this point in the history
updated NuGets
updated version to 0.8.0-beta.1
  • Loading branch information
Jani Giannoudis committed Nov 27, 2023
1 parent 9f64ee7 commit 5772c1b
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 73 deletions.
7 changes: 0 additions & 7 deletions Core/Data/DataException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Runtime.Serialization;

namespace PayrollEngine.Data;

Expand All @@ -22,10 +21,4 @@ public DataException(string message, Exception innerException) :
base(message, innerException)
{
}

/// <inheritdoc/>
protected DataException(SerializationInfo info, StreamingContext context) :
base(info, context)
{
}
}
6 changes: 3 additions & 3 deletions Core/PayrollEngine.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
</ItemGroup>

<!-- include xml documention files and json schemas to the nuget package -->
Expand Down
18 changes: 0 additions & 18 deletions Core/PayrollEngine.Core.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 0 additions & 7 deletions Core/PayrollException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Runtime.Serialization;

namespace PayrollEngine;

Expand All @@ -22,10 +21,4 @@ public PayrollException(string message, Exception innerException) :
base(message, innerException)
{
}

/// <inheritdoc/>
protected PayrollException(SerializationInfo info, StreamingContext context) :
base(info, context)
{
}
}
7 changes: 0 additions & 7 deletions Core/PayrollMapException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Runtime.Serialization;

namespace PayrollEngine;

Expand All @@ -22,10 +21,4 @@ public PayrollMapException(string message, Exception innerException) :
base(message, innerException)
{
}

/// <inheritdoc/>
protected PayrollMapException(SerializationInfo info, StreamingContext context) :
base(info, context)
{
}
}
7 changes: 0 additions & 7 deletions Core/PayrunException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Runtime.Serialization;

namespace PayrollEngine;

Expand All @@ -22,10 +21,4 @@ public PayrunException(string message, Exception innerException) :
base(message, innerException)
{
}

/// <inheritdoc/>
protected PayrunException(SerializationInfo info, StreamingContext context) :
base(info, context)
{
}
}
12 changes: 0 additions & 12 deletions Core/PersistenceException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Runtime.Serialization;

namespace PayrollEngine;

Expand Down Expand Up @@ -27,15 +26,4 @@ public PersistenceException(string message, PersistenceErrorType errorType, Exce
{
ErrorType = errorType;
}

/// <inheritdoc/>
protected PersistenceException(SerializationInfo info, StreamingContext context) :
base(info, context)
{
var errorType = info.GetInt32("ErrorType");
if (Enum.IsDefined(typeof(PersistenceErrorType), errorType))
{
ErrorType = (PersistenceErrorType)errorType;
}
}
}
7 changes: 0 additions & 7 deletions Core/QueryException.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using System.Runtime.Serialization;

namespace PayrollEngine;

Expand All @@ -22,10 +21,4 @@ public QueryException(string message, Exception innerException) :
base(message, innerException)
{
}

/// <inheritdoc/>
protected QueryException(SerializationInfo info, StreamingContext context) :
base(info, context)
{
}
}
2 changes: 1 addition & 1 deletion Core/ScriptingSpecification.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public static class ScriptingSpecification
public static readonly Version ScriptingVersion = new(1, 0, 0);

/// <summary>The c# language version, string represents the Microsoft.CodeAnalysis.CSharp.LanguageVersion enum</summary>
public static readonly string CSharpLanguageVersion = "CSharp11";
public static readonly string CSharpLanguageVersion = "CSharp12";

/// <summary>Tags start marker</summary>
public static readonly string TagsStartMarker = "/*";
Expand Down
5 changes: 4 additions & 1 deletion Core/UriExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ public static string AddQueryString(this string uri, string name, object value)
// others
stringValue = value.ToString();
}
return QueryHelpers.AddQueryString(uri, name, stringValue);

return string.IsNullOrWhiteSpace(stringValue) ?
uri :
QueryHelpers.AddQueryString(uri, name, stringValue);
}

/// <summary>Append the given query key and value to the URI</summary>
Expand Down
6 changes: 3 additions & 3 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<Version>0.6.0-beta.11</Version>
<FileVersion>0.6.0</FileVersion>
<TargetFramework>net8.0</TargetFramework>
<Version>0.8.0-beta.1</Version>
<FileVersion>0.8.0</FileVersion>
<InformationalVersion></InformationalVersion>
<Authors>Jani Giannoudis</Authors>
<Company>Software Consulting Giannoudis</Company>
Expand Down

0 comments on commit 5772c1b

Please sign in to comment.