Skip to content

Commit 35c1807

Browse files
gep13gep13
committed
Merge branch 'release/8.0.0'
* release/8.0.0: (doc) Remove mention of Newtonsoft (maint) Update Contrib Guidleines package (#153) Update to latest Refit Reference Cake 4.0.0 nuget package and change the TFMs to match requirements for Cake 4.0.0
2 parents 21293d4 + 2276e45 commit 35c1807

10 files changed

+36
-39
lines changed

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ You can easily reference Cake.AppVeyor directly in your build script via a cake
88

99
```csharp
1010
#addin nuget:?package=Cake.AppVeyor
11-
#addin nuget:?package=Refit&version=4.6.58
12-
#addin nuget:?package=Newtonsoft.Json&version=11.0.2
11+
#addin nuget:?package=Refit&version=9.0.3
1312
```
1413

15-
NOTE: It's very important at this point in time to specify the `Newtonsoft.Json` package *and* the version *11.0.2* for it, as well as the `Refit` package *and* the version *4.6.58* for it.
14+
NOTE: It's very important at this point in time to specify the `Refit` package *and* the version *9.0.2* for it.
1615

1716
## Aliases
1817

‎src/Cake.AppVeyor.Tests/Cake.AppVeyor.Tests.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Cake.Testing" Version="3.0.0" />
8+
<PackageReference Include="Cake.Testing" Version="4.0.0" />
99
<PackageReference Include="coverlet.msbuild" Version="6.0.4">
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
<PrivateAssets>all</PrivateAssets>
@@ -16,7 +16,7 @@
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
1818
<PackageReference Include="NSubstitute" Version="5.1.0" />
19-
<PackageReference Include="Refit" version="4.8.14" />
19+
<PackageReference Include="Refit" version="9.0.2" />
2020
<PackageReference Include="xunit" Version="2.9.3" />
2121
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
2222
</ItemGroup>

‎src/Cake.AppVeyor/AppVeyorAliases.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ namespace Cake.AppVeyor
99
/// <summary>
1010
/// <para>AppVeyor API related cake aliases.</para>
1111
/// <para>
12-
/// In order to use aliases from this addin, you will need to also reference Refit and Newtonsoft.Json as an addin.
12+
/// In order to use aliases from this addin, you will need to also reference Refit as an addin.
1313
/// Here is what including Cake.AppVeyor in your script should look like:
1414
/// <code>
1515
/// #addin package:?Cake.AppVeyor
16-
/// #addin package:?Refit&amp;version=4.6.58
17-
/// #addin package:?Newtonsoft.Json&amp;version=11.0.2
16+
/// #addin package:?Refit&amp;version=9.0.2
1817
/// </code>
1918
/// </para>
2019
/// </summary>

‎src/Cake.AppVeyor/Cake.AppVeyor.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<IncludeSymbols>true</IncludeSymbols>
77
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -32,14 +32,14 @@
3232
</ItemGroup>
3333

3434
<ItemGroup>
35-
<PackageReference Include="Cake.Common" Version="3.0.0" PrivateAssets="All" />
36-
<PackageReference Include="Cake.Core" Version="3.0.0" PrivateAssets="All" />
35+
<PackageReference Include="Cake.Common" Version="4.0.0" PrivateAssets="All" />
36+
<PackageReference Include="Cake.Core" Version="4.0.0" PrivateAssets="All" />
3737
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
3838
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3939
<PrivateAssets>all</PrivateAssets>
4040
</PackageReference>
41-
<PackageReference Include="Refit" version="4.8.14" />
42-
<PackageReference Include="CakeContrib.Guidelines" Version="1.6.1">
41+
<PackageReference Include="Refit" version="9.0.2" />
42+
<PackageReference Include="CakeContrib.Guidelines" Version="1.7.0">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4545
</PackageReference>

‎src/Cake.AppVeyor/Models/AppVeyorBuildRequestLatestCommit.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System.Collections.Generic;
2-
using Newtonsoft.Json;
2+
using System.Text.Json.Serialization;
33

44
namespace Cake.AppVeyor
55
{
@@ -20,25 +20,25 @@ public AppVeyorBuildRequestLatestCommit()
2020
/// <summary>
2121
/// Gets or sets the AppVeyor Account Name.
2222
/// </summary>
23-
[JsonProperty("accountName")]
23+
[JsonPropertyName("accountName")]
2424
public string AccountName { get; set; }
2525

2626
/// <summary>
2727
/// Gets or sets the AppVeyor Project Slug.
2828
/// </summary>
29-
[JsonProperty("projectSlug")]
29+
[JsonPropertyName("projectSlug")]
3030
public string ProjectSlug { get; set; }
3131

3232
/// <summary>
3333
/// Gets or sets the branch name for the project.
3434
/// </summary>
35-
[JsonProperty("branch")]
35+
[JsonPropertyName("branch")]
3636
public string Branch { get; set; }
3737

3838
/// <summary>
3939
/// Gets or sets the environment variables.
4040
/// </summary>
41-
[JsonProperty("environmentVariables")]
41+
[JsonPropertyName("environmentVariables")]
4242
public Dictionary<string, string> EnvironmentVariables { get; set; }
4343
}
4444
}

‎src/Cake.AppVeyor/Models/AppVeyorBuildRequestPullRequest.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Newtonsoft.Json;
1+
using System.Text.Json.Serialization;
22

33
namespace Cake.AppVeyor
44
{
@@ -10,19 +10,19 @@ public class AppVeyorBuildRequestPullRequest
1010
/// <summary>
1111
/// Gets or sets the AppVeyor Account Name.
1212
/// </summary>
13-
[JsonProperty("accountName")]
13+
[JsonPropertyName("accountName")]
1414
public string AccountName { get; set; }
1515

1616
/// <summary>
1717
/// Gets or sets the AppVeyor Project Slug.
1818
/// </summary>
19-
[JsonProperty("projectSlug")]
19+
[JsonPropertyName("projectSlug")]
2020
public string ProjectSlug { get; set; }
2121

2222
/// <summary>
2323
/// Gets or sets the Pull Request ID.
2424
/// </summary>
25-
[JsonProperty("pullRequestId")]
25+
[JsonPropertyName("pullRequestId")]
2626
public int PullRequestId { get; set; }
2727
}
2828
}

‎src/Cake.AppVeyor/Models/AppVeyorBuildRequestSpecificCommit.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Newtonsoft.Json;
1+
using System.Text.Json.Serialization;
22

33
namespace Cake.AppVeyor
44
{
@@ -18,25 +18,25 @@ public AppVeyorBuildRequestSpecificCommit()
1818
/// <summary>
1919
/// Gets or sets the AppVeyor Account Name.
2020
/// </summary>
21-
[JsonProperty("accountName")]
21+
[JsonPropertyName("accountName")]
2222
public string AccountName { get; set; }
2323

2424
/// <summary>
2525
/// Gets or sets the AppVeyor Project Slug.
2626
/// </summary>
27-
[JsonProperty("projectSlug")]
27+
[JsonPropertyName("projectSlug")]
2828
public string ProjectSlug { get; set; }
2929

3030
/// <summary>
3131
/// Gets or sets the branch name for the project.
3232
/// </summary>
33-
[JsonProperty("branch")]
33+
[JsonPropertyName("branch")]
3434
public string Branch { get; set; }
3535

3636
/// <summary>
3737
/// Gets or sets the SHA identifying a specific commit.
3838
/// </summary>
39-
[JsonProperty("commitId")]
39+
[JsonPropertyName("commitId")]
4040
public string CommitId { get; set; }
4141
}
4242
}

‎src/Cake.AppVeyor/Models/AppVeyorCancelDeploymentRequest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Newtonsoft.Json;
1+
using System.Text.Json.Serialization;
22

33
namespace Cake.AppVeyor
44
{
@@ -10,7 +10,7 @@ public class AppVeyorCancelDeploymentRequest
1010
/// <summary>
1111
/// Gets or sets of the deployment ID.
1212
/// </summary>
13-
[JsonProperty("deploymentId")]
13+
[JsonPropertyName("deploymentId")]
1414
public int DeploymentId { get; set; }
1515
}
1616
}

‎src/Cake.AppVeyor/Models/AppVeyorStartDeploymentRequest.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System.Collections.Generic;
2-
using Newtonsoft.Json;
2+
using System.Text.Json.Serialization;
33

44
namespace Cake.AppVeyor
55
{
@@ -19,37 +19,37 @@ public AppVeyorStartDeploymentRequest()
1919
/// <summary>
2020
/// Gets or sets the AppVeyor Environment Name.
2121
/// </summary>
22-
[JsonProperty("environmentName")]
22+
[JsonPropertyName("environmentName")]
2323
public string EnvironmentName { get; set; }
2424

2525
/// <summary>
2626
/// Gets or sets the AppVeyor Account Name.
2727
/// </summary>
28-
[JsonProperty("accountName")]
28+
[JsonPropertyName("accountName")]
2929
public string AccountName { get; set; }
3030

3131
/// <summary>
3232
/// Gets or sets the AppVeyor Project Slug.
3333
/// </summary>
34-
[JsonProperty("projectSlug")]
34+
[JsonPropertyName("projectSlug")]
3535
public string ProjectSlug { get; set; }
3636

3737
/// <summary>
3838
/// Gets or sets the AppVeyor Build Version.
3939
/// </summary>
40-
[JsonProperty("buildVersion")]
40+
[JsonPropertyName("buildVersion")]
4141
public string BuildVersion { get; set; }
4242

4343
/// <summary>
4444
/// Gets or sets the AppVeyor Build Job ID.
4545
/// </summary>
46-
[JsonProperty("buildJobId")]
46+
[JsonPropertyName("buildJobId")]
4747
public string BuildJobId { get; set; }
4848

4949
/// <summary>
5050
/// Gets or sets the environment variables.
5151
/// </summary>
52-
[JsonProperty("environmentVariables")]
52+
[JsonPropertyName("environmentVariables")]
5353
public Dictionary<string, string> EnvironmentVariables { get; set; }
5454
}
5555
}

‎test.cake‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#reference "BuildArtifacts/temp/_PublishedLibraries/Cake.AppVeyor/net6.0/Cake.AppVeyor.dll"
2-
#addin nuget:?package=Refit&version=4.8.14
3-
#addin nuget:?package=Newtonsoft.Json&version=13.0.4
2+
#addin nuget:?package=Refit&version=9.0.2
43

54
public class BuildData
65
{

0 commit comments

Comments
 (0)