Skip to content

Commit 849db8a

Browse files
arturcicarturcic
committed
fix: sonarcloud issues
1 parent 1358781 commit 849db8a

2 files changed

Lines changed: 35 additions & 123 deletions

File tree

‎src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs‎

Lines changed: 32 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,38 @@ public class GitVersionExecutorTests : TestBase
2121
private GitVersionCacheProvider gitVersionCacheProvider;
2222
private IServiceProvider sp;
2323

24+
private const string versionCacheFileContent =
25+
"""
26+
{
27+
"AssemblySemFileVer": "4.10.3.0",
28+
"AssemblySemVer": "4.10.3.0",
29+
"BranchName": "feature/test",
30+
"BuildMetaData": null,
31+
"CommitDate": "2015-11-10T00:00:00.000Z",
32+
"CommitsSinceVersionSource": 19,
33+
"EscapedBranchName": "feature-test",
34+
"FullBuildMetaData": "Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
35+
"FullSemVer": "4.10.3-test.19",
36+
"InformationalVersion": "4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
37+
"Major": 4,
38+
"MajorMinorPatch": "4.10.3",
39+
"Minor": 10,
40+
"Patch": 3,
41+
"PreReleaseLabel": "test",
42+
"PreReleaseLabelWithDash": "-test",
43+
"PreReleaseNumber": 19,
44+
"PreReleaseTag": "test.19",
45+
"PreReleaseTagWithDash": "-test.19",
46+
"SemVer": "4.10.3-test.19",
47+
"Sha": "dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
48+
"ShortSha": "dd2a29af",
49+
"UncommittedChanges": 0,
50+
"VersionSourceDistance": 19,
51+
"VersionSourceSha": "4.10.2",
52+
"WeightedPreReleaseNumber": 19
53+
}
54+
""";
55+
2456
[Test]
2557
public void CacheKeySameAfterReNormalizing()
2658
{
@@ -99,37 +131,6 @@ public void CacheKeyForWorktree()
99131
[Test]
100132
public void CacheFileExistsOnDisk()
101133
{
102-
const string versionCacheFileContent = """
103-
{
104-
"AssemblySemFileVer": "4.10.3.0",
105-
"AssemblySemVer": "4.10.3.0",
106-
"BranchName": "feature/test",
107-
"BuildMetaData": null,
108-
"CommitDate": "2015-11-10T00:00:00.000Z",
109-
"CommitsSinceVersionSource": 19,
110-
"EscapedBranchName": "feature-test",
111-
"FullBuildMetaData": "Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
112-
"FullSemVer": "4.10.3-test.19",
113-
"InformationalVersion": "4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
114-
"Major": 4,
115-
"MajorMinorPatch": "4.10.3",
116-
"Minor": 10,
117-
"Patch": 3,
118-
"PreReleaseLabel": "test",
119-
"PreReleaseLabelWithDash": "-test",
120-
"PreReleaseNumber": 19,
121-
"PreReleaseTag": "test.19",
122-
"PreReleaseTagWithDash": "-test.19",
123-
"SemVer": "4.10.3-test.19",
124-
"Sha": "dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
125-
"ShortSha": "dd2a29af",
126-
"UncommittedChanges": 0,
127-
"VersionSourceDistance": 19,
128-
"VersionSourceSha": "4.10.2",
129-
"WeightedPreReleaseNumber": 19
130-
}
131-
""";
132-
133134
var stringBuilder = new StringBuilder();
134135

135136
var logAppender = new TestLogAppender(Action);
@@ -164,34 +165,6 @@ public void CacheFileExistsOnDisk()
164165
[Test]
165166
public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDynamicallyCalculatedWithoutSavingInCache()
166167
{
167-
const string versionCacheFileContent = """
168-
{
169-
"AssemblySemFileVer": "4.10.3.0",
170-
"AssemblySemVer": "4.10.3.0",
171-
"BranchName": "feature/test",
172-
"BuildMetaData": null,
173-
"CommitDate": "2015-11-10T00:00:00.000Z",
174-
"CommitsSinceVersionSource": 19,
175-
"EscapedBranchName": "feature-test",
176-
"FullBuildMetaData": "Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
177-
"FullSemVer": "4.10.3-test.19",
178-
"InformationalVersion": "4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
179-
"Major": 4,
180-
"Minor": 10,
181-
"Patch": 3,
182-
"PreReleaseLabel": "test",
183-
"PreReleaseLabelWithDash": "-test",
184-
"PreReleaseNumber": 19,
185-
"PreReleaseTag": "test.19",
186-
"PreReleaseTagWithDash": "-test.19",
187-
"SemVer": "4.10.3-test.19",
188-
"Sha": "dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
189-
"ShortSha": "dd2a29af",
190-
"UncommittedChanges": 0,
191-
"VersionSourceDistance": 19
192-
}
193-
""";
194-
195168
using var fixture = new EmptyRepositoryFixture();
196169
fixture.Repository.MakeACommit();
197170

@@ -254,37 +227,6 @@ public void CacheFileIsMissing()
254227
[TestCase(ConfigurationFileLocator.DefaultAlternativeFileNameDotted)]
255228
public void ConfigChangeInvalidatesCache(string configFileName)
256229
{
257-
const string versionCacheFileContent = """
258-
{
259-
"AssemblySemFileVer": "4.10.3.0",
260-
"AssemblySemVer": "4.10.3.0",
261-
"BranchName": "feature/test",
262-
"BuildMetaData": null,
263-
"CommitDate": "2015-11-10T00:00:00.000Z",
264-
"CommitsSinceVersionSource": 19,
265-
"EscapedBranchName": "feature-test",
266-
"FullBuildMetaData": "Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
267-
"FullSemVer": "4.10.3-test.19",
268-
"InformationalVersion": "4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
269-
"Major": 4,
270-
"MajorMinorPatch": "4.10.3",
271-
"Minor": 10,
272-
"Patch": 3,
273-
"PreReleaseLabel": "test",
274-
"PreReleaseLabelWithDash": "-test",
275-
"PreReleaseNumber": 19,
276-
"PreReleaseTag": "test.19",
277-
"PreReleaseTagWithDash": "-test.19",
278-
"SemVer": "4.10.3-test.19",
279-
"Sha": "dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
280-
"ShortSha": "dd2a29af",
281-
"UncommittedChanges": 0,
282-
"VersionSourceDistance": 19,
283-
"VersionSourceSha": "4.10.2",
284-
"WeightedPreReleaseNumber": 19
285-
}
286-
""";
287-
288230
using var fixture = new EmptyRepositoryFixture();
289231

290232
var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
@@ -317,37 +259,6 @@ public void ConfigChangeInvalidatesCache(string configFileName)
317259
[Test]
318260
public void NoCacheBypassesCache()
319261
{
320-
const string versionCacheFileContent = """
321-
{
322-
"AssemblySemFileVer": "4.10.3.0",
323-
"AssemblySemVer": "4.10.3.0",
324-
"BranchName": "feature/test",
325-
"BuildMetaData": null,
326-
"CommitDate": "2015-11-10T00:00:00.000Z",
327-
"CommitsSinceVersionSource": 19,
328-
"EscapedBranchName": "feature-test",
329-
"FullBuildMetaData": "Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
330-
"FullSemVer": "4.10.3-test.19",
331-
"InformationalVersion": "4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
332-
"Major": 4,
333-
"MajorMinorPatch": "4.10.3",
334-
"Minor": 10,
335-
"Patch": 3,
336-
"PreReleaseLabel": "test",
337-
"PreReleaseLabelWithDash": "-test",
338-
"PreReleaseNumber": 19,
339-
"PreReleaseTag": "test.19",
340-
"PreReleaseTagWithDash": "-test.19",
341-
"SemVer": "4.10.3-test.19",
342-
"Sha": "dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f",
343-
"ShortSha": "dd2a29af",
344-
"UncommittedChanges": 0,
345-
"VersionSourceDistance": 19,
346-
"VersionSourceSha": "4.10.2",
347-
"WeightedPreReleaseNumber": 19
348-
}
349-
""";
350-
351262
using var fixture = new EmptyRepositoryFixture();
352263

353264
var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };

‎src/GitVersion.Schema/Program.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
}
3030

3131
var builder = new JsonSchemaBuilder();
32-
builder.Schema("http://json-schema.org/draft-07/schema#");
32+
const string jsonSchemaUri = "https://json-schema.org/draft-07/schema#";
33+
builder.Schema(jsonSchemaUri);
3334
builder.Id($"https://gitversion.net/schemas/{schemaVersion}/GitVersion.configuration.json");
3435
builder.Title($"GitVersion Configuration ({schemaVersion})");
3536
builder.Description($"GitVersion configuration schema ({schemaVersion})");
@@ -42,7 +43,7 @@
4243
configuration.PropertyNameResolver = PropertyNameResolvers.AsDeclared;
4344

4445
builder = new();
45-
builder.Schema("http://json-schema.org/draft-07/schema#");
46+
builder.Schema(jsonSchemaUri);
4647
builder.Id($"https://gitversion.net/schemas/{schemaVersion}/GitVersion.json");
4748
builder.Title("GitVersion version variables output");
4849
builder.Description("GitVersion output schema");

0 commit comments

Comments
 (0)