Skip to content

Commit 960b74e

Browse files
BorisDogBorisDog
authored
CSHARP-5211: Move Core contents to MongoDB.Driver project and remove Core (#1403)
1 parent 9b1c9ae commit 960b74e

File tree

890 files changed

+71
-286
lines changed

Some content is hidden

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

890 files changed

+71
-286
lines changed

‎CSharpDriver.sln

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Bson.Tests", "tests
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Bson.TestHelpers", "tests\MongoDB.Bson.TestHelpers\MongoDB.Bson.TestHelpers.csproj", "{4D6F0AD1-91CE-4736-AD4E-D9B11E49F206}"
2323
EndProject
24-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.Core", "src\MongoDB.Driver.Core\MongoDB.Driver.Core.csproj", "{8AEB0131-9029-476A-B0B4-EEF3442C8706}"
25-
EndProject
26-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.Core.TestHelpers", "tests\MongoDB.Driver.Core.TestHelpers\MongoDB.Driver.Core.TestHelpers.csproj", "{7296B5C1-2A73-4797-AF83-3AE5524BD504}"
27-
EndProject
28-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.Core.Tests", "tests\MongoDB.Driver.Core.Tests\MongoDB.Driver.Core.Tests.csproj", "{B7A0A6CE-B3F7-464C-8FF1-2435C9875445}"
29-
EndProject
3024
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.GridFS", "src\MongoDB.Driver.GridFS\MongoDB.Driver.GridFS.csproj", "{29FB1FD1-3BE0-4E30-BA8D-7964290CAEBA}"
3125
EndProject
3226
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver", "src\MongoDB.Driver\MongoDB.Driver.csproj", "{756980B3-0DCF-42F0-A324-C386B1A3E9F4}"
@@ -60,11 +54,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SmokeTests", "SmokeTests",
6054
EndProject
6155
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.TestHelpers", "tests\MongoDB.TestHelpers\MongoDB.TestHelpers.csproj", "{DF888021-744F-4A8B-9324-831DEFC48AB8}"
6256
EndProject
63-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Benchmarks", "benchmarks\MongoDB.Driver.Benchmarks\MongoDB.Driver.Benchmarks.csproj", "{CF670F4A-49DD-4030-A4A0-1F4D600EB70A}"
57+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.Benchmarks", "benchmarks\MongoDB.Driver.Benchmarks\MongoDB.Driver.Benchmarks.csproj", "{CF670F4A-49DD-4030-A4A0-1F4D600EB70A}"
6458
EndProject
6559
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FaasTests", "FaasTests", "{66E1914C-9E10-4B28-915E-AB3773EFDAB2}"
6660
EndProject
67-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.LambdaTest", "tests\FaasTests\LambdaTests\MongoDB.Driver.LambdaTest\MongoDB.Driver.LambdaTest.csproj", "{33B11279-DA4A-46EA-99BF-9DEDCAC50D95}"
61+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.LambdaTest", "tests\FaasTests\LambdaTests\MongoDB.Driver.LambdaTest\MongoDB.Driver.LambdaTest.csproj", "{33B11279-DA4A-46EA-99BF-9DEDCAC50D95}"
6862
EndProject
6963
Global
7064
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -84,18 +78,6 @@ Global
8478
{4D6F0AD1-91CE-4736-AD4E-D9B11E49F206}.Debug|Any CPU.Build.0 = Debug|Any CPU
8579
{4D6F0AD1-91CE-4736-AD4E-D9B11E49F206}.Release|Any CPU.ActiveCfg = Release|Any CPU
8680
{4D6F0AD1-91CE-4736-AD4E-D9B11E49F206}.Release|Any CPU.Build.0 = Release|Any CPU
87-
{8AEB0131-9029-476A-B0B4-EEF3442C8706}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
88-
{8AEB0131-9029-476A-B0B4-EEF3442C8706}.Debug|Any CPU.Build.0 = Debug|Any CPU
89-
{8AEB0131-9029-476A-B0B4-EEF3442C8706}.Release|Any CPU.ActiveCfg = Release|Any CPU
90-
{8AEB0131-9029-476A-B0B4-EEF3442C8706}.Release|Any CPU.Build.0 = Release|Any CPU
91-
{7296B5C1-2A73-4797-AF83-3AE5524BD504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
92-
{7296B5C1-2A73-4797-AF83-3AE5524BD504}.Debug|Any CPU.Build.0 = Debug|Any CPU
93-
{7296B5C1-2A73-4797-AF83-3AE5524BD504}.Release|Any CPU.ActiveCfg = Release|Any CPU
94-
{7296B5C1-2A73-4797-AF83-3AE5524BD504}.Release|Any CPU.Build.0 = Release|Any CPU
95-
{B7A0A6CE-B3F7-464C-8FF1-2435C9875445}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
96-
{B7A0A6CE-B3F7-464C-8FF1-2435C9875445}.Debug|Any CPU.Build.0 = Debug|Any CPU
97-
{B7A0A6CE-B3F7-464C-8FF1-2435C9875445}.Release|Any CPU.ActiveCfg = Release|Any CPU
98-
{B7A0A6CE-B3F7-464C-8FF1-2435C9875445}.Release|Any CPU.Build.0 = Release|Any CPU
9981
{29FB1FD1-3BE0-4E30-BA8D-7964290CAEBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10082
{29FB1FD1-3BE0-4E30-BA8D-7964290CAEBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
10183
{29FB1FD1-3BE0-4E30-BA8D-7964290CAEBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -156,9 +138,6 @@ Global
156138
{9FCB42A5-3BC6-492B-8EA0-53EF32E9F8CD} = {D2012971-32BB-4C5F-BFC4-30A9994AB152}
157139
{3CE61F2A-B852-45F9-B607-E0FFFEF9DBC6} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
158140
{4D6F0AD1-91CE-4736-AD4E-D9B11E49F206} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
159-
{8AEB0131-9029-476A-B0B4-EEF3442C8706} = {D2012971-32BB-4C5F-BFC4-30A9994AB152}
160-
{7296B5C1-2A73-4797-AF83-3AE5524BD504} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
161-
{B7A0A6CE-B3F7-464C-8FF1-2435C9875445} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}
162141
{29FB1FD1-3BE0-4E30-BA8D-7964290CAEBA} = {D2012971-32BB-4C5F-BFC4-30A9994AB152}
163142
{756980B3-0DCF-42F0-A324-C386B1A3E9F4} = {D2012971-32BB-4C5F-BFC4-30A9994AB152}
164143
{253DBC37-A955-4CCE-8EAF-9CF4A91895DB} = {E472BDF5-61F1-461D-872B-9F53BB3ACA80}

‎apidocs/docfx.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@
2727
"src": [
2828
{
2929
"files": [
30-
"MongoDB.Driver/*.csproj",
31-
"MongoDB.Driver.Core/*.csproj"
30+
"MongoDB.Driver/*.csproj"
3231
],
3332
"exclude": [
3433
"**/bin/**",

‎benchmarks/MongoDB.Driver.Benchmarks/MongoDB.Driver.Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</ItemGroup>
3131

3232
<ItemGroup>
33-
<ProjectReference Include="..\..\src\MongoDB.Driver.Core\MongoDB.Driver.Core.csproj" />
33+
<ProjectReference Include="..\..\src\MongoDB.Driver\MongoDB.Driver.csproj" />
3434
<ProjectReference Include="..\..\src\MongoDB.Driver.GridFS\MongoDB.Driver.GridFS.csproj" />
3535
<ProjectReference Include="..\..\tests\MongoDB.Driver.TestHelpers\MongoDB.Driver.TestHelpers.csproj" />
3636
</ItemGroup>

‎build.cake

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ var solutionFullPath = solutionFile.FullPath;
3535
var srcProjectNames = new[]
3636
{
3737
"MongoDB.Bson",
38-
"MongoDB.Driver.Core",
3938
"MongoDB.Driver",
4039
"MongoDB.Driver.GridFS"
4140
};
@@ -92,7 +91,7 @@ Task("BuildArtifacts")
9291
var toDirectory = artifactsBinDirectory.Combine(targetFramework);
9392
CleanDirectory(toDirectory);
9493

95-
var projects = new[] { "MongoDB.Bson", "MongoDB.Driver.Core", "MongoDB.Driver", "MongoDB.Driver.GridFS" };
94+
var projects = new[] { "MongoDB.Bson", "MongoDB.Driver", "MongoDB.Driver.GridFS" };
9695
foreach (var project in projects)
9796
{
9897
var fromDirectory = srcDirectory.Combine(project).Combine("bin").Combine(configuration).Combine(targetFramework);
@@ -337,7 +336,6 @@ Task("PackageNugetPackages")
337336
var projects = new[]
338337
{
339338
"MongoDB.Bson",
340-
"MongoDB.Driver.Core",
341339
"MongoDB.Driver",
342340
"MongoDB.Driver.GridFS"
343341
};
@@ -374,7 +372,6 @@ Task("PushToNuGet")
374372
var projects = new[]
375373
{
376374
"MongoDB.Bson",
377-
"MongoDB.Driver.Core",
378375
"MongoDB.Driver",
379376
"MongoDB.Driver.GridFS"
380377
};

‎evergreen/evergreen.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -931,8 +931,6 @@ functions:
931931
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Bson.${PACKAGE_VERSION}.snupkg"
932932
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.${PACKAGE_VERSION}.nupkg"
933933
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.${PACKAGE_VERSION}.snupkg"
934-
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Core.${PACKAGE_VERSION}.nupkg"
935-
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Core.${PACKAGE_VERSION}.snupkg"
936934
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.GridFS.${PACKAGE_VERSION}.nupkg"
937935
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.GridFS.${PACKAGE_VERSION}.snupkg"
938936
- "mongo-csharp-driver/artifacts/nuget/mongocsharpdriver.${PACKAGE_VERSION}.nupkg"
@@ -1083,20 +1081,6 @@ functions:
10831081
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.${PACKAGE_VERSION}.snupkg
10841082
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.${PACKAGE_VERSION}.snupkg
10851083
bucket: mciuploads
1086-
- command: s3.get
1087-
params:
1088-
aws_key: ${aws_key}
1089-
aws_secret: ${aws_secret}
1090-
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Core.${PACKAGE_VERSION}.nupkg
1091-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Core.${PACKAGE_VERSION}.nupkg
1092-
bucket: mciuploads
1093-
- command: s3.get
1094-
params:
1095-
aws_key: ${aws_key}
1096-
aws_secret: ${aws_secret}
1097-
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Core.${PACKAGE_VERSION}.snupkg
1098-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Core.${PACKAGE_VERSION}.snupkg
1099-
bucket: mciuploads
11001084
- command: s3.get
11011085
params:
11021086
aws_key: ${aws_key}

‎evergreen/push-packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if [ "$PACKAGES_SOURCE" = "https://api.nuget.org/v3/index.json" ] && [[ ! "$PACK
5555
exit 1
5656
fi
5757

58-
PACKAGES=("MongoDB.Bson" "MongoDB.Driver.Core" "MongoDB.Driver" "MongoDB.Driver.GridFS")
58+
PACKAGES=("MongoDB.Bson" "MongoDB.Driver" "MongoDB.Driver.GridFS")
5959

6060
for package in ${PACKAGES[*]}; do
6161
dotnet nuget verify ./artifacts/nuget/"$package"."$PACKAGE_VERSION".nupkg --certificate-fingerprint "$NUGET_SIGN_CERTIFICATE_FINGERPRINT"

‎src/MongoDB.Driver.Core/MongoDB.Driver.Core.csproj

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎src/MongoDB.Driver.Core/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/MongoDB.Driver.GridFS/MongoDB.Driver.GridFS.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<ItemGroup>
1818
<ProjectReference Include="..\MongoDB.Bson\MongoDB.Bson.csproj" />
1919
<ProjectReference Include="..\MongoDB.Driver\MongoDB.Driver.csproj" />
20-
<ProjectReference Include="..\MongoDB.Driver.Core\MongoDB.Driver.Core.csproj" />
2120
</ItemGroup>
2221

2322
</Project>

‎src/MongoDB.Driver.Core/BatchTransformingAsyncCursor.cs renamed to ‎src/MongoDB.Driver/Core/BatchTransformingAsyncCursor.cs

File renamed without changes.

0 commit comments

Comments
 (0)