Skip to content

Commit

Permalink
Merge pull request #524 from pentp/obsolete-targets
Browse files Browse the repository at this point in the history
Remove obsolete TargetFrameworks
  • Loading branch information
mclift authored Jun 11, 2023
2 parents 0ba05aa + 3b64d8f commit 22e29cd
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 66 deletions.
2 changes: 1 addition & 1 deletion src/Stateless/ParameterConversionResources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Stateless/Reflection/InvocationInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public enum Timing

internal static InvocationInfo Create(Delegate method, string description, Timing timing = Timing.Synchronous)
{
return new InvocationInfo(method?.TryGetMethodName(), description, timing);
return new InvocationInfo(method?.Method?.Name, description, timing);
}

/// <summary>
Expand Down
53 changes: 0 additions & 53 deletions src/Stateless/ReflectionExtensions.cs

This file was deleted.

2 changes: 1 addition & 1 deletion src/Stateless/StateConfigurationResources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions src/Stateless/StateMachine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ public IEnumerable<TTrigger> GetPermittedTriggers(params object[] args)
return CurrentRepresentation.GetPermittedTriggers(args);
}

#if !NETSTANDARD1_0
/// <summary>
/// Gets the currently-permissible triggers with any configured parameters.
/// </summary>
Expand All @@ -147,7 +146,6 @@ public IEnumerable<TriggerDetails<TState, TTrigger>> GetDetailedPermittedTrigger
return CurrentRepresentation.GetPermittedTriggers(args)
.Select(trigger => new TriggerDetails<TState, TTrigger>(trigger, _triggerConfiguration));
}
#endif

StateRepresentation CurrentRepresentation
{
Expand Down
2 changes: 1 addition & 1 deletion src/Stateless/StateMachineResources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Stateless/StateRepresentationResources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions src/Stateless/Stateless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<AssemblyName>Stateless</AssemblyName>
<AssemblyTitle>Stateless</AssemblyTitle>
<Product>Stateless</Product>
<TargetFrameworks>netstandard2.0;netstandard1.0;net45;net40;net472;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net462;net6.0</TargetFrameworks>
<Description>Create state machines and lightweight state machine-based workflows directly in .NET code</Description>
<Copyright>Copyright © Stateless Contributors 2009-$([System.DateTime]::Now.ToString(yyyy))</Copyright>
<NeutralLanguage>en-US</NeutralLanguage>
Expand All @@ -28,11 +28,7 @@
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' OR '$(TargetFramework)' == 'netstandard2.0' ">
<DefineConstants>$(DefineConstants);PORTABLE_REFLECTION;TASKS</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net472' OR '$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0'">
<PropertyGroup>
<DefineConstants>$(DefineConstants);TASKS</DefineConstants>
</PropertyGroup>

Expand Down

0 comments on commit 22e29cd

Please sign in to comment.