Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add | Local DB support for ARM64 and Common Code for LocalDB #2042

Closed
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -108,6 +108,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\DataSource.cs">
<Link>Microsoft\Data\SqlClient\DataSource.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs">
<Link>Microsoft\Data\SqlClient\DataClassification\SensitivityClassification.cs</Link>
</Compile>
@@ -742,7 +745,7 @@
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.uap.cs" />
<Compile Include="Microsoft\Data\SqlClient\PacketHandle.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\SessionHandle.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.uap.cs" />
<Compile Include="Microsoft\Data\SqlClient\LocalDB.uap.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Managed.cs" />
</ItemGroup>
@@ -753,8 +756,9 @@
</Compile>
<Compile Include="Interop\SNINativeMethodWrapper.Windows.cs" />
<Compile Include="Microsoft\Data\ProviderBase\DbConnectionPoolIdentity.Windows.cs" />
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.Windows.cs" />
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Windows.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\LocalDB.Windows.cs">
<Link>Microsoft\Data\SqlClient\LocalDB.Windows.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectNative.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Windows.cs" />
</ItemGroup>
@@ -768,7 +772,6 @@
<Compile Include="$(CommonPath)\Interop\Windows\kernel32\Interop.GetProcAddress.cs">
<Link>Common\Interop\Windows\kernel32\Interop.GetProcAddress.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.Common.cs" />
</ItemGroup>
<!-- Windows dependencies for MANAGED_SNI build -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true'">
@@ -793,7 +796,7 @@
<Compile Include="Microsoft\Data\SqlClient\LocalDBAPI.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\PacketHandle.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\SessionHandle.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\SNI\LocalDB.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\LocalDB.Unix.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParserStateObjectFactory.Managed.cs" />
<Compile Include="Microsoft\Data\SqlClient\TdsParser.Unix.cs" />
</ItemGroup>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

using System;
using Microsoft.Data.ProviderBase;
using Microsoft.Data.Common;

namespace Microsoft.Data.SqlClient
{
internal class LocalDB
{
internal static string GetLocalDBConnectionString(string localDbInstance)
{
throw ADP.LocalDBNotSUpportedException();
}

internal static string GetLocalDBDataSource(string fullServerName, TimeoutTimer timeout)
{
throw ADP.LocalDBNotSUpportedException();
}
}
}
Original file line number Diff line number Diff line change
@@ -2,13 +2,21 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.

namespace Microsoft.Data.SqlClient.SNI
using System;
using Microsoft.Data.ProviderBase;

namespace Microsoft.Data.SqlClient
{
internal class LocalDB
{
internal static string GetLocalDBConnectionString(string localDbInstance)
{
throw new PlatformNotSupportedException(Strings.LocalDBNotSupported); // No Registry support on UAP
}

internal static string GetLocalDBDataSource(string fullServerName, TimeoutTimer timeout)
{
throw new PlatformNotSupportedException(Strings.LocalDBNotSupported); // No Registry support on UAP
}
}
}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@ internal static partial class LocalDBAPI
private const string LocalDbPrefix = @"(localdb)\";
private const string LocalDbPrefix_NP = @"np:\\.\pipe\LOCALDB#";


[UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
private delegate int LocalDBFormatMessageDelegate(int hrLocalDB, uint dwFlags, uint dwLanguageId, StringBuilder buffer, ref uint buflen);

@@ -38,7 +37,6 @@ internal static string GetLocalDbInstanceNameFromServerName(string serverName)
{
return input.ToString();
}

}
return null;
}

This file was deleted.

Loading