Skip to content
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.

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

Remove JetBrains.Annotations dependency #3798

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
<PackageReference Include="Microsoft.Extensions.DependencyInjection"/>
<PackageReference Include="Microsoft.NET.Test.Sdk"/>

<PackageReference Include="JetBrains.Annotations" PrivateAssets="All"/>
<PackageReference Include="NSubstitute"/>

<PackageReference Include="NUnit"/>
Expand Down
3 changes: 1 addition & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<PackageVersion Include="FluentDateTime" Version="2.1.0" />
<PackageVersion Include="JsonSchema.Net.Generation" Version="3.5.0" />
<PackageVersion Include="LibGit2Sharp" Version="0.28.0" />
<PackageVersion Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageVersion Include="Microsoft.Build" Version="17.8.3" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
Expand Down Expand Up @@ -36,4 +35,4 @@
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
<PackageVersion Include="YamlDotNet" Version="13.7.1" />
</ItemGroup>
</Project>
</Project>
2 changes: 0 additions & 2 deletions src/GitVersion.Core/GitVersion.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
<ItemGroup>
<PackageReference Include="Polly" />
<PackageReference Include="System.Net.Requests" />

<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Options" />
<PackageReference Include="YamlDotNet" />
Expand Down
12 changes: 9 additions & 3 deletions src/GitVersion.Testing/Helpers/StringBuilderExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
using JetBrains.Annotations;
#if NET7_0_OR_GREATER
using System.Diagnostics.CodeAnalysis;
#endif

namespace GitVersion.Testing.Internal;

internal static class StringBuilderExtensions
{
[StringFormatMethod("format")]
public static void AppendLineFormat(this StringBuilder stringBuilder, string format, params object?[] args)
public static void AppendLineFormat(this StringBuilder stringBuilder,
#if NET7_0_OR_GREATER
[StringSyntax(StringSyntaxAttribute.CompositeFormat)]
#endif
string format,
params object?[] args)
{
stringBuilder.AppendFormat(format, args);
stringBuilder.AppendLine();
Expand Down