diff --git a/.gitignore b/.gitignore index a075513..d3d960a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,8 +19,8 @@ x64/ x86/ build/ bld/ -[Bb]in/ -[Oo]bj/ +**/[Bb]in/ +**/[Oo]bj/ # Visual Studo 2015 cache/options directory .vs/ @@ -200,4 +200,4 @@ FakesAssemblies/ **/Temp/ **/Builds/ Examples/Unity Example/*.sln -Examples/Unity Example/*.csproj \ No newline at end of file +Examples/Unity Example/*.csproj diff --git a/.travis.yml b/.travis.yml index 34c1a83..101f855 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ install: - nuget install xunit.runners -Version 1.9.2 -OutputDirectory testrunner script: - - xbuild /p:Configuration=Debug Fluent-State-Machine.sln + - msbuild /p:Configuration=Debug Fluent-State-Machine.sln - mono ./testrunner/xunit.runners.1.9.2/tools/xunit.console.exe ./Tests/bin/Debug/Fluent-State-Machine.Tests.dll group: stable diff --git a/Examples/Example1/Example1.csproj b/Examples/Example1/Example1.csproj index ba21338..107024a 100644 --- a/Examples/Example1/Example1.csproj +++ b/Examples/Example1/Example1.csproj @@ -1,60 +1,60 @@ - - - - - Debug - AnyCPU - {2542A390-0332-4752-8098-D81E7032B915} - Exe - Properties - Example1 - Example1 - v3.5 - 512 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - {74ec1b7f-cd01-4af3-aed5-ed0393a3a069} - Fluent-State-Machine - - - + + + + + Debug + AnyCPU + {2542A390-0332-4752-8098-D81E7032B915} + Exe + Properties + Example1 + Example1 + v3.5 + 512 + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + {74ec1b7f-cd01-4af3-aed5-ed0393a3a069} + Fluent-State-Machine + + + + --> \ No newline at end of file diff --git a/Fluent-State-Machine.csproj b/Fluent-State-Machine.csproj deleted file mode 100644 index 722d412..0000000 --- a/Fluent-State-Machine.csproj +++ /dev/null @@ -1,61 +0,0 @@ - - - - - Debug - AnyCPU - {74EC1B7F-CD01-4AF3-AED5-ED0393A3A069} - Library - Properties - RSG - Fluent-State-Machine - v3.5 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - Fluent-State-Machine.snk - - - true - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Fluent-State-Machine.sln b/Fluent-State-Machine.sln index 4ce49cf..5bf7c09 100644 --- a/Fluent-State-Machine.sln +++ b/Fluent-State-Machine.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fluent-State-Machine", "Fluent-State-Machine.csproj", "{74EC1B7F-CD01-4AF3-AED5-ED0393A3A069}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fluent-State-Machine", "Src\Fluent-State-Machine.csproj", "{74EC1B7F-CD01-4AF3-AED5-ED0393A3A069}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fluent-State-Machine.Tests", "Tests\Fluent-State-Machine.Tests.csproj", "{55DB04F4-F1BA-4A2D-9C83-3ECC5B7FC068}" EndProject diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs deleted file mode 100644 index 3acae6f..0000000 --- a/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Fluent-State-Machine")] -[assembly: AssemblyDescription("Fluent API for creating state machines in C#")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Real Serious Games")] -[assembly: AssemblyProduct("Fluent-State-Machine")] -[assembly: AssemblyCopyright("Copyright © Real Serious Games 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("89328abb-1bd3-4d97-8af3-ae9d248eb3a0")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] diff --git a/Src/Fluent-State-Machine.csproj b/Src/Fluent-State-Machine.csproj new file mode 100644 index 0000000..5b53996 --- /dev/null +++ b/Src/Fluent-State-Machine.csproj @@ -0,0 +1,15 @@ + + + net35;netstandard2.0 + 1.0.2 + Real Serious Games + Fluent API for creating state machines in C# + Copyright © Real Serious Games 2019 + https://opensource.org/licenses/MIT + https://github.com/Real-Serious-Games/Fluent-State-Machine + + true + true + Fluent-State-Machine.snk + + diff --git a/Fluent-State-Machine.snk b/Src/Fluent-State-Machine.snk similarity index 100% rename from Fluent-State-Machine.snk rename to Src/Fluent-State-Machine.snk diff --git a/State.cs b/Src/State.cs similarity index 100% rename from State.cs rename to Src/State.cs diff --git a/StateBuilder.cs b/Src/StateBuilder.cs similarity index 100% rename from StateBuilder.cs rename to Src/StateBuilder.cs diff --git a/StateMachineBuilder.cs b/Src/StateMachineBuilder.cs similarity index 100% rename from StateMachineBuilder.cs rename to Src/StateMachineBuilder.cs diff --git a/Tests/Fluent-State-Machine.Tests.csproj b/Tests/Fluent-State-Machine.Tests.csproj index b2df0de..e007f39 100644 --- a/Tests/Fluent-State-Machine.Tests.csproj +++ b/Tests/Fluent-State-Machine.Tests.csproj @@ -1,81 +1,81 @@ - - - - - - Debug - AnyCPU - {55DB04F4-F1BA-4A2D-9C83-3ECC5B7FC068} - Library - Properties - RSG.FluentStateMachineTests - Fluent-State-Machine.Tests - v3.5 - 512 - bd68c1bf - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Moq.4.2.1510.2205\lib\net35\Moq.dll - True - - - - - - - - - ..\packages\xunit.1.9.2\lib\net20\xunit.dll - - - - - - - - - - - - - - {74ec1b7f-cd01-4af3-aed5-ed0393a3a069} - Fluent-State-Machine - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - + + + + + + Debug + AnyCPU + {55DB04F4-F1BA-4A2D-9C83-3ECC5B7FC068} + Library + Properties + RSG.FluentStateMachineTests + Fluent-State-Machine.Tests + v3.5 + 512 + bd68c1bf + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Moq.4.2.1510.2205\lib\net35\Moq.dll + True + + + + + + + + + ..\packages\xunit.1.9.2\lib\net20\xunit.dll + + + + + + + + + + + + + + + + + {74ec1b7f-cd01-4af3-aed5-ed0393a3a069} + Fluent-State-Machine + + + + + + This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + --> \ No newline at end of file