From ef6173fba6468f869fc3d44b8d0bf5e3b7d3e0f9 Mon Sep 17 00:00:00 2001 From: Andy McFadden Date: Sun, 27 Feb 2022 07:55:36 -0800 Subject: [PATCH] Migrate to Visual Studio Community 2022 Minor change to solution. Removed CodeLab project stub, which was still targeting .NET Framework 4.6.1. The other projects with WPF code target 4.6.2, and I haven't updated them to 4.8 out of a fear that it might make 6502bench harder to install on older systems. The down side is that it requires an extra "dev pack" download to build the source code. 4.8 is the end of the line for .NET Framework, so at some point we should make that the official target. --- CodeLab/App.config | 6 - CodeLab/CodeLab.csproj | 84 -------------- CodeLab/Form1.resx | 142 ----------------------- CodeLab/MainWindow.Designer.cs | 46 -------- CodeLab/MainWindow.cs | 20 ---- CodeLab/MainWindow.resx | 120 ------------------- CodeLab/Program.cs | 22 ---- CodeLab/Properties/AssemblyInfo.cs | 36 ------ CodeLab/Properties/Resources.Designer.cs | 63 ---------- CodeLab/Properties/Resources.resx | 117 ------------------- CodeLab/Properties/Settings.Designer.cs | 26 ----- CodeLab/Properties/Settings.settings | 7 -- CodeLab/README.md | 1 - SourceNotes.md | 15 ++- WorkBench.sln | 10 +- 15 files changed, 11 insertions(+), 704 deletions(-) delete mode 100644 CodeLab/App.config delete mode 100644 CodeLab/CodeLab.csproj delete mode 100644 CodeLab/Form1.resx delete mode 100644 CodeLab/MainWindow.Designer.cs delete mode 100644 CodeLab/MainWindow.cs delete mode 100644 CodeLab/MainWindow.resx delete mode 100644 CodeLab/Program.cs delete mode 100644 CodeLab/Properties/AssemblyInfo.cs delete mode 100644 CodeLab/Properties/Resources.Designer.cs delete mode 100644 CodeLab/Properties/Resources.resx delete mode 100644 CodeLab/Properties/Settings.Designer.cs delete mode 100644 CodeLab/Properties/Settings.settings delete mode 100644 CodeLab/README.md diff --git a/CodeLab/App.config b/CodeLab/App.config deleted file mode 100644 index 731f6de..0000000 --- a/CodeLab/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/CodeLab/CodeLab.csproj b/CodeLab/CodeLab.csproj deleted file mode 100644 index 0bba042..0000000 --- a/CodeLab/CodeLab.csproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - AnyCPU - {3B66ABD8-7129-4D2B-B48E-B03FEC835CE1} - WinExe - CodeLab - CodeLab - v4.6.1 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - Form - - - MainWindow.cs - - - - - MainWindow.cs - Designer - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - \ No newline at end of file diff --git a/CodeLab/Form1.resx b/CodeLab/Form1.resx deleted file mode 100644 index 75db02c..0000000 --- a/CodeLab/Form1.resx +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 132, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - \ No newline at end of file diff --git a/CodeLab/MainWindow.Designer.cs b/CodeLab/MainWindow.Designer.cs deleted file mode 100644 index a5641bb..0000000 --- a/CodeLab/MainWindow.Designer.cs +++ /dev/null @@ -1,46 +0,0 @@ -namespace WorkBench -{ - partial class MainWindow - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.SuspendLayout(); - // - // MainWindow - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(284, 261); - this.Name = "MainWindow"; - this.Text = "6502bench"; - this.ResumeLayout(false); - - } - - #endregion - } -} \ No newline at end of file diff --git a/CodeLab/MainWindow.cs b/CodeLab/MainWindow.cs deleted file mode 100644 index 359f39e..0000000 --- a/CodeLab/MainWindow.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace WorkBench -{ - public partial class MainWindow : Form - { - public MainWindow() - { - InitializeComponent(); - } - } -} diff --git a/CodeLab/MainWindow.resx b/CodeLab/MainWindow.resx deleted file mode 100644 index 1af7de1..0000000 --- a/CodeLab/MainWindow.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/CodeLab/Program.cs b/CodeLab/Program.cs deleted file mode 100644 index 8bfd5f0..0000000 --- a/CodeLab/Program.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace WorkBench -{ - static class Program - { - /// - /// The main entry point for the application. - /// - [STAThread] - static void Main() - { - Application.EnableVisualStyles(); - Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new MainWindow()); - } - } -} diff --git a/CodeLab/Properties/AssemblyInfo.cs b/CodeLab/Properties/AssemblyInfo.cs deleted file mode 100644 index fbf61d5..0000000 --- a/CodeLab/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("WorkBench")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("WorkBench")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("3b66abd8-7129-4d2b-b48e-b03fec835ce1")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CodeLab/Properties/Resources.Designer.cs b/CodeLab/Properties/Resources.Designer.cs deleted file mode 100644 index 4b8ae6a..0000000 --- a/CodeLab/Properties/Resources.Designer.cs +++ /dev/null @@ -1,63 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace CodeLab.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CodeLab.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - } -} diff --git a/CodeLab/Properties/Resources.resx b/CodeLab/Properties/Resources.resx deleted file mode 100644 index af7dbeb..0000000 --- a/CodeLab/Properties/Resources.resx +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/CodeLab/Properties/Settings.Designer.cs b/CodeLab/Properties/Settings.Designer.cs deleted file mode 100644 index 99d3a5e..0000000 --- a/CodeLab/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace CodeLab.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.6.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/CodeLab/Properties/Settings.settings b/CodeLab/Properties/Settings.settings deleted file mode 100644 index 3964565..0000000 --- a/CodeLab/Properties/Settings.settings +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/CodeLab/README.md b/CodeLab/README.md deleted file mode 100644 index b8ff772..0000000 --- a/CodeLab/README.md +++ /dev/null @@ -1 +0,0 @@ -This is just a place-holder. Nothing to see here. diff --git a/SourceNotes.md b/SourceNotes.md index 1ebb9f2..cf32d87 100644 --- a/SourceNotes.md +++ b/SourceNotes.md @@ -1,9 +1,12 @@ # 6502bench Source Code Notes # All of the code is written in C# .NET, using the (free to download) Visual -Studio Community 2019 IDE as the primary development environment. The user -interface uses the WPF API. When installing Visual Studio, be sure to -include ".NET Desktop Development". +Studio Community 2022 IDE as the primary development environment. The user +interface uses the WPF API, targeted at .NET Framework 4.6.2. When +installing Visual Studio, be sure to include ".NET Desktop Development". +You may also need to install the .NET Framework 4.6.2 "Dev Pack" (as a +separate download, or via the "individual components" tab in the +Visual Studio Installer). The Solution file is called "WorkBench.sln" rather than "6502bench.sln" because some things in Visual Studio got weird when it didn't start with a @@ -29,8 +32,8 @@ AsmGen/AssemblerInfo.cs. If you want to add support for a new cross-assembler, start by adding new entries to the enum and data tables there. -Nothing system-specific is baked into the main application. The -SourceGen/RuntimeData directory has the system definitions for the -"new project" list, and subdirectories with symbol files and extension +Nothing specific to a target system is baked into the main application. The +SourceGen/RuntimeData directory has the system definitions used for the +"new project" list, along with subdirectories with symbol files and extension scripts. The [README file there](SourceGen/RuntimeData/README.md) explains a bit more. diff --git a/WorkBench.sln b/WorkBench.sln index 053deb0..cbb4cad 100644 --- a/WorkBench.sln +++ b/WorkBench.sln @@ -1,14 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2002 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.32112.339 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Asm65", "Asm65\Asm65.csproj", "{65A50BD0-AB07-492B-B51C-4CA1B700224D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonUtil", "CommonUtil\CommonUtil.csproj", "{A2993EAC-35D8-4768-8C54-152B4E14D69C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodeLab", "CodeLab\CodeLab.csproj", "{3B66ABD8-7129-4D2B-B48E-B03FEC835CE1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PluginCommon", "PluginCommon\PluginCommon.csproj", "{70F04543-9E46-4AD3-875A-160FD198C0FF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RuntimeData", "SourceGen\RuntimeData\RuntimeData.csproj", "{A8F1358E-02E2-4197-858D-041765BAE4CE}" @@ -42,10 +40,6 @@ Global {A2993EAC-35D8-4768-8C54-152B4E14D69C}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2993EAC-35D8-4768-8C54-152B4E14D69C}.Release|Any CPU.ActiveCfg = Release|Any CPU {A2993EAC-35D8-4768-8C54-152B4E14D69C}.Release|Any CPU.Build.0 = Release|Any CPU - {3B66ABD8-7129-4D2B-B48E-B03FEC835CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B66ABD8-7129-4D2B-B48E-B03FEC835CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B66ABD8-7129-4D2B-B48E-B03FEC835CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B66ABD8-7129-4D2B-B48E-B03FEC835CE1}.Release|Any CPU.Build.0 = Release|Any CPU {70F04543-9E46-4AD3-875A-160FD198C0FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {70F04543-9E46-4AD3-875A-160FD198C0FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {70F04543-9E46-4AD3-875A-160FD198C0FF}.Release|Any CPU.ActiveCfg = Release|Any CPU