#At file:///H:/connector_net/trunk/ based on revid:vvaintroub@strippedsblampk
793 Vladislav Vaintroub 2009-11-04 [merge]
merge
modified:
CHANGES
MySql.Data.Entity/Tests/DataTypeTests.cs
MySql.Data.Entity/Tests/Properties/schema.sql
MySql.Data.Entity/Tests/TestModel.Designer.cs
MySql.Data.Entity/Tests/TestModel.csdl
MySql.Data.Entity/Tests/TestModel.msl
MySql.Data.Entity/Tests/TestModel.ssdl
MySql.Data/Provider/MySql.Data.csproj
MySql.Data/Provider/Source/Connection.cs
MySql.Data/Provider/Source/command.cs
MySql.Data/Provider/Source/parameter.cs
MySql.Data/Tests/MySql.Data.Tests.csproj
MySql.Data/Tests/Source/CommandTests.cs
MySql.Web/Providers/MySql.Web.csproj
MySql.Web/Tests/MySql.Web.Tests.csproj
=== modified file 'CHANGES'
--- a/CHANGES 2009-11-04 15:45:47 +0000
+++ b/CHANGES 2009-11-04 15:47:24 +0000
@@ -7,6 +7,7 @@ Version 6.2.1
considered a guid if it has a *character* length of 36, not a *byte* length of 36 (bug #47985)
- fixed unsigned types in views when used as entities (bug # 47872)
- now exposing the MySqlDecimal type along with GetMySqlDecimal methods on data reader (bug #48100)
+- applied user-suggested patch to enable type-safe cloning (bug #48460)
Version 6.2.0
- we now cleanup idle connections in the pool, if they were not used for too long
=== modified file 'MySql.Data.Entity/Tests/DataTypeTests.cs'
--- a/MySql.Data.Entity/Tests/DataTypeTests.cs 2009-09-01 00:49:03 +0000
+++ b/MySql.Data.Entity/Tests/DataTypeTests.cs 2009-11-03 16:10:05 +0000
@@ -129,5 +129,20 @@ namespace MySql.Data.Entity.Tests
Assert.AreEqual(now, dt);
}
}
+
+ /// <summary>
+ /// Bug #48417 Invalid cast from 'System.String' to 'System.Guid'
+ /// </summary>
+ [Test]
+ public void GuidType()
+ {
+ using (testEntities context = new testEntities())
+ {
+ DataTypeTest dtt = context.DataTypeTests.First();
+ string guidAsChar = dtt.idAsChar;
+ Assert.AreEqual(guidAsChar, dtt.id.ToString());
+ Assert.AreEqual(guidAsChar, dtt.id2.ToString());
+ }
+ }
}
}
\ No newline at end of file
=== modified file 'MySql.Data.Entity/Tests/Properties/schema.sql'
--- a/MySql.Data.Entity/Tests/Properties/schema.sql 2009-08-10 21:17:20 +0000
+++ b/MySql.Data.Entity/Tests/Properties/schema.sql 2009-11-03 16:10:05 +0000
@@ -8,7 +8,7 @@ DROP TABLE IF EXISTS Stores;
DROP TABLE IF EXISTS Books;
DROP TABLE IF EXISTS Authors;
DROP TABLE IF EXISTS Publishers;
-
+DROP TABLE IF EXISTS DataTypeTests;
CREATE TABLE Employees(
Id INT NOT NULL PRIMARY KEY,
@@ -132,3 +132,12 @@ INSERT INTO Books VALUES (1, 'Debt of Ho
INSERT INTO Books VALUES (2, 'Insomnia', 350, 2, 1);
INSERT INTO Books VALUES (3, 'Rainmaker', 475, 3, 1);
+SET @guid=UUID();
+CREATE TABLE DataTypeTests(
+ id CHAR(36) CHARACTER SET utf8 NOT NULL PRIMARY KEY,
+ id2 CHAR(36) BINARY NOT NULL,
+ idAsChar VARCHAR(36));
+INSERT INTO DataTypeTests VALUES (@guid, @guid, @guid);
+INSERT INTO DataTypeTests VALUES ('481A6506-03A3-4ef9-A05A-B247E75A2FB4',
+ '481A6506-03A3-4ef9-A05A-B247E75A2FB4', '481A6506-03A3-4ef9-A05A-B247E75A2FB4');
+
=== modified file 'MySql.Data.Entity/Tests/TestModel.Designer.cs'
--- a/MySql.Data.Entity/Tests/TestModel.Designer.cs 2009-10-28 16:02:29 +0000
+++ b/MySql.Data.Entity/Tests/TestModel.Designer.cs 2009-11-03 16:10:05 +0000
@@ -15,7 +15,7 @@ //-----------------------------------
[assembly: global::System.Data.Objects.DataClasses.EdmRelationshipAttribute("testModel", "FK_Books_Publishers", "Publishers", global::System.Data.Metadata.Edm.RelationshipMultiplicity.One, typeof(MySql.Data.Entity.Tests.Publisher), "Books", global::System.Data.Metadata.Edm.RelationshipMultiplicity.Many, typeof(MySql.Data.Entity.Tests.Book))]
// Original file name:
-// Generation date: 10/28/2009 11:00:34 AM
+// Generation date: 11/3/2009 9:33:22 AM
namespace MySql.Data.Entity.Tests
{
@@ -185,6 +185,21 @@ namespace MySql.Data.Entity.Tests
}
private global::System.Data.Objects.ObjectQuery<Publisher> _Publishers;
/// <summary>
+ /// There are no comments for DataTypeTests in the schema.
+ /// </summary>
+ public global::System.Data.Objects.ObjectQuery<DataTypeTest> DataTypeTests
+ {
+ get
+ {
+ if ((this._DataTypeTests == null))
+ {
+ this._DataTypeTests = base.CreateQuery<DataTypeTest>("[DataTypeTests]");
+ }
+ return this._DataTypeTests;
+ }
+ }
+ private global::System.Data.Objects.ObjectQuery<DataTypeTest> _DataTypeTests;
+ /// <summary>
/// There are no comments for Employees in the schema.
/// </summary>
public void AddToEmployees(Employee employee)
@@ -247,6 +262,13 @@ namespace MySql.Data.Entity.Tests
{
base.AddObject("Publishers", publisher);
}
+ /// <summary>
+ /// There are no comments for DataTypeTests in the schema.
+ /// </summary>
+ public void AddToDataTypeTests(DataTypeTest dataTypeTest)
+ {
+ base.AddObject("DataTypeTests", dataTypeTest);
+ }
}
/// <summary>
/// There are no comments for testModel.Employee in the schema.
@@ -1654,4 +1676,97 @@ namespace MySql.Data.Entity.Tests
}
}
}
+ /// <summary>
+ /// There are no comments for testModel.DataTypeTest in the schema.
+ /// </summary>
+ /// <KeyProperties>
+ /// id
+ /// </KeyProperties>
+ [global::System.Data.Objects.DataClasses.EdmEntityTypeAttribute(NamespaceName="testModel", Name="DataTypeTest")]
+ [global::System.Runtime.Serialization.DataContractAttribute(IsReference=true)]
+ [global::System.Serializable()]
+ public partial class DataTypeTest : global::System.Data.Objects.DataClasses.EntityObject
+ {
+ /// <summary>
+ /// Create a new DataTypeTest object.
+ /// </summary>
+ /// <param name="id">Initial value of id.</param>
+ /// <param name="id2">Initial value of id2.</param>
+ public static DataTypeTest CreateDataTypeTest(global::System.Guid id, global::System.Guid id2)
+ {
+ DataTypeTest dataTypeTest = new DataTypeTest();
+ dataTypeTest.id = id;
+ dataTypeTest.id2 = id2;
+ return dataTypeTest;
+ }
+ /// <summary>
+ /// There are no comments for Property id in the schema.
+ /// </summary>
+ [global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute(EntityKeyProperty=true, IsNullable=false)]
+ [global::System.Runtime.Serialization.DataMemberAttribute()]
+ public global::System.Guid id
+ {
+ get
+ {
+ return this._id;
+ }
+ set
+ {
+ this.OnidChanging(value);
+ this.ReportPropertyChanging("id");
+ this._id = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value);
+ this.ReportPropertyChanged("id");
+ this.OnidChanged();
+ }
+ }
+ private global::System.Guid _id;
+ partial void OnidChanging(global::System.Guid value);
+ partial void OnidChanged();
+ /// <summary>
+ /// There are no comments for Property id2 in the schema.
+ /// </summary>
+ [global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute(IsNullable=false)]
+ [global::System.Runtime.Serialization.DataMemberAttribute()]
+ public global::System.Guid id2
+ {
+ get
+ {
+ return this._id2;
+ }
+ set
+ {
+ this.Onid2Changing(value);
+ this.ReportPropertyChanging("id2");
+ this._id2 = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value);
+ this.ReportPropertyChanged("id2");
+ this.Onid2Changed();
+ }
+ }
+ private global::System.Guid _id2;
+ partial void Onid2Changing(global::System.Guid value);
+ partial void Onid2Changed();
+ /// <summary>
+ /// There are no comments for Property idAsChar in the schema.
+ /// </summary>
+ [global::System.Data.Objects.DataClasses.EdmScalarPropertyAttribute()]
+ [global::System.Runtime.Serialization.DataMemberAttribute()]
+ public string idAsChar
+ {
+ get
+ {
+ return this._idAsChar;
+ }
+ set
+ {
+ this.OnidAsCharChanging(value);
+ this.ReportPropertyChanging("idAsChar");
+ this._idAsChar = global::System.Data.Objects.DataClasses.StructuralObject.SetValidValue(value, true);
+ this.ReportPropertyChanged("idAsChar");
+ this.OnidAsCharChanged();
+ }
+ }
+ private string _idAsChar;
+ partial void OnidAsCharChanging(string value);
+ partial void OnidAsCharChanged();
+ }
}
=== modified file 'MySql.Data.Entity/Tests/TestModel.csdl'
--- a/MySql.Data.Entity/Tests/TestModel.csdl 2009-09-01 00:49:03 +0000
+++ b/MySql.Data.Entity/Tests/TestModel.csdl 2009-11-03 16:10:05 +0000
@@ -27,6 +27,7 @@ <?xml version="1.0" encoding="utf-8"?
<End Role="Publishers" EntitySet="Publishers" />
<End Role="Books" EntitySet="Books" />
</AssociationSet>
+ <EntitySet Name="DataTypeTests" EntityType="testModel.DataTypeTest"/>
</EntityContainer>
<EntityType Name="Employee">
@@ -155,4 +156,13 @@ <End Role="Publishers" Type="testModel.Publisher" Multiplicity="1" />
<End Role="Books" Type="testModel.Book" Multiplicity="*" />
</Association>
+
+ <EntityType Name="DataTypeTest">
+ <Key>
+ <PropertyRef Name="id"/>
+ </Key>
+ <Property Name="id" Type="Guid" Nullable="false"/>
+ <Property Name="id2" Type="Guid" Nullable ="false"/>
+ <Property Name="idAsChar" Type="String" Nullable="true"/>
+ </EntityType>
</Schema>
=== modified file 'MySql.Data.Entity/Tests/TestModel.msl'
--- a/MySql.Data.Entity/Tests/TestModel.msl 2009-08-10 21:17:20 +0000
+++ b/MySql.Data.Entity/Tests/TestModel.msl 2009-11-03 16:10:05 +0000
@@ -174,7 +174,16 @@ <?xml version="1.0" encoding="utf-8"?
<EndProperty Name="Books">
<ScalarProperty Name="Id" ColumnName="Id" />
</EndProperty>
- </AssociationSetMapping>
-
+ </AssociationSetMapping>
+
+ <EntitySetMapping Name="DataTypeTests">
+ <EntityTypeMapping TypeName="testModel.DataTypeTest">
+ <MappingFragment StoreEntitySet="DataTypeTests">
+ <ScalarProperty Name="id" ColumnName="id" />
+ <ScalarProperty Name="id2" ColumnName="id2" />
+ <ScalarProperty Name="idAsChar" ColumnName="idAsChar"/>
+ </MappingFragment>
+ </EntityTypeMapping>
+ </EntitySetMapping>
</EntityContainerMapping>
</Mapping>
\ No newline at end of file
=== modified file 'MySql.Data.Entity/Tests/TestModel.ssdl'
--- a/MySql.Data.Entity/Tests/TestModel.ssdl 2009-09-01 00:49:03 +0000
+++ b/MySql.Data.Entity/Tests/TestModel.ssdl 2009-11-03 16:10:05 +0000
@@ -27,6 +27,7 @@ <?xml version="1.0" encoding="utf-8"?
<End Role="Publishers" EntitySet="Publishers" />
<End Role="Books" EntitySet="Books" />
</AssociationSet>
+ <EntitySet Name="DataTypeTests" EntityType="testModel.Store.DataTypeTests"/>
</EntityContainer>
<EntityType Name="Employees">
@@ -199,4 +200,12 @@ <?xml version="1.0" encoding="utf-8"?
<Parameter Name="theage" Type="int" Mode="In" />
</Function>
+ <EntityType Name="DataTypeTests">
+ <Key>
+ <PropertyRef Name="id"/>
+ </Key>
+ <Property Name="id" Type="guid" Nullable="false"/>
+ <Property Name="id2" Type="guid" Nullable ="false"/>
+ <Property Name="idAsChar" Type="varchar" MaxLength="36" Nullable="true"/>
+ </EntityType>
</Schema>
\ No newline at end of file
=== modified file 'MySql.Data/Provider/MySql.Data.csproj'
--- a/MySql.Data/Provider/MySql.Data.csproj 2009-10-09 21:44:54 +0000
+++ b/MySql.Data/Provider/MySql.Data.csproj 2009-11-03 18:47:29 +0000
@@ -260,7 +260,7 @@ <?xml version="1.0" encoding="utf-8"?
<ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
- <ProductName>.NET Framework Client Profile</ProductName>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
@@ -283,6 +283,11 @@ <?xml version="1.0" encoding="utf-8"?
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>true</Install>
</BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
+ <Visible>False</Visible>
+ <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
<Visible>False</Visible>
<ProductName>Windows Installer 3.1</ProductName>
=== modified file 'MySql.Data/Provider/Source/Connection.cs'
--- a/MySql.Data/Provider/Source/Connection.cs 2009-10-22 15:27:25 +0000
+++ b/MySql.Data/Provider/Source/Connection.cs 2009-11-03 18:00:36 +0000
@@ -498,7 +498,7 @@ namespace MySql.Data.MySqlClient
/// Creates a new MySqlConnection object with the exact same ConnectionString value
/// </summary>
/// <returns>A cloned MySqlConnection object</returns>
- object ICloneable.Clone()
+ public MySqlConnection Clone()
{
MySqlConnection clone = new MySqlConnection();
string connectionString = settings.ConnectionString;
@@ -507,6 +507,11 @@ namespace MySql.Data.MySqlClient
return clone;
}
+ object ICloneable.Clone()
+ {
+ return this.Clone();
+ }
+
#endregion
#region IDisposeable
=== modified file 'MySql.Data/Provider/Source/command.cs'
--- a/MySql.Data/Provider/Source/command.cs 2009-10-22 15:27:25 +0000
+++ b/MySql.Data/Provider/Source/command.cs 2009-11-03 18:00:36 +0000
@@ -703,24 +703,32 @@ namespace MySql.Data.MySqlClient
#endregion
#region ICloneable
+
/// <summary>
/// Creates a clone of this MySqlCommand object. CommandText, Connection, and Transaction properties
/// are included as well as the entire parameter list.
/// </summary>
/// <returns>The cloned MySqlCommand object</returns>
- object ICloneable.Clone()
+ public MySqlCommand Clone()
{
MySqlCommand clone = new MySqlCommand(cmdText, connection, curTransaction);
clone.CommandType = CommandType;
clone.CommandTimeout = CommandTimeout;
clone.batchableCommandText = batchableCommandText;
+ clone.UpdatedRowSource = UpdatedRowSource;
foreach (MySqlParameter p in parameters)
{
- clone.Parameters.Add((p as ICloneable).Clone());
+ clone.Parameters.Add(p.Clone());
}
return clone;
}
+
+ object ICloneable.Clone()
+ {
+ return this.Clone();
+ }
+
#endregion
#region Batching support
=== modified file 'MySql.Data/Provider/Source/parameter.cs'
--- a/MySql.Data/Provider/Source/parameter.cs 2009-07-13 18:01:18 +0000
+++ b/MySql.Data/Provider/Source/parameter.cs 2009-11-03 17:58:32 +0000
@@ -608,7 +608,7 @@ namespace MySql.Data.MySqlClient
#region ICloneable
- object ICloneable.Clone()
+ public MySqlParameter Clone()
{
MySqlParameter clone = new MySqlParameter(paramName, mySqlDbType, direction,
sourceColumn, sourceVersion, paramValue);
@@ -617,6 +617,11 @@ namespace MySql.Data.MySqlClient
return clone;
}
+ object ICloneable.Clone()
+ {
+ return this.Clone();
+ }
+
#endregion
/// <summary>
=== modified file 'MySql.Data/Tests/MySql.Data.Tests.csproj'
--- a/MySql.Data/Tests/MySql.Data.Tests.csproj 2009-10-14 12:59:53 +0000
+++ b/MySql.Data/Tests/MySql.Data.Tests.csproj 2009-11-03 18:47:29 +0000
@@ -16,6 +16,21 @@ <?xml version="1.0" encoding="utf-8"?
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -98,6 +113,28 @@ <?xml version="1.0" encoding="utf-8"?
<ItemGroup>
<EmbeddedResource Include="Properties\Setup.sql" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
+ <Visible>False</Visible>
+ <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
=== modified file 'MySql.Data/Tests/Source/CommandTests.cs'
--- a/MySql.Data/Tests/Source/CommandTests.cs 2009-09-24 21:59:05 +0000
+++ b/MySql.Data/Tests/Source/CommandTests.cs 2009-11-03 18:00:36 +0000
@@ -128,9 +128,9 @@ namespace MySql.Data.MySqlClient.Tests
[Test]
public void CloneCommand()
{
- IDbCommand cmd = new MySqlCommand();
- IDbCommand cmd2 = ((ICloneable)cmd).Clone() as IDbCommand;
- cmd2.ToString();
+ MySqlCommand cmd = new MySqlCommand();
+ MySqlCommand newCommand = cmd.Clone();
+ IDbCommand newCommand2 = (IDbCommand)(cmd as ICloneable).Clone();
}
[Test]
=== modified file 'MySql.Web/Providers/MySql.Web.csproj'
--- a/MySql.Web/Providers/MySql.Web.csproj 2009-09-16 20:23:34 +0000
+++ b/MySql.Web/Providers/MySql.Web.csproj 2009-11-03 18:47:29 +0000
@@ -19,6 +19,21 @@ <?xml version="1.0" encoding="utf-8"?
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -60,6 +75,8 @@ <?xml version="1.0" encoding="utf-8"?
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
</Compile>
<Compile Include="Source\Application.cs" />
<Compile Include="Source\Install.cs">
@@ -93,6 +110,28 @@ <?xml version="1.0" encoding="utf-8"?
<Name>MySql.Data</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
+ <Visible>False</Visible>
+ <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
=== modified file 'MySql.Web/Tests/MySql.Web.Tests.csproj'
--- a/MySql.Web/Tests/MySql.Web.Tests.csproj 2009-09-16 20:23:34 +0000
+++ b/MySql.Web/Tests/MySql.Web.Tests.csproj 2009-11-03 18:47:29 +0000
@@ -16,6 +16,21 @@ <?xml version="1.0" encoding="utf-8"?
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -71,6 +86,28 @@ <?xml version="1.0" encoding="utf-8"?
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.VisualBasic.PowerPacks.10.0">
+ <Visible>False</Visible>
+ <ProductName>Microsoft Visual Basic PowerPacks 10.0</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Attachment: [text/bzr-bundle] bzr/vvaintroub@mysql.com-20091104154724-pdhe93k2qdjqcgrp.bundle
| Thread |
|---|
| • bzr commit into connector-net-trunk branch (vvaintroub:793) | Vladislav Vaintroub | 4 Nov |
