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 @@
+
+
+ Always
+
+
+
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 @@
false
+
+
+ Always
+
+
+
@@ -18,10 +24,4 @@
-
-
- Always
-
-
-
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 @@
-
+
netcoreapp3.1
+
+
+ Always
+
+
+
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 @@
-
-
+
+ Always
+
-
- Always
-
+
+
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 @@
DEBUG;TRACE
+
+
+ Always
+
+