diff --git a/Build.sln b/Build.sln
index 47274cd69d..682f55932d 100644
--- a/Build.sln
+++ b/Build.sln
@@ -104,145 +104,271 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug-CI|Any CPU = Debug-CI|Any CPU
 		Release|Any CPU = Release|Any CPU
+		Release-CI|Any CPU = Release-CI|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{AB24E403-54F3-4F67-B5E0-119A7227AAC1}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{12C1623C-1B28-46DF-A4B5-6B767A01ECF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{12C1623C-1B28-46DF-A4B5-6B767A01ECF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12C1623C-1B28-46DF-A4B5-6B767A01ECF6}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{12C1623C-1B28-46DF-A4B5-6B767A01ECF6}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{12C1623C-1B28-46DF-A4B5-6B767A01ECF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12C1623C-1B28-46DF-A4B5-6B767A01ECF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12C1623C-1B28-46DF-A4B5-6B767A01ECF6}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{12C1623C-1B28-46DF-A4B5-6B767A01ECF6}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{3370FC04-B669-46A4-A4AA-A89540318F8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3370FC04-B669-46A4-A4AA-A89540318F8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3370FC04-B669-46A4-A4AA-A89540318F8D}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{3370FC04-B669-46A4-A4AA-A89540318F8D}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{3370FC04-B669-46A4-A4AA-A89540318F8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3370FC04-B669-46A4-A4AA-A89540318F8D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3370FC04-B669-46A4-A4AA-A89540318F8D}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{3370FC04-B669-46A4-A4AA-A89540318F8D}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{47E8F3DC-FF3F-4CC7-8643-1807260B0B18}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{3D84CF8B-C6DF-4D78-8DE1-708582B43711}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{D4BA64B3-D7F6-4A3A-AF1D-74E41B49D865}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{F3025446-D2C7-4FEA-AB03-C707F7B48B43}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{3C45A898-4AA9-476F-8302-63391D6ED044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C45A898-4AA9-476F-8302-63391D6ED044}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C45A898-4AA9-476F-8302-63391D6ED044}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C45A898-4AA9-476F-8302-63391D6ED044}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{3C45A898-4AA9-476F-8302-63391D6ED044}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C45A898-4AA9-476F-8302-63391D6ED044}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C45A898-4AA9-476F-8302-63391D6ED044}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{3C45A898-4AA9-476F-8302-63391D6ED044}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{2E740096-911F-47D0-A46D-998DBB76FC5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E740096-911F-47D0-A46D-998DBB76FC5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E740096-911F-47D0-A46D-998DBB76FC5D}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E740096-911F-47D0-A46D-998DBB76FC5D}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{2E740096-911F-47D0-A46D-998DBB76FC5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E740096-911F-47D0-A46D-998DBB76FC5D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E740096-911F-47D0-A46D-998DBB76FC5D}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{2E740096-911F-47D0-A46D-998DBB76FC5D}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{BC91BCEF-D146-4EB0-BE63-C637880C5800}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC91BCEF-D146-4EB0-BE63-C637880C5800}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BC91BCEF-D146-4EB0-BE63-C637880C5800}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{BC91BCEF-D146-4EB0-BE63-C637880C5800}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{BC91BCEF-D146-4EB0-BE63-C637880C5800}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC91BCEF-D146-4EB0-BE63-C637880C5800}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BC91BCEF-D146-4EB0-BE63-C637880C5800}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{BC91BCEF-D146-4EB0-BE63-C637880C5800}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{C9826909-2E5E-4453-93FA-B6BE4503DF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C9826909-2E5E-4453-93FA-B6BE4503DF02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C9826909-2E5E-4453-93FA-B6BE4503DF02}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{C9826909-2E5E-4453-93FA-B6BE4503DF02}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{C9826909-2E5E-4453-93FA-B6BE4503DF02}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C9826909-2E5E-4453-93FA-B6BE4503DF02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C9826909-2E5E-4453-93FA-B6BE4503DF02}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{C9826909-2E5E-4453-93FA-B6BE4503DF02}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{0AF0A39D-7184-4EBE-B8CB-4A61034607FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0AF0A39D-7184-4EBE-B8CB-4A61034607FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0AF0A39D-7184-4EBE-B8CB-4A61034607FE}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{0AF0A39D-7184-4EBE-B8CB-4A61034607FE}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{0AF0A39D-7184-4EBE-B8CB-4A61034607FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0AF0A39D-7184-4EBE-B8CB-4A61034607FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0AF0A39D-7184-4EBE-B8CB-4A61034607FE}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{0AF0A39D-7184-4EBE-B8CB-4A61034607FE}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{72EEFBFE-AF88-4E16-AD6C-7D9857CDC32C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{72EEFBFE-AF88-4E16-AD6C-7D9857CDC32C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72EEFBFE-AF88-4E16-AD6C-7D9857CDC32C}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{72EEFBFE-AF88-4E16-AD6C-7D9857CDC32C}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{72EEFBFE-AF88-4E16-AD6C-7D9857CDC32C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{72EEFBFE-AF88-4E16-AD6C-7D9857CDC32C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72EEFBFE-AF88-4E16-AD6C-7D9857CDC32C}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{72EEFBFE-AF88-4E16-AD6C-7D9857CDC32C}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{3C515676-8565-4A19-98E7-266F83D579A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3C515676-8565-4A19-98E7-266F83D579A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C515676-8565-4A19-98E7-266F83D579A8}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C515676-8565-4A19-98E7-266F83D579A8}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{3C515676-8565-4A19-98E7-266F83D579A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3C515676-8565-4A19-98E7-266F83D579A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C515676-8565-4A19-98E7-266F83D579A8}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{3C515676-8565-4A19-98E7-266F83D579A8}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{B45F760C-6D3D-48E1-9E2C-97CECC6A7061}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{DE4F000A-B65C-4395-B066-891B7423E9EC}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{DE4F000A-B65C-4395-B066-891B7423E9EC}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
 		{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12B1AAA1-14DE-4B85-8C33-B32EA3A95B82}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
 		{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{89DB6325-2C81-467D-BE8A-C4AEBB6540A5}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{2A24DA41-0D3A-48A6-83D5-8584A1D4CA94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2A24DA41-0D3A-48A6-83D5-8584A1D4CA94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2A24DA41-0D3A-48A6-83D5-8584A1D4CA94}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{2A24DA41-0D3A-48A6-83D5-8584A1D4CA94}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{2A24DA41-0D3A-48A6-83D5-8584A1D4CA94}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2A24DA41-0D3A-48A6-83D5-8584A1D4CA94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2A24DA41-0D3A-48A6-83D5-8584A1D4CA94}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{2A24DA41-0D3A-48A6-83D5-8584A1D4CA94}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{9A327DB7-42E2-4C82-9537-0D995B9171FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9A327DB7-42E2-4C82-9537-0D995B9171FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A327DB7-42E2-4C82-9537-0D995B9171FF}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{9A327DB7-42E2-4C82-9537-0D995B9171FF}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{9A327DB7-42E2-4C82-9537-0D995B9171FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A327DB7-42E2-4C82-9537-0D995B9171FF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A327DB7-42E2-4C82-9537-0D995B9171FF}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{9A327DB7-42E2-4C82-9537-0D995B9171FF}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{7549D7F8-58A3-4F4F-8544-DEF2ABF79A0B}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
 		{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1AC1E9B-27EA-4AE0-8C83-328BD96F978A}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
 		{CB20F8F9-8C1D-43A6-96EA-89FEC2512C99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB20F8F9-8C1D-43A6-96EA-89FEC2512C99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB20F8F9-8C1D-43A6-96EA-89FEC2512C99}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB20F8F9-8C1D-43A6-96EA-89FEC2512C99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CB20F8F9-8C1D-43A6-96EA-89FEC2512C99}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB20F8F9-8C1D-43A6-96EA-89FEC2512C99}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
 		{A9469897-4FD8-49E7-97F1-FE420A2B75B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9469897-4FD8-49E7-97F1-FE420A2B75B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A9469897-4FD8-49E7-97F1-FE420A2B75B9}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{A9469897-4FD8-49E7-97F1-FE420A2B75B9}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{A9469897-4FD8-49E7-97F1-FE420A2B75B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9469897-4FD8-49E7-97F1-FE420A2B75B9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A9469897-4FD8-49E7-97F1-FE420A2B75B9}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{A9469897-4FD8-49E7-97F1-FE420A2B75B9}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{366C2EC6-B9D8-4676-9C88-98F041B8FC93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{366C2EC6-B9D8-4676-9C88-98F041B8FC93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{366C2EC6-B9D8-4676-9C88-98F041B8FC93}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{366C2EC6-B9D8-4676-9C88-98F041B8FC93}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{366C2EC6-B9D8-4676-9C88-98F041B8FC93}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{366C2EC6-B9D8-4676-9C88-98F041B8FC93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{366C2EC6-B9D8-4676-9C88-98F041B8FC93}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{366C2EC6-B9D8-4676-9C88-98F041B8FC93}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{535A7E34-AC73-4781-B791-2C81A9066A2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{535A7E34-AC73-4781-B791-2C81A9066A2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{535A7E34-AC73-4781-B791-2C81A9066A2C}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{535A7E34-AC73-4781-B791-2C81A9066A2C}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{535A7E34-AC73-4781-B791-2C81A9066A2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{535A7E34-AC73-4781-B791-2C81A9066A2C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{535A7E34-AC73-4781-B791-2C81A9066A2C}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{535A7E34-AC73-4781-B791-2C81A9066A2C}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{2EEC1BF8-758F-4D9D-B063-8CF005468B24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2EEC1BF8-758F-4D9D-B063-8CF005468B24}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2EEC1BF8-758F-4D9D-B063-8CF005468B24}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{2EEC1BF8-758F-4D9D-B063-8CF005468B24}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{2EEC1BF8-758F-4D9D-B063-8CF005468B24}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2EEC1BF8-758F-4D9D-B063-8CF005468B24}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2EEC1BF8-758F-4D9D-B063-8CF005468B24}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{2EEC1BF8-758F-4D9D-B063-8CF005468B24}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{0EE3DF1C-44E6-4669-88AA-D8D2612DA817}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{A7C295D2-8DEA-4CAE-A8CB-44CD0529EC65}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{C984AF76-66C2-4A5F-A3DC-9F8FE0CD4D2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C984AF76-66C2-4A5F-A3DC-9F8FE0CD4D2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C984AF76-66C2-4A5F-A3DC-9F8FE0CD4D2F}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
 		{C984AF76-66C2-4A5F-A3DC-9F8FE0CD4D2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C984AF76-66C2-4A5F-A3DC-9F8FE0CD4D2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C984AF76-66C2-4A5F-A3DC-9F8FE0CD4D2F}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
 		{91442476-F818-4A7D-A3BC-2159BCDE3352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{91442476-F818-4A7D-A3BC-2159BCDE3352}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91442476-F818-4A7D-A3BC-2159BCDE3352}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
 		{91442476-F818-4A7D-A3BC-2159BCDE3352}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91442476-F818-4A7D-A3BC-2159BCDE3352}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91442476-F818-4A7D-A3BC-2159BCDE3352}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
 		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{0BA0EC69-F124-44C1-823D-C97FE3AEC59E}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 		{3487890D-43F4-4810-9587-1F02F646915D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3487890D-43F4-4810-9587-1F02F646915D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3487890D-43F4-4810-9587-1F02F646915D}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
 		{3487890D-43F4-4810-9587-1F02F646915D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3487890D-43F4-4810-9587-1F02F646915D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3487890D-43F4-4810-9587-1F02F646915D}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
 		{9413B5A0-1120-43AD-8784-8A3726C1898C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9413B5A0-1120-43AD-8784-8A3726C1898C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9413B5A0-1120-43AD-8784-8A3726C1898C}.Debug-CI|Any CPU.ActiveCfg = Debug|Any CPU
+		{9413B5A0-1120-43AD-8784-8A3726C1898C}.Debug-CI|Any CPU.Build.0 = Debug|Any CPU
 		{9413B5A0-1120-43AD-8784-8A3726C1898C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9413B5A0-1120-43AD-8784-8A3726C1898C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9413B5A0-1120-43AD-8784-8A3726C1898C}.Release-CI|Any CPU.ActiveCfg = Release|Any CPU
+		{9413B5A0-1120-43AD-8784-8A3726C1898C}.Release-CI|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Build/Build.proj b/Build/Build.proj
deleted file mode 100644
index ff4d21c74b..0000000000
--- a/Build/Build.proj
+++ /dev/null
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.Build.Traversal">
-
-    <ItemGroup>
-        <ProjectsToExclude Include="..\source\Archive\**" />
-        <ProjectsToExclude Include="..\source\Tools\**" />
-        <ProjectsToExclude Include="..\source\**\*Templates*\**" />
-        <ProjectsToExclude Include="..\source\Kernel-TapRoot\Demo\**" />
-        <ProjectsToExclude Include="..\source\Kernel-X86\50-Application\**" />
-        <ProjectsToExclude Include="..\tests\Cosmos.VS.Windows.Test\Cosmos.VS.Windows.Test.csproj" />
-        <ProjectReference Include="..\source\**\*.*proj;..\tests\**\*.*proj" Exclude="@(ProjectsToExclude)" />
-    </ItemGroup>
-
-</Project>
diff --git a/appveyor.yml b/appveyor.yml
index 043ca80068..9bd6b4741b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 version: 0.20150918.{build}
 image: Visual Studio 2017
-configuration: Debug
+configuration: Debug-CI
 platform: Any CPU
 shallow_clone: true
 clone_folder: c:\Cosmos
@@ -13,7 +13,7 @@ build_script:
 - cmd: |
     rem %APPVEYOR_BUILD_FOLDER%
 
-    msbuild build\Build.proj /t:Restore;Build /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+    msbuild Build.sln /t:Restore;Build /maxcpucount /verbosity:normal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 
     dotnet publish ..\IL2CPU\source\IL2CPU -r win7-x86 -o "c:\CosmosRun\Build\IL2CPU\"