From c9aeea207b4d6b0c5f058c11304780302a7b1ba0 Mon Sep 17 00:00:00 2001
From: Bob Baker <31376573+rbaker26@users.noreply.github.com>
Date: Tue, 16 Jun 2020 23:09:17 -0700
Subject: [PATCH] added rel links for json instructions

---
 SAP1EMU.Engine-CLI/InstructionSets.json       | 180 ------------------
 SAP1EMU.Engine-CLI/SAP1EMU.Engine-CLI.csproj  |   6 +
 SAP1EMU.Lib.Test/SAP1EMU.Lib.Test.csproj      |  12 +-
 .../InstructionSets.json                      |   0
 SAP1EMU.Lib/SAP1EMU.Lib.csproj                |   8 +-
 SAP1EMU.Sandbox/InstructionSets.json          | 168 ----------------
 SAP1EMU.Sandbox/SAP1EMU.Sandbox.csproj        |  10 +-
 SAP1EMU.WebApp/SAP1EMU.WebApp.csproj          |   5 +
 8 files changed, 29 insertions(+), 360 deletions(-)
 delete mode 100644 SAP1EMU.Engine-CLI/InstructionSets.json
 rename {SAP1EMU.Lib.Test => SAP1EMU.Lib}/InstructionSets.json (100%)
 delete mode 100644 SAP1EMU.Sandbox/InstructionSets.json

diff --git a/SAP1EMU.Engine-CLI/InstructionSets.json b/SAP1EMU.Engine-CLI/InstructionSets.json
deleted file mode 100644
index 1a46cf8f..00000000
--- a/SAP1EMU.Engine-CLI/InstructionSets.json
+++ /dev/null
@@ -1,180 +0,0 @@
-[
-  {
-    "SetName": "SAP1Emu",
-    "SetDescription": "The full intruction set for the SAP1Emu Project.",
-    "instructions": [
-      {
-        "OpCode": "LDA",
-        "BinCode": "0000",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101100001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "ADD",
-        "BinCode": "0001",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101110000111",
-          "00111100011111"
-        ]
-      },
-      {
-        "OpCode": "SUB",
-        "BinCode": "0010",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101110000111",
-          "00111100111111"
-        ]
-      },
-      {
-        "OpCode": "STA",
-        "BinCode": "0011",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00111111001101",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "JMP",
-        "BinCode": "0100",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111010001100",
-          "00111110001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "JEQ",
-        "BinCode": "0101",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111010001100",
-          "00111110001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "JIC",
-        "BinCode": "1001",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111010001100",
-          "00111110001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "OUT",
-        "BinCode": "1110",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111111001011",
-          "00111110001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "HLT",
-        "BinCode": "1111",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111110001111",
-          "00111110001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "NOP",
-        "BinCode": "0000",
-        "MicroCode": [
-          "00111110001111",
-          "00111110001111",
-          "00111110001111",
-          "00111110001111",
-          "00111110001111",
-          "00111110001111"
-        ]
-      }
-    ]
-  },
-  {
-    "SetName": "Malvino",
-    "SetDescription": "The instruction set outlined in Digital Computer Electronics by Malvino & Brown.\nThe SAP1EMU Set is a superset of the Malvino Set.",
-    "instructions": [
-      {
-        "OpCode": "LDA",
-        "BinCode": "0000",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101100001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "ADD",
-        "BinCode": "0001",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101110000111",
-          "00111100011111"
-        ]
-      }
-    ]
-  },
-  {
-    "SetName": "BenEater",
-    "SetDescription": "The instruction set outlined by Ben Eater.",
-    "instructions": [
-      {
-        "OpCode": "ADD",
-        "BinCode": "1111",
-        "MicroCode": [
-          "10101",
-          "00011"
-        ]
-      },
-      {
-        "OpCode": "LDA",
-        "BinCode": "0000",
-        "MicroCode": [
-          "01010",
-          "11111"
-        ]
-      }
-    ]
-  }
-]
\ No newline at end of file
diff --git a/SAP1EMU.Engine-CLI/SAP1EMU.Engine-CLI.csproj b/SAP1EMU.Engine-CLI/SAP1EMU.Engine-CLI.csproj
index d76ff093..a296e7cd 100644
--- a/SAP1EMU.Engine-CLI/SAP1EMU.Engine-CLI.csproj
+++ b/SAP1EMU.Engine-CLI/SAP1EMU.Engine-CLI.csproj
@@ -22,6 +22,12 @@
     <None Remove="packages-microsoft-prod.deb" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="..\SAP1EMU.Lib\InstructionSets.json" Link="InstructionSets.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.8.0" />
   </ItemGroup>
diff --git a/SAP1EMU.Lib.Test/SAP1EMU.Lib.Test.csproj b/SAP1EMU.Lib.Test/SAP1EMU.Lib.Test.csproj
index 69d31836..0786b2bf 100644
--- a/SAP1EMU.Lib.Test/SAP1EMU.Lib.Test.csproj
+++ b/SAP1EMU.Lib.Test/SAP1EMU.Lib.Test.csproj
@@ -6,6 +6,12 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Include="..\SAP1EMU.Lib\InstructionSets.json" Link="InstructionSets.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
@@ -18,10 +24,4 @@
     <ProjectReference Include="..\SAP1EMU.Lib\SAP1EMU.Lib.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="InstructionSets.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>
diff --git a/SAP1EMU.Lib.Test/InstructionSets.json b/SAP1EMU.Lib/InstructionSets.json
similarity index 100%
rename from SAP1EMU.Lib.Test/InstructionSets.json
rename to SAP1EMU.Lib/InstructionSets.json
diff --git a/SAP1EMU.Lib/SAP1EMU.Lib.csproj b/SAP1EMU.Lib/SAP1EMU.Lib.csproj
index cb631906..b3527179 100644
--- a/SAP1EMU.Lib/SAP1EMU.Lib.csproj
+++ b/SAP1EMU.Lib/SAP1EMU.Lib.csproj
@@ -1,7 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Update="InstructionSets.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>
diff --git a/SAP1EMU.Sandbox/InstructionSets.json b/SAP1EMU.Sandbox/InstructionSets.json
deleted file mode 100644
index b26ee05c..00000000
--- a/SAP1EMU.Sandbox/InstructionSets.json
+++ /dev/null
@@ -1,168 +0,0 @@
-[
-  {
-    "SetName": "SAP1Emu",
-    "SetDescription": "The full intruction set for the SAP1Emu Project.",
-    "instructions": [
-      {
-        "OpCode": "LDA",
-        "BinCode": "0000",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101100001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "ADD",
-        "BinCode": "0001",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101110000111",
-          "00111100011111"
-        ]
-      },
-      {
-        "OpCode": "SUB",
-        "BinCode": "0010",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101110000111",
-          "00111100111111"
-        ]
-      },
-      {
-        "OpCode": "STA",
-        "BinCode": "0011",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00111111001101",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "JMP",
-        "BinCode": "0100",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111010001100",
-          "00111110001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "JEQ",
-        "BinCode": "0101",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111010001100",
-          "00111110001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "JIC",
-        "BinCode": "1001",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111010001100",
-          "00111110001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "OUT",
-        "BinCode": "1110",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111111001011",
-          "00111110001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "HLT",
-        "BinCode": "1111",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00111110001111",
-          "00111110001111",
-          "00111110001111"
-        ]
-      }
-    ]
-  },
-  {
-    "SetName": "Malvino",
-    "SetDescription": "The instruction set outlined in Digital Computer Electronics by Malvino & Brown.\nThe SAP1EMU Set is a superset of the Malvino Set.",
-    "instructions": [
-      {
-        "OpCode": "LDA",
-        "BinCode": "0000",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101100001111",
-          "00111110001111"
-        ]
-      },
-      {
-        "OpCode": "ADD",
-        "BinCode": "0001",
-        "MicroCode": [
-          "01011110001111",
-          "10111110001111",
-          "00100110001111",
-          "00011010001111",
-          "00101110000111",
-          "00111100011111"
-        ]
-      }
-    ]
-  },
-  {
-    "SetName": "BenEater",
-    "SetDescription": "The instruction set outlined by Ben Eater.",
-    "instructions": [
-      {
-        "OpCode": "ADD",
-        "BinCode": "1111",
-        "MicroCode": [
-          "10101",
-          "00011"
-        ]
-      },
-      {
-        "OpCode": "LDA",
-        "BinCode": "0000",
-        "MicroCode": [
-          "01010",
-          "11111"
-        ]
-      }
-    ]
-  }
-]
\ No newline at end of file
diff --git a/SAP1EMU.Sandbox/SAP1EMU.Sandbox.csproj b/SAP1EMU.Sandbox/SAP1EMU.Sandbox.csproj
index b9c1bfac..043ae2fd 100644
--- a/SAP1EMU.Sandbox/SAP1EMU.Sandbox.csproj
+++ b/SAP1EMU.Sandbox/SAP1EMU.Sandbox.csproj
@@ -6,14 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SAP1EMU.Engine\SAP1EMU.Engine.csproj" />
-    <ProjectReference Include="..\SAP1EMU.Lib\SAP1EMU.Lib.csproj" />
+    <Content Include="..\SAP1EMU.Lib\InstructionSets.json" Link="InstructionSets.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="InstructionSets.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    <ProjectReference Include="..\SAP1EMU.Engine\SAP1EMU.Engine.csproj" />
+    <ProjectReference Include="..\SAP1EMU.Lib\SAP1EMU.Lib.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/SAP1EMU.WebApp/SAP1EMU.WebApp.csproj b/SAP1EMU.WebApp/SAP1EMU.WebApp.csproj
index 96f9ccd9..5859fc77 100644
--- a/SAP1EMU.WebApp/SAP1EMU.WebApp.csproj
+++ b/SAP1EMU.WebApp/SAP1EMU.WebApp.csproj
@@ -6,6 +6,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
+  <ItemGroup>
+    <Content Include="..\SAP1EMU.Lib\InstructionSets.json" Link="InstructionSets.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ElectronNET.API" Version="8.31.1" />
     <PackageReference Include="jQuery" Version="3.5.1" />