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.

Sign up for GitHub

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

Jump to bottom

chore: simplify roslyn multi targeting #1028

Merged
merged 1 commit into from Jan 2, 2024
Merged

chore: simplify roslyn multi targeting #1028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.Roslyn4.0.cs
View file
Open in desktop
@@ -0,0 +1,16 @@
#if !ROSLYN4_4_OR_GREATER
using Microsoft.CodeAnalysis;

namespace Riok.Mapperly.Helpers;

internal static partial class IncrementalValuesProviderExtensions
{
public static IncrementalValueProvider<TSource> WithTrackingName<TSource>(this IncrementalValueProvider<TSource> source, string name) =>
source;

public static IncrementalValuesProvider<TSource> WithTrackingName<TSource>(
this IncrementalValuesProvider<TSource> source,
string name
) => source;
}
#endif
26 changes: 8 additions & 18 deletions src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@

namespace Riok.Mapperly.Helpers;

internal static class IncrementalValuesProviderExtensions
internal static partial class IncrementalValuesProviderExtensions
{
public static IncrementalValuesProvider<TSource> WhereNotNull<TSource>(this IncrementalValuesProvider<TSource?> source)
where TSource : struct
Expand All @@ -15,6 +15,13 @@
#nullable enable
}

public static IncrementalValuesProvider<TSource> WhereNotNull<TSource>(this IncrementalValuesProvider<TSource?> source)
{

Check warning on line 19 in src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs

View check run for this annotation

Codecov / codecov/patch

src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs#L19 

Added line #L19 was not covered by tests
#nullable disable
return source.Where(x => x != null);
#nullable enable
}

Check warning on line 23 in src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs

View check run for this annotation

Codecov / codecov/patch

src/Riok.Mapperly/Helpers/IncrementalValuesProviderExtensions.cs#L23 

Added line #L23 was not covered by tests

/// <summary>
/// Registers an output node into an <see cref="IncrementalGeneratorInitializationContext"/> to output a diagnostic.
/// </summary>
Expand Down Expand Up @@ -69,21 +76,4 @@
}
);
}

#if !ROSLYN4_4_OR_GREATER
public static IncrementalValuesProvider<TSource> WhereNotNull<TSource>(this IncrementalValuesProvider<TSource?> source)
{
#nullable disable
return source.Where(x => x != null);
#nullable enable
}

public static IncrementalValueProvider<TSource> WithTrackingName<TSource>(this IncrementalValueProvider<TSource> source, string name) =>
source;

public static IncrementalValuesProvider<TSource> WithTrackingName<TSource>(
this IncrementalValuesProvider<TSource> source,
string name
) => source;
#endif
}
4 changes: 0 additions & 4 deletions src/Riok.Mapperly/Riok.Mapperly.Roslyn4.4.props
View file
Open in desktop
@@ -1,9 +1,5 @@
<Project>

<PropertyGroup>
<DefineConstants>$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
</ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions src/Riok.Mapperly/Riok.Mapperly.Roslyn4.5.props
View file
Open in desktop
@@ -1,9 +1,5 @@
<Project>

<PropertyGroup>
<DefineConstants>$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" PrivateAssets="all" />
</ItemGroup>
Expand Down
5 changes: 0 additions & 5 deletions src/Riok.Mapperly/Riok.Mapperly.Roslyn4.7.props
View file
Open in desktop
@@ -1,10 +1,5 @@
<Project>

<PropertyGroup>
<DefineConstants>$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
<DefineConstants>$(DefineConstants);ROSLYN4_7_OR_GREATER</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="all" />
</ItemGroup>
Expand Down
4 changes: 3 additions & 1 deletion src/Riok.Mapperly/Riok.Mapperly.csproj
View file
Open in desktop
Expand Up @@ -16,8 +16,10 @@
<PackageTags>Mapper SourceGenerator</PackageTags>
<PackageIcon>logo.png</PackageIcon>

<!-- default roslyn version -->
<!-- default roslyn version and constants -->
<ROSLYN_VERSION Condition="'$(ROSLYN_VERSION)' == ''">4.7</ROSLYN_VERSION>
<DefineConstants Condition="$(ROSLYN_VERSION) >= 4.4">$(DefineConstants);ROSLYN4_4_OR_GREATER</DefineConstants>
<DefineConstants Condition="$(ROSLYN_VERSION) >= 4.7">$(DefineConstants);ROSLYN4_7_OR_GREATER</DefineConstants>
</PropertyGroup>

<Target Name="Husky" BeforeTargets="Restore;CollectPackageReferences" Condition="'$(HUSKY)' != 0 AND '$(CI)' == ''">
Expand Down