Segregated windows-based sub-projects into their own directory

gec · May 16, 2013 · ee3cbce · ee3cbce
1 parent 7c07708
commit ee3cbce
Show file tree

Hide file tree

Showing 106 changed files with 1,174 additions and 1,068 deletions.
diff --git a/vstudio10/DNP.sln b/vstudio10/DNP.sln
@@ -1,7 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSToCppXMLBinder", "..\CSToCppXMLBinder\CSToCppXMLBinder.csproj", "{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3", "DNP3.vcxproj", "{E053E7ED-F462-4DE0-8D69-6D97045FFB25}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3Test", "DNP3Test.vcxproj", "{893D4C53-0729-480D-8F40-75E7139224DF}"
@@ -28,29 +26,31 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "APLXML", "APLXML.vcxproj",
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DNP3Java", "DNP3Java.vcxproj", "{ADDD6B3A-FFAE-4534-B27B-2795CEE8D2AD}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "TestSetInstaller", "..\TestSetInstaller\TestSetInstaller.vdproj", "{9FAD9888-9441-4ACF-8750-90AFEA9F938A}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demos", "..\demos", "{CE05D40B-B770-42DB-91AE-BC14AAF7A413}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "demos", "demos", "{CE05D40B-B770-42DB-91AE-BC14AAF7A413}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SlaveDemo", "SlaveDemo.vcxproj", "{9C4EC600-DE0F-4042-BE12-F4BAF605A49C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MasterDemo", "MasterDemo.vcxproj", "{02A532F5-D728-41F6-B3B8-19823DD20CD5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "..\dotnet", "{9A7489FE-BBB2-41B1-A4F8-BCC01DE1C89B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "windows", "windows", "{9A7489FE-BBB2-41B1-A4F8-BCC01DE1C89B}"
+EndProject
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "TestSetInstaller", "..\windows\TestSetInstaller\TestSetInstaller.vdproj", "{9FAD9888-9441-4ACF-8750-90AFEA9F938A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMasterDemo", "..\DotNet\DotNetMasterDemo\DotNetMasterDemo.csproj", "{9BEAD0C0-833F-4368-82D1-BAE30F38E6C5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CSToCppXMLBinder", "..\windows\CSToCppXMLBinder\CSToCppXMLBinder.csproj", "{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetInterface", "..\DotNet\DotNetInterface\DotNetInterface.csproj", "{C280F8AA-8461-4126-BF88-454891422FD8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetMasterDemo", "..\windows\DotNetMasterDemo\DotNetMasterDemo.csproj", "{9BEAD0C0-833F-4368-82D1-BAE30F38E6C5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetSlaveDemo", "..\DotNet\DotNetSlaveDemo\DotNetSlaveDemo.csproj", "{96F33EA8-6CE5-4D70-82AD-9C9DA664A688}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetInterface", "..\windows\DotNetInterface\DotNetInterface.csproj", "{C280F8AA-8461-4126-BF88-454891422FD8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetTestSet", "..\DotNet\DotNetTestSet\DotNetTestSet.csproj", "{F1EBF237-ADE1-478F-B9A0-34B6B2996C94}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetSlaveDemo", "..\windows\DotNetSlaveDemo\DotNetSlaveDemo.csproj", "{96F33EA8-6CE5-4D70-82AD-9C9DA664A688}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSetControlLibrary", "..\DotNet\TestSetControlLibrary\TestSetControlLibrary.csproj", "{A37903BE-7E9B-4442-8D9A-1C33F58F661F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetTestSet", "..\windows\DotNetTestSet\DotNetTestSet.csproj", "{F1EBF237-ADE1-478F-B9A0-34B6B2996C94}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "DotNetTestSetInstaller", "..\DotNet\DotNetTestSetInstaller\DotNetTestSetInstaller.vdproj", "{1CC669D2-F7BC-4A6B-A516-89E108E36BA8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSetControlLibrary", "..\windows\TestSetControlLibrary\TestSetControlLibrary.csproj", "{A37903BE-7E9B-4442-8D9A-1C33F58F661F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DotNetAdapter", "..\DotNet\DotNetAdapter\DotNetAdapter.vcxproj", "{83D36075-5D61-4D88-9EBF-1BD87359A47A}"
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "DotNetTestSetInstaller", "..\windows\DotNetTestSetInstaller\DotNetTestSetInstaller.vdproj", "{1CC669D2-F7BC-4A6B-A516-89E108E36BA8}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DotNetAdapter", "..\windows\DotNetAdapter\DotNetAdapter.vcxproj", "{83D36075-5D61-4D88-9EBF-1BD87359A47A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -66,24 +66,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Win32.ActiveCfg = Debug|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|x64.ActiveCfg = Debug|x64
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|x64.Build.0 = Debug|x64
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|x86.Build.0 = Debug|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Win32.ActiveCfg = Release|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|x64.ActiveCfg = Release|x64
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|x64.Build.0 = Release|x64
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|x86.ActiveCfg = Release|Any CPU
-		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|x86.Build.0 = Release|Any CPU
 		{E053E7ED-F462-4DE0-8D69-6D97045FFB25}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{E053E7ED-F462-4DE0-8D69-6D97045FFB25}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{E053E7ED-F462-4DE0-8D69-6D97045FFB25}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -315,20 +297,6 @@ Global
 		{ADDD6B3A-FFAE-4534-B27B-2795CEE8D2AD}.Release|x64.ActiveCfg = Release|x64
 		{ADDD6B3A-FFAE-4534-B27B-2795CEE8D2AD}.Release|x64.Build.0 = Release|x64
 		{ADDD6B3A-FFAE-4534-B27B-2795CEE8D2AD}.Release|x86.ActiveCfg = Release|Win32
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|Any CPU.ActiveCfg = Debug
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|Mixed Platforms.ActiveCfg = Debug
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|Win32.ActiveCfg = Debug
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|x64.ActiveCfg = Debug
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|x64.Build.0 = Debug
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|x86.ActiveCfg = Debug
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Any CPU.ActiveCfg = Release
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Mixed Platforms.ActiveCfg = Release
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Mixed Platforms.Build.0 = Release
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Win32.ActiveCfg = Release
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|x64.ActiveCfg = Release
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|x64.Build.0 = Release
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|x86.ActiveCfg = Release
-		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|x86.Build.0 = Release
 		{9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{9C4EC600-DE0F-4042-BE12-F4BAF605A49C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -365,6 +333,38 @@ Global
 		{02A532F5-D728-41F6-B3B8-19823DD20CD5}.Release|x64.Build.0 = Release|x64
 		{02A532F5-D728-41F6-B3B8-19823DD20CD5}.Release|x86.ActiveCfg = Release|Win32
 		{02A532F5-D728-41F6-B3B8-19823DD20CD5}.Release|x86.Build.0 = Release|Win32
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|Any CPU.ActiveCfg = Debug
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|Mixed Platforms.ActiveCfg = Debug
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|Win32.ActiveCfg = Debug
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|x64.ActiveCfg = Debug
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|x64.Build.0 = Debug
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Debug|x86.ActiveCfg = Debug
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Any CPU.ActiveCfg = Release
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Mixed Platforms.ActiveCfg = Release
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Mixed Platforms.Build.0 = Release
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|Win32.ActiveCfg = Release
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|x64.ActiveCfg = Release
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|x64.Build.0 = Release
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|x86.ActiveCfg = Release
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A}.Release|x86.Build.0 = Release
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|x64.ActiveCfg = Debug|x64
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|x64.Build.0 = Debug|x64
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Debug|x86.Build.0 = Debug|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|Win32.ActiveCfg = Release|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|x64.ActiveCfg = Release|x64
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|x64.Build.0 = Release|x64
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|x86.ActiveCfg = Release|Any CPU
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0}.Release|x86.Build.0 = Release|Any CPU
 		{9BEAD0C0-833F-4368-82D1-BAE30F38E6C5}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{9BEAD0C0-833F-4368-82D1-BAE30F38E6C5}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
 		{9BEAD0C0-833F-4368-82D1-BAE30F38E6C5}.Debug|Mixed Platforms.Build.0 = Debug|x86
@@ -493,5 +493,7 @@ Global
 		{A37903BE-7E9B-4442-8D9A-1C33F58F661F} = {9A7489FE-BBB2-41B1-A4F8-BCC01DE1C89B}
 		{1CC669D2-F7BC-4A6B-A516-89E108E36BA8} = {9A7489FE-BBB2-41B1-A4F8-BCC01DE1C89B}
 		{83D36075-5D61-4D88-9EBF-1BD87359A47A} = {9A7489FE-BBB2-41B1-A4F8-BCC01DE1C89B}
+		{9FAD9888-9441-4ACF-8750-90AFEA9F938A} = {9A7489FE-BBB2-41B1-A4F8-BCC01DE1C89B}
+		{F5DDA7D5-B5CC-47DF-923B-55049170C0D0} = {9A7489FE-BBB2-41B1-A4F8-BCC01DE1C89B}
 	EndGlobalSection
 EndGlobal
diff --git a/...ibs/x86/boost_date_time-vc100-mt-1_47.dll → ...ibs/x86/boost_date_time-vc100-mt-1_47.dll b/...ibs/x86/boost_date_time-vc100-mt-1_47.dll → ...ibs/x86/boost_date_time-vc100-mt-1_47.dll
diff --git a/...stLibs/x86/boost_system-vc100-mt-1_47.dll → ...stLibs/x86/boost_system-vc100-mt-1_47.dll b/...stLibs/x86/boost_system-vc100-mt-1_47.dll → ...stLibs/x86/boost_system-vc100-mt-1_47.dll
diff --git a/...stLibs/x86/boost_thread-vc100-mt-1_47.dll → ...stLibs/x86/boost_thread-vc100-mt-1_47.dll b/...stLibs/x86/boost_thread-vc100-mt-1_47.dll → ...stLibs/x86/boost_thread-vc100-mt-1_47.dll
diff --git a/CSToCppXMLBinder/Bind.cs → windows/CSToCppXMLBinder/Bind.cs b/CSToCppXMLBinder/Bind.cs → windows/CSToCppXMLBinder/Bind.cs
diff --git a/CSToCppXMLBinder/CSToCppXMLBinder.csproj → .../CSToCppXMLBinder/CSToCppXMLBinder.csproj b/CSToCppXMLBinder/CSToCppXMLBinder.csproj → .../CSToCppXMLBinder/CSToCppXMLBinder.csproj
diff --git a/CSToCppXMLBinder/CppBinder.cs → windows/CSToCppXMLBinder/CppBinder.cs b/CSToCppXMLBinder/CppBinder.cs → windows/CSToCppXMLBinder/CppBinder.cs
diff --git a/DotNet/DotNetAdapter/AssemblyInfo.cpp → windows/DotNetAdapter/AssemblyInfo.cpp b/DotNet/DotNetAdapter/AssemblyInfo.cpp → windows/DotNetAdapter/AssemblyInfo.cpp
diff --git a/.../DotNetAdapter/CommandAcceptorAdapter.cpp → .../DotNetAdapter/CommandAcceptorAdapter.cpp b/.../DotNetAdapter/CommandAcceptorAdapter.cpp → .../DotNetAdapter/CommandAcceptorAdapter.cpp
diff --git a/...et/DotNetAdapter/CommandAcceptorAdapter.h → ...ws/DotNetAdapter/CommandAcceptorAdapter.h b/...et/DotNetAdapter/CommandAcceptorAdapter.h → ...ws/DotNetAdapter/CommandAcceptorAdapter.h
diff --git a/DotNet/DotNetAdapter/Conversions.cpp → windows/DotNetAdapter/Conversions.cpp b/DotNet/DotNetAdapter/Conversions.cpp → windows/DotNetAdapter/Conversions.cpp
diff --git a/DotNet/DotNetAdapter/Conversions.h → windows/DotNetAdapter/Conversions.h b/DotNet/DotNetAdapter/Conversions.h → windows/DotNetAdapter/Conversions.h
diff --git a/DotNet/DotNetAdapter/DotNetAdapter.vcxproj → windows/DotNetAdapter/DotNetAdapter.vcxproj b/DotNet/DotNetAdapter/DotNetAdapter.vcxproj → windows/DotNetAdapter/DotNetAdapter.vcxproj
diff --git a/...tNetAdapter/DotNetAdapter.vcxproj.filters → ...tNetAdapter/DotNetAdapter.vcxproj.filters b/...tNetAdapter/DotNetAdapter.vcxproj.filters → ...tNetAdapter/DotNetAdapter.vcxproj.filters
diff --git a/DotNet/DotNetAdapter/FilterLevel.h → windows/DotNetAdapter/FilterLevel.h b/DotNet/DotNetAdapter/FilterLevel.h → windows/DotNetAdapter/FilterLevel.h
diff --git a/DotNet/DotNetAdapter/LogAdapter.cpp → windows/DotNetAdapter/LogAdapter.cpp b/DotNet/DotNetAdapter/LogAdapter.cpp → windows/DotNetAdapter/LogAdapter.cpp
diff --git a/DotNet/DotNetAdapter/LogAdapter.h → windows/DotNetAdapter/LogAdapter.h b/DotNet/DotNetAdapter/LogAdapter.h → windows/DotNetAdapter/LogAdapter.h
diff --git a/...tNetAdapter/MasterDataObserverAdapter.cpp → ...tNetAdapter/MasterDataObserverAdapter.cpp b/...tNetAdapter/MasterDataObserverAdapter.cpp → ...tNetAdapter/MasterDataObserverAdapter.cpp
diff --git a/...DotNetAdapter/MasterDataObserverAdapter.h → ...DotNetAdapter/MasterDataObserverAdapter.h b/...DotNetAdapter/MasterDataObserverAdapter.h → ...DotNetAdapter/MasterDataObserverAdapter.h
diff --git a/DotNet/DotNetAdapter/ReadMe.txt → windows/DotNetAdapter/ReadMe.txt b/DotNet/DotNetAdapter/ReadMe.txt → windows/DotNetAdapter/ReadMe.txt
diff --git a/...etAdapter/SlaveCommandAcceptorAdapter.cpp → ...etAdapter/SlaveCommandAcceptorAdapter.cpp b/...etAdapter/SlaveCommandAcceptorAdapter.cpp → ...etAdapter/SlaveCommandAcceptorAdapter.cpp
diff --git a/...tNetAdapter/SlaveCommandAcceptorAdapter.h → ...tNetAdapter/SlaveCommandAcceptorAdapter.h b/...tNetAdapter/SlaveCommandAcceptorAdapter.h → ...tNetAdapter/SlaveCommandAcceptorAdapter.h
diff --git a/...otNetAdapter/SlaveDataObserverAdapter.cpp → ...otNetAdapter/SlaveDataObserverAdapter.cpp b/...otNetAdapter/SlaveDataObserverAdapter.cpp → ...otNetAdapter/SlaveDataObserverAdapter.cpp
diff --git a/.../DotNetAdapter/SlaveDataObserverAdapter.h → .../DotNetAdapter/SlaveDataObserverAdapter.h b/.../DotNetAdapter/SlaveDataObserverAdapter.h → .../DotNetAdapter/SlaveDataObserverAdapter.h
diff --git a/DotNet/DotNetAdapter/StackManager.cpp → windows/DotNetAdapter/StackManager.cpp b/DotNet/DotNetAdapter/StackManager.cpp → windows/DotNetAdapter/StackManager.cpp
diff --git a/DotNet/DotNetAdapter/StackManager.h → windows/DotNetAdapter/StackManager.h b/DotNet/DotNetAdapter/StackManager.h → windows/DotNetAdapter/StackManager.h
diff --git a/DotNet/DotNetAdapter/Stdafx.cpp → windows/DotNetAdapter/Stdafx.cpp b/DotNet/DotNetAdapter/Stdafx.cpp → windows/DotNetAdapter/Stdafx.cpp
diff --git a/DotNet/DotNetAdapter/Stdafx.h → windows/DotNetAdapter/Stdafx.h b/DotNet/DotNetAdapter/Stdafx.h → windows/DotNetAdapter/Stdafx.h
diff --git a/DotNet/DotNetAdapter/app.aps → windows/DotNetAdapter/app.aps b/DotNet/DotNetAdapter/app.aps → windows/DotNetAdapter/app.aps
diff --git a/DotNet/DotNetAdapter/app.ico → windows/DotNetAdapter/app.ico b/DotNet/DotNetAdapter/app.ico → windows/DotNetAdapter/app.ico
diff --git a/DotNet/DotNetAdapter/app.rc → windows/DotNetAdapter/app.rc b/DotNet/DotNetAdapter/app.rc → windows/DotNetAdapter/app.rc
diff --git a/DotNet/DotNetAdapter/resource.h → windows/DotNetAdapter/resource.h b/DotNet/DotNetAdapter/resource.h → windows/DotNetAdapter/resource.h
diff --git a/DotNet/DotNetInterface/CommandTypes.cs → windows/DotNetInterface/CommandTypes.cs b/DotNet/DotNetInterface/CommandTypes.cs → windows/DotNetInterface/CommandTypes.cs
diff --git a/DotNet/DotNetInterface/ConfigObjects.cs → windows/DotNetInterface/ConfigObjects.cs b/DotNet/DotNetInterface/ConfigObjects.cs → windows/DotNetInterface/ConfigObjects.cs
diff --git a/DotNet/DotNetInterface/Conversions.cs → windows/DotNetInterface/Conversions.cs b/DotNet/DotNetInterface/Conversions.cs → windows/DotNetInterface/Conversions.cs
diff --git a/DotNet/DotNetInterface/DataTypes.cs → windows/DotNetInterface/DataTypes.cs b/DotNet/DotNetInterface/DataTypes.cs → windows/DotNetInterface/DataTypes.cs
diff --git a/...et/DotNetInterface/DotNetInterface.csproj → ...ws/DotNetInterface/DotNetInterface.csproj b/...et/DotNetInterface/DotNetInterface.csproj → ...ws/DotNetInterface/DotNetInterface.csproj
diff --git a/DotNet/DotNetInterface/ICommandAcceptor.cs → windows/DotNetInterface/ICommandAcceptor.cs b/DotNet/DotNetInterface/ICommandAcceptor.cs → windows/DotNetInterface/ICommandAcceptor.cs
diff --git a/DotNet/DotNetInterface/IDataObserver.cs → windows/DotNetInterface/IDataObserver.cs b/DotNet/DotNetInterface/IDataObserver.cs → windows/DotNetInterface/IDataObserver.cs
diff --git a/DotNet/DotNetInterface/IFuture.cs → windows/DotNetInterface/IFuture.cs b/DotNet/DotNetInterface/IFuture.cs → windows/DotNetInterface/IFuture.cs
diff --git a/DotNet/DotNetInterface/ILogHandler.cs → windows/DotNetInterface/ILogHandler.cs b/DotNet/DotNetInterface/ILogHandler.cs → windows/DotNetInterface/ILogHandler.cs
diff --git a/DotNet/DotNetInterface/LogTypes.cs → windows/DotNetInterface/LogTypes.cs b/DotNet/DotNetInterface/LogTypes.cs → windows/DotNetInterface/LogTypes.cs
diff --git a/...otNetInterface/Properties/AssemblyInfo.cs → ...otNetInterface/Properties/AssemblyInfo.cs b/...otNetInterface/Properties/AssemblyInfo.cs → ...otNetInterface/Properties/AssemblyInfo.cs
diff --git a/DotNet/DotNetInterface/SerialSettings.cs → windows/DotNetInterface/SerialSettings.cs b/DotNet/DotNetInterface/SerialSettings.cs → windows/DotNetInterface/SerialSettings.cs
diff --git a/...ace/Tests/ConfigSerializationTestSuite.cs → ...ace/Tests/ConfigSerializationTestSuite.cs b/...ace/Tests/ConfigSerializationTestSuite.cs → ...ace/Tests/ConfigSerializationTestSuite.cs
diff --git a/.../DotNetMasterDemo/DotNetMasterDemo.csproj → .../DotNetMasterDemo/DotNetMasterDemo.csproj b/.../DotNetMasterDemo/DotNetMasterDemo.csproj → .../DotNetMasterDemo/DotNetMasterDemo.csproj
diff --git a/DotNet/DotNetMasterDemo/Program.cs → windows/DotNetMasterDemo/Program.cs b/DotNet/DotNetMasterDemo/Program.cs → windows/DotNetMasterDemo/Program.cs
diff --git a/...tNetMasterDemo/Properties/AssemblyInfo.cs → ...tNetMasterDemo/Properties/AssemblyInfo.cs b/...tNetMasterDemo/Properties/AssemblyInfo.cs → ...tNetMasterDemo/Properties/AssemblyInfo.cs
diff --git a/...et/DotNetSlaveDemo/DotNetSlaveDemo.csproj → ...ws/DotNetSlaveDemo/DotNetSlaveDemo.csproj b/...et/DotNetSlaveDemo/DotNetSlaveDemo.csproj → ...ws/DotNetSlaveDemo/DotNetSlaveDemo.csproj
diff --git a/DotNet/DotNetSlaveDemo/Program.cs → windows/DotNetSlaveDemo/Program.cs b/DotNet/DotNetSlaveDemo/Program.cs → windows/DotNetSlaveDemo/Program.cs
diff --git a/...otNetSlaveDemo/Properties/AssemblyInfo.cs → ...otNetSlaveDemo/Properties/AssemblyInfo.cs b/...otNetSlaveDemo/Properties/AssemblyInfo.cs → ...otNetSlaveDemo/Properties/AssemblyInfo.cs
diff --git a/...tNetTestSet/DisplayAdapterDataObserver.cs → ...tNetTestSet/DisplayAdapterDataObserver.cs b/...tNetTestSet/DisplayAdapterDataObserver.cs → ...tNetTestSet/DisplayAdapterDataObserver.cs
diff --git a/DotNet/DotNetTestSet/DotNetTestSet.csproj → windows/DotNetTestSet/DotNetTestSet.csproj b/DotNet/DotNetTestSet/DotNetTestSet.csproj → windows/DotNetTestSet/DotNetTestSet.csproj
diff --git a/DotNet/DotNetTestSet/LogControlAdapter.cs → windows/DotNetTestSet/LogControlAdapter.cs b/DotNet/DotNetTestSet/LogControlAdapter.cs → windows/DotNetTestSet/LogControlAdapter.cs
diff --git a/DotNet/DotNetTestSet/Program.cs → windows/DotNetTestSet/Program.cs b/DotNet/DotNetTestSet/Program.cs → windows/DotNetTestSet/Program.cs
diff --git a/.../DotNetTestSet/Properties/AssemblyInfo.cs → .../DotNetTestSet/Properties/AssemblyInfo.cs b/.../DotNetTestSet/Properties/AssemblyInfo.cs → .../DotNetTestSet/Properties/AssemblyInfo.cs
diff --git a/...tTestSet/Properties/Resources.Designer.cs → ...tTestSet/Properties/Resources.Designer.cs b/...tTestSet/Properties/Resources.Designer.cs → ...tTestSet/Properties/Resources.Designer.cs
diff --git a/...t/DotNetTestSet/Properties/Resources.resx → ...s/DotNetTestSet/Properties/Resources.resx b/...t/DotNetTestSet/Properties/Resources.resx → ...s/DotNetTestSet/Properties/Resources.resx
diff --git a/...etTestSet/Properties/Settings.Designer.cs → ...etTestSet/Properties/Settings.Designer.cs b/...etTestSet/Properties/Settings.Designer.cs → ...etTestSet/Properties/Settings.Designer.cs
diff --git a/...otNetTestSet/Properties/Settings.settings → ...otNetTestSet/Properties/Settings.settings b/...otNetTestSet/Properties/Settings.settings → ...otNetTestSet/Properties/Settings.settings
diff --git a/DotNet/DotNetTestSet/TestSetForm.Designer.cs → ...ows/DotNetTestSet/TestSetForm.Designer.cs b/DotNet/DotNetTestSet/TestSetForm.Designer.cs → ...ows/DotNetTestSet/TestSetForm.Designer.cs
diff --git a/DotNet/DotNetTestSet/TestSetForm.cs → windows/DotNetTestSet/TestSetForm.cs b/DotNet/DotNetTestSet/TestSetForm.cs → windows/DotNetTestSet/TestSetForm.cs
diff --git a/DotNet/DotNetTestSet/TestSetForm.resx → windows/DotNetTestSet/TestSetForm.resx b/DotNet/DotNetTestSet/TestSetForm.resx → windows/DotNetTestSet/TestSetForm.resx
diff --git a/...etInstaller/DotNetTestSetInstaller.vdproj → ...etInstaller/DotNetTestSetInstaller.vdproj b/...etInstaller/DotNetTestSetInstaller.vdproj → ...etInstaller/DotNetTestSetInstaller.vdproj
diff --git a/...tSetControlLibrary/FilterLevelComboBox.cs → ...tSetControlLibrary/FilterLevelComboBox.cs b/...tSetControlLibrary/FilterLevelComboBox.cs → ...tSetControlLibrary/FilterLevelComboBox.cs
diff --git a/...tSetControlLibrary/FlickerFreeListView.cs → ...tSetControlLibrary/FlickerFreeListView.cs b/...tSetControlLibrary/FlickerFreeListView.cs → ...tSetControlLibrary/FlickerFreeListView.cs
diff --git a/...stSetControlLibrary/IMeasurementSource.cs → ...stSetControlLibrary/IMeasurementSource.cs b/...stSetControlLibrary/IMeasurementSource.cs → ...stSetControlLibrary/IMeasurementSource.cs
diff --git a/...rary/LinkLayerSettingsControl.Designer.cs → ...rary/LinkLayerSettingsControl.Designer.cs b/...rary/LinkLayerSettingsControl.Designer.cs → ...rary/LinkLayerSettingsControl.Designer.cs
diff --git a/...ontrolLibrary/LinkLayerSettingsControl.cs → ...ontrolLibrary/LinkLayerSettingsControl.cs b/...ontrolLibrary/LinkLayerSettingsControl.cs → ...ontrolLibrary/LinkLayerSettingsControl.cs
diff --git a/...trolLibrary/LinkLayerSettingsControl.resx → ...trolLibrary/LinkLayerSettingsControl.resx b/...trolLibrary/LinkLayerSettingsControl.resx → ...trolLibrary/LinkLayerSettingsControl.resx
diff --git a/...tSetControlLibrary/LogControl.Designer.cs → ...tSetControlLibrary/LogControl.Designer.cs b/...tSetControlLibrary/LogControl.Designer.cs → ...tSetControlLibrary/LogControl.Designer.cs
diff --git a/DotNet/TestSetControlLibrary/LogControl.cs → windows/TestSetControlLibrary/LogControl.cs b/DotNet/TestSetControlLibrary/LogControl.cs → windows/TestSetControlLibrary/LogControl.cs
diff --git a/DotNet/TestSetControlLibrary/LogControl.resx → ...ows/TestSetControlLibrary/LogControl.resx b/DotNet/TestSetControlLibrary/LogControl.resx → ...ows/TestSetControlLibrary/LogControl.resx
diff --git a/...trolLibrary/MasterDataDisplay.Designer.cs → ...trolLibrary/MasterDataDisplay.Designer.cs b/...trolLibrary/MasterDataDisplay.Designer.cs → ...trolLibrary/MasterDataDisplay.Designer.cs
diff --git a/...estSetControlLibrary/MasterDataDisplay.cs → ...estSetControlLibrary/MasterDataDisplay.cs b/...estSetControlLibrary/MasterDataDisplay.cs → ...estSetControlLibrary/MasterDataDisplay.cs
diff --git a/...tSetControlLibrary/MasterDataDisplay.resx → ...tSetControlLibrary/MasterDataDisplay.resx b/...tSetControlLibrary/MasterDataDisplay.resx → ...tSetControlLibrary/MasterDataDisplay.resx
diff --git a/...rolLibrary/MasterSettingsForm.Designer.cs → ...rolLibrary/MasterSettingsForm.Designer.cs b/...rolLibrary/MasterSettingsForm.Designer.cs → ...rolLibrary/MasterSettingsForm.Designer.cs
diff --git a/...stSetControlLibrary/MasterSettingsForm.cs → ...stSetControlLibrary/MasterSettingsForm.cs b/...stSetControlLibrary/MasterSettingsForm.cs → ...stSetControlLibrary/MasterSettingsForm.cs
diff --git a/...SetControlLibrary/MasterSettingsForm.resx → ...SetControlLibrary/MasterSettingsForm.resx b/...SetControlLibrary/MasterSettingsForm.resx → ...SetControlLibrary/MasterSettingsForm.resx
diff --git a/...ControlLibrary/Properties/AssemblyInfo.cs → ...ControlLibrary/Properties/AssemblyInfo.cs b/...ControlLibrary/Properties/AssemblyInfo.cs → ...ControlLibrary/Properties/AssemblyInfo.cs
diff --git a/...rolLibrary/SerialSettingsForm.Designer.cs → ...rolLibrary/SerialSettingsForm.Designer.cs b/...rolLibrary/SerialSettingsForm.Designer.cs → ...rolLibrary/SerialSettingsForm.Designer.cs
diff --git a/...stSetControlLibrary/SerialSettingsForm.cs → ...stSetControlLibrary/SerialSettingsForm.cs b/...stSetControlLibrary/SerialSettingsForm.cs → ...stSetControlLibrary/SerialSettingsForm.cs
diff --git a/...SetControlLibrary/SerialSettingsForm.resx → ...SetControlLibrary/SerialSettingsForm.resx b/...SetControlLibrary/SerialSettingsForm.resx → ...SetControlLibrary/SerialSettingsForm.resx
diff --git a/...etControlLibrary/SetpointForm.Designer.cs → ...etControlLibrary/SetpointForm.Designer.cs b/...etControlLibrary/SetpointForm.Designer.cs → ...etControlLibrary/SetpointForm.Designer.cs
diff --git a/DotNet/TestSetControlLibrary/SetpointForm.cs → ...ows/TestSetControlLibrary/SetpointForm.cs b/DotNet/TestSetControlLibrary/SetpointForm.cs → ...ows/TestSetControlLibrary/SetpointForm.cs
diff --git a/...t/TestSetControlLibrary/SetpointForm.resx → ...s/TestSetControlLibrary/SetpointForm.resx b/...t/TestSetControlLibrary/SetpointForm.resx → ...s/TestSetControlLibrary/SetpointForm.resx
diff --git a/...etControlLibrary/StackBrowser.Designer.cs → ...etControlLibrary/StackBrowser.Designer.cs b/...etControlLibrary/StackBrowser.Designer.cs → ...etControlLibrary/StackBrowser.Designer.cs
diff --git a/DotNet/TestSetControlLibrary/StackBrowser.cs → ...ows/TestSetControlLibrary/StackBrowser.cs b/DotNet/TestSetControlLibrary/StackBrowser.cs → ...ows/TestSetControlLibrary/StackBrowser.cs
diff --git a/...t/TestSetControlLibrary/StackBrowser.resx → ...s/TestSetControlLibrary/StackBrowser.resx b/...t/TestSetControlLibrary/StackBrowser.resx → ...s/TestSetControlLibrary/StackBrowser.resx
diff --git a/...olLibrary/StackDisplayControl.Designer.cs → ...olLibrary/StackDisplayControl.Designer.cs b/...olLibrary/StackDisplayControl.Designer.cs → ...olLibrary/StackDisplayControl.Designer.cs
diff --git a/...tSetControlLibrary/StackDisplayControl.cs → ...tSetControlLibrary/StackDisplayControl.cs b/...tSetControlLibrary/StackDisplayControl.cs → ...tSetControlLibrary/StackDisplayControl.cs
diff --git a/...etControlLibrary/StackDisplayControl.resx → ...etControlLibrary/StackDisplayControl.resx b/...etControlLibrary/StackDisplayControl.resx → ...etControlLibrary/StackDisplayControl.resx
diff --git a/...estSetControlLibrary/TcpClientSettings.cs → ...estSetControlLibrary/TcpClientSettings.cs b/...estSetControlLibrary/TcpClientSettings.cs → ...estSetControlLibrary/TcpClientSettings.cs
diff --git a/...ontrolLibrary/TcpSettingsForm.Designer.cs → ...ontrolLibrary/TcpSettingsForm.Designer.cs b/...ontrolLibrary/TcpSettingsForm.Designer.cs → ...ontrolLibrary/TcpSettingsForm.Designer.cs
diff --git a/.../TestSetControlLibrary/TcpSettingsForm.cs → .../TestSetControlLibrary/TcpSettingsForm.cs b/.../TestSetControlLibrary/TcpSettingsForm.cs → .../TestSetControlLibrary/TcpSettingsForm.cs
diff --git a/...estSetControlLibrary/TcpSettingsForm.resx → ...estSetControlLibrary/TcpSettingsForm.resx b/...estSetControlLibrary/TcpSettingsForm.resx → ...estSetControlLibrary/TcpSettingsForm.resx
diff --git a/...ntrolLibrary/TestSetControlLibrary.csproj → ...ntrolLibrary/TestSetControlLibrary.csproj b/...ntrolLibrary/TestSetControlLibrary.csproj → ...ntrolLibrary/TestSetControlLibrary.csproj
diff --git a/...olLibrary/TimeSeriesChartForm.Designer.cs → ...olLibrary/TimeSeriesChartForm.Designer.cs b/...olLibrary/TimeSeriesChartForm.Designer.cs → ...olLibrary/TimeSeriesChartForm.Designer.cs
diff --git a/...tSetControlLibrary/TimeSeriesChartForm.cs → ...tSetControlLibrary/TimeSeriesChartForm.cs b/...tSetControlLibrary/TimeSeriesChartForm.cs → ...tSetControlLibrary/TimeSeriesChartForm.cs
diff --git a/...etControlLibrary/TimeSeriesChartForm.resx → ...etControlLibrary/TimeSeriesChartForm.resx b/...etControlLibrary/TimeSeriesChartForm.resx → ...etControlLibrary/TimeSeriesChartForm.resx
diff --git a/TestSetInstaller/EULA.RTF → windows/TestSetInstaller/EULA.RTF b/TestSetInstaller/EULA.RTF → windows/TestSetInstaller/EULA.RTF