From e4e27b403be5faacec49aaf7f0b4414d5c24d1b9 Mon Sep 17 00:00:00 2001 From: Dmitriy Moskalenko <58020981+sixtyfourbitmoose@users.noreply.github.com> Date: Wed, 20 Nov 2019 22:46:06 -0800 Subject: [PATCH 1/4] Updated build configuration. Fixed build issues. Updated .gitignore file to exclude modern Visual Studio artifacts. Disabled assembly signing for AOtomation and removed the odd/unnecessary AssemblyInfo file that was not in the right place and blocking the build. Preparing for .NET Core 3.0 upgrade. --- .gitignore | 304 ++++++++++++++++-- CellAO/CellAO.sln | 259 +-------------- .../CellAO.Communication.csproj | 11 +- .../CellAO.Communication/packages.config | 1 + .../Source/CellAO.Core/CellAO.Core.csproj | 11 +- .../CellAO.Core/Entities/TemporaryBag.cs | 4 +- .../Functions/FunctionArguments.cs | 3 - .../NPCHandler/NonPlayerCharacterHandler.cs | 2 +- .../VendorHandler/VendorHandler.cs | 37 ++- .../Source/CellAO.Core/packages.config | 1 + .../CellAO.Interfaces.csproj | 11 +- .../CellAO.Interfaces/IFunctionArguments.cs | 1 - .../Source/CellAO.Interfaces/packages.config | 1 + .../CellAO.ObjectManager.csproj | 4 +- .../Source/CellAO.ObjectManager/Pool.cs | 6 +- .../CellAO.ObjectManager/PooledObject.cs | 4 +- .../Source/CellAO.Stats/CellAO.Stats.csproj | 4 +- .../PlayfieldLoader/PlayfieldLoader.csproj | 14 +- .../Source/PlayfieldLoader/packages.config | 4 + .../Libraries/Source/Utility/DebugStrings.cs | 7 +- .../Libraries/Source/Utility/Utility.csproj | 11 +- .../Libraries/Source/Utility/packages.config | 1 + CellAO/Server/ChatEngine/ChatEngine.csproj | 8 +- CellAO/Server/LoginEngine/LoginEngine.csproj | 4 +- CellAO/Server/ZoneEngine/ChatCommands/Npc.cs | 6 +- .../ZoneEngine/ChatCommands/ShowStatel.cs | 2 +- .../ZoneEngine/ChatCommands/WalkingTest.cs | 6 +- .../ZoneEngine/ChatCommands/tptoproxy.cs | 4 +- .../GenericCmdMessageHandler.cs | 2 +- .../ZoneEngine/Core/Playfields/Playfield.cs | 2 +- CellAO/Server/ZoneEngine/Scripts/InfoBot.cs | 2 +- CellAO/Server/ZoneEngine/ZoneEngine.csproj | 9 +- CellAO/Server/ZoneEngine/packages.config | 1 + .../Extractor Serializer.csproj | 11 +- .../Extractor Serializer/packages.config | 1 + .../MarkDownDocumentator.csproj | 4 +- .../MarkDownDocumentator/Program.cs | 4 - .../SCFUPacketFlagViewer/Program.cs | 7 +- .../SCFUPacketFlagViewer.csproj | 4 +- 39 files changed, 389 insertions(+), 389 deletions(-) create mode 100644 CellAO/Libraries/Source/PlayfieldLoader/packages.config diff --git a/.gitignore b/.gitignore index b0b5cf23..dfcfd56f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,80 @@ -# Build Folders (you can keep bin if you'd like, to store dlls and pdbs) -[Bb]in/ -[Oo]bj/ - -# mstest test results -TestResults - ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files +*.rsuser *.suo *.user +*.userosscache *.sln.docstates +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + # Build results [Dd]ebug/ +[Dd]ebugPublic/ [Rr]elease/ +[Rr]eleases/ x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio *_i.c *_p.c +*_h.h *.ilk *.meta *.obj +*.iobj *.pch *.pdb +*.ipdb *.pgc *.pgd *.rsp @@ -32,35 +83,78 @@ x64/ *.tli *.tlh *.tmp +*.tmp_proj +*_wpftmp.csproj *.log *.vspscc *.vssscc .builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* # Visual C++ cache files ipch/ *.aps *.ncb +*.opendb *.opensdf *.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb # Visual Studio profiler *.psess *.vsp *.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ # Guidance Automation Toolkit *.gpState # ReSharper is a .NET coding add-in -_ReSharper* +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml # NCrunch -*.ncrunch* +_NCrunch_* .*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ -# Installshield output folder -[Ee]xpress +# Installshield output folder +[Ee]xpress/ # DocProject is a documentation generator add-in DocProject/buildhelp/ @@ -73,40 +167,184 @@ DocProject/Help/Html2 DocProject/Help/html # Click-Once directory -publish +publish/ # Publish Web Output -*.Publish.xml +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj -# NuGet Packages Directory -packages +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ -# Windows Azure Build Output -csx +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ *.build.csdef -# Windows Store app package directory +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ # Others -[Bb]in -[Oo]bj -sql -TestResults -[Tt]est[Rr]esult* -*.Cache -ClientBin -[Ss]tyle[Cc]op.* +ClientBin/ ~$* +*~ *.dbmdl -Generated_Code #added for RIA/Silverlight projects +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs -# Backup & report files from converting an old project file to a newer -# Visual Studio version. Backup files are not needed, because we have git ;-) +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML -/*/AO.Core.XML -/CellAO/Built -CellAO/_dotMemory.CellAO/ -CellAO/CellAO.sln.DotSettings +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ diff --git a/CellAO/CellAO.sln b/CellAO/CellAO.sln index 8ad2eaa1..cb4c15a5 100644 --- a/CellAO/CellAO.sln +++ b/CellAO/CellAO.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29411.108 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChatEngine", "Server\ChatEngine\ChatEngine.csproj", "{B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}" ProjectSection(ProjectDependencies) = postProject @@ -64,8 +64,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CellAO.Enums", "Libraries\S EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CellAO.Stats", "Libraries\Source\CellAO.Stats\CellAO.Stats.csproj", "{3E414ED6-3CAD-4C99-A35D-1802255DE3CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmokeLounge.AOtomation.Messaging", "Libraries\Source\AOtomation\AOtomation.Messaging\src\SmokeLounge.AOtomation.Messaging\SmokeLounge.AOtomation.Messaging.csproj", "{3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CellAO.Communication", "Libraries\Source\CellAO.Communication\CellAO.Communication.csproj", "{55F93BC4-61C6-42F3-A8CB-788221059917}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkDownDocumentator", "..\Tools\Algorithman\MarkDownDocumentator\MarkDownDocumentator.csproj", "{2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}" @@ -105,332 +103,100 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebEngine", "Server\WebEngi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SCFUPacketFlagViewer", "..\Tools\Algorithman\SCFUPacketFlagViewer\SCFUPacketFlagViewer.csproj", "{B746D260-F136-4A32-A6B5-DA6AF6ADB33E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsgPack.Mono", "Libraries\Source\msgpack-cli\src\MsgPack.Mono\MsgPack.Mono.csproj", "{6E8C2296-21E9-4113-89C4-76376516AA14}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlayfieldLoader", "Libraries\Source\PlayfieldLoader\PlayfieldLoader.csproj", "{E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmokeLounge.AOtomation.Messaging", "Libraries\Source\AOtomation\AOtomation.Messaging\SmokeLounge.AOtomation.Messaging.csproj", "{18D555CD-B217-48C7-B3BC-0A678964100A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|Itanium = Debug|Itanium - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU - Release|Itanium = Release|Itanium - Release|Mixed Platforms = Release|Mixed Platforms - Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Debug|x64.ActiveCfg = Debug|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Debug|x86.ActiveCfg = Debug|Any CPU {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Release|Any CPU.ActiveCfg = Release|Any CPU {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Release|Any CPU.Build.0 = Release|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Release|Itanium.ActiveCfg = Release|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Release|x64.ActiveCfg = Release|Any CPU - {B3514F3D-2D74-4DCF-BAB0-05FAAAFFDD83}.Release|x86.ActiveCfg = Release|Any CPU {60385925-84F5-4893-A5E0-C8C1D1190790}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {60385925-84F5-4893-A5E0-C8C1D1190790}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Debug|x64.ActiveCfg = Debug|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Debug|x86.ActiveCfg = Debug|Any CPU {60385925-84F5-4893-A5E0-C8C1D1190790}.Release|Any CPU.ActiveCfg = Release|Any CPU {60385925-84F5-4893-A5E0-C8C1D1190790}.Release|Any CPU.Build.0 = Release|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Release|Itanium.ActiveCfg = Release|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Release|x64.ActiveCfg = Release|Any CPU - {60385925-84F5-4893-A5E0-C8C1D1190790}.Release|x86.ActiveCfg = Release|Any CPU {CA8044C8-3283-4382-8B47-3CA7972692F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CA8044C8-3283-4382-8B47-3CA7972692F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Debug|x64.ActiveCfg = Debug|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Debug|x86.ActiveCfg = Debug|Any CPU {CA8044C8-3283-4382-8B47-3CA7972692F9}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA8044C8-3283-4382-8B47-3CA7972692F9}.Release|Any CPU.Build.0 = Release|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Release|Itanium.ActiveCfg = Release|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Release|x64.ActiveCfg = Release|Any CPU - {CA8044C8-3283-4382-8B47-3CA7972692F9}.Release|x86.ActiveCfg = Release|Any CPU {63D6C409-58EB-4033-87E0-E0DDA6594075}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {63D6C409-58EB-4033-87E0-E0DDA6594075}.Debug|Any CPU.Build.0 = Debug|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Debug|x64.ActiveCfg = Debug|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Debug|x86.ActiveCfg = Debug|Any CPU {63D6C409-58EB-4033-87E0-E0DDA6594075}.Release|Any CPU.ActiveCfg = Release|Any CPU {63D6C409-58EB-4033-87E0-E0DDA6594075}.Release|Any CPU.Build.0 = Release|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Release|Itanium.ActiveCfg = Release|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Release|x64.ActiveCfg = Release|Any CPU - {63D6C409-58EB-4033-87E0-E0DDA6594075}.Release|x86.ActiveCfg = Release|Any CPU {CB56F285-02AE-4816-9E8A-EC69991400E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CB56F285-02AE-4816-9E8A-EC69991400E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Debug|x64.ActiveCfg = Debug|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Debug|x86.ActiveCfg = Debug|Any CPU {CB56F285-02AE-4816-9E8A-EC69991400E5}.Release|Any CPU.ActiveCfg = Release|Any CPU {CB56F285-02AE-4816-9E8A-EC69991400E5}.Release|Any CPU.Build.0 = Release|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Release|Itanium.ActiveCfg = Release|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Release|x64.ActiveCfg = Release|Any CPU - {CB56F285-02AE-4816-9E8A-EC69991400E5}.Release|x86.ActiveCfg = Release|Any CPU {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Debug|x64.ActiveCfg = Debug|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Debug|x86.ActiveCfg = Debug|Any CPU {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Release|Any CPU.ActiveCfg = Release|Any CPU {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Release|Any CPU.Build.0 = Release|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Release|Itanium.ActiveCfg = Release|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Release|x64.ActiveCfg = Release|Any CPU - {8AEF23B2-9E44-40A1-A74E-CF7348B45B62}.Release|x86.ActiveCfg = Release|Any CPU {71AB07AD-4D94-4693-8560-47862E5B6E61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {71AB07AD-4D94-4693-8560-47862E5B6E61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Debug|x64.ActiveCfg = Debug|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Debug|x86.ActiveCfg = Debug|Any CPU {71AB07AD-4D94-4693-8560-47862E5B6E61}.Release|Any CPU.ActiveCfg = Release|Any CPU {71AB07AD-4D94-4693-8560-47862E5B6E61}.Release|Any CPU.Build.0 = Release|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Release|Itanium.ActiveCfg = Release|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Release|x64.ActiveCfg = Release|Any CPU - {71AB07AD-4D94-4693-8560-47862E5B6E61}.Release|x86.ActiveCfg = Release|Any CPU {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Debug|x64.ActiveCfg = Debug|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Debug|x86.ActiveCfg = Debug|Any CPU {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Release|Any CPU.ActiveCfg = Release|Any CPU {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Release|Any CPU.Build.0 = Release|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Release|Itanium.ActiveCfg = Release|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Release|x64.ActiveCfg = Release|Any CPU - {DDD3B520-1F43-4EEF-A2A9-FC621424090A}.Release|x86.ActiveCfg = Release|Any CPU {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Debug|x64.ActiveCfg = Debug|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Debug|x86.ActiveCfg = Debug|Any CPU {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Release|Any CPU.Build.0 = Release|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Release|Itanium.ActiveCfg = Release|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Release|x64.ActiveCfg = Release|Any CPU - {77D1AEF7-AA59-4B5A-B114-E0C1EBE1B3C9}.Release|x86.ActiveCfg = Release|Any CPU {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Debug|x64.ActiveCfg = Debug|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Debug|x86.ActiveCfg = Debug|Any CPU {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Release|Any CPU.ActiveCfg = Release|Any CPU {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Release|Any CPU.Build.0 = Release|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Release|Itanium.ActiveCfg = Release|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Release|x64.ActiveCfg = Release|Any CPU - {2D8E1D1E-787A-4949-89B7-C10C3D1D0AF9}.Release|x86.ActiveCfg = Release|Any CPU {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Debug|x64.ActiveCfg = Debug|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Debug|x86.ActiveCfg = Debug|Any CPU {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Release|Any CPU.ActiveCfg = Release|Any CPU {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Release|Any CPU.Build.0 = Release|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Release|Itanium.ActiveCfg = Release|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Release|x64.ActiveCfg = Release|Any CPU - {D53F0612-FEFE-4EAF-80AA-480F25C8DD76}.Release|x86.ActiveCfg = Release|Any CPU {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Debug|x64.ActiveCfg = Debug|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Debug|x86.ActiveCfg = Debug|Any CPU {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Release|Any CPU.ActiveCfg = Release|Any CPU {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Release|Any CPU.Build.0 = Release|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Release|Itanium.ActiveCfg = Release|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Release|x64.ActiveCfg = Release|Any CPU - {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C}.Release|x86.ActiveCfg = Release|Any CPU {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Debug|x64.ActiveCfg = Debug|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Debug|x86.ActiveCfg = Debug|Any CPU {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Release|Any CPU.Build.0 = Release|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Release|Itanium.ActiveCfg = Release|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Release|x64.ActiveCfg = Release|Any CPU - {3E414ED6-3CAD-4C99-A35D-1802255DE3CB}.Release|x86.ActiveCfg = Release|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Debug|x64.ActiveCfg = Debug|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Debug|x86.ActiveCfg = Debug|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Release|Any CPU.Build.0 = Release|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Release|Itanium.ActiveCfg = Release|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Release|x64.ActiveCfg = Release|Any CPU - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4}.Release|x86.ActiveCfg = Release|Any CPU {55F93BC4-61C6-42F3-A8CB-788221059917}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55F93BC4-61C6-42F3-A8CB-788221059917}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Debug|x64.ActiveCfg = Debug|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Debug|x86.ActiveCfg = Debug|Any CPU {55F93BC4-61C6-42F3-A8CB-788221059917}.Release|Any CPU.ActiveCfg = Release|Any CPU {55F93BC4-61C6-42F3-A8CB-788221059917}.Release|Any CPU.Build.0 = Release|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Release|Itanium.ActiveCfg = Release|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Release|x64.ActiveCfg = Release|Any CPU - {55F93BC4-61C6-42F3-A8CB-788221059917}.Release|x86.ActiveCfg = Release|Any CPU {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Debug|x64.ActiveCfg = Debug|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Debug|x86.ActiveCfg = Debug|Any CPU {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Release|Any CPU.ActiveCfg = Release|Any CPU {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Release|Any CPU.Build.0 = Release|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Release|Itanium.ActiveCfg = Release|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Release|x64.ActiveCfg = Release|Any CPU - {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47}.Release|x86.ActiveCfg = Release|Any CPU {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Debug|x64.ActiveCfg = Debug|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Debug|x86.ActiveCfg = Debug|Any CPU {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Release|Any CPU.ActiveCfg = Release|Any CPU {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Release|Any CPU.Build.0 = Release|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Release|Itanium.ActiveCfg = Release|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Release|x64.ActiveCfg = Release|Any CPU - {4BBD60C6-AED0-4347-B4CA-A262D3474826}.Release|x86.ActiveCfg = Release|Any CPU {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Debug|Any CPU.Build.0 = Debug|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Debug|x64.ActiveCfg = Debug|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Debug|x86.ActiveCfg = Debug|Any CPU {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Release|Any CPU.ActiveCfg = Release|Any CPU {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Release|Any CPU.Build.0 = Release|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Release|Itanium.ActiveCfg = Release|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Release|x64.ActiveCfg = Release|Any CPU - {65A705B0-F8BF-4D68-A8FD-C630A87DC120}.Release|x86.ActiveCfg = Release|Any CPU {A8218B30-C168-4949-B482-3C6800F04A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A8218B30-C168-4949-B482-3C6800F04A63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Debug|x64.ActiveCfg = Debug|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Debug|x86.ActiveCfg = Debug|Any CPU {A8218B30-C168-4949-B482-3C6800F04A63}.Release|Any CPU.ActiveCfg = Release|Any CPU {A8218B30-C168-4949-B482-3C6800F04A63}.Release|Any CPU.Build.0 = Release|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Release|Itanium.ActiveCfg = Release|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Release|x64.ActiveCfg = Release|Any CPU - {A8218B30-C168-4949-B482-3C6800F04A63}.Release|x86.ActiveCfg = Release|Any CPU {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Debug|x64.ActiveCfg = Debug|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Debug|x86.ActiveCfg = Debug|Any CPU {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Release|Any CPU.ActiveCfg = Release|Any CPU {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Release|Any CPU.Build.0 = Release|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Release|Itanium.ActiveCfg = Release|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Release|x64.ActiveCfg = Release|Any CPU - {B746D260-F136-4A32-A6B5-DA6AF6ADB33E}.Release|x86.ActiveCfg = Release|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Debug|x64.ActiveCfg = Debug|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Debug|x86.ActiveCfg = Debug|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Release|Any CPU.Build.0 = Release|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Release|Itanium.ActiveCfg = Release|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Release|x64.ActiveCfg = Release|Any CPU - {6E8C2296-21E9-4113-89C4-76376516AA14}.Release|x86.ActiveCfg = Release|Any CPU {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Debug|Itanium.ActiveCfg = Debug|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Debug|x64.ActiveCfg = Debug|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Debug|x86.ActiveCfg = Debug|Any CPU {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Release|Any CPU.ActiveCfg = Release|Any CPU {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Release|Any CPU.Build.0 = Release|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Release|Itanium.ActiveCfg = Release|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Release|x64.ActiveCfg = Release|Any CPU - {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4}.Release|x86.ActiveCfg = Release|Any CPU + {18D555CD-B217-48C7-B3BC-0A678964100A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {18D555CD-B217-48C7-B3BC-0A678964100A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {18D555CD-B217-48C7-B3BC-0A678964100A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {18D555CD-B217-48C7-B3BC-0A678964100A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -446,19 +212,18 @@ Global {D53F0612-FEFE-4EAF-80AA-480F25C8DD76} = {7E3CCEE1-EEFC-48D3-823B-2E7CA4FEE88C} {0C09AF43-3456-4FD6-9041-D9A6D7C3F36C} = {7E3CCEE1-EEFC-48D3-823B-2E7CA4FEE88C} {3E414ED6-3CAD-4C99-A35D-1802255DE3CB} = {7E3CCEE1-EEFC-48D3-823B-2E7CA4FEE88C} - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4} = {7E3CCEE1-EEFC-48D3-823B-2E7CA4FEE88C} {55F93BC4-61C6-42F3-A8CB-788221059917} = {7E3CCEE1-EEFC-48D3-823B-2E7CA4FEE88C} {2D1258F5-D00F-4C5A-B0FB-76ED66E11B47} = {6A9A7146-702D-4F23-BC06-A385167ED6A4} {4BBD60C6-AED0-4347-B4CA-A262D3474826} = {7E3CCEE1-EEFC-48D3-823B-2E7CA4FEE88C} {65A705B0-F8BF-4D68-A8FD-C630A87DC120} = {7E3CCEE1-EEFC-48D3-823B-2E7CA4FEE88C} {B746D260-F136-4A32-A6B5-DA6AF6ADB33E} = {6A9A7146-702D-4F23-BC06-A385167ED6A4} - {6E8C2296-21E9-4113-89C4-76376516AA14} = {7E3CCEE1-EEFC-48D3-823B-2E7CA4FEE88C} {E187E908-8CD8-4EC5-B46B-09F81BE9D4C4} = {7E3CCEE1-EEFC-48D3-823B-2E7CA4FEE88C} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - BuildVersion_BuildVersioningStyle = None.None.None.Increment - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_UpdateFileVersion = True BuildVersion_AssemblyInfoFilename = SolutionAssemblyInfo.cs + BuildVersion_UpdateFileVersion = True + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_BuildVersioningStyle = None.None.None.Increment + SolutionGuid = {C566C7B9-BE9F-4E13-B5A1-C642341AE159} EndGlobalSection EndGlobal diff --git a/CellAO/Libraries/Source/CellAO.Communication/CellAO.Communication.csproj b/CellAO/Libraries/Source/CellAO.Communication/CellAO.Communication.csproj index 68f6533b..0b056447 100644 --- a/CellAO/Libraries/Source/CellAO.Communication/CellAO.Communication.csproj +++ b/CellAO/Libraries/Source/CellAO.Communication/CellAO.Communication.csproj @@ -35,6 +35,9 @@ ..\..\..\packages\MemBus.2.0.2\lib\Net40-Client\MemBus.dll + + ..\..\..\packages\MsgPack.Cli.1.0.1\lib\net35\MsgPack.dll + @@ -72,8 +75,8 @@ - - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4} + + {18d555cd-b217-48c7-b3bc-0a678964100a} SmokeLounge.AOtomation.Messaging @@ -84,10 +87,6 @@ {77d1aef7-aa59-4b5a-b114-e0c1ebe1b3c9} Cell.Util - - {6e8c2296-21e9-4113-89c4-76376516aa14} - MsgPack.Mono - {cb56f285-02ae-4816-9e8a-ec69991400e5} Utility diff --git a/CellAO/Libraries/Source/CellAO.Communication/packages.config b/CellAO/Libraries/Source/CellAO.Communication/packages.config index e14a7a2d..c02b89ab 100644 --- a/CellAO/Libraries/Source/CellAO.Communication/packages.config +++ b/CellAO/Libraries/Source/CellAO.Communication/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/CellAO/Libraries/Source/CellAO.Core/CellAO.Core.csproj b/CellAO/Libraries/Source/CellAO.Core/CellAO.Core.csproj index 4592b635..4b281910 100644 --- a/CellAO/Libraries/Source/CellAO.Core/CellAO.Core.csproj +++ b/CellAO/Libraries/Source/CellAO.Core/CellAO.Core.csproj @@ -44,6 +44,9 @@ ..\..\..\packages\MemBus.2.0.2\lib\Net40-Client\MemBus.dll + + ..\..\..\packages\MsgPack.Cli.1.0.1\lib\net35\MsgPack.dll + ..\..\..\packages\NLog.2.1.0\lib\net40\NLog.dll @@ -188,8 +191,8 @@ - - {3ceac898-bfca-45ea-bf34-c4bbb85d2da4} + + {18d555cd-b217-48c7-b3bc-0a678964100a} SmokeLounge.AOtomation.Messaging @@ -224,10 +227,6 @@ {ddd3b520-1f43-4eef-a2a9-fc621424090a} CellAO.Exceptions - - {6e8c2296-21e9-4113-89c4-76376516aa14} - MsgPack.Mono - {4bbd60c6-aed0-4347-b4ca-a262d3474826} Translations diff --git a/CellAO/Libraries/Source/CellAO.Core/Entities/TemporaryBag.cs b/CellAO/Libraries/Source/CellAO.Core/Entities/TemporaryBag.cs index bb037017..87cc9675 100644 --- a/CellAO/Libraries/Source/CellAO.Core/Entities/TemporaryBag.cs +++ b/CellAO/Libraries/Source/CellAO.Core/Entities/TemporaryBag.cs @@ -71,12 +71,12 @@ public bool Add(Identity from, IItem item) if (from.Equals(this.Shopper)) { this.vendorsBag.Add(this.vendorsBag.FindFreeSlot(), item); - LogUtil.Debug(DebugInfoDetail.Shopping, "Added Item from character " + from.ToString(true)); + LogUtil.Debug(DebugInfoDetail.Shopping, "Added Item from character " + from.ToString()); } else { this.charactersBag.Add(from.Instance); - LogUtil.Debug(DebugInfoDetail.Shopping, "Added Item from shop on position " + from.ToString(true)); + LogUtil.Debug(DebugInfoDetail.Shopping, "Added Item from shop on position " + from.ToString()); } // For now no invalid trades diff --git a/CellAO/Libraries/Source/CellAO.Core/Functions/FunctionArguments.cs b/CellAO/Libraries/Source/CellAO.Core/Functions/FunctionArguments.cs index d20e0c9c..66e2cb76 100644 --- a/CellAO/Libraries/Source/CellAO.Core/Functions/FunctionArguments.cs +++ b/CellAO/Libraries/Source/CellAO.Core/Functions/FunctionArguments.cs @@ -35,12 +35,9 @@ namespace CellAO.Core.Functions using System; using System.Collections.Generic; - using System.Runtime.InteropServices; using System.Runtime.Serialization; using System.Text; - using CellAO.Interfaces; - using MsgPack; #endregion diff --git a/CellAO/Libraries/Source/CellAO.Core/NPCHandler/NonPlayerCharacterHandler.cs b/CellAO/Libraries/Source/CellAO.Core/NPCHandler/NonPlayerCharacterHandler.cs index 548e215e..47229892 100644 --- a/CellAO/Libraries/Source/CellAO.Core/NPCHandler/NonPlayerCharacterHandler.cs +++ b/CellAO/Libraries/Source/CellAO.Core/NPCHandler/NonPlayerCharacterHandler.cs @@ -155,7 +155,7 @@ public static ICharacter InstantiateMobSpawn( Identity mobId = new Identity() { Type = IdentityType.CanbeAffected, Instance = mob.Id }; if (Pool.Instance.GetObject(playfield.Identity, mobId) != null) { - throw new Exception("Object " + mobId.ToString(true) + " already exists!!"); + throw new Exception("Object " + mobId.ToString() + " already exists!!"); } Character cmob = new Character(playfield.Identity, mobId, npccontroller); cmob.Read(); diff --git a/CellAO/Libraries/Source/CellAO.Core/VendorHandler/VendorHandler.cs b/CellAO/Libraries/Source/CellAO.Core/VendorHandler/VendorHandler.cs index 1ec759b2..46f4eb85 100644 --- a/CellAO/Libraries/Source/CellAO.Core/VendorHandler/VendorHandler.cs +++ b/CellAO/Libraries/Source/CellAO.Core/VendorHandler/VendorHandler.cs @@ -57,17 +57,23 @@ public static void SpawnVendorFromDatabaseTemplate(DBVendor vendor, IPlayfield p { Identity pfIdentity = new Identity() { Type = IdentityType.Playfield, Instance = vendor.Playfield }; Identity freeIdentity = new Identity() - { - Type = IdentityType.VendingMachine, - Instance = + { + Type = IdentityType.VendingMachine, + Instance = Pool.Instance.GetFreeInstance( 0x70000000, IdentityType.VendingMachine) - }; + }; Vendor v = new Vendor(pfIdentity, freeIdentity, vendor.Hash); - v.RawCoordinates = new Vector3(vendor.X, vendor.Y, vendor.Z); + v.RawCoordinates = new Vector3() + { + X = vendor.X, + Y = vendor.Y, + Z = vendor.Z + }; + v.Heading = new Quaternion(vendor.HeadingX, vendor.HeadingY, vendor.HeadingZ, vendor.HeadingW); v.Playfield = playfield; } @@ -76,16 +82,23 @@ public static void SpawnEmptyVendorFromTemplate(StatelData statelData, IPlayfiel { Identity pfIdentity = new Identity() { Type = IdentityType.Playfield, Instance = statelData.PlayfieldId }; Identity freeIdentity = new Identity() - { - Type = IdentityType.VendingMachine, - Instance = + { + Type = IdentityType.VendingMachine, + Instance = Pool.Instance.GetFreeInstance( 0x70000000, IdentityType.VendingMachine) - }; + }; + Vendor v = new Vendor(pfIdentity, freeIdentity, statelData.TemplateId); v.OriginalIdentity = statelData.Identity; - v.RawCoordinates = new Vector3(statelData.X, statelData.Y, statelData.Z); + v.RawCoordinates = new Vector3() + { + X = statelData.X, + Y = statelData.Y, + Z = statelData.Z + }; + v.Heading = new Quaternion( statelData.HeadingX, statelData.HeadingY, @@ -105,12 +118,12 @@ public static void SpawnVendorsForPlayfield(IPlayfield playfield, StatelData[] r DBVendor vendor = vendors.FirstOrDefault(x => x.Id == id); if (vendor != null) { - LogUtil.Debug(DebugInfoDetail.Statel, sd.Identity.ToString(true) + " - DB " + vendor.TemplateId); + LogUtil.Debug(DebugInfoDetail.Statel, sd.Identity.ToString() + " - DB " + vendor.TemplateId); SpawnVendorFromDatabaseTemplate(vendor, playfield); } else { - LogUtil.Debug(DebugInfoDetail.Statel, sd.Identity.ToString(true) + " - " + sd.TemplateId); + LogUtil.Debug(DebugInfoDetail.Statel, sd.Identity.ToString() + " - " + sd.TemplateId); SpawnEmptyVendorFromTemplate(sd, playfield, id); } } diff --git a/CellAO/Libraries/Source/CellAO.Core/packages.config b/CellAO/Libraries/Source/CellAO.Core/packages.config index b95e55a9..755b11b1 100644 --- a/CellAO/Libraries/Source/CellAO.Core/packages.config +++ b/CellAO/Libraries/Source/CellAO.Core/packages.config @@ -3,5 +3,6 @@ + \ No newline at end of file diff --git a/CellAO/Libraries/Source/CellAO.Interfaces/CellAO.Interfaces.csproj b/CellAO/Libraries/Source/CellAO.Interfaces/CellAO.Interfaces.csproj index ca0a79bc..a4b7f461 100644 --- a/CellAO/Libraries/Source/CellAO.Interfaces/CellAO.Interfaces.csproj +++ b/CellAO/Libraries/Source/CellAO.Interfaces/CellAO.Interfaces.csproj @@ -35,6 +35,9 @@ ..\..\..\packages\MemBus.2.0.2\lib\Net40-Client\MemBus.dll + + ..\..\..\packages\MsgPack.Cli.1.0.1\lib\net35\MsgPack.dll + @@ -63,8 +66,8 @@ - - {3ceac898-bfca-45ea-bf34-c4bbb85d2da4} + + {18d555cd-b217-48c7-b3bc-0a678964100a} SmokeLounge.AOtomation.Messaging @@ -75,10 +78,6 @@ {0c09af43-3456-4fd6-9041-d9a6d7c3f36c} CellAO.Enums - - {6e8c2296-21e9-4113-89c4-76376516aa14} - MsgPack.Mono - {cb56f285-02ae-4816-9e8a-ec69991400e5} Utility diff --git a/CellAO/Libraries/Source/CellAO.Interfaces/IFunctionArguments.cs b/CellAO/Libraries/Source/CellAO.Interfaces/IFunctionArguments.cs index 0aa53fff..cb4f6ae9 100644 --- a/CellAO/Libraries/Source/CellAO.Interfaces/IFunctionArguments.cs +++ b/CellAO/Libraries/Source/CellAO.Interfaces/IFunctionArguments.cs @@ -35,7 +35,6 @@ namespace CellAO.Interfaces using System.Collections.Generic; using System.Runtime.Serialization; - using MsgPack; #endregion diff --git a/CellAO/Libraries/Source/CellAO.Interfaces/packages.config b/CellAO/Libraries/Source/CellAO.Interfaces/packages.config index e14a7a2d..c02b89ab 100644 --- a/CellAO/Libraries/Source/CellAO.Interfaces/packages.config +++ b/CellAO/Libraries/Source/CellAO.Interfaces/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/CellAO/Libraries/Source/CellAO.ObjectManager/CellAO.ObjectManager.csproj b/CellAO/Libraries/Source/CellAO.ObjectManager/CellAO.ObjectManager.csproj index 5eea5d79..d8a12f34 100644 --- a/CellAO/Libraries/Source/CellAO.ObjectManager/CellAO.ObjectManager.csproj +++ b/CellAO/Libraries/Source/CellAO.ObjectManager/CellAO.ObjectManager.csproj @@ -49,8 +49,8 @@ - - {3ceac898-bfca-45ea-bf34-c4bbb85d2da4} + + {18d555cd-b217-48c7-b3bc-0a678964100a} SmokeLounge.AOtomation.Messaging diff --git a/CellAO/Libraries/Source/CellAO.ObjectManager/Pool.cs b/CellAO/Libraries/Source/CellAO.ObjectManager/Pool.cs index ae9ce520..02dcbe20 100644 --- a/CellAO/Libraries/Source/CellAO.ObjectManager/Pool.cs +++ b/CellAO/Libraries/Source/CellAO.ObjectManager/Pool.cs @@ -411,13 +411,13 @@ public T GetObject(Identity parent, Identity identity) where T : class return (T)temp; } throw new TypeInstanceMismatchException( - "Tried to retrieve " + identity.ToString(true) + "Tried to retrieve " + identity.ToString() + " with the wrong type (" + typeof(T).ToString() + " != " + temp.GetType().ToString() + ")"); } } throw new Exception("Identity type not in this parent's list"); } - throw new ParentNotInPoolException("Parent " + parent.ToString(true) + " not in Pool list"); + throw new ParentNotInPoolException("Parent " + parent.ToString() + " not in Pool list"); } /// @@ -555,7 +555,7 @@ public void RemoveObject(T obj) where T : IDisposable, IEntity { throw new ArgumentNullException( "Tried to remove object, which is not in the pool: " - + obj.Identity.ToString(true)); + + obj.Identity.ToString()); } } } diff --git a/CellAO/Libraries/Source/CellAO.ObjectManager/PooledObject.cs b/CellAO/Libraries/Source/CellAO.ObjectManager/PooledObject.cs index 0abc8d50..09444804 100644 --- a/CellAO/Libraries/Source/CellAO.ObjectManager/PooledObject.cs +++ b/CellAO/Libraries/Source/CellAO.ObjectManager/PooledObject.cs @@ -64,7 +64,7 @@ public PooledObject(Identity parent, Identity id) Pool.Instance.AddObject(parent, this); LogUtil.Debug( DebugInfoDetail.Pool, - "Created new object " + id.ToString(true) + " of " + parent.ToString(true)); + "Created new object " + id.ToString() + " of " + parent.ToString()); } /// @@ -77,7 +77,7 @@ public PooledObject(Identity parent, Identity id) /// public void Dispose() { - LogUtil.Debug(DebugInfoDetail.Pool, "Removed object " + this.Identity.ToString(true) + " of " + this.Parent.ToString(true)); + LogUtil.Debug(DebugInfoDetail.Pool, "Removed object " + this.Identity.ToString() + " of " + this.Parent.ToString()); this.Dispose(true); GC.SuppressFinalize(this); } diff --git a/CellAO/Libraries/Source/CellAO.Stats/CellAO.Stats.csproj b/CellAO/Libraries/Source/CellAO.Stats/CellAO.Stats.csproj index bb1b9232..c47141ab 100644 --- a/CellAO/Libraries/Source/CellAO.Stats/CellAO.Stats.csproj +++ b/CellAO/Libraries/Source/CellAO.Stats/CellAO.Stats.csproj @@ -75,8 +75,8 @@ - - {3ceac898-bfca-45ea-bf34-c4bbb85d2da4} + + {18D555CD-B217-48C7-B3BC-0A678964100A} SmokeLounge.AOtomation.Messaging diff --git a/CellAO/Libraries/Source/PlayfieldLoader/PlayfieldLoader.csproj b/CellAO/Libraries/Source/PlayfieldLoader/PlayfieldLoader.csproj index cba1c6c6..d2f375bf 100644 --- a/CellAO/Libraries/Source/PlayfieldLoader/PlayfieldLoader.csproj +++ b/CellAO/Libraries/Source/PlayfieldLoader/PlayfieldLoader.csproj @@ -31,6 +31,9 @@ 4 + + ..\..\..\packages\MsgPack.Cli.1.0.1\lib\net35\MsgPack.dll + @@ -47,8 +50,8 @@ - - {3CEAC898-BFCA-45EA-BF34-C4BBB85D2DA4} + + {18D555CD-B217-48C7-B3BC-0A678964100A} SmokeLounge.AOtomation.Messaging @@ -67,15 +70,14 @@ {d53f0612-fefe-4eaf-80aa-480f25c8dd76} CellAO.Interfaces - - {6E8C2296-21E9-4113-89C4-76376516AA14} - MsgPack.Mono - {CB56F285-02AE-4816-9E8A-EC69991400E5} Utility + + +