Skip to content

updated to target modern netstandard and net libraries #143

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

Open
jdrames wants to merge 2 commits into
base: master
Choose a base branch
from
Open

updated to target modern netstandard and net libraries #143

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
35f47ef
Updated framework target and dependency versions
jdrames Feb 22, 2025
4c5d168
updated for modern nullish assignment
jdrames Feb 22, 2025
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
6 changes: 4 additions & 2 deletions Mailjet.Client/Mailjet.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<LangVersion>latest</LangVersion>

<Version>3.0.0</Version>
<PackageVersion>3.0.0</PackageVersion>
Expand Down Expand Up @@ -36,7 +37,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions Mailjet.Client/MailjetRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public MailjetRequest Property(string key, JToken value)

public string BuildUrl()
{
string resourceId = ResourceId != null ? ResourceId.Id : null;
string resourceId = ResourceId?.Id;
string actionId = ActionId.HasValue ? ActionId.Value.ToString() : null;
string url = Resource.BuildUrl(resourceId, actionId);
return UrlHelper.AddQuerryString(url, Filters);
Expand All @@ -56,7 +56,7 @@ public override string ToString()
{
dynamic jObject = new JObject();
jObject.Resource = JObject.FromObject(Resource);
jObject.ResourceId = ResourceId != null ? ResourceId.Id : null;
jObject.ResourceId = ResourceId?.Id;
jObject.ActionID = ActionId.HasValue ? ActionId.Value.ToString() : null;
jObject.Filters = JObject.FromObject(Filters);
jObject.Body = Body;
Expand Down
4 changes: 2 additions & 2 deletions Mailjet.ConsoleApplication/Mailjet.ConsoleApplication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

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

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
12 changes: 6 additions & 6 deletions Mailjet.Tests/Mailjet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

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

</PropertyGroup>

Expand All @@ -16,11 +16,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.1.11" />
<PackageReference Include="MSTest.TestFramework" Version="1.1.11" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.8.2" />
<PackageReference Include="MSTest.TestFramework" Version="3.8.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down