Skip to content

Commit 6046e33

Browse files
committed
User Story 37654: Create Extensions base package
- Moved extensions out of MDS solution and directory tree so we can apply different NuGet configs. - Removed local packages/ from top-level NuGet.config since it is only needed by MDS projects. - Added a NuGet config for the MDS solution that appends the local packages/ dir as a source. - Simplified solution and project filenames.
1 parent 9c34926 commit 6046e33

File tree

12 files changed

+24
-26
lines changed

12 files changed

+24
-26
lines changed

NuGet.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
<clear />
55
<!-- We use a curated, vetted ADO feed for our dependencies. -->
66
<add key="curated" value="https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/sqlclient/nuget/v3/index.json" />
7-
8-
<!-- During development, our sibling packages may only be available locally. -->
9-
<add key="local" value="packages/" />
107
</packageSources>
118
<auditSources>
129
<clear />

build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
<!-- Populate all managed projects -->
5353
<ItemGroup>
54-
<ExtensionsPackage Include="**/extensions/Extensions/Microsoft.Data.SqlClient.Extensions.slnx" />
54+
<ExtensionsPackage Include="**/Extensions/Microsoft.Data.SqlClient.Extensions.slnx" />
5555
<SqlServerLib Include="**/Microsoft.SqlServer.Server.csproj" />
5656
<NetFxDriver Include="**/netfx/**/Microsoft.Data.SqlClient*.csproj" Condition="'$(IsEnabledWindows)' == 'true'" />
5757
<NetCoreDriver Include="**/netcore/**/Microsoft.Data.SqlClient*.csproj" />

eng/pipelines/stages/ci-build-extensions-package-stage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ stages:
7979

8080
# The Extensions solution file to use for all dotnet CLI commands.
8181
- name: project
82-
value: src/Microsoft.Data.SqlClient/extensions/Extensions/Microsoft.Data.SqlClient.Extensions.slnx
82+
value: src/Microsoft.Data.SqlClient.Extensions/Extensions/Microsoft.Data.SqlClient.Extensions.slnx
8383

8484
# dotnet CLI arguments common to all commands.
8585
- name: commonArguments
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Solution>
2+
<Folder Name="/src/">
3+
<Project Path="src/Extensions.csproj" />
4+
</Folder>
5+
<Folder Name="/test/">
6+
<Project Path="test/Extensions.Test.csproj" />
7+
</Folder>
8+
</Solution>
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<ProjectReference Include="../src/Microsoft.Data.SqlClient.Extensions.csproj" />
13+
<ProjectReference Include="../src/Extensions.csproj" />
1414
</ItemGroup>
1515

1616
<ItemGroup>
File renamed without changes.

src/Microsoft.Data.SqlClient.sln

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -304,18 +304,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient.Un
304304
EndProject
305305
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Microsoft.Data.SqlClient\tests\Common\Common.csproj", "{67128EC0-30F5-6A98-448B-55F88A1DE707}"
306306
EndProject
307-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "extensions", "extensions", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
308-
EndProject
309-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{5612FCAA-05D3-4E79-94E5-EEDB2DC70524}"
310-
EndProject
311-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
312-
EndProject
313-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient.Extensions", "Microsoft.Data.SqlClient\extensions\Extensions\src\Microsoft.Data.SqlClient.Extensions.csproj", "{AB71787B-C474-24D1-5EDF-345386CA2460}"
314-
EndProject
315-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0C88DD14-F956-CE84-757C-A364CCF449FC}"
316-
EndProject
317-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Data.SqlClient.Extensions.Test", "Microsoft.Data.SqlClient\extensions\Extensions\test\Microsoft.Data.SqlClient.Extensions.Test.csproj", "{3028DECE-90B8-2F58-6167-98722A3964D4}"
318-
EndProject
319307
Global
320308
GlobalSection(SolutionConfigurationPlatforms) = preSolution
321309
Debug|Any CPU = Debug|Any CPU

0 commit comments

Comments
 (0)