Skip to content

Commit d600f89

Browse files
Feature | Project Microsoft.SqlServer.Server separation phase 2 (MDS consumes MSS using netcore) (#1585)
1 parent 73eba15 commit d600f89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+56
-1691
lines changed

build.proj

+3-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<Target Name="BuildAll" DependsOnTargets="BuildSqlServerLib;BuildNetFx;BuildNetCore" />
7272
<Target Name="BuildAllConfigurations" DependsOnTargets="Restore;BuildTools;BuildSqlServerLib;BuildNetFx;BuildNetCoreAllOS;GenerateNugetPackage" />
7373
<Target Name="BuildSqlServerPackage" DependsOnTargets="BuildSqlServerLibAnyOS;GenerateSqlServerPackage"/>
74-
<Target Name="BuildTestsNetCore" DependsOnTargets="RestoreTestsNetCore;BuildAKVNetCore;BuildFunctionalTestsNetCore;BuildManualTestsNetCore"/>
74+
<Target Name="BuildTestsNetCore" DependsOnTargets="BuildSqlServerLib;RestoreTestsNetCore;BuildAKVNetCore;BuildFunctionalTestsNetCore;BuildManualTestsNetCore"/>
7575
<Target Name="BuildTestsNetFx" DependsOnTargets="BuildSqlServerLib;RestoreTestsNetFx;BuildAKVNetFx;BuildFunctionalTestsNetFx;BuildManualTestsNetFx" Condition="$(IsEnabledWindows) == 'true'"/>
7676
<Target Name="BuildTests" DependsOnTargets="BuildTestsNetCore;BuildTestsNetFx"/>
7777

@@ -113,7 +113,9 @@
113113
</Target>
114114

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

119121
<Target Name="BuildNetCore" DependsOnTargets="RestoreNetCore">

doc/samples/IBinarySerialize.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.IO;
33
using System.Data;
44
using System.Data.SqlTypes;
5-
using Microsoft.Data.SqlClient.Server;
5+
using Microsoft.SqlServer.Server;
66
using System.Text;
77

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

48-
// using Microsoft.Data.SqlClient.Server;
48+
// using Microsoft.SqlServer.Server;
4949
public void Read(System.IO.BinaryReader r)
5050
{
5151

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

87-
// using Microsoft.Data.SqlClient.Server;
87+
// using Microsoft.SqlServer.Server;
8888
public void Write(System.IO.BinaryWriter w)
8989
{
9090
int maxStringSize = 20;

doc/samples/SqlFunctionAttribute.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.IO;
33
using System.Collections;
44
//<Snippet1>
5-
using Microsoft.Data.SqlClient.Server;
5+
using Microsoft.SqlServer.Server;
66

77
public class Class1
88
{

doc/samples/SqlUserDefinedAggregate.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
using System;
22
//<Snippet1>
3-
using Microsoft.Data.SqlClient.Server;
3+
using Microsoft.SqlServer.Server;
44
using System.IO;
55
using System.Data.Sql;
66
using System.Data.SqlTypes;
77
using System.Text;
88

99
[Serializable]
10-
[Microsoft.Data.SqlClient.Server.SqlUserDefinedAggregate(
11-
Microsoft.Data.SqlClient.Server.Format.UserDefined,
10+
[Microsoft.SqlServer.Server.SqlUserDefinedAggregate(
11+
Microsoft.SqlServer.Server.Format.UserDefined,
1212
IsInvariantToNulls = true,
1313
IsInvariantToDuplicates = false,
1414
IsInvariantToOrder = false,
1515
MaxByteSize = 8000)
1616
]
17-
public class Concatenate : Microsoft.Data.SqlClient.Server.IBinarySerialize
17+
public class Concatenate : Microsoft.SqlServer.Server.IBinarySerialize
1818
{
1919

2020
public void Read(BinaryReader r)

doc/samples/SqlUserDefinedType1.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//<Snippet5>
33
using System;
44
using System.Data.SqlTypes;
5-
using Microsoft.Data.SqlClient.Server;
5+
using Microsoft.SqlServer.Server;
66

77
[Serializable()]
88
[SqlUserDefinedType(Format.Native)]
@@ -133,7 +133,7 @@ public SqlString Quadrant()
133133

134134
//-----------------------------------------------------------------------------
135135
//<Snippet12>
136-
// using Microsoft.Data.SqlClient.Server;
136+
// using Microsoft.SqlServer.Server;
137137

138138
[SqlUserDefinedType(Format.Native, MaxByteSize = 8000)]
139139
public class SampleType

doc/snippets/Microsoft.Data.SqlClient.Server/DataAccessKind.xml

-26
This file was deleted.

doc/snippets/Microsoft.Data.SqlClient.Server/Format.xml

-51
This file was deleted.

doc/snippets/Microsoft.Data.SqlClient.Server/IBinarySerialize.xml

-54
This file was deleted.

doc/snippets/Microsoft.Data.SqlClient.Server/InvalidUdtException.xml

-22
This file was deleted.

0 commit comments

Comments
 (0)