Skip to content

Commit 190229b

Browse files
ltrzesniewskiltrzesniewski
committed
Remove JetBrains.Annotations
1 parent 77faffb commit 190229b

File tree

8 files changed

+18
-33
lines changed

8 files changed

+18
-33
lines changed

‎src/Abc.Zebus.MessageDsl.Build/Build/GenerateZebusMessagesTask.cs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
1-
using System;
1+
#nullable enable
2+
3+
using System;
24
using System.IO;
35
using Abc.Zebus.MessageDsl.Ast;
46
using Abc.Zebus.MessageDsl.Generator;
5-
using JetBrains.Annotations;
67
using Microsoft.Build.Framework;
78
using Microsoft.Build.Utilities;
89

9-
#nullable enable
10-
1110
namespace Abc.Zebus.MessageDsl.Build;
1211

13-
[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
1412
public class GenerateZebusMessagesTask : Task
1513
{
16-
private const string _logSubcategory = "Zebus.MessageDsl";
14+
private const string LogSubcategory = "Zebus.MessageDsl";
1715

1816
[Required]
1917
public ITaskItem[] InputFiles { get; set; } = default!;
@@ -84,8 +82,8 @@ private static string GetValidTargetFilePath(ITaskItem inputFile)
8482
}
8583

8684
private void LogDebug(string message)
87-
=> Log.LogMessage(_logSubcategory, null, null, null, 0, 0, 0, 0, MessageImportance.Low, message, null);
85+
=> Log.LogMessage(LogSubcategory, null, null, null, 0, 0, 0, 0, MessageImportance.Low, message, null);
8886

8987
private void LogError(ITaskItem? inputFile, string message, int lineNumber = 0, int columnNumber = 0)
90-
=> Log.LogError(_logSubcategory, null, null, inputFile?.ItemSpec, lineNumber, columnNumber, 0, 0, message, null);
88+
=> Log.LogError(LogSubcategory, null, null, inputFile?.ItemSpec, lineNumber, columnNumber, 0, 0, message, null);
9189
}

‎src/Abc.Zebus.MessageDsl.Tests/MessageDsl/GeneratorTests.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Abc.Zebus.MessageDsl.Ast;
44
using Abc.Zebus.MessageDsl.Generator;
55
using Abc.Zebus.MessageDsl.Tests.TestTools;
6-
using JetBrains.Annotations;
76
using VerifyNUnit;
87

98
namespace Abc.Zebus.MessageDsl.Tests.MessageDsl;
@@ -19,15 +18,13 @@ static GeneratorTests()
1918
protected abstract string SnapshotExtension { get; }
2019
protected abstract string GenerateRaw(ParsedContracts contracts);
2120

22-
[MustUseReturnValue]
2321
protected string Generate(MessageDefinition message)
2422
{
2523
var contracts = new ParsedContracts();
2624
contracts.Messages.Add(message);
2725
return Generate(contracts);
2826
}
2927

30-
[MustUseReturnValue]
3128
protected string Generate(ParsedContracts contracts)
3229
{
3330
PreProcess(contracts);

‎src/Abc.Zebus.MessageDsl.Tests/MessageDsl/ParsedContractsTests.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Abc.Zebus.MessageDsl.Analysis;
55
using Abc.Zebus.MessageDsl.Ast;
66
using Abc.Zebus.MessageDsl.Tests.TestTools;
7-
using JetBrains.Annotations;
87
using NUnit.Framework;
98

109
namespace Abc.Zebus.MessageDsl.Tests.MessageDsl;
@@ -956,7 +955,7 @@ public bool should_validate_attribute_targets(string definitionText)
956955
public void should_handle_errors(string definitionText)
957956
=> Parse(definitionText);
958957

959-
private static ParsedContracts ParseValid([LanguageInjection("csharp")] string definitionText)
958+
private static ParsedContracts ParseValid([StringSyntax("csharp")] string definitionText)
960959
{
961960
var contracts = Parse(definitionText);
962961

@@ -966,7 +965,7 @@ private static ParsedContracts ParseValid([LanguageInjection("csharp")] string d
966965
return contracts;
967966
}
968967

969-
private static ParsedContracts ParseInvalid([LanguageInjection("csharp")] string definitionText)
968+
private static ParsedContracts ParseInvalid([StringSyntax("csharp")] string definitionText)
970969
{
971970
var contracts = Parse(definitionText);
972971

@@ -976,7 +975,7 @@ private static ParsedContracts ParseInvalid([LanguageInjection("csharp")] string
976975
return contracts;
977976
}
978977

979-
private static ParsedContracts Parse([LanguageInjection("csharp")] string definitionText)
978+
private static ParsedContracts Parse([StringSyntax("csharp")] string definitionText)
980979
{
981980
Console.WriteLine();
982981
Console.WriteLine("PARSE: {0}", definitionText);

‎src/Abc.Zebus.MessageDsl/Analysis/TextInterval.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System;
2-
using JetBrains.Annotations;
2+
using System.Diagnostics.Contracts;
33

44
namespace Abc.Zebus.MessageDsl.Analysis;
55

‎src/Abc.Zebus.MessageDsl/Ast/MemberOptions.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using JetBrains.Annotations;
2-
3-
namespace Abc.Zebus.MessageDsl.Ast;
1+
namespace Abc.Zebus.MessageDsl.Ast;
42

53
public class MemberOptions : OptionsBase
64
{
@@ -12,7 +10,7 @@ public class MemberOptions : OptionsBase
1210
public bool Public
1311
{
1412
get => !Internal;
15-
[UsedImplicitly] set => Internal = !value;
13+
set => Internal = !value;
1614
}
1715

1816
public bool Nullable { get; set; }

‎src/Abc.Zebus.MessageDsl/Ast/OptionsBase.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
using System;
22
using System.Linq;
33
using System.Reflection;
4-
using JetBrains.Annotations;
54

65
namespace Abc.Zebus.MessageDsl.Ast;
76

8-
[UsedImplicitly(ImplicitUseTargetFlags.WithMembers)]
97
public abstract class OptionsBase
108
{
119
public OptionDescriptor? GetOptionDescriptor(string? optionName)
1210
{
1311
if (string.IsNullOrEmpty(optionName))
1412
return null;
1513

16-
var property = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance)
17-
.FirstOrDefault(prop => prop.Name.Equals(optionName, StringComparison.OrdinalIgnoreCase));
14+
var property = GetType()
15+
.GetProperties(BindingFlags.Public | BindingFlags.Instance)
16+
.FirstOrDefault(prop => prop.Name.Equals(optionName, StringComparison.OrdinalIgnoreCase));
1817

1918
if (property == null)
2019
return null;

‎src/Abc.Zebus.MessageDsl/Ast/ParsedContracts.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Abc.Zebus.MessageDsl.Analysis;
44
using Abc.Zebus.MessageDsl.Dsl;
55
using Antlr4.Runtime;
6-
using JetBrains.Annotations;
76

87
namespace Abc.Zebus.MessageDsl.Ast;
98

@@ -98,15 +97,15 @@ public void AddError(IToken? token, string message)
9897
public void AddError(ParserRuleContext? context, string message)
9998
=> AddError(context?.Start, message);
10099

101-
[StringFormatMethod("format"), Obsolete("Use a string interpolation")]
100+
[Obsolete("Use a string interpolation")]
102101
public void AddError(ParserRuleContext? context, string format, params object?[] args)
103102
=> AddError(context, string.Format(format, args));
104103

105-
[StringFormatMethod("format"), Obsolete("Use a string interpolation")]
104+
[Obsolete("Use a string interpolation")]
106105
public void AddError(IToken? token, string format, params object?[] args)
107106
=> AddError(token, string.Format(format, args));
108107

109-
[StringFormatMethod("format"), Obsolete("Use a string interpolation")]
108+
[Obsolete("Use a string interpolation")]
110109
public void AddError(string format, params object?[] args)
111110
=> AddError(string.Format(format, args));
112111
}

‎src/Directory.Build.props‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@
3737
<EnableSourceControlManagerQueries>false</EnableSourceControlManagerQueries>
3838
</PropertyGroup>
3939

40-
<ItemGroup>
41-
<!-- Do not update beyond 2024.3.0, later versions do not use [Conditional] anymore -->
42-
<PackageReference Include="JetBrains.Annotations" Version="[2024.3.0]" PrivateAssets="all" />
43-
</ItemGroup>
44-
4540
<ItemGroup>
4641
<None Include="$(MSBuildThisFileDirectory)NuGetReadme.md" Pack="true" PackagePath="/README.md" Visible="false" />
4742
</ItemGroup>

0 commit comments

Comments
 (0)