Windows Fix: Statically link msvcr71 into micasa.dll and micasacache.dll.

c_adlib/Novell.CASA.A-D.csproj

@@ -79,24 +79,6 @@
                     AssemblyName = "System.Xml"
                     HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
                 />
-                <Reference
-                    Name = "gdk-sharp"
-                    AssemblyName = "gdk-sharp"
-                    HintPath = "C:\Program Files\Common Files\GTK\2.4\lib\gtk-sharp-2.0\gdk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "glib-sharp"
-                    AssemblyName = "glib-sharp"
-                    HintPath = "C:\Program Files\Common Files\GTK\2.4\lib\gtk-sharp-2.0\glib-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
-                <Reference
-                    Name = "gtk-sharp"
-                    AssemblyName = "gtk-sharp"
-                    HintPath = "C:\Program Files\Common Files\GTK\2.4\lib\gtk-sharp-2.0\gtk-sharp.dll"
-                    AssemblyFolderKey = "hklm\gtk-sharp"
-                />
                 <Reference
                     Name = "Novell.CASA.CASAPolicy"
                     Project = "{636A9D7E-BFB5-4EB9-96F8-51FF85A98826}"
@@ -112,6 +94,42 @@
                     Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
+                <Reference
+                    Name = "pango-sharp"
+                    AssemblyName = "pango-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\pango-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "atk-sharp"
+                    AssemblyName = "atk-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\atk-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "gdk-sharp"
+                    AssemblyName = "gdk-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\gdk-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "glade-sharp"
+                    AssemblyName = "glade-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\glade-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "gtk-sharp"
+                    AssemblyName = "gtk-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\gtk-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "glib-sharp"
+                    AssemblyName = "glib-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\glib-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
             </References>
         </Build>
         <Files>

c_gui/CASAManager.csproj

@@ -94,36 +94,6 @@
                     Project = "{57CD94A2-5B4A-40C3-8189-CB760FB78357}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
-                <Reference
-                    Name = "atk-sharp"
-                    AssemblyName = "atk-sharp"
-                    HintPath = "..\extern\w32\gtk-sharp-2.0\atk-sharp.dll"
-                />
-                <Reference
-                    Name = "gdk-sharp"
-                    AssemblyName = "gdk-sharp"
-                    HintPath = "..\extern\w32\gtk-sharp-2.0\gdk-sharp.dll"
-                />
-                <Reference
-                    Name = "glade-sharp"
-                    AssemblyName = "glade-sharp"
-                    HintPath = "..\extern\w32\gtk-sharp-2.0\glade-sharp.dll"
-                />
-                <Reference
-                    Name = "glib-sharp"
-                    AssemblyName = "glib-sharp"
-                    HintPath = "..\extern\w32\gtk-sharp-2.0\glib-sharp.dll"
-                />
-                <Reference
-                    Name = "gtk-sharp"
-                    AssemblyName = "gtk-sharp"
-                    HintPath = "..\extern\w32\gtk-sharp-2.0\gtk-sharp.dll"
-                />
-                <Reference
-                    Name = "pango-sharp"
-                    AssemblyName = "pango-sharp"
-                    HintPath = "..\extern\w32\gtk-sharp-2.0\pango-sharp.dll"
-                />
                 <Reference
                     Name = "System.Windows.Forms"
                     AssemblyName = "System.Windows.Forms"
@@ -139,6 +109,42 @@
                     Project = "{E21DD887-22F4-4935-9851-409715F663B0}"
                     Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
                 />
+                <Reference
+                    Name = "pango-sharp"
+                    AssemblyName = "pango-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\pango-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "atk-sharp"
+                    AssemblyName = "atk-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\atk-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "gdk-sharp"
+                    AssemblyName = "gdk-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\gdk-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "glade-sharp"
+                    AssemblyName = "glade-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\glade-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "glib-sharp"
+                    AssemblyName = "glib-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\glib-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
+                <Reference
+                    Name = "gtk-sharp"
+                    AssemblyName = "gtk-sharp"
+                    HintPath = "C:\GTK\2.6\lib\gtk-sharp-2.0\gtk-sharp.dll"
+                    AssemblyFolderKey = "hklm\gtk-sharp"
+                />
             </References>
         </Build>
         <Files>

c_micasacache/link.w32

@@ -1,17 +1,13 @@
 LINK_DEF_BLD = \
 	echo "$(addprefix $(OBJDIR),$(notdir $(OBJS)))" > $(LINKDEF);\
-	echo "$(MSC)lib/kernel32.lib" >> $(LINKDEF);\
-	echo "$(MSC)lib/msvcrt.lib" >> $(LINKDEF);\
-	echo "$(MSC)lib/advapi32.lib" >> $(LINKDEF);\
-	echo "$(MSC)lib/ole32.lib" >> $(LINKDEF);\
 	echo "/LIBPATH:$(MSC)lib" >> $(LINKDEF);\
+	echo "kernel32.lib" >> $(LINKDEF);\
+	echo "advapi32.lib" >> $(LINKDEF);\
+	echo "ole32.lib" >> $(LINKDEF);\
 	echo "/DLL" >> $(LINKDEF);\
-	echo "/PDBTYPE:con" >> $(LINKDEF);\
 	echo "/OUT:$(BINDIR)$(basename $(notdir $@)).dll" >> $(LINKDEF);\
    	echo "/MAP:$(BINDIR)$(basename $(notdir $@)).map" >> $(LINKDEF);\
 	echo "/PDB:$(BINDIR)$(basename $(notdir $@)).pdb" >> $(LINKDEF);\
-	echo "/DEBUG" >> $(LINKDEF);\
-	echo "/DEBUGTYPE:BOTH"  >> $(LINKDEF);\
 	echo "/MACHINE:IX86" >> $(LINKDEF);\
 	echo "/SUBSYSTEM:WINDOWS" >> $(LINKDEF);\
 	echo "/INCREMENTAL:NO" >> $(LINKDEF);\
@@ -25,9 +21,8 @@ LINK_DEF_BLD = \
 	echo "/NODEFAULTLIB:wininet" >> $(LINKDEF);\
 	echo "/NODEFAULTLIB:uuid" >> $(LINKDEF);\
 	echo "/NODEFAULTLIB:user32" >> $(LINKDEF);\
-	echo "/NODEFAULTLIB:libcmt" >> $(LINKDEF);\
 	echo "/NODEFAULTLIB:libcmtd" >> $(LINKDEF);\
-	echo "/WARN:3" >> $(LINKDEF);\
+	echo "/NODEFAULTLIB:msvcr71.lib" >> $(LINKDEF);\
 	echo "/OPT:REF" >> $(LINKDEF);\
 	echo "/EXPORT:sscs_CacheRemoveSecretStore">> $(LINKDEF);\
 	echo "/EXPORT:sscs_CacheEnumerateKeychainIDs">> $(LINKDEF);\

c_micasad/micasad.csproj

@@ -300,7 +300,7 @@
                 />
                 <File
                     RelPath = "init\ProjectInstaller.cs"
-                    SubType = "Code"
+                    SubType = "Component"
                     BuildAction = "Compile"
                 />
                 <File
@@ -310,7 +310,7 @@
                 />
                 <File
                     RelPath = "init\WinSecretStoreClientService.cs"
-                    SubType = "Code"
+                    SubType = "Component"
                     BuildAction = "Compile"
                 />
                 <File

c_micasadk/link.w32

@@ -1,32 +1,30 @@
 LINK_DEF_BLD = \
 	echo "$(addprefix $(OBJDIR),$(notdir $(OBJS)))" > $(LINKDEF);\
 	echo "/LIBPATH:$(MSC)lib" >> $(LINKDEF);\
-	echo "/LIBPATH:$(MSC)platformsdk/lib" >> $(LINKDEF);\
 	echo "/LIBPATH:../lib/w32" >> $(LINKDEF);\
 	echo "kernel32.lib" >> $(LINKDEF);\
+	echo "advapi32.lib" >> $(LINKDEF);\
 	echo "ole32.lib" >> $(LINKDEF);\
 	echo "micasacache.lib" >> $(LINKDEF);\
 	echo "/DLL" >> $(LINKDEF);\
 	echo "/OUT:$(BINDIR)$(basename $(notdir $@)).dll" >> $(LINKDEF);\
    	echo "/MAP:$(BINDIR)$(basename $(notdir $@)).map" >> $(LINKDEF);\
-	echo "/DEBUG" >> $(LINKDEF);\
+	echo "/PDB:$(BINDIR)$(basename $(notdir $@)).pdb" >> $(LINKDEF);\
 	echo "/MACHINE:IX86" >> $(LINKDEF);\
 	echo "/SUBSYSTEM:WINDOWS" >> $(LINKDEF);\
 	echo "/INCREMENTAL:NO" >> $(LINKDEF);\
 	echo "/VERSION:$(BLD_VER)" >> $(LINKDEF);\
 	echo "/FIXED:NO" >> $(LINKDEF);\
-	echo "/NODEFAULTLIB:uuid" >> $(LINKDEF);\
 	echo "/NODEFAULTLIB:libc" >> $(LINKDEF);\
 	echo "/NODEFAULTLIB:oldnames" >> $(LINKDEF);\
-	echo "/NODEFAULTLIB:user32" >> $(LINKDEF);\
-	echo "/NODEFAULTLIB:gdi32" >> $(LINKDEF);\
-	echo "/NODEFAULTLIB:comdlg32" >> $(LINKDEF);\
-	echo "/NODEFAULTLIB:winspool" >> $(LINKDEF);\
-	echo "/NODEFAULTLIB:shell32" >> $(LINKDEF);\
 	echo "/NODEFAULTLIB:comctl32" >> $(LINKDEF);\
 	echo "/NODEFAULTLIB:olepro32" >> $(LINKDEF);\
-	echo "/NODEFAULTLIB:user32" >> $(LINKDEF);\
+	echo "/NODEFAULTLIB:oleaut32" >> $(LINKDEF);\
 	echo "/NODEFAULTLIB:wininet" >> $(LINKDEF);\
+	echo "/NODEFAULTLIB:uuid" >> $(LINKDEF);\
+	echo "/NODEFAULTLIB:user32" >> $(LINKDEF);\
+	echo "/NODEFAULTLIB:libcmtd" >> $(LINKDEF);\
+	echo "/NODEFAULTLIB:msvcr71.lib" >> $(LINKDEF);\
 	echo "/OPT:REF" >> $(LINKDEF);\
 	echo "/EXPORT:miCASA_CreateSHSHandle" >> $(LINKDEF);\
 	echo "/EXPORT:miCASA_DestroySHSHandle" >> $(LINKDEF);\

shsrc/wshsrc/mk-micasacache-ow

@@ -24,7 +24,7 @@ cd $BR/c_common
 COMMON_FILES=$(ls)
 (ln -f $COMMON_FILES $BR/c_micasacache)
 cd $BR/c_micasacache
-($BR/$GNU_I/make -I $BR/make -f makefile ROOT=$PR PLAT=w32 MODULE=client BLD_VER=\"$BLD_NO\" XTRA_CFLAGS="-D\"SSCS_WIN32_PLAT_F\" -D\"N_PLAT_CLIENT\"  -MTd -Od -Zi -GZ" XTRA=md $2 $3 $4 $5 $6)
+($BR/$GNU_I/make -I $BR/make -f makefile ROOT=$PR PLAT=w32 MODULE=client BLD_VER=\"$BLD_NO\" XTRA_CFLAGS="-D\"SSCS_WIN32_PLAT_F\" -D\"N_PLAT_CLIENT\"  -MT -Ox " XTRA=md $2 $3 $4 $5 $6)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)

shsrc/wshsrc/mk-micasadk-ow

@@ -24,7 +24,7 @@ cd $BR/c_common
 COMMON_FILES=$(ls)
 (ln -f $COMMON_FILES $BR/c_micasadk)
 cd $BR/c_micasadk
-($BR/$GNU_I/make -I $BR/make -f makefile ROOT=$PR PLAT=w32 MODULE=client BLD_VER=\"$BLD_NO\" XTRA_CFLAGS="-D\"N_PLAT_CLIENT\"  -MD -Od -Z7" XTRA=md $2 $3 $4 $5 $6)
+($BR/$GNU_I/make -I $BR/make -f makefile ROOT=$PR PLAT=w32 MODULE=client BLD_VER=\"$BLD_NO\" XTRA_CFLAGS="-D\"N_PLAT_CLIENT\"  -MT -Ox " XTRA=md $2 $3 $4 $5 $6)
 RCODE=$?
 rm -f $COMMON_FILES
 if(test $RCODE != 0)

vs_solutions/CASAInstall/CASA.vdproj

@@ -13,6 +13,12 @@
 "SccProvider" = "8:"
     "Hierarchy"
     {
+        "Entry"
+        {
+        "MsmKey" = "8:_0532B715CB414B478EF7F1C249E501E8"
+        "OwnerKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
         "Entry"
         {
         "MsmKey" = "8:_1759661D2FDA4F2E95C0E7FC36CFA63C"
@@ -21,6 +27,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_88EF6178AF974BB3BA6BDD14F8FE5A23"
+        "OwnerKey" = "8:_D1641051214046F78EDF37DC13C414ED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -33,18 +45,6 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_B7B1DB5DD09B4D36B2A8C353C94A7297"
-        "OwnerKey" = "8:_8A1A4BA980A9443DBCD4DE4ACDA8F19A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_B7B1DB5DD09B4D36B2A8C353C94A7297"
-        "OwnerKey" = "8:_D1641051214046F78EDF37DC13C414ED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
         "MsmKey" = "8:_D1641051214046F78EDF37DC13C414ED"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -250,13 +250,13 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:CASA"
-        "ProductCode" = "8:{57440238-DFAE-411E-906D-B73B7183B07F}"
+        "ProductCode" = "8:{B5628252-6539-4F60-943B-974088A26847}"
-        "PackageCode" = "8:{EED56817-5E66-4562-AECB-DB0A43716A8D}"
+        "PackageCode" = "8:{92C4EA00-0131-44CA-81A8-7CC0A258E667}"
         "UpgradeCode" = "8:{DFD8B8A0-EA51-4202-831C-7CD2B90A63AE}"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
-        "ProductVersion" = "8:1.5.132"
+        "ProductVersion" = "8:1.5.146"
         "Manufacturer" = "8:Novell"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -730,16 +730,24 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_B7B1DB5DD09B4D36B2A8C353C94A7297"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_0532B715CB414B478EF7F1C249E501E8"
             {
             "UseDynamicProperties" = "11:TRUE"
             "IsDependency" = "11:TRUE"
             "SourcePath" = "8:dotnetfxredist_x86.msm"
-                "Properties"
+            "LanguageId" = "3:0"
-                {
+            "Exclude" = "11:FALSE"
+            "Folder" = "8:"
+            "Feature" = "8:"
+            "IsolateTo" = "8:"
             }
-            "LanguageId" = "3:1033"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_88EF6178AF974BB3BA6BDD14F8FE5A23"
-            "Exclude" = "11:TRUE"
+            {
+            "UseDynamicProperties" = "11:TRUE"
+            "IsDependency" = "11:TRUE"
+            "SourcePath" = "8:dotnetfxredist_x86.msm"
+            "LanguageId" = "3:0"
+            "Exclude" = "11:FALSE"
             "Folder" = "8:"
             "Feature" = "8:"
             "IsolateTo" = "8:"

vs_solutions/miCASA-msm/miCASA-msm.vdproj

@@ -87,86 +87,8 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
+        "MsmKey" = "8:_103FD9A55BF94171BE3E7FDA2CDF87C6"
-        "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
+        "OwnerKey" = "8:_UNDEFINED"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_53CD7D10E6CC45EF83D4C371BF5BECEF"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_8039E843D06434022A08C6B96797B187"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_F9EE246A22C88B0E40149A5C39612EE3"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_A47EDC5C7F17B89FA528AC6AF5E27356"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_240CCF597BBD08EDB302CC1681F4D4D0"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_E5A85B0EC9EB553B9E0648781BD250E3"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_F49D94B7153A1DD540BF6CA5C348B06F"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_0453CF261E6BA843B51FC502E70FF7FC"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_58D5C694323CA4E1C71E2FD5E4F2CD6F"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_0CF75D920850F8D1BCF2BDA55935489A"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_41D0728D857296857EEBAE2A2F71F38C"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_036E4CAC185367DD377EA8CBE06E1841"
-        "MsmSig" = "8:_UNDEFINED"
-        }
-        "Entry"
-        {
-        "MsmKey" = "8:_17A893E0737E4EA38201050E23256EBD"
-        "OwnerKey" = "8:_29EBB88ADB672423B03C04F3E8128BF0"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -387,6 +309,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_B2FF8C71BE554A958152114358037BB3"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_B518A6FBE9E147398154C99B22D364B6"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -405,6 +333,90 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_00A157D73BD142028C639E9E59679CF0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_53CD7D10E6CC45EF83D4C371BF5BECEF"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_8039E843D06434022A08C6B96797B187"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_F9EE246A22C88B0E40149A5C39612EE3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_A47EDC5C7F17B89FA528AC6AF5E27356"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_240CCF597BBD08EDB302CC1681F4D4D0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_E5A85B0EC9EB553B9E0648781BD250E3"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_F49D94B7153A1DD540BF6CA5C348B06F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_0453CF261E6BA843B51FC502E70FF7FC"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_58D5C694323CA4E1C71E2FD5E4F2CD6F"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_0CF75D920850F8D1BCF2BDA55935489A"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_41D0728D857296857EEBAE2A2F71F38C"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_036E4CAC185367DD377EA8CBE06E1841"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_CBE2E2777EA046AEA5A45A19DB58C7E6"
+        "OwnerKey" = "8:_29EBB88ADB672423B03C04F3E8128BF0"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_CC926AC5EE2C4920B2395B7DE6C4DAA2"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -513,6 +525,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_FFCD28DFFAE247149672C7FAE8B75D1A"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_FFD9E1013ED54F3F9FDC07B341BB6432"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -728,7 +746,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.0.2132.25719, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.Common, Version=1.0.2141.23507, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_0CF75D920850F8D1BCF2BDA55935489A"
@@ -775,6 +793,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_103FD9A55BF94171BE3E7FDA2CDF87C6"
+            {
+            "SourcePath" = "8:..\\..\\doc\\License.txt"
+            "TargetName" = "8:License.txt"
+            "Tag" = "8:"
+            "Folder" = "8:_03838E82B8D44391A6087F49B760E71C"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_1A4CE567CBB9469C9EAF7D6B15A1C2D6"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\CASAicons.ico"
@@ -941,7 +979,7 @@
             {
             "AssemblyRegister" = "3:1"
             "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.0.2132.25720, Culture=neutral"
+            "AssemblyAsmDisplayName" = "8:Novell.CASA.miCASAWrapper, Version=1.0.2141.23508, Culture=neutral"
                 "ScatterAssemblies"
                 {
                     "_41D0728D857296857EEBAE2A2F71F38C"
@@ -1341,6 +1379,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_B2FF8C71BE554A958152114358037BB3"
+            {
+            "SourcePath" = "8:..\\..\\doc\\Readme.txt"
+            "TargetName" = "8:Readme.txt"
+            "Tag" = "8:"
+            "Folder" = "8:_03838E82B8D44391A6087F49B760E71C"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_B518A6FBE9E147398154C99B22D364B6"
             {
             "SourcePath" = "8:..\\..\\c_gui\\images\\keyring-logo.png"
@@ -1654,6 +1712,26 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
+            "{A582A373-4685-4296-BEFE-614B80A702C3}:_FFCD28DFFAE247149672C7FAE8B75D1A"
+            {
+            "SourcePath" = "8:..\\..\\doc\\CASA_Reference_Guide.pdf"
+            "TargetName" = "8:CASA_Reference_Guide.pdf"
+            "Tag" = "8:"
+            "Folder" = "8:_03838E82B8D44391A6087F49B760E71C"
+            "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:"
+            }
             "{A582A373-4685-4296-BEFE-614B80A702C3}:_FFD9E1013ED54F3F9FDC07B341BB6432"
             {
             "SourcePath" = "8:C:\\WINDOWS\\system32\\regsvc.dll"
@@ -1743,6 +1821,17 @@
                             "Property" = "8:_115A38F3DC8940EF9053628253BCFD3A"
                                 "Folders"
                                 {
+                                    "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_03838E82B8D44391A6087F49B760E71C"
+                                    {
+                                    "Name" = "8:doc"
+                                    "AlwaysCreate" = "11:FALSE"
+                                    "Condition" = "8:"
+                                    "Transitive" = "11:FALSE"
+                                    "Property" = "8:_CE495B67F3E4457599AEB158422AB6FB"
+                                        "Folders"
+                                        {
+                                        }
+                                    }
                                     "{F27BD5C5-A65D-4608-96D4-7C5DA1F76302}:_1236C5CCF7794A1F9F9629930BC2392B"
                                     {
                                     "Name" = "8:help"
@@ -1821,7 +1910,7 @@
         }
         "MergeModule"
         {
-            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_17A893E0737E4EA38201050E23256EBD"
+            "{35A69C6E-5BA4-440D-803D-762B59A45393}:_CBE2E2777EA046AEA5A45A19DB58C7E6"
             {
             "UseDynamicProperties" = "11:FALSE"
             "IsDependency" = "11:TRUE"