Moved the core projects back to netstandard1.3

mysql · Apr 26, 2017 · e0ba75b · e0ba75b
1 parent 480cdad
commit e0ba75b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 48 deletions.
diff --git a/...re/src/MySql.Data.EntityFrameworkCore.Design/MySql.Data.EntityFrameworkCore.Design.csproj b/...re/src/MySql.Data.EntityFrameworkCore.Design/MySql.Data.EntityFrameworkCore.Design.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <VersionPrefix>6.10.2</VersionPrefix>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard1.3</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DelaySign>true</DelaySign>

diff --git a/EntityFrameworkCore/src/MySql.Data.EntityFrameworkCore/MySql.Data.EntityFrameworkCore.csproj b/EntityFrameworkCore/src/MySql.Data.EntityFrameworkCore/MySql.Data.EntityFrameworkCore.csproj
@@ -6,7 +6,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <VersionPrefix>6.10.2</VersionPrefix>
     <Authors>Oracle</Authors>
-    <TargetFrameworks>net452;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard1.3</TargetFrameworks>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <DelaySign>true</DelaySign>
     <AssemblyName>MySql.Data.EntityFrameworkCore</AssemblyName>

diff --git a/MySQL.Data/src/MySql.Data.csproj b/MySQL.Data/src/MySql.Data.csproj
@@ -7,7 +7,7 @@
     <VersionPrefix>6.10.2</VersionPrefix>
     <Authors>Oracle</Authors>
     <AssemblyName>MySql.Data</AssemblyName>
-    <TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;net452</TargetFrameworks>
     <PackageId>MySql.Data</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageReleaseNotes>Review ReleaseNotes.txt for details.</PackageReleaseNotes>
@@ -58,7 +58,7 @@
     </None>
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
     <DefineConstants>$(DefineConstants);NET_CORE;NETCORE10</DefineConstants>
   </PropertyGroup>
 
@@ -81,7 +81,7 @@
     <EmbeddedResource Include="keywords.txt;Resources.resx;ResourcesX.resx;Properties\ReservedWords.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.3'">
     <Compile Remove="**/net452/*.cs;Replication/*.cs" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.1" />
     <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />

diff --git a/MySQL.Data/src/MySqlStream.cs b/MySQL.Data/src/MySqlStream.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2016, Oracle and/or its affiliates. All rights reserved.
+// Copyright � 2004, 2016, Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -73,7 +73,7 @@ public MySqlStream(Stream baseStream, Encoding encoding, bool compress)
       else
         stream = timedStream;
 
-      inStream = new BufferedStream(stream);
+      inStream = stream;
       outStream = stream;
     }
 

diff --git a/MySQL.Data/src/MysqlDefs.cs b/MySQL.Data/src/MysqlDefs.cs
@@ -1,4 +1,4 @@
-// Copyright © 2004, 2016 Oracle and/or its affiliates. All rights reserved.
+// Copyright � 2004, 2016 Oracle and/or its affiliates. All rights reserved.
 //
 // MySQL Connector/NET is licensed under the terms of the GPLv2
 // <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most 
@@ -468,27 +468,6 @@ public string ClientVersion
     public string Platform => Is64BitOS() ? "x86_64" : "x86_32";
 #endif
 
-    [DisplayName("program_name")]
-    public string ProgramName
-    {
-      get
-      {
-        string name = Environment.GetCommandLineArgs()[0];
-        try
-        {
-          string path = name.Trim('"');
-          name = System.IO.Path.GetFileName(path);
-          if (Assembly.GetEntryAssembly() != null)
-            name = Assembly.GetEntryAssembly().ManifestModule.Name;
-        }
-        catch (Exception ex)
-        {
-          name = ClientName;
-          System.Diagnostics.Debug.WriteLine(ex.ToString());
-        }
-        return name;
-      }
-    }
 
     [DisplayName("_os")]
     public string OS

diff --git a/MySQL.Data/tests/MySql.Data.Tests.csproj b/MySQL.Data/tests/MySql.Data.Tests.csproj
@@ -8,7 +8,7 @@
     <Authors>Oracle</Authors>
     <Company>Oracle</Company>
     <Product>MySql.Data.Tests</Product>
-    <TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
     <PackageId>MySql.Data.Tests</PackageId>
     <PackageTags>MySql;.NET Connector;MySql Connector/NET;netcore;.Net Core;MySql Conector/Net Core;coreclr;C/NET;C/Net Core</PackageTags>
     <PackageIconUrl>http://www.mysql.com/common/logos/logo-mysql-170x115.png</PackageIconUrl>
@@ -26,11 +26,11 @@
     <DelaySign>True</DelaySign>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
+  <PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
     <DefineConstants>$(DefineConstants);NET_CORE;NETCORE10</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
     <Compile Remove="Framework\net452\**" />
     <Compile Remove="Framework\net452\MediumTrust\*.cs" />
     <EmbeddedResource Remove="Framework\net452\**" />

diff --git a/MySQL.Data/tests/ParameterTests.cs b/MySQL.Data/tests/ParameterTests.cs
@@ -491,22 +491,6 @@ public void NonInputParametersToCtor()
     }
 #endif
 
-    /// <summary>
-    /// Bug #13991 oldsyntax configuration and ParameterMarker value bug 
-    /// </summary>
-    [Fact]
-    public void SetOldSyntaxAfterCommandCreation()
-    {
-      executeSQL("CREATE TABLE Test (id INT NOT NULL, name VARCHAR(100), dt DATETIME, tm TIME, ts TIMESTAMP, PRIMARY KEY(id))");
-
-      MySqlConnection c = new MySqlConnection(Connection.ConnectionString + ";old syntax=yes");
-      MySqlCommand cmd = new MySqlCommand("INSERT INTO Test (id) VALUES (@id)", c);      
-      cmd.Parameters.AddWithValue("@id", 2);
-      c.Open();
-      cmd.ExecuteNonQuery();
-      c.Close();
-    }
-
     [Fact]
     public void UseAtSignForParameters()
     {