Skip to content

Commit 68db413

Browse files
arturcicarturcic
committed
remove custom json serializer, use System.Text.Json
1 parent 4684cb8 commit 68db413

16 files changed

+400
-372
lines changed

‎build/artifacts-test.cake

+2
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ Task("Artifacts-MsBuildCore-Test")
116116
{
117117
var (distro, targetframework) = dockerImage;
118118

119+
if (targetframework == "3.1" && distro == "fedora.33-x64") continue; // TODO check why this one fails
120+
119121
if (targetframework == "3.1") {
120122
targetframework = $"netcoreapp{targetframework}";
121123
} else if (targetframework == "5.0") {

‎src/Directory.Build.props

+6-1
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
<PackageVersion_JetBrainsAnnotations>2020.3.0</PackageVersion_JetBrainsAnnotations>
2929
<PackageVersion_YamlDotNet>8.1.2</PackageVersion_YamlDotNet>
30-
<PackageVersion_NewtonsoftJson>12.0.3</PackageVersion_NewtonsoftJson>
3130
<PackageVersion_MicrosoftExtensions>5.0.0</PackageVersion_MicrosoftExtensions>
31+
<PackageVersion_MicrosoftJson>5.0.0</PackageVersion_MicrosoftJson>
3232
<PackageVersion_MsBuild>16.8.0</PackageVersion_MsBuild>
3333

3434
<PackageVersion_MicrosoftTestSdk>16.8.3</PackageVersion_MicrosoftTestSdk>
@@ -42,6 +42,11 @@
4242

4343
</PropertyGroup>
4444

45+
<ItemGroup>
46+
<PackageReference Include="System.Text.Json" Version="$(PackageVersion_MicrosoftJson)" />
47+
<PackageReference Include="System.Text.Encodings.Web" Version="$(PackageVersion_MicrosoftJson)" />
48+
</ItemGroup>
49+
4550
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
4651
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(PackageVersion_MicrosoftTestSdk)" />
4752
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />

‎src/GitVersionCore.Tests/VersionCalculation/Approved/JsonVersionBuilderTests.Json.approved.txt

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
{
2-
"Major":1,
3-
"Minor":2,
4-
"Patch":0,
5-
"PreReleaseTag":"unstable.4",
6-
"PreReleaseTagWithDash":"-unstable.4",
7-
"PreReleaseLabel":"unstable",
8-
"PreReleaseLabelWithDash":"-unstable",
9-
"PreReleaseNumber":4,
10-
"WeightedPreReleaseNumber":4,
11-
"BuildMetaData":5,
12-
"BuildMetaDataPadded":"0005",
13-
"FullBuildMetaData":"5.Branch.feature1.Sha.commitSha",
14-
"MajorMinorPatch":"1.2.0",
15-
"SemVer":"1.2.0-unstable.4",
16-
"LegacySemVer":"1.2.0-unstable4",
17-
"LegacySemVerPadded":"1.2.0-unstable0004",
18-
"AssemblySemVer":"1.2.0.0",
19-
"AssemblySemFileVer":"1.2.0.0",
20-
"FullSemVer":"1.2.0-unstable.4+5",
21-
"InformationalVersion":"1.2.0-unstable.4+5.Branch.feature1.Sha.commitSha",
22-
"BranchName":"feature1",
23-
"EscapedBranchName":"feature1",
24-
"Sha":"commitSha",
25-
"ShortSha":"commitShortSha",
26-
"NuGetVersionV2":"1.2.0-unstable0004",
27-
"NuGetVersion":"1.2.0-unstable0004",
28-
"NuGetPreReleaseTagV2":"unstable0004",
29-
"NuGetPreReleaseTag":"unstable0004",
30-
"VersionSourceSha":"versionSourceSha",
31-
"CommitsSinceVersionSource":5,
32-
"CommitsSinceVersionSourcePadded":"0005",
33-
"UncommittedChanges":0,
34-
"CommitDate":"2014-03-06"
2+
"Major": 1,
3+
"Minor": 2,
4+
"Patch": 0,
5+
"PreReleaseTag": "unstable.4",
6+
"PreReleaseTagWithDash": "-unstable.4",
7+
"PreReleaseLabel": "unstable",
8+
"PreReleaseLabelWithDash": "-unstable",
9+
"PreReleaseNumber": 4,
10+
"WeightedPreReleaseNumber": 4,
11+
"BuildMetaData": 5,
12+
"BuildMetaDataPadded": "0005",
13+
"FullBuildMetaData": "5.Branch.feature1.Sha.commitSha",
14+
"MajorMinorPatch": "1.2.0",
15+
"SemVer": "1.2.0-unstable.4",
16+
"LegacySemVer": "1.2.0-unstable4",
17+
"LegacySemVerPadded": "1.2.0-unstable0004",
18+
"AssemblySemVer": "1.2.0.0",
19+
"AssemblySemFileVer": "1.2.0.0",
20+
"FullSemVer": "1.2.0-unstable.4+5",
21+
"InformationalVersion": "1.2.0-unstable.4+5.Branch.feature1.Sha.commitSha",
22+
"BranchName": "feature1",
23+
"EscapedBranchName": "feature1",
24+
"Sha": "commitSha",
25+
"ShortSha": "commitShortSha",
26+
"NuGetVersionV2": "1.2.0-unstable0004",
27+
"NuGetVersion": "1.2.0-unstable0004",
28+
"NuGetPreReleaseTagV2": "unstable0004",
29+
"NuGetPreReleaseTag": "unstable0004",
30+
"VersionSourceSha": "versionSourceSha",
31+
"CommitsSinceVersionSource": 5,
32+
"CommitsSinceVersionSourcePadded": "0005",
33+
"UncommittedChanges": 0,
34+
"CommitDate": "2014-03-06"
3535
}

‎src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranch.approved.txt

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
{
2-
"Major":1,
3-
"Minor":2,
4-
"Patch":3,
5-
"PreReleaseTag":"",
6-
"PreReleaseTagWithDash":"",
7-
"PreReleaseLabel":"",
8-
"PreReleaseLabelWithDash":"",
9-
"PreReleaseNumber":"",
10-
"WeightedPreReleaseNumber":0,
11-
"BuildMetaData":5,
12-
"BuildMetaDataPadded":"0005",
13-
"FullBuildMetaData":"5.Branch.feature-123.Sha.commitSha",
14-
"MajorMinorPatch":"1.2.3",
15-
"SemVer":"1.2.3",
16-
"LegacySemVer":"1.2.3",
17-
"LegacySemVerPadded":"1.2.3",
18-
"AssemblySemVer":"1.2.3.0",
19-
"AssemblySemFileVer":"1.2.3.0",
20-
"FullSemVer":"1.2.3+5",
21-
"InformationalVersion":"1.2.3+5.Branch.feature-123.Sha.commitSha",
22-
"BranchName":"feature/123",
23-
"EscapedBranchName":"feature-123",
24-
"Sha":"commitSha",
25-
"ShortSha":"commitShortSha",
26-
"NuGetVersionV2":"1.2.3",
27-
"NuGetVersion":"1.2.3",
28-
"NuGetPreReleaseTagV2":"",
29-
"NuGetPreReleaseTag":"",
30-
"VersionSourceSha":"versionSourceSha",
31-
"CommitsSinceVersionSource":5,
32-
"CommitsSinceVersionSourcePadded":"0005",
33-
"UncommittedChanges":0,
34-
"CommitDate":"2014-03-06"
2+
"Major": 1,
3+
"Minor": 2,
4+
"Patch": 3,
5+
"PreReleaseTag": "",
6+
"PreReleaseTagWithDash": "",
7+
"PreReleaseLabel": "",
8+
"PreReleaseLabelWithDash": "",
9+
"PreReleaseNumber": "",
10+
"WeightedPreReleaseNumber": 0,
11+
"BuildMetaData": 5,
12+
"BuildMetaDataPadded": "0005",
13+
"FullBuildMetaData": "5.Branch.feature-123.Sha.commitSha",
14+
"MajorMinorPatch": "1.2.3",
15+
"SemVer": "1.2.3",
16+
"LegacySemVer": "1.2.3",
17+
"LegacySemVerPadded": "1.2.3",
18+
"AssemblySemVer": "1.2.3.0",
19+
"AssemblySemFileVer": "1.2.3.0",
20+
"FullSemVer": "1.2.3+5",
21+
"InformationalVersion": "1.2.3+5.Branch.feature-123.Sha.commitSha",
22+
"BranchName": "feature/123",
23+
"EscapedBranchName": "feature-123",
24+
"Sha": "commitSha",
25+
"ShortSha": "commitShortSha",
26+
"NuGetVersionV2": "1.2.3",
27+
"NuGetVersion": "1.2.3",
28+
"NuGetPreReleaseTagV2": "",
29+
"NuGetPreReleaseTag": "",
30+
"VersionSourceSha": "versionSourceSha",
31+
"CommitsSinceVersionSource": 5,
32+
"CommitsSinceVersionSourcePadded": "0005",
33+
"UncommittedChanges": 0,
34+
"CommitDate": "2014-03-06"
3535
}

‎src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForFeatureBranchWithCustomAssemblyInfoFormat.approved.txt

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
{
2-
"Major":1,
3-
"Minor":2,
4-
"Patch":3,
5-
"PreReleaseTag":"",
6-
"PreReleaseTagWithDash":"",
7-
"PreReleaseLabel":"",
8-
"PreReleaseLabelWithDash":"",
9-
"PreReleaseNumber":"",
10-
"WeightedPreReleaseNumber":0,
11-
"BuildMetaData":5,
12-
"BuildMetaDataPadded":"0005",
13-
"FullBuildMetaData":"5.Branch.feature-123.Sha.commitSha",
14-
"MajorMinorPatch":"1.2.3",
15-
"SemVer":"1.2.3",
16-
"LegacySemVer":"1.2.3",
17-
"LegacySemVerPadded":"1.2.3",
18-
"AssemblySemVer":"1.2.3.0",
19-
"AssemblySemFileVer":"1.2.3.0",
20-
"FullSemVer":"1.2.3+5",
21-
"InformationalVersion":"1.2.3+5.Branch.feature-123.Sha.commitShortSha",
22-
"BranchName":"feature/123",
23-
"EscapedBranchName":"feature-123",
24-
"Sha":"commitSha",
25-
"ShortSha":"commitShortSha",
26-
"NuGetVersionV2":"1.2.3",
27-
"NuGetVersion":"1.2.3",
28-
"NuGetPreReleaseTagV2":"",
29-
"NuGetPreReleaseTag":"",
30-
"VersionSourceSha":"versionSourceSha",
31-
"CommitsSinceVersionSource":5,
32-
"CommitsSinceVersionSourcePadded":"0005",
33-
"UncommittedChanges":0,
34-
"CommitDate":"2014-03-06"
2+
"Major": 1,
3+
"Minor": 2,
4+
"Patch": 3,
5+
"PreReleaseTag": "",
6+
"PreReleaseTagWithDash": "",
7+
"PreReleaseLabel": "",
8+
"PreReleaseLabelWithDash": "",
9+
"PreReleaseNumber": "",
10+
"WeightedPreReleaseNumber": 0,
11+
"BuildMetaData": 5,
12+
"BuildMetaDataPadded": "0005",
13+
"FullBuildMetaData": "5.Branch.feature-123.Sha.commitSha",
14+
"MajorMinorPatch": "1.2.3",
15+
"SemVer": "1.2.3",
16+
"LegacySemVer": "1.2.3",
17+
"LegacySemVerPadded": "1.2.3",
18+
"AssemblySemVer": "1.2.3.0",
19+
"AssemblySemFileVer": "1.2.3.0",
20+
"FullSemVer": "1.2.3+5",
21+
"InformationalVersion": "1.2.3+5.Branch.feature-123.Sha.commitShortSha",
22+
"BranchName": "feature/123",
23+
"EscapedBranchName": "feature-123",
24+
"Sha": "commitSha",
25+
"ShortSha": "commitShortSha",
26+
"NuGetVersionV2": "1.2.3",
27+
"NuGetVersion": "1.2.3",
28+
"NuGetPreReleaseTagV2": "",
29+
"NuGetPreReleaseTag": "",
30+
"VersionSourceSha": "versionSourceSha",
31+
"CommitsSinceVersionSource": 5,
32+
"CommitsSinceVersionSourcePadded": "0005",
33+
"UncommittedChanges": 0,
34+
"CommitDate": "2014-03-06"
3535
}

‎src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
{
2-
"Major":1,
3-
"Minor":2,
4-
"Patch":3,
5-
"PreReleaseTag":"unstable.4",
6-
"PreReleaseTagWithDash":"-unstable.4",
7-
"PreReleaseLabel":"unstable",
8-
"PreReleaseLabelWithDash":"-unstable",
9-
"PreReleaseNumber":4,
10-
"WeightedPreReleaseNumber":4,
11-
"BuildMetaData":5,
12-
"BuildMetaDataPadded":"0005",
13-
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
14-
"MajorMinorPatch":"1.2.3",
15-
"SemVer":"1.2.3-unstable.4",
16-
"LegacySemVer":"1.2.3-unstable4",
17-
"LegacySemVerPadded":"1.2.3-unstable0004",
18-
"AssemblySemVer":"1.2.3.0",
19-
"AssemblySemFileVer":"1.2.3.0",
20-
"FullSemVer":"1.2.3-unstable.4+5",
21-
"InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
22-
"BranchName":"develop",
23-
"EscapedBranchName":"develop",
24-
"Sha":"commitSha",
25-
"ShortSha":"commitShortSha",
26-
"NuGetVersionV2":"1.2.3-unstable0004",
27-
"NuGetVersion":"1.2.3-unstable0004",
28-
"NuGetPreReleaseTagV2":"unstable0004",
29-
"NuGetPreReleaseTag":"unstable0004",
30-
"VersionSourceSha":"versionSourceSha",
31-
"CommitsSinceVersionSource":5,
32-
"CommitsSinceVersionSourcePadded":"0005",
33-
"UncommittedChanges":0,
34-
"CommitDate":"2014-03-06"
2+
"Major": 1,
3+
"Minor": 2,
4+
"Patch": 3,
5+
"PreReleaseTag": "unstable.4",
6+
"PreReleaseTagWithDash": "-unstable.4",
7+
"PreReleaseLabel": "unstable",
8+
"PreReleaseLabelWithDash": "-unstable",
9+
"PreReleaseNumber": 4,
10+
"WeightedPreReleaseNumber": 4,
11+
"BuildMetaData": 5,
12+
"BuildMetaDataPadded": "0005",
13+
"FullBuildMetaData": "5.Branch.develop.Sha.commitSha",
14+
"MajorMinorPatch": "1.2.3",
15+
"SemVer": "1.2.3-unstable.4",
16+
"LegacySemVer": "1.2.3-unstable4",
17+
"LegacySemVerPadded": "1.2.3-unstable0004",
18+
"AssemblySemVer": "1.2.3.0",
19+
"AssemblySemFileVer": "1.2.3.0",
20+
"FullSemVer": "1.2.3-unstable.4+5",
21+
"InformationalVersion": "1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
22+
"BranchName": "develop",
23+
"EscapedBranchName": "develop",
24+
"Sha": "commitSha",
25+
"ShortSha": "commitShortSha",
26+
"NuGetVersionV2": "1.2.3-unstable0004",
27+
"NuGetVersion": "1.2.3-unstable0004",
28+
"NuGetPreReleaseTagV2": "unstable0004",
29+
"NuGetPreReleaseTag": "unstable0004",
30+
"VersionSourceSha": "versionSourceSha",
31+
"CommitsSinceVersionSource": 5,
32+
"CommitsSinceVersionSourcePadded": "0005",
33+
"UncommittedChanges": 0,
34+
"CommitDate": "2014-03-06"
3535
}

‎src/GitVersionCore.Tests/VersionCalculation/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
{
2-
"Major":1,
3-
"Minor":2,
4-
"Patch":3,
5-
"PreReleaseTag":"unstable.4",
6-
"PreReleaseTagWithDash":"-unstable.4",
7-
"PreReleaseLabel":"unstable",
8-
"PreReleaseLabelWithDash":"-unstable",
9-
"PreReleaseNumber":4,
10-
"WeightedPreReleaseNumber":4,
11-
"BuildMetaData":5,
12-
"BuildMetaDataPadded":"05",
13-
"FullBuildMetaData":"5.Branch.develop.Sha.commitSha",
14-
"MajorMinorPatch":"1.2.3",
15-
"SemVer":"1.2.3-unstable.4",
16-
"LegacySemVer":"1.2.3-unstable4",
17-
"LegacySemVerPadded":"1.2.3-unstable00004",
18-
"AssemblySemVer":"1.2.3.0",
19-
"AssemblySemFileVer":"1.2.3.0",
20-
"FullSemVer":"1.2.3-unstable.4+5",
21-
"InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
22-
"BranchName":"develop",
23-
"EscapedBranchName":"develop",
24-
"Sha":"commitSha",
25-
"ShortSha":"commitShortSha",
26-
"NuGetVersionV2":"1.2.3-unstable00004",
27-
"NuGetVersion":"1.2.3-unstable00004",
28-
"NuGetPreReleaseTagV2":"unstable0004",
29-
"NuGetPreReleaseTag":"unstable0004",
30-
"VersionSourceSha":"versionSourceSha",
31-
"CommitsSinceVersionSource":5,
32-
"CommitsSinceVersionSourcePadded":"0005",
33-
"UncommittedChanges":0,
34-
"CommitDate":"2014-03-06"
2+
"Major": 1,
3+
"Minor": 2,
4+
"Patch": 3,
5+
"PreReleaseTag": "unstable.4",
6+
"PreReleaseTagWithDash": "-unstable.4",
7+
"PreReleaseLabel": "unstable",
8+
"PreReleaseLabelWithDash": "-unstable",
9+
"PreReleaseNumber": 4,
10+
"WeightedPreReleaseNumber": 4,
11+
"BuildMetaData": 5,
12+
"BuildMetaDataPadded": "05",
13+
"FullBuildMetaData": "5.Branch.develop.Sha.commitSha",
14+
"MajorMinorPatch": "1.2.3",
15+
"SemVer": "1.2.3-unstable.4",
16+
"LegacySemVer": "1.2.3-unstable4",
17+
"LegacySemVerPadded": "1.2.3-unstable00004",
18+
"AssemblySemVer": "1.2.3.0",
19+
"AssemblySemFileVer": "1.2.3.0",
20+
"FullSemVer": "1.2.3-unstable.4+5",
21+
"InformationalVersion": "1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
22+
"BranchName": "develop",
23+
"EscapedBranchName": "develop",
24+
"Sha": "commitSha",
25+
"ShortSha": "commitShortSha",
26+
"NuGetVersionV2": "1.2.3-unstable00004",
27+
"NuGetVersion": "1.2.3-unstable00004",
28+
"NuGetPreReleaseTagV2": "unstable0004",
29+
"NuGetPreReleaseTag": "unstable0004",
30+
"VersionSourceSha": "versionSourceSha",
31+
"CommitsSinceVersionSource": 5,
32+
"CommitsSinceVersionSourcePadded": "0005",
33+
"UncommittedChanges": 0,
34+
"CommitDate": "2014-03-06"
3535
}

0 commit comments

Comments
 (0)