Skip to content

Commit 74f6a10

Browse files
committed
- Removed MDS package ref dependency on Abstractions until pipelines are ready.
- Renamed AbstractionsPackage to Abstractions in targets. - Updated BUILDGUIDE based on project ref behaviour.
1 parent bddb02e commit 74f6a10

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

build.proj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,8 @@
5252

5353
<!-- Populate all managed projects -->
5454
<ItemGroup>
55-
<<<<<<< HEAD
5655
<Abstractions Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
5756
<AbstractionsTest Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj" />
58-
=======
59-
<AbstractionsPackage Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
60-
<AbstractionsTestPackage Include="src/Microsoft.Data.SqlClient.Extensions/Abstractions/test/Abstractions.Test.csproj" />
61-
>>>>>>> a597ce3a (Split the C# code/project changes out from the pipeline changes.)
6257
<SqlServerLib Include="**/Microsoft.SqlServer.Server.csproj" />
6358
<NetFxDriver Include="**/netfx/**/Microsoft.Data.SqlClient*.csproj" Condition="'$(IsEnabledWindows)' == 'true'" />
6459
<NetCoreDriver Include="**/netcore/**/Microsoft.Data.SqlClient*.csproj" />

0 commit comments

Comments
 (0)