diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.assets.cache index fa583116edf1dfeb60f3c50d140933201a36585a..7dcce0e548e46b90764d6354561e1e2dd771f572 GIT binary patch literal 137 zc$^FHc6a1rU|`6Y`Lft-vc#^t2G_eM*SatqnQarhm({N558oPxa1XnEtqg<#BM{5z ihZd(673(MFR2J*&<&~zVmgpBGCTAz6rxxqu(+mI~z8cH` diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index cb5b3a48e5a45e2b9dffcde942e7cd5129282630..b2220f812506685b6c8118fe08aaa1a6975a54a8 GIT binary patch literal 20937 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 diff --git a/SpriteFontPlus/src/obj/project.assets.json b/SpriteFontPlus/src/obj/project.assets.json --- a/SpriteFontPlus/src/obj/project.assets.json +++ b/SpriteFontPlus/src/obj/project.assets.json @@ -2,57 +2,8 @@ "version": 3, "targets": { ".NETFramework,Version=v4.5": { - "Microsoft.NETFramework.ReferenceAssemblies/1.0.0": { - "type": "package", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net45": "1.0.0" - } - }, - "Microsoft.NETFramework.ReferenceAssemblies.net45/1.0.0": { - "type": "package", - "build": { - "build/Microsoft.NETFramework.ReferenceAssemblies.net45.targets": {} - } - }, "FNA/1.0.0": { "type": "project", - "framework": ".NETFramework,Version=v4.0", - "compile": { - "bin/placeholder/FNA.dll": {} - }, - "runtime": { - "bin/placeholder/FNA.dll": {} - } - } - }, - ".NETStandard,Version=v2.0": { - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "compile": { - "lib/netstandard1.0/_._": {} - }, - "runtime": { - "lib/netstandard1.0/_._": {} - } - }, - "NETStandard.Library/2.0.3": { - "type": "package", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - }, - "compile": { - "lib/netstandard1.0/_._": {} - }, - "runtime": { - "lib/netstandard1.0/_._": {} - }, - "build": { - "build/netstandard2.0/NETStandard.Library.targets": {} - } - }, - "FNA/1.0.0": { - "type": "project", - "framework": ".NETStandard,Version=v2.0", "compile": { "bin/placeholder/FNA.dll": {} }, @@ -63,493 +14,15 @@ } }, "libraries": { - "Microsoft.NETCore.Platforms/1.1.0": { - "sha512": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", - "type": "package", - "path": "microsoft.netcore.platforms/1.1.0", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "ThirdPartyNotices.txt", - "dotnet_library_license.txt", - "lib/netstandard1.0/_._", - "microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "microsoft.netcore.platforms.nuspec", - "runtime.json" - ] - }, - "Microsoft.NETFramework.ReferenceAssemblies/1.0.0": { - "sha512": "7D2TMufjGiowmt0E941kVoTIS+GTNzaPopuzM1/1LSaJAdJdBrVP0SkZW7AgDd0a2U1DjsIeaKG1wxGVBNLDMw==", - "type": "package", - "path": "microsoft.netframework.referenceassemblies/1.0.0", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "microsoft.netframework.referenceassemblies.1.0.0.nupkg.sha512", - "microsoft.netframework.referenceassemblies.nuspec" - ] - }, - "Microsoft.NETFramework.ReferenceAssemblies.net45/1.0.0": { - "sha512": "f7XMQsZFaoc3w8Vg3VQ3FHuU2C9vf0Ng5EAV4gzdNWDerPM/OmrzccLj15eI1wCLLXj4jk8+lKsbonzJeyXgQQ==", - "type": "package", - "path": "microsoft.netframework.referenceassemblies.net45/1.0.0", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "build/.NETFramework/v4.5/Accessibility.dll", - "build/.NETFramework/v4.5/Accessibility.xml", - "build/.NETFramework/v4.5/CustomMarshalers.dll", - "build/.NETFramework/v4.5/CustomMarshalers.xml", - "build/.NETFramework/v4.5/Facades/System.Collections.Concurrent.dll", - "build/.NETFramework/v4.5/Facades/System.Collections.dll", - "build/.NETFramework/v4.5/Facades/System.ComponentModel.Annotations.dll", - "build/.NETFramework/v4.5/Facades/System.ComponentModel.EventBasedAsync.dll", - "build/.NETFramework/v4.5/Facades/System.ComponentModel.dll", - "build/.NETFramework/v4.5/Facades/System.Diagnostics.Contracts.dll", - "build/.NETFramework/v4.5/Facades/System.Diagnostics.Debug.dll", - "build/.NETFramework/v4.5/Facades/System.Diagnostics.Tools.dll", - "build/.NETFramework/v4.5/Facades/System.Diagnostics.Tracing.dll", - "build/.NETFramework/v4.5/Facades/System.Dynamic.Runtime.dll", - "build/.NETFramework/v4.5/Facades/System.Globalization.dll", - "build/.NETFramework/v4.5/Facades/System.IO.dll", - "build/.NETFramework/v4.5/Facades/System.Linq.Expressions.dll", - "build/.NETFramework/v4.5/Facades/System.Linq.Parallel.dll", - "build/.NETFramework/v4.5/Facades/System.Linq.Queryable.dll", - "build/.NETFramework/v4.5/Facades/System.Linq.dll", - "build/.NETFramework/v4.5/Facades/System.Net.NetworkInformation.dll", - "build/.NETFramework/v4.5/Facades/System.Net.Primitives.dll", - "build/.NETFramework/v4.5/Facades/System.Net.Requests.dll", - "build/.NETFramework/v4.5/Facades/System.ObjectModel.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Emit.ILGeneration.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Emit.Lightweight.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Emit.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Extensions.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.Primitives.dll", - "build/.NETFramework/v4.5/Facades/System.Reflection.dll", - "build/.NETFramework/v4.5/Facades/System.Resources.ResourceManager.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Extensions.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.InteropServices.WindowsRuntime.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.InteropServices.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Numerics.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Serialization.Json.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Serialization.Primitives.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.Serialization.Xml.dll", - "build/.NETFramework/v4.5/Facades/System.Runtime.dll", - "build/.NETFramework/v4.5/Facades/System.Security.Principal.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.Duplex.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.Http.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.NetTcp.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.Primitives.dll", - "build/.NETFramework/v4.5/Facades/System.ServiceModel.Security.dll", - "build/.NETFramework/v4.5/Facades/System.Text.Encoding.Extensions.dll", - "build/.NETFramework/v4.5/Facades/System.Text.Encoding.dll", - "build/.NETFramework/v4.5/Facades/System.Text.RegularExpressions.dll", - "build/.NETFramework/v4.5/Facades/System.Threading.Tasks.Parallel.dll", - "build/.NETFramework/v4.5/Facades/System.Threading.Tasks.dll", - "build/.NETFramework/v4.5/Facades/System.Threading.dll", - "build/.NETFramework/v4.5/Facades/System.Xml.ReaderWriter.dll", - "build/.NETFramework/v4.5/Facades/System.Xml.XDocument.dll", - "build/.NETFramework/v4.5/Facades/System.Xml.XmlSerializer.dll", - "build/.NETFramework/v4.5/ISymWrapper.dll", - "build/.NETFramework/v4.5/ISymWrapper.xml", - "build/.NETFramework/v4.5/Microsoft.Activities.Build.dll", - "build/.NETFramework/v4.5/Microsoft.Activities.Build.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Conversion.v4.0.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Conversion.v4.0.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Engine.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Engine.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Framework.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Framework.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Tasks.v4.0.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Tasks.v4.0.xml", - "build/.NETFramework/v4.5/Microsoft.Build.Utilities.v4.0.dll", - "build/.NETFramework/v4.5/Microsoft.Build.Utilities.v4.0.xml", - "build/.NETFramework/v4.5/Microsoft.Build.dll", - "build/.NETFramework/v4.5/Microsoft.Build.xml", - "build/.NETFramework/v4.5/Microsoft.CSharp.dll", - "build/.NETFramework/v4.5/Microsoft.CSharp.xml", - "build/.NETFramework/v4.5/Microsoft.JScript.dll", - "build/.NETFramework/v4.5/Microsoft.JScript.xml", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.Data.dll", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.Data.xml", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.dll", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.Compatibility.xml", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.dll", - "build/.NETFramework/v4.5/Microsoft.VisualBasic.xml", - "build/.NETFramework/v4.5/Microsoft.VisualC.STLCLR.dll", - "build/.NETFramework/v4.5/Microsoft.VisualC.STLCLR.xml", - "build/.NETFramework/v4.5/Microsoft.VisualC.dll", - "build/.NETFramework/v4.5/Microsoft.VisualC.xml", - "build/.NETFramework/v4.5/PermissionSets/FullTrust.xml", - "build/.NETFramework/v4.5/PermissionSets/Internet.xml", - "build/.NETFramework/v4.5/PermissionSets/LocalIntranet.xml", - "build/.NETFramework/v4.5/PresentationBuildTasks.dll", - "build/.NETFramework/v4.5/PresentationBuildTasks.xml", - "build/.NETFramework/v4.5/PresentationCore.dll", - "build/.NETFramework/v4.5/PresentationCore.xml", - "build/.NETFramework/v4.5/PresentationFramework.Aero.dll", - "build/.NETFramework/v4.5/PresentationFramework.Aero.xml", - "build/.NETFramework/v4.5/PresentationFramework.Aero2.dll", - "build/.NETFramework/v4.5/PresentationFramework.AeroLite.dll", - "build/.NETFramework/v4.5/PresentationFramework.Classic.dll", - "build/.NETFramework/v4.5/PresentationFramework.Classic.xml", - "build/.NETFramework/v4.5/PresentationFramework.Luna.dll", - "build/.NETFramework/v4.5/PresentationFramework.Luna.xml", - "build/.NETFramework/v4.5/PresentationFramework.Royale.dll", - "build/.NETFramework/v4.5/PresentationFramework.Royale.xml", - "build/.NETFramework/v4.5/PresentationFramework.dll", - "build/.NETFramework/v4.5/PresentationFramework.xml", - "build/.NETFramework/v4.5/ReachFramework.dll", - "build/.NETFramework/v4.5/ReachFramework.xml", - "build/.NETFramework/v4.5/RedistList/FrameworkList.xml", - "build/.NETFramework/v4.5/System.Activities.Core.Presentation.dll", - "build/.NETFramework/v4.5/System.Activities.Core.Presentation.xml", - "build/.NETFramework/v4.5/System.Activities.DurableInstancing.dll", - "build/.NETFramework/v4.5/System.Activities.DurableInstancing.xml", - "build/.NETFramework/v4.5/System.Activities.Presentation.dll", - "build/.NETFramework/v4.5/System.Activities.Presentation.xml", - "build/.NETFramework/v4.5/System.Activities.dll", - "build/.NETFramework/v4.5/System.Activities.xml", - "build/.NETFramework/v4.5/System.AddIn.Contract.dll", - "build/.NETFramework/v4.5/System.AddIn.Contract.xml", - "build/.NETFramework/v4.5/System.AddIn.dll", - "build/.NETFramework/v4.5/System.AddIn.xml", - "build/.NETFramework/v4.5/System.ComponentModel.Composition.Registration.dll", - "build/.NETFramework/v4.5/System.ComponentModel.Composition.dll", - "build/.NETFramework/v4.5/System.ComponentModel.Composition.xml", - "build/.NETFramework/v4.5/System.ComponentModel.DataAnnotations.dll", - "build/.NETFramework/v4.5/System.ComponentModel.DataAnnotations.xml", - "build/.NETFramework/v4.5/System.Configuration.Install.dll", - "build/.NETFramework/v4.5/System.Configuration.Install.xml", - "build/.NETFramework/v4.5/System.Configuration.dll", - "build/.NETFramework/v4.5/System.Configuration.xml", - "build/.NETFramework/v4.5/System.Core.dll", - "build/.NETFramework/v4.5/System.Core.xml", - "build/.NETFramework/v4.5/System.Data.DataSetExtensions.dll", - "build/.NETFramework/v4.5/System.Data.DataSetExtensions.xml", - "build/.NETFramework/v4.5/System.Data.Entity.Design.dll", - "build/.NETFramework/v4.5/System.Data.Entity.Design.xml", - "build/.NETFramework/v4.5/System.Data.Entity.dll", - "build/.NETFramework/v4.5/System.Data.Entity.xml", - "build/.NETFramework/v4.5/System.Data.Linq.dll", - "build/.NETFramework/v4.5/System.Data.Linq.xml", - "build/.NETFramework/v4.5/System.Data.OracleClient.dll", - "build/.NETFramework/v4.5/System.Data.OracleClient.xml", - "build/.NETFramework/v4.5/System.Data.Services.Client.dll", - "build/.NETFramework/v4.5/System.Data.Services.Client.xml", - "build/.NETFramework/v4.5/System.Data.Services.Design.dll", - "build/.NETFramework/v4.5/System.Data.Services.Design.xml", - "build/.NETFramework/v4.5/System.Data.Services.dll", - "build/.NETFramework/v4.5/System.Data.Services.xml", - "build/.NETFramework/v4.5/System.Data.SqlXml.dll", - "build/.NETFramework/v4.5/System.Data.SqlXml.xml", - "build/.NETFramework/v4.5/System.Data.dll", - "build/.NETFramework/v4.5/System.Data.xml", - "build/.NETFramework/v4.5/System.Deployment.dll", - "build/.NETFramework/v4.5/System.Deployment.xml", - "build/.NETFramework/v4.5/System.Design.dll", - "build/.NETFramework/v4.5/System.Design.xml", - "build/.NETFramework/v4.5/System.Device.dll", - "build/.NETFramework/v4.5/System.Device.xml", - "build/.NETFramework/v4.5/System.DirectoryServices.AccountManagement.dll", - "build/.NETFramework/v4.5/System.DirectoryServices.AccountManagement.xml", - "build/.NETFramework/v4.5/System.DirectoryServices.Protocols.dll", - "build/.NETFramework/v4.5/System.DirectoryServices.Protocols.xml", - "build/.NETFramework/v4.5/System.DirectoryServices.dll", - "build/.NETFramework/v4.5/System.DirectoryServices.xml", - "build/.NETFramework/v4.5/System.Drawing.Design.dll", - "build/.NETFramework/v4.5/System.Drawing.Design.xml", - "build/.NETFramework/v4.5/System.Drawing.dll", - "build/.NETFramework/v4.5/System.Drawing.xml", - "build/.NETFramework/v4.5/System.EnterpriseServices.Thunk.dll", - "build/.NETFramework/v4.5/System.EnterpriseServices.Wrapper.dll", - "build/.NETFramework/v4.5/System.EnterpriseServices.dll", - "build/.NETFramework/v4.5/System.EnterpriseServices.xml", - "build/.NETFramework/v4.5/System.IO.Compression.FileSystem.dll", - "build/.NETFramework/v4.5/System.IO.Compression.FileSystem.xml", - "build/.NETFramework/v4.5/System.IO.Compression.dll", - "build/.NETFramework/v4.5/System.IO.Compression.xml", - "build/.NETFramework/v4.5/System.IO.Log.dll", - "build/.NETFramework/v4.5/System.IO.Log.xml", - "build/.NETFramework/v4.5/System.IdentityModel.Selectors.dll", - "build/.NETFramework/v4.5/System.IdentityModel.Selectors.xml", - "build/.NETFramework/v4.5/System.IdentityModel.Services.dll", - "build/.NETFramework/v4.5/System.IdentityModel.Services.xml", - "build/.NETFramework/v4.5/System.IdentityModel.dll", - "build/.NETFramework/v4.5/System.IdentityModel.xml", - "build/.NETFramework/v4.5/System.Management.Instrumentation.dll", - "build/.NETFramework/v4.5/System.Management.Instrumentation.xml", - "build/.NETFramework/v4.5/System.Management.dll", - "build/.NETFramework/v4.5/System.Management.xml", - "build/.NETFramework/v4.5/System.Messaging.dll", - "build/.NETFramework/v4.5/System.Messaging.xml", - "build/.NETFramework/v4.5/System.Net.Http.WebRequest.dll", - "build/.NETFramework/v4.5/System.Net.Http.WebRequest.xml", - "build/.NETFramework/v4.5/System.Net.Http.dll", - "build/.NETFramework/v4.5/System.Net.Http.xml", - "build/.NETFramework/v4.5/System.Net.dll", - "build/.NETFramework/v4.5/System.Net.xml", - "build/.NETFramework/v4.5/System.Numerics.dll", - "build/.NETFramework/v4.5/System.Numerics.xml", - "build/.NETFramework/v4.5/System.Printing.dll", - "build/.NETFramework/v4.5/System.Printing.xml", - "build/.NETFramework/v4.5/System.Reflection.Context.dll", - "build/.NETFramework/v4.5/System.Reflection.Context.xml", - "build/.NETFramework/v4.5/System.Runtime.Caching.dll", - "build/.NETFramework/v4.5/System.Runtime.Caching.xml", - "build/.NETFramework/v4.5/System.Runtime.DurableInstancing.dll", - "build/.NETFramework/v4.5/System.Runtime.DurableInstancing.xml", - "build/.NETFramework/v4.5/System.Runtime.Remoting.dll", - "build/.NETFramework/v4.5/System.Runtime.Remoting.xml", - "build/.NETFramework/v4.5/System.Runtime.Serialization.Formatters.Soap.dll", - "build/.NETFramework/v4.5/System.Runtime.Serialization.Formatters.Soap.xml", - "build/.NETFramework/v4.5/System.Runtime.Serialization.dll", - "build/.NETFramework/v4.5/System.Runtime.Serialization.xml", - "build/.NETFramework/v4.5/System.Security.dll", - "build/.NETFramework/v4.5/System.Security.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Activation.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Activation.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Activities.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Activities.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Channels.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Channels.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Discovery.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Discovery.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Routing.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Routing.xml", - "build/.NETFramework/v4.5/System.ServiceModel.Web.dll", - "build/.NETFramework/v4.5/System.ServiceModel.Web.xml", - "build/.NETFramework/v4.5/System.ServiceModel.dll", - "build/.NETFramework/v4.5/System.ServiceModel.xml", - "build/.NETFramework/v4.5/System.ServiceProcess.dll", - "build/.NETFramework/v4.5/System.ServiceProcess.xml", - "build/.NETFramework/v4.5/System.Speech.dll", - "build/.NETFramework/v4.5/System.Speech.xml", - "build/.NETFramework/v4.5/System.Threading.Tasks.Dataflow.xml", - "build/.NETFramework/v4.5/System.Transactions.dll", - "build/.NETFramework/v4.5/System.Transactions.xml", - "build/.NETFramework/v4.5/System.Web.Abstractions.dll", - "build/.NETFramework/v4.5/System.Web.ApplicationServices.dll", - "build/.NETFramework/v4.5/System.Web.ApplicationServices.xml", - "build/.NETFramework/v4.5/System.Web.DataVisualization.Design.dll", - "build/.NETFramework/v4.5/System.Web.DataVisualization.dll", - "build/.NETFramework/v4.5/System.Web.DataVisualization.xml", - "build/.NETFramework/v4.5/System.Web.DynamicData.Design.dll", - "build/.NETFramework/v4.5/System.Web.DynamicData.Design.xml", - "build/.NETFramework/v4.5/System.Web.DynamicData.dll", - "build/.NETFramework/v4.5/System.Web.DynamicData.xml", - "build/.NETFramework/v4.5/System.Web.Entity.Design.dll", - "build/.NETFramework/v4.5/System.Web.Entity.Design.xml", - "build/.NETFramework/v4.5/System.Web.Entity.dll", - "build/.NETFramework/v4.5/System.Web.Entity.xml", - "build/.NETFramework/v4.5/System.Web.Extensions.Design.dll", - "build/.NETFramework/v4.5/System.Web.Extensions.Design.xml", - "build/.NETFramework/v4.5/System.Web.Extensions.dll", - "build/.NETFramework/v4.5/System.Web.Extensions.xml", - "build/.NETFramework/v4.5/System.Web.Mobile.dll", - "build/.NETFramework/v4.5/System.Web.Mobile.xml", - "build/.NETFramework/v4.5/System.Web.RegularExpressions.dll", - "build/.NETFramework/v4.5/System.Web.RegularExpressions.xml", - "build/.NETFramework/v4.5/System.Web.Routing.dll", - "build/.NETFramework/v4.5/System.Web.Services.dll", - "build/.NETFramework/v4.5/System.Web.Services.xml", - "build/.NETFramework/v4.5/System.Web.dll", - "build/.NETFramework/v4.5/System.Web.xml", - "build/.NETFramework/v4.5/System.Windows.Controls.Ribbon.dll", - "build/.NETFramework/v4.5/System.Windows.Controls.Ribbon.xml", - "build/.NETFramework/v4.5/System.Windows.Forms.DataVisualization.Design.dll", - "build/.NETFramework/v4.5/System.Windows.Forms.DataVisualization.dll", - "build/.NETFramework/v4.5/System.Windows.Forms.DataVisualization.xml", - "build/.NETFramework/v4.5/System.Windows.Forms.dll", - "build/.NETFramework/v4.5/System.Windows.Forms.xml", - "build/.NETFramework/v4.5/System.Windows.Input.Manipulations.dll", - "build/.NETFramework/v4.5/System.Windows.Input.Manipulations.xml", - "build/.NETFramework/v4.5/System.Windows.Presentation.dll", - "build/.NETFramework/v4.5/System.Windows.Presentation.xml", - "build/.NETFramework/v4.5/System.Windows.dll", - "build/.NETFramework/v4.5/System.Workflow.Activities.dll", - "build/.NETFramework/v4.5/System.Workflow.Activities.xml", - "build/.NETFramework/v4.5/System.Workflow.ComponentModel.dll", - "build/.NETFramework/v4.5/System.Workflow.ComponentModel.xml", - "build/.NETFramework/v4.5/System.Workflow.Runtime.dll", - "build/.NETFramework/v4.5/System.Workflow.Runtime.xml", - "build/.NETFramework/v4.5/System.WorkflowServices.dll", - "build/.NETFramework/v4.5/System.WorkflowServices.xml", - "build/.NETFramework/v4.5/System.Xaml.dll", - "build/.NETFramework/v4.5/System.Xaml.xml", - "build/.NETFramework/v4.5/System.Xml.Linq.dll", - "build/.NETFramework/v4.5/System.Xml.Linq.xml", - "build/.NETFramework/v4.5/System.Xml.Serialization.dll", - "build/.NETFramework/v4.5/System.Xml.dll", - "build/.NETFramework/v4.5/System.Xml.xml", - "build/.NETFramework/v4.5/System.dll", - "build/.NETFramework/v4.5/System.xml", - "build/.NETFramework/v4.5/UIAutomationClient.dll", - "build/.NETFramework/v4.5/UIAutomationClient.xml", - "build/.NETFramework/v4.5/UIAutomationClientsideProviders.dll", - "build/.NETFramework/v4.5/UIAutomationClientsideProviders.xml", - "build/.NETFramework/v4.5/UIAutomationProvider.dll", - "build/.NETFramework/v4.5/UIAutomationProvider.xml", - "build/.NETFramework/v4.5/UIAutomationTypes.dll", - "build/.NETFramework/v4.5/UIAutomationTypes.xml", - "build/.NETFramework/v4.5/WindowsBase.dll", - "build/.NETFramework/v4.5/WindowsBase.xml", - "build/.NETFramework/v4.5/WindowsFormsIntegration.dll", - "build/.NETFramework/v4.5/WindowsFormsIntegration.xml", - "build/.NETFramework/v4.5/XamlBuildTask.dll", - "build/.NETFramework/v4.5/XamlBuildTask.xml", - "build/.NETFramework/v4.5/mscorlib.dll", - "build/.NETFramework/v4.5/mscorlib.xml", - "build/.NETFramework/v4.5/sysglobl.dll", - "build/.NETFramework/v4.5/sysglobl.xml", - "build/Microsoft.NETFramework.ReferenceAssemblies.net45.targets", - "microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg.sha512", - "microsoft.netframework.referenceassemblies.net45.nuspec" - ] - }, - "NETStandard.Library/2.0.3": { - "sha512": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "type": "package", - "path": "netstandard.library/2.0.3", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "build/netstandard2.0/NETStandard.Library.targets", - "build/netstandard2.0/ref/Microsoft.Win32.Primitives.dll", - "build/netstandard2.0/ref/System.AppContext.dll", - "build/netstandard2.0/ref/System.Collections.Concurrent.dll", - "build/netstandard2.0/ref/System.Collections.NonGeneric.dll", - "build/netstandard2.0/ref/System.Collections.Specialized.dll", - "build/netstandard2.0/ref/System.Collections.dll", - "build/netstandard2.0/ref/System.ComponentModel.Composition.dll", - "build/netstandard2.0/ref/System.ComponentModel.EventBasedAsync.dll", - "build/netstandard2.0/ref/System.ComponentModel.Primitives.dll", - "build/netstandard2.0/ref/System.ComponentModel.TypeConverter.dll", - "build/netstandard2.0/ref/System.ComponentModel.dll", - "build/netstandard2.0/ref/System.Console.dll", - "build/netstandard2.0/ref/System.Core.dll", - "build/netstandard2.0/ref/System.Data.Common.dll", - "build/netstandard2.0/ref/System.Data.dll", - "build/netstandard2.0/ref/System.Diagnostics.Contracts.dll", - "build/netstandard2.0/ref/System.Diagnostics.Debug.dll", - "build/netstandard2.0/ref/System.Diagnostics.FileVersionInfo.dll", - "build/netstandard2.0/ref/System.Diagnostics.Process.dll", - "build/netstandard2.0/ref/System.Diagnostics.StackTrace.dll", - "build/netstandard2.0/ref/System.Diagnostics.TextWriterTraceListener.dll", - "build/netstandard2.0/ref/System.Diagnostics.Tools.dll", - "build/netstandard2.0/ref/System.Diagnostics.TraceSource.dll", - "build/netstandard2.0/ref/System.Diagnostics.Tracing.dll", - "build/netstandard2.0/ref/System.Drawing.Primitives.dll", - "build/netstandard2.0/ref/System.Drawing.dll", - "build/netstandard2.0/ref/System.Dynamic.Runtime.dll", - "build/netstandard2.0/ref/System.Globalization.Calendars.dll", - "build/netstandard2.0/ref/System.Globalization.Extensions.dll", - "build/netstandard2.0/ref/System.Globalization.dll", - "build/netstandard2.0/ref/System.IO.Compression.FileSystem.dll", - "build/netstandard2.0/ref/System.IO.Compression.ZipFile.dll", - "build/netstandard2.0/ref/System.IO.Compression.dll", - "build/netstandard2.0/ref/System.IO.FileSystem.DriveInfo.dll", - "build/netstandard2.0/ref/System.IO.FileSystem.Primitives.dll", - "build/netstandard2.0/ref/System.IO.FileSystem.Watcher.dll", - "build/netstandard2.0/ref/System.IO.FileSystem.dll", - "build/netstandard2.0/ref/System.IO.IsolatedStorage.dll", - "build/netstandard2.0/ref/System.IO.MemoryMappedFiles.dll", - "build/netstandard2.0/ref/System.IO.Pipes.dll", - "build/netstandard2.0/ref/System.IO.UnmanagedMemoryStream.dll", - "build/netstandard2.0/ref/System.IO.dll", - "build/netstandard2.0/ref/System.Linq.Expressions.dll", - "build/netstandard2.0/ref/System.Linq.Parallel.dll", - "build/netstandard2.0/ref/System.Linq.Queryable.dll", - "build/netstandard2.0/ref/System.Linq.dll", - "build/netstandard2.0/ref/System.Net.Http.dll", - "build/netstandard2.0/ref/System.Net.NameResolution.dll", - "build/netstandard2.0/ref/System.Net.NetworkInformation.dll", - "build/netstandard2.0/ref/System.Net.Ping.dll", - "build/netstandard2.0/ref/System.Net.Primitives.dll", - "build/netstandard2.0/ref/System.Net.Requests.dll", - "build/netstandard2.0/ref/System.Net.Security.dll", - "build/netstandard2.0/ref/System.Net.Sockets.dll", - "build/netstandard2.0/ref/System.Net.WebHeaderCollection.dll", - "build/netstandard2.0/ref/System.Net.WebSockets.Client.dll", - "build/netstandard2.0/ref/System.Net.WebSockets.dll", - "build/netstandard2.0/ref/System.Net.dll", - "build/netstandard2.0/ref/System.Numerics.dll", - "build/netstandard2.0/ref/System.ObjectModel.dll", - "build/netstandard2.0/ref/System.Reflection.Extensions.dll", - "build/netstandard2.0/ref/System.Reflection.Primitives.dll", - "build/netstandard2.0/ref/System.Reflection.dll", - "build/netstandard2.0/ref/System.Resources.Reader.dll", - "build/netstandard2.0/ref/System.Resources.ResourceManager.dll", - "build/netstandard2.0/ref/System.Resources.Writer.dll", - "build/netstandard2.0/ref/System.Runtime.CompilerServices.VisualC.dll", - "build/netstandard2.0/ref/System.Runtime.Extensions.dll", - "build/netstandard2.0/ref/System.Runtime.Handles.dll", - "build/netstandard2.0/ref/System.Runtime.InteropServices.RuntimeInformation.dll", - "build/netstandard2.0/ref/System.Runtime.InteropServices.dll", - "build/netstandard2.0/ref/System.Runtime.Numerics.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.Formatters.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.Json.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.Primitives.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.Xml.dll", - "build/netstandard2.0/ref/System.Runtime.Serialization.dll", - "build/netstandard2.0/ref/System.Runtime.dll", - "build/netstandard2.0/ref/System.Security.Claims.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.Algorithms.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.Csp.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.Encoding.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.Primitives.dll", - "build/netstandard2.0/ref/System.Security.Cryptography.X509Certificates.dll", - "build/netstandard2.0/ref/System.Security.Principal.dll", - "build/netstandard2.0/ref/System.Security.SecureString.dll", - "build/netstandard2.0/ref/System.ServiceModel.Web.dll", - "build/netstandard2.0/ref/System.Text.Encoding.Extensions.dll", - "build/netstandard2.0/ref/System.Text.Encoding.dll", - "build/netstandard2.0/ref/System.Text.RegularExpressions.dll", - "build/netstandard2.0/ref/System.Threading.Overlapped.dll", - "build/netstandard2.0/ref/System.Threading.Tasks.Parallel.dll", - "build/netstandard2.0/ref/System.Threading.Tasks.dll", - "build/netstandard2.0/ref/System.Threading.Thread.dll", - "build/netstandard2.0/ref/System.Threading.ThreadPool.dll", - "build/netstandard2.0/ref/System.Threading.Timer.dll", - "build/netstandard2.0/ref/System.Threading.dll", - "build/netstandard2.0/ref/System.Transactions.dll", - "build/netstandard2.0/ref/System.ValueTuple.dll", - "build/netstandard2.0/ref/System.Web.dll", - "build/netstandard2.0/ref/System.Windows.dll", - "build/netstandard2.0/ref/System.Xml.Linq.dll", - "build/netstandard2.0/ref/System.Xml.ReaderWriter.dll", - "build/netstandard2.0/ref/System.Xml.Serialization.dll", - "build/netstandard2.0/ref/System.Xml.XDocument.dll", - "build/netstandard2.0/ref/System.Xml.XPath.XDocument.dll", - "build/netstandard2.0/ref/System.Xml.XPath.dll", - "build/netstandard2.0/ref/System.Xml.XmlDocument.dll", - "build/netstandard2.0/ref/System.Xml.XmlSerializer.dll", - "build/netstandard2.0/ref/System.Xml.dll", - "build/netstandard2.0/ref/System.dll", - "build/netstandard2.0/ref/mscorlib.dll", - "build/netstandard2.0/ref/netstandard.dll", - "build/netstandard2.0/ref/netstandard.xml", - "lib/netstandard1.0/_._", - "netstandard.library.2.0.3.nupkg.sha512", - "netstandard.library.nuspec" - ] - }, "FNA/1.0.0": { "type": "project", - "path": "../../FNA/FNA.Core.csproj", - "msbuildProject": "../../FNA/FNA.Core.csproj" + "path": "../../FNA/FNA.csproj", + "msbuildProject": "../../FNA/FNA.csproj" } }, "projectFileDependencyGroups": { ".NETFramework,Version=v4.5": [ - "FNA >= 1.0.0", - "Microsoft.NETFramework.ReferenceAssemblies >= 1.0.0" - ], - ".NETStandard,Version=v2.0": [ - "FNA >= 1.0.0", - "NETStandard.Library >= 2.0.3" + "FNA >= 1.0.0" ] }, "packageFolders": { @@ -558,37 +31,26 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj", + "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", "projectName": "SpriteFontPlus", - "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj", + "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", "packagesPath": "/Users/alys/.nuget/packages/", "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/", "projectStyle": "PackageReference", - "crossTargeting": true, "configFilePaths": [ - "/Users/alys/.nuget/NuGet/NuGet.Config" + "/Users/alys/.config/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ - "net45", - "netstandard2.0" + "net45" ], "sources": { "https://api.nuget.org/v3/index.json": {} }, "frameworks": { "net45": { - "targetAlias": "net45", "projectReferences": { - "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj": { - "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj" - } - } - }, - "netstandard2.0": { - "targetAlias": "netstandard2.0", - "projectReferences": { - "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj": { - "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.Core.csproj" + "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": { + "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj" } } } @@ -601,38 +63,7 @@ }, "frameworks": { "net45": { - "targetAlias": "net45", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies": { - "suppressParent": "All", - "target": "Package", - "version": "[1.0.0, )", - "autoReferenced": true - } - }, - "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.202/RuntimeIdentifierGraph.json" - }, - "netstandard2.0": { - "targetAlias": "netstandard2.0", - "dependencies": { - "NETStandard.Library": { - "suppressParent": "All", - "target": "Package", - "version": "[2.0.3, )", - "autoReferenced": true - } - }, - "imports": [ - "net461", - "net462", - "net47", - "net471", - "net472", - "net48" - ], - "assetTargetFallback": true, - "warn": true, - "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/5.0.202/RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json" } } } diff --git a/SpriteFontPlus/src/obj/project.nuget.cache b/SpriteFontPlus/src/obj/project.nuget.cache --- a/SpriteFontPlus/src/obj/project.nuget.cache +++ b/SpriteFontPlus/src/obj/project.nuget.cache @@ -1,13 +1,8 @@ { "version": 2, - "dgSpecHash": "3R9WDhpmDP/ybl/9zAzE/8D8e7oHOYnPI6vqSMFXlQArdzsXsOcO+zrPKGiDeMip0lN4Lm30Wumk1II5bYeXkA==", + "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==", "success": true, - "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.Core.csproj", - "expectedPackageFiles": [ - "/Users/alys/.nuget/packages/microsoft.netcore.platforms/1.1.0/microsoft.netcore.platforms.1.1.0.nupkg.sha512", - "/Users/alys/.nuget/packages/microsoft.netframework.referenceassemblies/1.0.0/microsoft.netframework.referenceassemblies.1.0.0.nupkg.sha512", - "/Users/alys/.nuget/packages/microsoft.netframework.referenceassemblies.net45/1.0.0/microsoft.netframework.referenceassemblies.net45.1.0.0.nupkg.sha512", - "/Users/alys/.nuget/packages/netstandard.library/2.0.3/netstandard.library.2.0.3.nupkg.sha512" - ], + "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj", + "expectedPackageFiles": [], "logs": [] } \ No newline at end of file diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -107,7 +107,6 @@ } ; - Logging.Log(LogLevel.Critical, "Test"); #endif this.gdm = new GraphicsDeviceManager(this) { // Typically you would load a config here... diff --git a/isometric-park-fna/Logging.cs b/isometric-park-fna/Logging.cs --- a/isometric-park-fna/Logging.cs +++ b/isometric-park-fna/Logging.cs @@ -12,6 +12,7 @@ Critical, Error, Warning, + Success, Info, Debug, Trace @@ -27,15 +28,17 @@ {LogLevel.Critical, (ConsoleColor.White, ConsoleColor.Red)}, {LogLevel.Error, (ConsoleColor.Red, ConsoleColor.Black)}, {LogLevel.Warning, (ConsoleColor.Yellow, ConsoleColor.Black)}, + {LogLevel.Success, (ConsoleColor.Green, ConsoleColor.Black)}, {LogLevel.Info, (ConsoleColor.White, ConsoleColor.Black)}, {LogLevel.Debug, (ConsoleColor.White, ConsoleColor.Blue)}, - {LogLevel.Trace, (ConsoleColor.White, ConsoleColor.Gray)}, + {LogLevel.Trace, (ConsoleColor.White, ConsoleColor.DarkGray)}, }; private static void Log_(LogLevel level, string message, int lineNumber, string caller, string path) { + var timestamp = DateTime.Now; var start_foreground = Console.ForegroundColor; var start_background = Console.BackgroundColor; @@ -45,13 +48,14 @@ Console.ForegroundColor = new_foreground; Console.BackgroundColor = new_background; - Console.Out.Write(string.Format("{0} ", level.ToString())); + //29/Apr/2021 22:43:30 + Console.Out.Write(string.Format("[{0}] {1}", timestamp.ToString("s"), level.ToString())); Console.ForegroundColor = start_foreground; Console.BackgroundColor = start_background; - Console.Out.WriteLine(string.Format("{0} [{1}:{2}]", message, path, lineNumber)); + Console.Out.WriteLine(string.Format(" {0} [{1}:{2}]", message, path, lineNumber)); } public static void Log(LogLevel level, string message, diff --git a/isometric-park-fna/UI/DebugWindow.cs b/isometric-park-fna/UI/DebugWindow.cs --- a/isometric-park-fna/UI/DebugWindow.cs +++ b/isometric-park-fna/UI/DebugWindow.cs @@ -147,6 +147,17 @@ { this.show_test_window = !this.show_test_window; } + + if (ImGui.Button("Test Logging")) + { + Logging.Log(LogLevel.Critical, "Test"); + Logging.Log(LogLevel.Error, "Test"); + Logging.Log(LogLevel.Warning, "Test"); + Logging.Log(LogLevel.Info, "Test"); + Logging.Log(LogLevel.Debug, "Test"); + Logging.Log(LogLevel.Trace, "Test"); + + } if (debugInfo.pastFps.Length >= 1) { ImGui.PlotLines("Frame Rate", ref debugInfo.pastFps[0], debugInfo.pastFps.Length);