Fix windows project files due to directory and path changes.

CASA/adlib/Novell.CASA.A-D.csproj

@@ -94,35 +94,41 @@
                     Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
-                <Reference
-                    Name = "pango-sharp"
-                    AssemblyName = "pango-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\pango-sharp.dll"
-                />
                 <Reference
                     Name = "atk-sharp"
                     AssemblyName = "atk-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\atk-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
                 <Reference
                     Name = "gdk-sharp"
                     AssemblyName = "gdk-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\gdk-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
                 <Reference
                     Name = "glade-sharp"
                     AssemblyName = "glade-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\glade-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
                 <Reference
                     Name = "glib-sharp"
                     AssemblyName = "glib-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\glib-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
                 <Reference
                     Name = "gtk-sharp"
                     AssemblyName = "gtk-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\gtk-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
+                />
+                <Reference
+                    Name = "pango-sharp"
+                    AssemblyName = "pango-sharp"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
             </References>
         </Build>

CASA/adlib/Novell.CASA.A-D.csproj.user

@@ -1,7 +1,7 @@
 <VisualStudioProject>
     <CSHARP LastOpenVersion = "7.10.3077" >
         <Build>
-            <Settings ReferencePath = "C:\GtkRun\2.8\lib\gtk-sharp\" >
+            <Settings ReferencePath = "" >
                 <Config
                     Name = "Debug"
                     EnableASPDebugging = "false"

CASA/gui/CASAManager.csproj

@@ -105,39 +105,45 @@
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
                 <Reference
-                    Name = "pango-sharp"
+                    Name = "Novell.CASA.CASAPolicy"
-                    AssemblyName = "pango-sharp"
+                    Project = "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\pango-sharp.dll"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
                 <Reference
                     Name = "atk-sharp"
                     AssemblyName = "atk-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\atk-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\atk-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
                 <Reference
                     Name = "gdk-sharp"
                     AssemblyName = "gdk-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\gdk-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gdk-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
                 <Reference
                     Name = "glade-sharp"
                     AssemblyName = "glade-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\glade-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glade-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
                 <Reference
                     Name = "glib-sharp"
                     AssemblyName = "glib-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\glib-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\glib-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
                 <Reference
                     Name = "gtk-sharp"
                     AssemblyName = "gtk-sharp"
-                    HintPath = "..\..\..\..\..\..\GtkRun\2.8\lib\gtk-sharp\gtk-sharp.dll"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\gtk-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
                 <Reference
-                    Name = "Novell.CASA.CASAPolicy"
+                    Name = "pango-sharp"
-                    Project = "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
+                    AssemblyName = "pango-sharp"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                    HintPath = "C:\GTK\2.8\lib\gtk-sharp-2.0\pango-sharp.dll"
+                    AssemblyFolderKey = "hklm\dn\gtk-sharp-2.0"
                 />
             </References>
         </Build>

CASA/gui/CASAManager.csproj.user

@@ -1,7 +1,7 @@
 <VisualStudioProject>
     <CSHARP LastOpenVersion = "7.10.3077" >
         <Build>
-            <Settings ReferencePath = "D:\casa\extern\w32\gtk-sharp-2.0\;C:\GtkRun\2.8\lib\gtk-sharp\" >
+            <Settings ReferencePath = "" >
                 <Config
                     Name = "Debug"
                     EnableASPDebugging = "false"

CASA/micasad/micasad.csproj

@@ -114,11 +114,6 @@
                     AssemblyName = "System.Runtime.Serialization.Formatters.Soap"
                     HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Runtime.Serialization.Formatters.Soap.dll"
                 />
-                <Reference
-                    Name = "Novell.CASA.Common"
-                    Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
                 <Reference
                     Name = "AppModule.InterProcessComm"
                     Project = "{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}"
@@ -129,6 +124,11 @@
                     Project = "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
+                <Reference
+                    Name = "Novell.CASA.Common"
+                    Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
             </References>
         </Build>
         <Files>

CASA/micasadk/c_micasadk.vcproj

@@ -82,7 +82,7 @@
 				Name="VCLinkerTool"
 				AdditionalDependencies="micasacache.lib"
 				LinkIncremental="1"
-				AdditionalLibraryDirectories="..\c_micasacache\Release"
+				AdditionalLibraryDirectories="..\micasacache\Release"
 				ModuleDefinitionFile=".\micasa.def"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
@@ -120,7 +120,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
 			<File
-				RelativePath="..\c_common\sscs_ll.c">
+				RelativePath="..\common\sscs_ll.c">
 			</File>
 			<File
 				RelativePath=".\sscs_ndk.c">

CASA/package/windows/vs_solutions/CASAInstall/CASA.sln

@@ -11,65 +11,65 @@ Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "miCASA-Dev-msm", "..\miCASA
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cSample", "..\..\c_test\c_sample\CSample.vcproj", "{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cSample", "..\..\..\..\test\c_sample\CSample.vcproj", "{2635AF48-A4B2-42BD-97E2-A9AD9FF79E8C}"
 	ProjectSection(ProjectDependencies) = postProject
 		{99988A22-4C58-4BF7-A2DB-57761E76FB26} = {99988A22-4C58-4BF7-A2DB-57761E76FB26}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cSharpSample", "..\..\c_test\c_sharp_sample\cSharpSample.csproj", "{3FB57160-F475-4650-A45C-19D020661A2D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cSharpSample", "..\..\..\..\test\c_sharp_sample\cSharpSample.csproj", "{3FB57160-F475-4650-A45C-19D020661A2D}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lcredmgr", "..\..\LoginCapture\windows\windows.vcproj", "{55E85618-3643-4213-A15F-08DA1F02D9BB}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lcredmgr", "..\..\..\..\LoginCapture\windows\windows.vcproj", "{55E85618-3643-4213-A15F-08DA1F02D9BB}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.miCASAWrapper", "..\..\c_sharp\NSSCSWrapper\Novell.CASA.miCASAWrapper.csproj", "{E21DD887-22F4-4935-9851-409715F663B0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.miCASAWrapper", "..\..\..\..\sharp\NSSCSWrapper\Novell.CASA.miCASAWrapper.csproj", "{E21DD887-22F4-4935-9851-409715F663B0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1} = {E98F1F7E-40B6-44C8-AC66-EC867B141FA1}
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66} = {077B53BB-404A-4B2F-BA17-AAE98C5E9C66}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..\c_micasad\lib\Novell.CASA.Common.csproj", "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..\..\..\micasad\lib\Novell.CASA.Common.csproj", "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1} = {E98F1F7E-40B6-44C8-AC66-EC867B141FA1}
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66} = {077B53BB-404A-4B2F-BA17-AAE98C5E9C66}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CASAManager", "..\..\c_gui\CASAManager.csproj", "{A1A805D0-B400-4D11-A772-348CE13F1046}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CASAManager", "..\..\..\..\gui\CASAManager.csproj", "{A1A805D0-B400-4D11-A772-348CE13F1046}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.A-D", "..\..\c_adlib\Novell.CASA.A-D.csproj", "{25D49F34-F655-4CCF-93F1-449243AF7A32}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.A-D", "..\..\..\..\adlib\Novell.CASA.A-D.csproj", "{25D49F34-F655-4CCF-93F1-449243AF7A32}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.CASAPolicy", "..\..\c_policy\Novell.CASA.CASAPolicy.csproj", "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.CASAPolicy", "..\..\..\..\policy\Novell.CASA.CASAPolicy.csproj", "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "micasad", "..\..\c_micasad\micasad.csproj", "{E39D2266-AB30-430E-A466-AC909363A830}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "micasad", "..\..\..\..\micasad\micasad.csproj", "{E39D2266-AB30-430E-A466-AC909363A830}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.InterProcessComm", "..\..\extern\w32\namedpipes\AppModule.InterProcessComm\AppModule.InterProcessComm.csproj", "{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.InterProcessComm", "..\..\..\..\extern\w32\namedpipes\AppModule.InterProcessComm\AppModule.InterProcessComm.csproj", "{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.NamedPipes", "..\..\extern\w32\namedpipes\AppModule.NamedPipes\AppModule.NamedPipes.csproj", "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.NamedPipes", "..\..\..\..\extern\w32\namedpipes\AppModule.NamedPipes\AppModule.NamedPipes.csproj", "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}"
 	ProjectSection(ProjectDependencies) = postProject
 		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1} = {E98F1F7E-40B6-44C8-AC66-EC867B141FA1}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad_firefox_native", "..\..\c_adlib\ad_ff\firefox.vcproj", "{BB304ECF-FCBA-4693-9D47-86749815DDC8}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ad_firefox_native", "..\..\..\..\adlib\ad_ff\firefox.vcproj", "{BB304ECF-FCBA-4693-9D47-86749815DDC8}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "micasacache", "..\..\c_micasacache\c_micasacache.vcproj", "{B5DB4B53-AB02-4EDC-9C02-BF7DE68F91A3}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "micasacache", "..\..\..\..\micasacache\c_micasacache.vcproj", "{B5DB4B53-AB02-4EDC-9C02-BF7DE68F91A3}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "micasa", "..\..\c_micasadk\c_micasadk.vcproj", "{99988A22-4C58-4BF7-A2DB-57761E76FB26}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "micasa", "..\..\..\..\micasadk\c_micasadk.vcproj", "{99988A22-4C58-4BF7-A2DB-57761E76FB26}"
 	ProjectSection(ProjectDependencies) = postProject
 		{B5DB4B53-AB02-4EDC-9C02-BF7DE68F91A3} = {B5DB4B53-AB02-4EDC-9C02-BF7DE68F91A3}
 	EndProjectSection

CASA/package/windows/vs_solutions/CASAInstall/CASA.vdproj

@@ -51,13 +51,13 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_D5F48F90200A4D8C9DCF3212488F0B51"
+        "MsmKey" = "8:_E709738C0F104FD99A413E46921BAD31"
         "OwnerKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_D5F48F90200A4D8C9DCF3212488F0B51"
+        "MsmKey" = "8:_E709738C0F104FD99A413E46921BAD31"
         "OwnerKey" = "8:_D1641051214046F78EDF37DC13C414ED"
         "MsmSig" = "8:_UNDEFINED"
         }
@@ -134,7 +134,7 @@
         {
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_1759661D2FDA4F2E95C0E7FC36CFA63C"
             {
-            "SourcePath" = "8:..\\..\\c_gui\\images\\CASAicons.ico"
+            "SourcePath" = "8:..\\..\\..\\..\\gui\\images\\CASAicons.ico"
             "TargetName" = "8:CASAicons.ico"
             "Tag" = "8:"
             "Folder" = "8:_E8900D5F0BD44DC0BB0BEFDF7C43B30C"
@@ -174,7 +174,7 @@
             }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_93A5D480D91747B086FD13789A12978B"
             {
-            "SourcePath" = "8:..\\..\\c_gui\\images\\CASA.bmp"
+            "SourcePath" = "8:..\\..\\..\\..\\gui\\images\\CASA.bmp"
             "TargetName" = "8:CASA.bmp"
             "Tag" = "8:"
             "Folder" = "8:_E8900D5F0BD44DC0BB0BEFDF7C43B30C"
@@ -214,7 +214,7 @@
             }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_EF467E7BEF8E4109BAD7E2FE47508D13"
             {
-            "SourcePath" = "8:..\\..\\c_gui\\images\\CASAicons.ico"
+            "SourcePath" = "8:..\\..\\..\\..\\gui\\images\\CASAicons.ico"
             "TargetName" = "8:CASAicons.ico"
             "Tag" = "8:"
             "Folder" = "8:_E8900D5F0BD44DC0BB0BEFDF7C43B30C"
@@ -302,13 +302,13 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:CASA"
-        "ProductCode" = "8:{9027DE0E-CDDF-42BB-B9CF-C5E5AED08A19}"
+        "ProductCode" = "8:{E87F8885-C799-4C0A-9761-8514A8A09C46}"
-        "PackageCode" = "8:{B35E18F2-56D9-4F52-9ADF-078D410A1330}"
+        "PackageCode" = "8:{8D36149E-F746-4006-A4FA-3E6745D36021}"
         "UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
-        "ProductVersion" = "8:1.6.498"
+        "ProductVersion" = "8:1.6.699"
         "Manufacturer" = "8:Novell"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -830,7 +830,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_D5F48F90200A4D8C9DCF3212488F0B51"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_E709738C0F104FD99A413E46921BAD31"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
@@ -849,7 +849,7 @@
         {
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
             {
-            "SourcePath" = "8:..\\miCASA-msm\\Debug\\miCASA-msm.msm"
+            "SourcePath" = "8:..\\miCASA-msm\\Release\\miCASA-msm.msm"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_E8900D5F0BD44DC0BB0BEFDF7C43B30C"
@@ -881,17 +881,6 @@
                 "SourcePath" = "8:..\\miCASA-msm\\Release\\miCASA-msm.msm"
                     "Properties"
                     {
-                        "_30C4BAFB25D54C8D832E595E47C9DF22.71E87B6C0C774E9FBADBFDACFC28E60A"
-                        {
-                        "Name" = "8:_30C4BAFB25D54C8D832E595E47C9DF22.71E87B6C0C774E9FBADBFDACFC28E60A"
-                        "DisplayName" = "8:Module Retargetable Folder"
-                        "Description" = "8:"
-                        "Type" = "3:32769"
-                        "ContextData" = "8:_RetargetableFolder"
-                        "Attributes" = "3:6"
-                        "Setting" = "3:1"
-                        "UsePlugInResources" = "11:FALSE"
-                        }
                     }
                 "LanguageId" = "3:1033"
                 "Exclude" = "11:FALSE"
@@ -902,7 +891,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_D1641051214046F78EDF37DC13C414ED"
             {
-            "SourcePath" = "8:..\\miCASA-Dev-msm\\Debug\\miCASA-Dev-msm.msm"
+            "SourcePath" = "8:..\\miCASA-Dev-msm\\Release\\miCASA-Dev-msm.msm"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_E8900D5F0BD44DC0BB0BEFDF7C43B30C"
@@ -934,31 +923,17 @@
                 "SourcePath" = "8:..\\miCASA-Dev-msm\\Release\\miCASA-Dev-msm.msm"
                     "Properties"
                     {
-                        "_242B167EC4AF81C382DE914EC07C7C04.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "_62D43560615587AE3DB95A0BA428D5BE.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         {
-                        "Name" = "8:_242B167EC4AF81C382DE914EC07C7C04.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Name" = "8:_62D43560615587AE3DB95A0BA428D5BE.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "DisplayName" = "8:"
                         "Description" = "8:"
                         "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_9A995E0D0CEDCF7A350BE0F53570F392.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_A1ECD7DAF522A0E5D85BCDD9EAED3209.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "Attributes" = "3:0"
                         "Setting" = "3:2"
-                        "Value" = "8:_9A995E0D0CEDCF7A350BE0F53570F392.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Value" = "8:_A1ECD7DAF522A0E5D85BCDD9EAED3209.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_9A995E0D0CEDCF7A350BE0F53570F392.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_A1ECD7DAF522A0E5D85BCDD9EAED3209.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "UsePlugInResources" = "11:FALSE"
-                        }
-                        "_3F036DA99C645EE527B5B32BD8B9B230.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        {
-                        "Name" = "8:_3F036DA99C645EE527B5B32BD8B9B230.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DisplayName" = "8:"
-                        "Description" = "8:"
-                        "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_0C0F3A22289795FB2309CD74E74C6763.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "Attributes" = "3:0"
-                        "Setting" = "3:2"
-                        "Value" = "8:_0C0F3A22289795FB2309CD74E74C6763.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_0C0F3A22289795FB2309CD74E74C6763.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "UsePlugInResources" = "11:FALSE"
                         }
@@ -973,87 +948,59 @@
                         "Setting" = "3:1"
                         "UsePlugInResources" = "11:FALSE"
                         }
-                        "_7802A95EF4665B8DB7E9362E1C9B2FD8.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "_6E1C74B0F6DBAA22C571F4B02C1DB283.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         {
-                        "Name" = "8:_7802A95EF4665B8DB7E9362E1C9B2FD8.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Name" = "8:_6E1C74B0F6DBAA22C571F4B02C1DB283.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "DisplayName" = "8:"
                         "Description" = "8:"
                         "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_006D07CC5FBDF33B436B3759F63BD5C4.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_E33B56BF66EDE9E5F123E5CB7C4EEAB7.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "Attributes" = "3:0"
                         "Setting" = "3:2"
-                        "Value" = "8:_006D07CC5FBDF33B436B3759F63BD5C4.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Value" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_006D07CC5FBDF33B436B3759F63BD5C4.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "UsePlugInResources" = "11:FALSE"
                         }
-                        "_BB6FAE3F3DADF2BDFBA6861D27102788.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "_8F963A15E45820A7669429B1C62E11E0.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         {
-                        "Name" = "8:_BB6FAE3F3DADF2BDFBA6861D27102788.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Name" = "8:_8F963A15E45820A7669429B1C62E11E0.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "DisplayName" = "8:"
                         "Description" = "8:"
                         "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_587E42A280590E3B8A25FBB49A0CD2BF.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_97A9E83174008B64F2EEC7EFA68BF566.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "Attributes" = "3:0"
                         "Setting" = "3:2"
-                        "Value" = "8:_587E42A280590E3B8A25FBB49A0CD2BF.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Value" = "8:_97A9E83174008B64F2EEC7EFA68BF566.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_587E42A280590E3B8A25FBB49A0CD2BF.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_97A9E83174008B64F2EEC7EFA68BF566.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "UsePlugInResources" = "11:FALSE"
                         }
-                        "_C0956765EFF35B75C8A06040A9F5E4ED.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "_95C01A87787956AC69FC2E9C7FA507A7.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         {
-                        "Name" = "8:_C0956765EFF35B75C8A06040A9F5E4ED.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Name" = "8:_95C01A87787956AC69FC2E9C7FA507A7.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "DisplayName" = "8:"
                         "Description" = "8:"
                         "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_EE70DB957A50F493A24ECCE707FEE919.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_79C6F8F43FF4CB3AF63B925D0EA1C564.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "Attributes" = "3:0"
                         "Setting" = "3:2"
-                        "Value" = "8:_EE70DB957A50F493A24ECCE707FEE919.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Value" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_EE70DB957A50F493A24ECCE707FEE919.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "UsePlugInResources" = "11:FALSE"
                         }
-                        "_CCEC6AED4C157C7EAA8519A01E15C3DD.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "_ED516AEF413A6424C60E58C4FE881B58.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         {
-                        "Name" = "8:_CCEC6AED4C157C7EAA8519A01E15C3DD.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Name" = "8:_ED516AEF413A6424C60E58C4FE881B58.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "DisplayName" = "8:"
                         "Description" = "8:"
                         "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_E21347B83D471F385D35F5D6886AA45B.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_4CF0917F390ACC0AF5A1750516A3993E.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "Attributes" = "3:0"
                         "Setting" = "3:2"
-                        "Value" = "8:_E21347B83D471F385D35F5D6886AA45B.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "Value" = "8:_4CF0917F390ACC0AF5A1750516A3993E.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_E21347B83D471F385D35F5D6886AA45B.4F1ACC03A482468C9BEBF6D83FA4F7FE"
+                        "DefaultValue" = "8:_4CF0917F390ACC0AF5A1750516A3993E.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "UsePlugInResources" = "11:FALSE"
-                        }
-                        "_D10CCC488DA6B5340FB2B63C7FB75401.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        {
-                        "Name" = "8:_D10CCC488DA6B5340FB2B63C7FB75401.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DisplayName" = "8:"
-                        "Description" = "8:"
-                        "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_2A502FD865DCE177557890E33D6A4E26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "Attributes" = "3:0"
-                        "Setting" = "3:2"
-                        "Value" = "8:_2A502FD865DCE177557890E33D6A4E26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_2A502FD865DCE177557890E33D6A4E26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "UsePlugInResources" = "11:FALSE"
-                        }
-                        "_F3F054CE353A3BBC798B2DF0769E46D4.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        {
-                        "Name" = "8:_F3F054CE353A3BBC798B2DF0769E46D4.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DisplayName" = "8:"
-                        "Description" = "8:"
-                        "Type" = "3:2"
-                        "ContextData" = "8:InstallToGAC=;IsolateToManifest=_F1C9E9791B2803517583E3E84515A4E3.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "Attributes" = "3:0"
-                        "Setting" = "3:2"
-                        "Value" = "8:_F1C9E9791B2803517583E3E84515A4E3.4F1ACC03A482468C9BEBF6D83FA4F7FE"
-                        "DefaultValue" = "8:_F1C9E9791B2803517583E3E84515A4E3.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "ParentName" = "8:_6418E7496A474EDDAC9A91150BBE4A26.4F1ACC03A482468C9BEBF6D83FA4F7FE"
                         "UsePlugInResources" = "11:FALSE"
                         }

CASA/package/windows/vs_solutions/CASAManager/CASAManager.sln

@@ -1,37 +1,33 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CASAManager", "..\..\c_gui\CASAManager.csproj", "{A1A805D0-B400-4D11-A772-348CE13F1046}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CASAManager", "..\..\..\..\gui\CASAManager.csproj", "{A1A805D0-B400-4D11-A772-348CE13F1046}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.A-D", "..\..\c_adlib\Novell.CASA.A-D.csproj", "{25D49F34-F655-4CCF-93F1-449243AF7A32}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.A-D", "..\..\..\..\adlib\Novell.CASA.A-D.csproj", "{25D49F34-F655-4CCF-93F1-449243AF7A32}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.CASAPolicy", "..\..\c_policy\Novell.CASA.CASAPolicy.csproj", "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.CASAPolicy", "..\..\..\..\policy\Novell.CASA.CASAPolicy.csproj", "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..\c_micasad\lib\Novell.CASA.Common.csproj", "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..\..\..\micasad\lib\Novell.CASA.Common.csproj", "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.miCASAWrapper", "..\..\c_sharp\NSSCSWrapper\Novell.CASA.miCASAWrapper.csproj", "{E21DD887-22F4-4935-9851-409715F663B0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.miCASAWrapper", "..\..\..\..\sharp\NSSCSWrapper\Novell.CASA.miCASAWrapper.csproj", "{E21DD887-22F4-4935-9851-409715F663B0}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cSharpSample", "..\..\c_test\c_sharp_sample\cSharpSample.csproj", "{3FB57160-F475-4650-A45C-19D020661A2D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cSharpSample", "..\..\..\..\test\c_sharp_sample\cSharpSample.csproj", "{3FB57160-F475-4650-A45C-19D020661A2D}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "c-sharp-net-credential", "..\..\ClientPasswordManager\c-sharp-net-credential\c-sharp-net-credential.csproj", "{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.InterProcessComm", "..\..\..\..\extern\w32\namedpipes\AppModule.InterProcessComm\AppModule.InterProcessComm.csproj", "{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.InterProcessComm", "..\..\extern\w32\namedpipes\AppModule.InterProcessComm\AppModule.InterProcessComm.csproj", "{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.NamedPipes", "..\..\..\..\extern\w32\namedpipes\AppModule.NamedPipes\AppModule.NamedPipes.csproj", "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}"
-	ProjectSection(ProjectDependencies) = postProject
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.NamedPipes", "..\..\extern\w32\namedpipes\AppModule.NamedPipes\AppModule.NamedPipes.csproj", "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -65,10 +61,6 @@ Global
 		{3FB57160-F475-4650-A45C-19D020661A2D}.Debug.Build.0 = Debug|.NET
 		{3FB57160-F475-4650-A45C-19D020661A2D}.Release.ActiveCfg = Release|.NET
 		{3FB57160-F475-4650-A45C-19D020661A2D}.Release.Build.0 = Release|.NET
-		{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}.Debug.ActiveCfg = Debug|.NET
-		{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}.Debug.Build.0 = Debug|.NET
-		{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}.Release.ActiveCfg = Release|.NET
-		{D7D0F5D8-0F45-4DCA-818B-8E71168A2CA3}.Release.Build.0 = Release|.NET
 		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}.Debug.ActiveCfg = Debug|.NET
 		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}.Debug.Build.0 = Debug|.NET
 		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}.Release.ActiveCfg = Release|.NET

CASA/package/windows/vs_solutions/miCASA-Dev-msm/miCASA-Dev-msm.vdproj

@@ -13,24 +13,6 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
-        "Entry"
-        {
-        "MsmKey" = "8:_0957D58F09B746A586762D07522072C3"
-        "OwnerKey" = "8:_21DEA64259A6D7CEF8F7C1A4228D2221"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_0957D58F09B746A586762D07522072C3"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_21DEA64259A6D7CEF8F7C1A4228D2221"
-        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
-        "MsmSig" = "8:_UNDEFINED"
-        }
         "Entry"
         {
         "MsmKey" = "8:_24DA7E000C1645438F67455260F5A201"
@@ -45,18 +27,60 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
+        "OwnerKey" = "8:_A1ECD7DAF522A0E5D85BCDD9EAED3209"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564"
+        "OwnerKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564"
+        "OwnerKey" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_9630BD80B06842BB9DE27916F038665C"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
+        "MsmKey" = "8:_9BEBCD4FC9A543CCB3B45D7D1098AB83"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_A1ECD7DAF522A0E5D85BCDD9EAED3209"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_A7A23CA536234B8BAE08CA9528EC8F93"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -69,8 +93,44 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_E1BD8C4853644B74A9F09611F6EC8BD8"
+        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
-        "OwnerKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
+        "OwnerKey" = "8:_A1ECD7DAF522A0E5D85BCDD9EAED3209"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
+        "OwnerKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
+        "OwnerKey" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_C071E033A8B0450E833BB5FB786E1027"
+        "OwnerKey" = "8:_79C6F8F43FF4CB3AF63B925D0EA1C564"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
+        "OwnerKey" = "8:_718042C617DB414B91C69D1ACCD99A42"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
+        "OwnerKey" = "8:_4CF0917F390ACC0AF5A1750516A3993E"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -122,40 +182,9 @@
         }
         "File"
         {
-            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_21DEA64259A6D7CEF8F7C1A4228D2221"
-            {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.Casa, Version=1.6.1.0, Culture=neutral, PublicKeyToken=da5dcda9c6cb5607"
-                "ScatterAssemblies"
-                {
-                    "_21DEA64259A6D7CEF8F7C1A4228D2221"
-                    {
-                    "Name" = "8:Novell.Casa.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:Novell.Casa.dll"
-            "TargetName" = "8:"
-            "Tag" = "8:"
-            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
-            "Condition" = "8:"
-            "Transitive" = "11:FALSE"
-            "Vital" = "11:TRUE"
-            "ReadOnly" = "11:FALSE"
-            "Hidden" = "11:FALSE"
-            "System" = "11:FALSE"
-            "Permanent" = "11:FALSE"
-            "SharedLegacy" = "11:FALSE"
-            "PackageAs" = "3:1"
-            "Register" = "3:1"
-            "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
-            "IsolateTo" = "8:"
-            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_24DA7E000C1645438F67455260F5A201"
             {
-            "SourcePath" = "8:..\\..\\include\\micasa_mgmd.h"
+            "SourcePath" = "8:..\\..\\..\\..\\include\\micasa_mgmd.h"
             "TargetName" = "8:micasa_mgmd.h"
             "Tag" = "8:"
             "Folder" = "8:_74C8706957E54C25B02C3025A6FE7488"
@@ -173,9 +202,71 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_4CF0917F390ACC0AF5A1750516A3993E"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.6.2356.23746, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_4CF0917F390ACC0AF5A1750516A3993E"
+                    {
+                    "Name" = "8:Novell.CASA.Common.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Novell.CASA.Common.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_79C6F8F43FF4CB3AF63B925D0EA1C564"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppModule.InterProcessComm, Version=1.6.0.23746, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_79C6F8F43FF4CB3AF63B925D0EA1C564"
+                    {
+                    "Name" = "8:AppModule.InterProcessComm.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppModule.InterProcessComm.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_9630BD80B06842BB9DE27916F038665C"
             {
-            "SourcePath" = "8:..\\..\\include\\sscs_utf8.h"
+            "SourcePath" = "8:..\\..\\..\\..\\include\\sscs_utf8.h"
             "TargetName" = "8:sscs_utf8.h"
             "Tag" = "8:"
             "Folder" = "8:_74C8706957E54C25B02C3025A6FE7488"
@@ -193,9 +284,60 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_9BEBCD4FC9A543CCB3B45D7D1098AB83"
+            {
+            "SourcePath" = "8:..\\..\\..\\..\\test\\java_sample\\src\\JavaSample.java"
+            "TargetName" = "8:JavaSample.java"
+            "Tag" = "8:"
+            "Folder" = "8:_05F7B25876E24EF4B5AB49C731A96CF4"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_A1ECD7DAF522A0E5D85BCDD9EAED3209"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.6.2356.23750, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_A1ECD7DAF522A0E5D85BCDD9EAED3209"
+                    {
+                    "Name" = "8:Novell.CASA.miCASAWrapper.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:Novell.CASA.miCASAWrapper.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_A7A23CA536234B8BAE08CA9528EC8F93"
             {
-            "SourcePath" = "8:..\\..\\include\\micasa_types.h"
+            "SourcePath" = "8:..\\..\\..\\..\\include\\micasa_types.h"
             "TargetName" = "8:micasa_types.h"
             "Tag" = "8:"
             "Folder" = "8:_74C8706957E54C25B02C3025A6FE7488"
@@ -233,12 +375,23 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{A582A373-4685-4296-BEFE-614B80A702C3}:_E1BD8C4853644B74A9F09611F6EC8BD8"
+            "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
             {
-            "SourcePath" = "8:..\\..\\c_test\\java_sample\\src\\JavaSample.java"
+            "AssemblyRegister" = "3:1"
-            "TargetName" = "8:JavaSample.java"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppModule.NamedPipes, Version=1.6.0.23746, Culture=neutral"
+                "ScatterAssemblies"
+                {
+                    "_E33B56BF66EDE9E5F123E5CB7C4EEAB7"
+                    {
+                    "Name" = "8:AppModule.NamedPipes.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppModule.NamedPipes.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
-            "Folder" = "8:_05F7B25876E24EF4B5AB49C731A96CF4"
+            "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"
             "Condition" = "8:"
             "Transitive" = "11:FALSE"
             "Vital" = "11:TRUE"
@@ -250,7 +403,7 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
         }
@@ -389,7 +542,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_0957D58F09B746A586762D07522072C3"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_C071E033A8B0450E833BB5FB786E1027"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"
@@ -417,7 +570,7 @@
         {
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_384A908A3DE54B359C611011C2A2AA97"
             {
-            "SourcePath" = "8:..\\..\\c_test\\c_sample\\Release\\cSample.exe"
+            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sample\\Release\\cSample.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_F3F9192858114846913E6271C812F8FA"
@@ -445,7 +598,7 @@
             }
             "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_718042C617DB414B91C69D1ACCD99A42"
             {
-            "SourcePath" = "8:..\\..\\c_test\\c_sharp_sample\\obj\\Release\\CSharpSample.exe"
+            "SourcePath" = "8:..\\..\\..\\..\\test\\c_sharp_sample\\obj\\Release\\CSharpSample.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_60E3A2D74B8D4F348C473CBA0F171A15"

CASA/package/windows/vs_solutions/micasad/micasad.sln

@@ -1,17 +1,17 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "micasad", "..\..\c_micasad\micasad.csproj", "{E39D2266-AB30-430E-A466-AC909363A830}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.InterProcessComm", "..\..\..\..\extern\w32\namedpipes\AppModule.InterProcessComm\AppModule.InterProcessComm.csproj", "{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..\c_micasad\lib\Novell.CASA.Common.csproj", "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.NamedPipes", "..\..\..\..\extern\w32\namedpipes\AppModule.NamedPipes\AppModule.NamedPipes.csproj", "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.InterProcessComm", "..\..\extern\w32\namedpipes\AppModule.InterProcessComm\AppModule.InterProcessComm.csproj", "{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "micasad", "..\..\..\..\micasad\micasad.csproj", "{E39D2266-AB30-430E-A466-AC909363A830}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppModule.NamedPipes", "..\..\extern\w32\namedpipes\AppModule.NamedPipes\AppModule.NamedPipes.csproj", "{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novell.CASA.Common", "..\..\..\..\micasad\lib\Novell.CASA.Common.csproj", "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
@@ -21,14 +21,6 @@ Global
 		Release = Release
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
-		{E39D2266-AB30-430E-A466-AC909363A830}.Debug.ActiveCfg = Debug|.NET
-		{E39D2266-AB30-430E-A466-AC909363A830}.Debug.Build.0 = Debug|.NET
-		{E39D2266-AB30-430E-A466-AC909363A830}.Release.ActiveCfg = Release|.NET
-		{E39D2266-AB30-430E-A466-AC909363A830}.Release.Build.0 = Release|.NET
-		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Debug.ActiveCfg = Debug|.NET
-		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Debug.Build.0 = Debug|.NET
-		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Release.ActiveCfg = Release|.NET
-		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Release.Build.0 = Release|.NET
 		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}.Debug.ActiveCfg = Debug|.NET
 		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}.Debug.Build.0 = Debug|.NET
 		{E98F1F7E-40B6-44C8-AC66-EC867B141FA1}.Release.ActiveCfg = Release|.NET
@@ -37,6 +29,14 @@ Global
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}.Debug.Build.0 = Debug|.NET
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}.Release.ActiveCfg = Release|.NET
 		{077B53BB-404A-4B2F-BA17-AAE98C5E9C66}.Release.Build.0 = Release|.NET
+		{E39D2266-AB30-430E-A466-AC909363A830}.Debug.ActiveCfg = Debug|.NET
+		{E39D2266-AB30-430E-A466-AC909363A830}.Debug.Build.0 = Debug|.NET
+		{E39D2266-AB30-430E-A466-AC909363A830}.Release.ActiveCfg = Release|.NET
+		{E39D2266-AB30-430E-A466-AC909363A830}.Release.Build.0 = Release|.NET
+		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Debug.ActiveCfg = Debug|.NET
+		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Debug.Build.0 = Debug|.NET
+		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Release.ActiveCfg = Release|.NET
+		{57CD94A2-5B4A-40C3-8189-CB760FB78357}.Release.Build.0 = Release|.NET
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection