Skip to content
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
4 changes: 2 additions & 2 deletions TJC.StateMachine.Tests/Mocks/RevolverStates.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
internal enum RevolverStates
{
Loaded,
Empty
Empty,
}
}
}
5 changes: 0 additions & 5 deletions TJC.StateMachine.Tests/TJC.StateMachine.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -8,20 +7,16 @@
<IsTestProject>true</IsTestProject>
<AppDesignerFolder>Tests</AppDesignerFolder>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.1" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\TJC.StateMachine\TJC.StateMachine.csproj" />
</ItemGroup>

<ItemGroup>
<Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
</ItemGroup>

</Project>
12 changes: 9 additions & 3 deletions TJC.StateMachine.Tests/Tests/StatePropertyAccessibility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,24 @@ public class StatePropertyAccessibility
[TestMethod]
public void EnsurePropertyStateIsNotPubliclyAccessible()
{
var prop = typeof(StateMachineBase<RevolverStates>).GetProperty("State", BindingFlags.Instance | BindingFlags.Public);
var prop = typeof(StateMachineBase<RevolverStates>).GetProperty(
"State",
BindingFlags.Instance | BindingFlags.Public
);
Assert.IsNull(prop);
}

[TestMethod]
public void EnsurePropertyStateIsProtectedAccessible()
{
var prop = typeof(StateMachineBase<RevolverStates>).GetProperty("State", BindingFlags.Instance | BindingFlags.NonPublic);
var prop = typeof(StateMachineBase<RevolverStates>).GetProperty(
"State",
BindingFlags.Instance | BindingFlags.NonPublic
);
Assert.IsNotNull(prop);
var getter = prop.GetMethod;
Assert.IsNotNull(getter);
Assert.IsTrue(getter.IsFamily);
}
}
}
}
41 changes: 27 additions & 14 deletions TJC.StateMachine/TJC.StateMachine.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -44,40 +44,48 @@
</AssemblyAttribute>
</ItemGroup>
<!-- TASKS -->
<UsingTask TaskName="ReadFileContent" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
<UsingTask
TaskName="ReadFileContent"
TaskFactory="RoslynCodeTaskFactory"
AssemblyName="Microsoft.Build.Tasks.Core"
>
<ParameterGroup>
<FilePath ParameterType="System.String" Required="true" />
<Content Output="true" ParameterType="System.String" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Code Type="Fragment" Language="cs">
<![CDATA[
Content = File.ReadAllText(FilePath);
<![CDATA[
Content = File.ReadAllText(FilePath);
]]>
</Code>
</Task>
</UsingTask>
<UsingTask TaskName="AppendNewLineAndFile" TaskFactory="RoslynCodeTaskFactory" AssemblyName="Microsoft.Build.Tasks.Core">
<UsingTask
TaskName="AppendNewLineAndFile"
TaskFactory="RoslynCodeTaskFactory"
AssemblyName="Microsoft.Build.Tasks.Core"
>
<ParameterGroup>
<File1 ParameterType="System.String" Required="true" />
<File2 ParameterType="System.String" Required="true" />
</ParameterGroup>
<Task>
<Using Namespace="System.IO" />
<Code Type="Fragment" Language="cs">
<![CDATA[
var text = Environment.NewLine;
text += "===========================================================";
text += Environment.NewLine;
text += Environment.NewLine;
text += File.ReadAllText(File2);
text += Environment.NewLine;
File.AppendAllText(File1, text);
<![CDATA[
var text = Environment.NewLine;
text += "===========================================================";
text += Environment.NewLine;
text += Environment.NewLine;
text += File.ReadAllText(File2);
text += Environment.NewLine;
File.AppendAllText(File1, text);
]]>
</Code>
</Task>
</UsingTask>
</UsingTask>
<!-- PRE-PACK -->
<Target Name="CustomSetup" BeforeTargets="_IntermediatePack">
<Message Text="=== CUSTOM SETUP ===" Importance="high" />
Expand All @@ -99,6 +107,11 @@
<!-- Cleanup License File -->
<Target Name="RestoreLicenseFile">
<Message Text="Restore License File Contents" Importance="high" />
<WriteLinesToFile File="..\LICENSE" Lines="$(OriginalLicenseLines)" Overwrite="true" Encoding="UTF-8" />
<WriteLinesToFile
File="..\LICENSE"
Lines="$(OriginalLicenseLines)"
Overwrite="true"
Encoding="UTF-8"
/>
</Target>
</Project>
Loading