# HG changeset patch # User alys # Date 2021-04-16 03:35:40 # Node ID 1a1a95e7d4da88507dc770400afb72a44fb4d9c6 # Parent 876fafc4258056fd135c077ed1680b4c9f11bb60 Add Contracts to budget. 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 cc8c15ddf724a119a73eeddea79684ec463ffe55..e34f77adede52d30e92de5038331960d43d2cbe5 GIT binary patch literal 17897 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/Users/alys/.nuget/packages/ /Users/alys/.nuget/packages/ PackageReference - 5.8.0 + 5.6.0 - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) 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.201/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.201/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": "AvKmYKc88bJckphAgHXheUIHeesAncWXbgk6/PQVuxOzmKwDSFnsyg9u++EKNsxOlDt4tDOOVkyfDMjvYvNCKQ==", + "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/Engines/SimulationBridgeEngine.cs b/isometric-park-fna/Engines/SimulationBridgeEngine.cs --- a/isometric-park-fna/Engines/SimulationBridgeEngine.cs +++ b/isometric-park-fna/Engines/SimulationBridgeEngine.cs @@ -9,7 +9,9 @@ namespace isometricparkfna.Engines { [Receives(typeof(GameRateMessage), typeof(TogglePauseMessage))] - [Reads(typeof(BudgetComponent))] + [Reads(typeof(BudgetComponent), + typeof(BudgetLineComponent), + typeof(ContractStatusComponent))] [Writes(typeof(BudgetComponent))] class SimulationBridgeEngine : Engine { @@ -42,6 +44,23 @@ this.simulation.paused = !this.simulation.paused; } + decimal new_contract_amount = 0M; + + foreach (ref readonly var entity in ReadEntities()) + { + ref readonly var budgetComponent = ref GetComponent(entity); + var status = GetComponent(entity).status; + + // SetComponent(entity, new BudgetComponent{currentBudget = this.simulation.latestBudget, + // priorBudget = this.simulation.previousBudget}); + if (status == ContractStatus.Accepted) + { + new_contract_amount += budgetComponent.amount; + } + } + + simulation.contracts = new_contract_amount; + } } diff --git a/isometric-park-fna/Engines/Spawners/ContractSpawner.cs b/isometric-park-fna/Engines/Spawners/ContractSpawner.cs --- a/isometric-park-fna/Engines/Spawners/ContractSpawner.cs +++ b/isometric-park-fna/Engines/Spawners/ContractSpawner.cs @@ -65,6 +65,7 @@ AddComponent(contract, new AreaComponent { squares = squares }); AddComponent(contract, new NameComponent { DisplayName = message.name }); AddComponent(contract, new ContractStatusComponent { status = ContractStatus.Proposed }); + AddComponent(contract, new BudgetLineComponent { category = "Contracts", amount = 100.0M }); } } diff --git a/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs b/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs --- a/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs +++ b/isometric-park-fna/Renderers/ImGuiWindowRenderer.cs @@ -39,14 +39,15 @@ case Window.Contracts: var contracts = ReadEntities(); - var contract_data = new List<(Entity, string, ContractStatus)>(); + var contract_data = new List<(Entity, string, ContractStatus, decimal)>(); // var names = contracts.Select(entity => GetComponent(entity).DisplayName) foreach(var e in contracts) { var name = GetComponent(e).DisplayName; var status = GetComponent(e).status; - contract_data.Add((e, name, status)); + var amount = GetComponent(e).amount; + contract_data.Add((e, name, status, amount)); } diff --git a/isometric-park-fna/Simulation.cs b/isometric-park-fna/Simulation.cs --- a/isometric-park-fna/Simulation.cs +++ b/isometric-park-fna/Simulation.cs @@ -19,6 +19,7 @@ //revenue public decimal subsidy; + public decimal contracts; //expenses public decimal upkeep; @@ -82,6 +83,7 @@ private List budgets; + public decimal contracts; public Budget latestBudget { @@ -287,6 +289,7 @@ money = this.money, trees = this.map.tree_count, subsidy = 1000, + contracts = this.contracts, upkeep = this.map.tree_count * 1, tree_planting = this.tree_planting * Simulation.TREE_PLANT_COST, tree_clearing = this.tree_clearing * Simulation.TREE_CLEAR_COST @@ -306,7 +309,7 @@ this.money = budget.money - (budget.upkeep + budget.tree_planting + budget.tree_clearing) - + (budget.subsidy); + + (budget.subsidy + budget.contracts); budget.final_money = this.money; diff --git a/isometric-park-fna/UI/BudgetWindow.cs b/isometric-park-fna/UI/BudgetWindow.cs --- a/isometric-park-fna/UI/BudgetWindow.cs +++ b/isometric-park-fna/UI/BudgetWindow.cs @@ -103,6 +103,7 @@ batch.DrawString(font, String.Format("REVENUE", this.budget.upkeep), new Vector2(x, bar_height * 4 + y), Color.Black); batch.DrawString(font, String.Format("Subsidy................${0:}....${1:}", this.budget.subsidy, this.previous_budget.subsidy), new Vector2(x, bar_height * 5 + y), Color.Black); + batch.DrawString(font, String.Format("Contracts..............${0:}....${1:}", this.budget.contracts, this.previous_budget.contracts), new Vector2(x, bar_height * 6 + y), Color.Black); batch.DrawString(font, String.Format("EXPENSES", this.budget.upkeep), new Vector2(x, bar_height * 9 + y), Color.Black); batch.DrawString(font, String.Format("Upkeep.................${0:}....${1:}", this.budget.upkeep, this.previous_budget.upkeep), new Vector2(x, bar_height * 10 + y), Color.Black); diff --git a/isometric-park-fna/UI/ContractsWindow.cs b/isometric-park-fna/UI/ContractsWindow.cs --- a/isometric-park-fna/UI/ContractsWindow.cs +++ b/isometric-park-fna/UI/ContractsWindow.cs @@ -16,8 +16,9 @@ { public static Entity selected; public static ContractStatus selected_status; + public static decimal selected_amount; - public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine engine, List<(Entity entity, string name, ContractStatus status)> contracts) + public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine engine, List<(Entity entity, string name, ContractStatus status, decimal amount)> contracts) { bool newShow = true; if (newShow) @@ -47,9 +48,9 @@ ImGui.PushStyleColor(ImGuiCol.Button, new Num.Vector4(0.75f, 0.75f, 0.75f, 1f)); ImGui.PushStyleColor(ImGuiCol.Text, new Num.Vector4(0f, 0f, 0f, 1f)); - ImGui.SetNextWindowSize(new Num.Vector2(400, 400)); + ImGui.SetNextWindowSize(new Num.Vector2(300, 300)); ImGui.Begin("Contracts", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings); - ImGui.ListBoxHeader("##Contracts:"); + ImGui.ListBoxHeader("##Contracts:", new Num.Vector2(300, 150)); foreach (var contract in contracts) { if (ImGui.Selectable(contract.name, ContractsWindow.selected == contract.entity)) @@ -59,6 +60,7 @@ if (ContractsWindow.selected == contract.entity) { ContractsWindow.selected_status = contract.status; + ContractsWindow.selected_amount = contract.amount; } @@ -84,6 +86,7 @@ } } ImGui.ListBoxFooter(); + ImGui.Text(string.Format("Amount: ${0}/mo.", ContractsWindow.selected_amount)); if (selected_status == ContractStatus.Proposed) { if (ImGui.Button("Select"))