MySQL Lists are EOL. Please join:

List:Internals« Previous MessageNext Message »
From:rburnett Date:September 27 2005 2:19pm
Subject:Connector/NET commit: r184 - in branches/1.0: Installer TestSuite mysqlclient
View as plain text  
Modified:
   branches/1.0/Installer/main.wxs
   branches/1.0/TestSuite/AssemblyInfo.cs
   branches/1.0/mysqlclient/AssemblyInfo.cs
Log:
main.wxs - removed extra backslash from vs registry entries
mysqlclient/AssemblyInfo.cs - updated version to 1.0.6
TestSuite/AssemblyInfo.cs - updated version to 1.0.6

Modified: branches/1.0/Installer/main.wxs
===================================================================
--- branches/1.0/Installer/main.wxs	2005-09-27 02:29:23 UTC (rev 183)
+++ branches/1.0/Installer/main.wxs	2005-09-27 14:19:42 UTC (rev 184)
@@ -25,13 +25,13 @@
 				<Directory Id="Bin11" Name="NET11" LongName=".NET 1.1">
 					<Component Id="Net11" Guid="77e80230-2238-49be-a4ed-49b5213c9a3a">
 						<File Id="CoreBin11" Name="MD11" LongName="MySql.Data.dll" src="..\bin\net-1.1\$(var.build)\mysql.data.dll" DiskId="1"  />
-						<Registry Id="vs71registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\7.1\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)" Type="string" KeyPath="yes" Value="[TARGETDIR]\bin\.NET 1.1\" />
+						<Registry Id="vs71registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\7.1\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)" Type="string" KeyPath="yes" Value="[TARGETDIR]bin\.NET 1.1\" />
 					</Component>
 				</Directory>
 				<Directory Id="Bin10" Name="NET10" LongName=".NET 1.0">
 					<Component Id="Net10" Guid="b18df028-1dfb-4577-95f6-2c504df41040">
 						<File Id="CoreBin10" Name="MD10" LongName="MySql.Data.dll" src="..\bin\net-1.0\$(var.build)\mysql.data.dll" DiskId="1" />
-						<Registry Id="vs70registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\7.0\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)" Type="string" KeyPath="yes" Value="[TARGETDIR]\bin\.NET 1.0\" />
+						<Registry Id="vs70registry" Root="HKLM" Key="Software\Microsoft\VisualStudio\7.0\AssemblyFolders\MySQL Connector Net $(var.ProductVersion)" Type="string" KeyPath="yes" Value="[TARGETDIR]bin\.NET 1.0\" />
 					</Component>
 				</Directory>
 				<Directory Id="Mono10" Name="MONO10" LongName="Mono 1.0">

Modified: branches/1.0/TestSuite/AssemblyInfo.cs
===================================================================
--- branches/1.0/TestSuite/AssemblyInfo.cs	2005-09-27 02:29:23 UTC (rev 183)
+++ branches/1.0/TestSuite/AssemblyInfo.cs	2005-09-27 14:19:42 UTC (rev 184)
@@ -46,7 +46,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.0.5.*")]
+[assembly: AssemblyVersion("1.0.6.*")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 

Modified: branches/1.0/mysqlclient/AssemblyInfo.cs
===================================================================
--- branches/1.0/mysqlclient/AssemblyInfo.cs	2005-09-27 02:29:23 UTC (rev 183)
+++ branches/1.0/mysqlclient/AssemblyInfo.cs	2005-09-27 14:19:42 UTC (rev 184)
@@ -50,7 +50,7 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.0.5.*")]
+[assembly: AssemblyVersion("1.0.6.*")]
 
 //
 // In order to sign your assembly you must specify a key to use. Refer to the 
@@ -79,6 +79,6 @@
 //
 [assembly: AssemblyDelaySign(false)]
 #if FINAL
-[assembly: AssemblyKeyFile(@"d:\work\connector-net\cnet.snk")]
+[assembly: AssemblyKeyFile(@"..\..\..\..\..\..\cnet.snk")]
 #endif
 [assembly: AssemblyKeyName("")]

Thread
Connector/NET commit: r184 - in branches/1.0: Installer TestSuite mysqlclientrburnett27 Sep