Skip to content

Commit

Permalink
Feature | Project Microsoft.SqlServer.Server separation phase 2 (MDS …
Browse files Browse the repository at this point in the history
…consumes MSS using netcore) (#1585)
  • Loading branch information
DavoudEshtehari authored Jun 14, 2022
1 parent 73eba15 commit d600f89
Show file tree
Hide file tree
Showing 51 changed files with 56 additions and 1,691 deletions.
4 changes: 3 additions & 1 deletion build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<Target Name="BuildAll" DependsOnTargets="BuildSqlServerLib;BuildNetFx;BuildNetCore" />
<Target Name="BuildAllConfigurations" DependsOnTargets="Restore;BuildTools;BuildSqlServerLib;BuildNetFx;BuildNetCoreAllOS;GenerateNugetPackage" />
<Target Name="BuildSqlServerPackage" DependsOnTargets="BuildSqlServerLibAnyOS;GenerateSqlServerPackage"/>
<Target Name="BuildTestsNetCore" DependsOnTargets="RestoreTestsNetCore;BuildAKVNetCore;BuildFunctionalTestsNetCore;BuildManualTestsNetCore"/>
<Target Name="BuildTestsNetCore" DependsOnTargets="BuildSqlServerLib;RestoreTestsNetCore;BuildAKVNetCore;BuildFunctionalTestsNetCore;BuildManualTestsNetCore"/>
<Target Name="BuildTestsNetFx" DependsOnTargets="BuildSqlServerLib;RestoreTestsNetFx;BuildAKVNetFx;BuildFunctionalTestsNetFx;BuildManualTestsNetFx" Condition="$(IsEnabledWindows) == 'true'"/>
<Target Name="BuildTests" DependsOnTargets="BuildTestsNetCore;BuildTestsNetFx"/>

Expand Down Expand Up @@ -113,7 +113,9 @@
</Target>

<Target Name="BuildSqlServerLib" DependsOnTargets="RestoreSqlServerLib">
<!-- Only build platform specific builds for Package reference types -->
<MSBuild Projects="@(SqlServerLib)" Properties="$(CI);$(SqlServerLibProperties);Platform=AnyCPU;" RemoveProperties="TargetsWindows;TargetsUnix;" />
<MSBuild Projects="@(SqlServerLib)" Properties="$(CI);$(SqlServerLibProperties);Platform=$(Platform);" Condition="$(ReferenceType.Contains('Package'))"/>
</Target>

<Target Name="BuildNetCore" DependsOnTargets="RestoreNetCore">
Expand Down
6 changes: 3 additions & 3 deletions doc/samples/IBinarySerialize.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.IO;
using System.Data;
using System.Data.SqlTypes;
using Microsoft.Data.SqlClient.Server;
using Microsoft.SqlServer.Server;
using System.Text;

namespace test
Expand Down Expand Up @@ -45,7 +45,7 @@ static void Main(string[] args)
// Bytes 0 - 19: string text, padded to the right with null characters
// Bytes 20+: Double value

// using Microsoft.Data.SqlClient.Server;
// using Microsoft.SqlServer.Server;
public void Read(System.IO.BinaryReader r)
{

Expand Down Expand Up @@ -84,7 +84,7 @@ public void Read(System.IO.BinaryReader r)
// Bytes 0 - 19: string text, padded to the right with null characters
// Bytes 20+: Double value

// using Microsoft.Data.SqlClient.Server;
// using Microsoft.SqlServer.Server;
public void Write(System.IO.BinaryWriter w)
{
int maxStringSize = 20;
Expand Down
2 changes: 1 addition & 1 deletion doc/samples/SqlFunctionAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.IO;
using System.Collections;
//<Snippet1>
using Microsoft.Data.SqlClient.Server;
using Microsoft.SqlServer.Server;

public class Class1
{
Expand Down
8 changes: 4 additions & 4 deletions doc/samples/SqlUserDefinedAggregate.cs
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
using System;
//<Snippet1>
using Microsoft.Data.SqlClient.Server;
using Microsoft.SqlServer.Server;
using System.IO;
using System.Data.Sql;
using System.Data.SqlTypes;
using System.Text;

[Serializable]
[Microsoft.Data.SqlClient.Server.SqlUserDefinedAggregate(
Microsoft.Data.SqlClient.Server.Format.UserDefined,
[Microsoft.SqlServer.Server.SqlUserDefinedAggregate(
Microsoft.SqlServer.Server.Format.UserDefined,
IsInvariantToNulls = true,
IsInvariantToDuplicates = false,
IsInvariantToOrder = false,
MaxByteSize = 8000)
]
public class Concatenate : Microsoft.Data.SqlClient.Server.IBinarySerialize
public class Concatenate : Microsoft.SqlServer.Server.IBinarySerialize
{

public void Read(BinaryReader r)
Expand Down
4 changes: 2 additions & 2 deletions doc/samples/SqlUserDefinedType1.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
//<Snippet5>
using System;
using System.Data.SqlTypes;
using Microsoft.Data.SqlClient.Server;
using Microsoft.SqlServer.Server;

[Serializable()]
[SqlUserDefinedType(Format.Native)]
Expand Down Expand Up @@ -133,7 +133,7 @@ public SqlString Quadrant()

//-----------------------------------------------------------------------------
//<Snippet12>
// using Microsoft.Data.SqlClient.Server;
// using Microsoft.SqlServer.Server;

[SqlUserDefinedType(Format.Native, MaxByteSize = 8000)]
public class SampleType
Expand Down
26 changes: 0 additions & 26 deletions doc/snippets/Microsoft.Data.SqlClient.Server/DataAccessKind.xml

This file was deleted.

51 changes: 0 additions & 51 deletions doc/snippets/Microsoft.Data.SqlClient.Server/Format.xml

This file was deleted.

54 changes: 0 additions & 54 deletions doc/snippets/Microsoft.Data.SqlClient.Server/IBinarySerialize.xml

This file was deleted.

This file was deleted.

Loading

0 comments on commit d600f89

Please sign in to comment.