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

Feature/netstandard2.0 support #6

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+147 −228
Open

Feature/netstandard2.0 support #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a2b17df
Ignore all bin and obj folders
RoryDungan Aug 12, 2019
e39b35d
Move source to its own folder
RoryDungan Aug 12, 2019
68bb503
Build for netstandard2.0 in addition to net35
RoryDungan Aug 12, 2019
bcb81ce
Travis CI: switch from XBuild to MSBuild
RoryDungan Aug 12, 2019
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
6 changes: 3 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ x64/
x86/
build/
bld/
[Bb]in/
[Oo]bj/
**/[Bb]in/
**/[Oo]bj/

# Visual Studo 2015 cache/options directory
.vs/
Expand Down Expand Up @@ -200,4 +200,4 @@ FakesAssemblies/
**/Temp/
**/Builds/
Examples/Unity Example/*.sln
Examples/Unity Example/*.csproj
Examples/Unity Example/*.csproj
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
106 changes: 53 additions & 53 deletions Examples/Example1/Example1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2542A390-0332-4752-8098-D81E7032B915}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Example1</RootNamespace>
<AssemblyName>Example1</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Fluent-State-Machine.csproj">
<Project>{74ec1b7f-cd01-4af3-aed5-ed0393a3a069}</Project>
<Name>Fluent-State-Machine</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2542A390-0332-4752-8098-D81E7032B915}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Example1</RootNamespace>
<AssemblyName>Example1</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Src\Fluent-State-Machine.csproj">
<Project>{74ec1b7f-cd01-4af3-aed5-ed0393a3a069}</Project>
<Name>Fluent-State-Machine</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
-->
</Project>
61 changes: 0 additions & 61 deletions Fluent-State-Machine.csproj
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Fluent-State-Machine.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
35 changes: 0 additions & 35 deletions Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions Src/Fluent-State-Machine.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net35;netstandard2.0</TargetFrameworks>
<Version>1.0.2</Version>
<Authors>Real Serious Games</Authors>
<Description>Fluent API for creating state machines in C#</Description>
<Copyright>Copyright © Real Serious Games 2019</Copyright>
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
<PackageProjectUrl>https://github.com/Real-Serious-Games/Fluent-State-Machine</PackageProjectUrl>
<RepositoryUrl></RepositoryUrl>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>Fluent-State-Machine.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
</Project>
0 Fluent-State-Machine.snk → Src/Fluent-State-Machine.snk
View file
Open in desktop
File renamed without changes.
0 State.cs → Src/State.cs
View file
Open in desktop
File renamed without changes.
0 StateBuilder.cs → Src/StateBuilder.cs
View file
Open in desktop
File renamed without changes.
0 StateMachineBuilder.cs → Src/StateMachineBuilder.cs
View file
Open in desktop
File renamed without changes.
Loading