File tree Expand file tree Collapse file tree 1 file changed +0
-5
lines changed Expand file tree Collapse file tree 1 file changed +0
-5
lines changed Original file line number Diff line number Diff line change 52
52
53
53
<!-- Populate all managed projects -->
54
54
<ItemGroup >
55
- <<<<<<< HEAD
56
55
<Abstractions Include =" src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj" />
57
56
<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.)
62
57
<SqlServerLib Include =" **/Microsoft.SqlServer.Server.csproj" />
63
58
<NetFxDriver Include =" **/netfx/**/Microsoft.Data.SqlClient*.csproj" Condition =" '$(IsEnabledWindows)' == 'true'" />
64
59
<NetCoreDriver Include =" **/netcore/**/Microsoft.Data.SqlClient*.csproj" />
You can’t perform that action at this time.
0 commit comments