From 11e5b6c276abf2c0fbb44311e0f56fbda0a01f83 Mon Sep 17 00:00:00 2001 From: David Fidge Date: Wed, 23 Feb 2022 11:56:28 +1030 Subject: [PATCH 1/2] Update BehaviourTree so that it supports the following target frameworks: .net standard 2.1, core 3.1, .net 5 and .net 6. Update Demo and Tests to .net 5. --- .../BehaviourTree.Demo.csproj | 202 +++--------------- .../Properties/AssemblyInfo.cs | 35 --- .../BehaviourTree.Tests.csproj | 114 ++-------- .../Properties/AssemblyInfo.cs | 35 --- src/BehaviourTree.sln | 74 +++---- src/BehaviourTree/BehaviourTree.csproj | 5 +- 6 files changed, 84 insertions(+), 381 deletions(-) delete mode 100644 src/BehaviourTree.Demo/Properties/AssemblyInfo.cs delete mode 100644 src/BehaviourTree.Tests/Properties/AssemblyInfo.cs diff --git a/src/BehaviourTree.Demo/BehaviourTree.Demo.csproj b/src/BehaviourTree.Demo/BehaviourTree.Demo.csproj index 2204a9a..b824e68 100644 --- a/src/BehaviourTree.Demo/BehaviourTree.Demo.csproj +++ b/src/BehaviourTree.Demo/BehaviourTree.Demo.csproj @@ -1,178 +1,26 @@ - - - - - Debug - AnyCPU - {0E73126D-3B25-4DD8-9D41-A72C1AC1BD44} - WinExe - BehaviourTree.Demo - BehaviourTree.Demo - v4.6.1 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - HostForm.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - HostForm.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - - Always - - - Always - - - Always - - - - - {7112076b-363d-4886-9186-617283349034} - BehaviourTree - - - - + + + + WinExe + net5.0-windows + enable + true + + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + \ No newline at end of file diff --git a/src/BehaviourTree.Demo/Properties/AssemblyInfo.cs b/src/BehaviourTree.Demo/Properties/AssemblyInfo.cs deleted file mode 100644 index 4a08465..0000000 --- a/src/BehaviourTree.Demo/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("BehaviourTree.Demo")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("BehaviourTree.Demo")] -[assembly: AssemblyCopyright("Copyright © 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("0e73126d-3b25-4dd8-9d41-a72c1ac1bd44")] - -// 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.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/BehaviourTree.Tests/BehaviourTree.Tests.csproj b/src/BehaviourTree.Tests/BehaviourTree.Tests.csproj index cdee400..57ccfc0 100644 --- a/src/BehaviourTree.Tests/BehaviourTree.Tests.csproj +++ b/src/BehaviourTree.Tests/BehaviourTree.Tests.csproj @@ -1,94 +1,20 @@ - - - - - - Debug - AnyCPU - {642AD8E2-054B-4789-9741-2CFF08BC2A44} - Library - Properties - BehaviourTree.Tests - BehaviourTree.Tests - v4.6.1 - 512 - - - - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {7112076b-363d-4886-9186-617283349034} - BehaviourTree - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use 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 + + + + net5.0 + + false + + + + + + + + + + + + + + diff --git a/src/BehaviourTree.Tests/Properties/AssemblyInfo.cs b/src/BehaviourTree.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 939bd75..0000000 --- a/src/BehaviourTree.Tests/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("BehaviourTree.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("BehaviourTree.Tests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[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("642ad8e2-054b-4789-9741-2cff08bc2a44")] - -// 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.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/BehaviourTree.sln b/src/BehaviourTree.sln index 40f0845..d5e92f3 100644 --- a/src/BehaviourTree.sln +++ b/src/BehaviourTree.sln @@ -1,37 +1,37 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29926.136 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BehaviourTree", "BehaviourTree\BehaviourTree.csproj", "{7112076B-363D-4886-9186-617283349034}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BehaviourTree.Tests", "BehaviourTree.Tests\BehaviourTree.Tests.csproj", "{642AD8E2-054B-4789-9741-2CFF08BC2A44}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BehaviourTree.Demo", "BehaviourTree.Demo\BehaviourTree.Demo.csproj", "{0E73126D-3B25-4DD8-9D41-A72C1AC1BD44}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7112076B-363D-4886-9186-617283349034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7112076B-363D-4886-9186-617283349034}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7112076B-363D-4886-9186-617283349034}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7112076B-363D-4886-9186-617283349034}.Release|Any CPU.Build.0 = Release|Any CPU - {642AD8E2-054B-4789-9741-2CFF08BC2A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {642AD8E2-054B-4789-9741-2CFF08BC2A44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {642AD8E2-054B-4789-9741-2CFF08BC2A44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {642AD8E2-054B-4789-9741-2CFF08BC2A44}.Release|Any CPU.Build.0 = Release|Any CPU - {0E73126D-3B25-4DD8-9D41-A72C1AC1BD44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E73126D-3B25-4DD8-9D41-A72C1AC1BD44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E73126D-3B25-4DD8-9D41-A72C1AC1BD44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E73126D-3B25-4DD8-9D41-A72C1AC1BD44}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {71D56863-4558-4FD2-A1B6-DEAE12B3EA13} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31903.59 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BehaviourTree", "BehaviourTree\BehaviourTree.csproj", "{7112076B-363D-4886-9186-617283349034}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BehaviourTree.Tests", "BehaviourTree.Tests\BehaviourTree.Tests.csproj", "{BB45F150-9250-456F-A468-1B092EAC805F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BehaviourTree.Demo", "BehaviourTree.Demo\BehaviourTree.Demo.csproj", "{AE94C659-BFBE-4734-922E-0AA8734B0F1E}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7112076B-363D-4886-9186-617283349034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7112076B-363D-4886-9186-617283349034}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7112076B-363D-4886-9186-617283349034}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7112076B-363D-4886-9186-617283349034}.Release|Any CPU.Build.0 = Release|Any CPU + {BB45F150-9250-456F-A468-1B092EAC805F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BB45F150-9250-456F-A468-1B092EAC805F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BB45F150-9250-456F-A468-1B092EAC805F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BB45F150-9250-456F-A468-1B092EAC805F}.Release|Any CPU.Build.0 = Release|Any CPU + {AE94C659-BFBE-4734-922E-0AA8734B0F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AE94C659-BFBE-4734-922E-0AA8734B0F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AE94C659-BFBE-4734-922E-0AA8734B0F1E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AE94C659-BFBE-4734-922E-0AA8734B0F1E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {71D56863-4558-4FD2-A1B6-DEAE12B3EA13} + EndGlobalSection +EndGlobal diff --git a/src/BehaviourTree/BehaviourTree.csproj b/src/BehaviourTree/BehaviourTree.csproj index 6327ba3..f62de9c 100644 --- a/src/BehaviourTree/BehaviourTree.csproj +++ b/src/BehaviourTree/BehaviourTree.csproj @@ -1,9 +1,8 @@  - - netstandard1.0 + netstandard2.1;netcoreapp3.1;net5.0;net6.0 BehaviourTree - 1.0.0 + 1.0.0 c# behavior behaviour tree behaviourtree behaviortree ai bot A simple c# behaviour tree library. https://github.com/Eraclys/BehaviourTree/ From ff25a43c4d9eb5724865d0822e5f4bfa4171a6d8 Mon Sep 17 00:00:00 2001 From: David Fidge Date: Tue, 27 Dec 2022 15:32:40 +1030 Subject: [PATCH 2/2] Update all nuget packages in the solution. --- src/BehaviourTree.Tests/BehaviourTree.Tests.csproj | 8 ++++---- src/BehaviourTree/BehaviourTree.csproj | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BehaviourTree.Tests/BehaviourTree.Tests.csproj b/src/BehaviourTree.Tests/BehaviourTree.Tests.csproj index 57ccfc0..d504ea8 100644 --- a/src/BehaviourTree.Tests/BehaviourTree.Tests.csproj +++ b/src/BehaviourTree.Tests/BehaviourTree.Tests.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/BehaviourTree/BehaviourTree.csproj b/src/BehaviourTree/BehaviourTree.csproj index f62de9c..44afc8b 100644 --- a/src/BehaviourTree/BehaviourTree.csproj +++ b/src/BehaviourTree/BehaviourTree.csproj @@ -11,7 +11,7 @@ - + \ No newline at end of file