Skip to content

Commit b1a0b01

Browse files
authored
Merge branch 'master' into docsp-38064-linq-positional
2 parents 57726f5 + 8c2bdc5 commit b1a0b01

Some content is hidden

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

48 files changed

+4670
-1036
lines changed

config/redirects

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
define: prefix docs/drivers/csharp
22
define: base https://www.mongodb.com/${prefix}
3-
define: versions v2.19 v2.20 v2.21 v2.22 v2.23 v2.24 v2.25 v2.26 v2.27 v2.28 v2.29 v2.30 v3.0 master
3+
define: versions v2.19 v2.20 v2.21 v2.22 v2.23 v2.24 v2.25 v2.26 v2.27 v2.28 v2.29 v2.30 v3.0 v3.1 master
44

55
symlink: current -> master
66

@@ -19,3 +19,6 @@ raw: ${prefix}/master -> ${base}/upcoming/
1919
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/modify/#replace-operation -> ${base}/${version}/fundamentals/crud/write-operations/replace/
2020
[*-master]: ${prefix}/${version}/fundamentals/crud/write-operations/modify/ -> ${base}/${version}/fundamentals/crud/write-operations/
2121
[*-master] ${prefix}/${version}/fundamentals/builders/#define-an-update -> ${base}/${version}/fundamentals/crud/write-operations
22+
[v3.0-*]: ${prefix}/${version}/fundamentals/enterprise-authentication/ -> ${base}/${version}/fundamentals/authentication/
23+
[*-v2.30]: ${prefix}/${version}/fundamentals/odata/ -> ${base}/${version}/
24+
[*-v2.30]: ${prefix}/${version}/fundamentals/crud/write-operations/bulk-write/ -> ${base}/${version}/fundamentals/crud/write-operations/

snooty.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ toc_landing_pages = [
66
"/fundamentals/serialization",
77
"/fundamentals/crud/write-operations/update-one",
88
"/fundamentals/crud/write-operations/update-many",
9+
"/fundamentals/authentication",
910
"/upgrade",
11+
"/fundamentals/database-collection"
1012
]
1113
name = "csharp"
1214
title = "C#/.NET"
@@ -32,7 +34,7 @@ mdb-server = "MongoDB Server"
3234
mongo-community = "MongoDB Community Edition"
3335
mongo-enterprise = "MongoDB Enterprise Edition"
3436
docs-branch = "master" # always set this to the docs branch (i.e. master, 1.7, 1.8, etc.)
35-
version-number = "3.0"
37+
version-number = "3.1"
3638
last-version-2-number = "2.30"
3739
version = "v{+version-number+}"
3840
example = "https://raw.githubusercontent.com/mongodb/docs-csharp/{+docs-branch+}/source/includes/code-examples"

source/connection-troubleshooting.txt

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -182,28 +182,7 @@ the same machine doesn't require any authorization to connect.
182182
X.509 Credential Error
183183
~~~~~~~~~~~~~~~~~~~~~~
184184

185-
If you are using Windows as your operating system, you might encounter an issue in which the
186-
{+driver-short+} is unable to locate an ``X.509`` authentication certificate in memory.
187-
This error is raised with the following error message:
188-
189-
.. code-block:: none
190-
:copyable: false
191-
192-
No credentials are available in the security package
193-
194-
The following section describes a method that may help resolve the issue.
195-
196-
Create and Store the Certificate On-Disk
197-
----------------------------------------
198-
199-
Use the following code to generate any ``X.509`` certificates required by your application:
200-
201-
.. code-block:: csharp
202-
203-
using (X509Certificate2 certWithKey = certOnly.CopyWithPrivateKey(key))
204-
{
205-
return new X509Certificate2(certWithKey.Export(X509ContentType.Pkcs12));
206-
}
185+
.. include:: /includes/troubleshooting/x509.rst
207186

208187
Error Sending Message
209188
~~~~~~~~~~~~~~~~~~~~~

source/fundamentals.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Fundamentals
1818
Atlas Search </fundamentals/atlas-search>
1919
Stable API </fundamentals/stable-api>
2020
Authentication </fundamentals/authentication>
21-
Enterprise Authentication </fundamentals/enterprise-authentication>
2221
Aggregation </fundamentals/aggregation>
2322
LINQ </fundamentals/linq>
2423
BSON Operations </fundamentals/bson>
@@ -30,6 +29,10 @@ Fundamentals
3029
Time Series Collections </fundamentals/time-series>
3130
In-Use Encryption </fundamentals/encrypt-fields>
3231
Search Geospatially </fundamentals/geo>
32+
Store Large Files </fundamentals/gridfs>
33+
Replica Set Operations </fundamentals/read-write-configuration>
34+
OData </fundamentals/odata>
35+
Monitoring </fundamentals/monitoring>
3336

3437
- :ref:`Connecting to MongoDB <csharp-connection>`
3538
- :ref:`csharp-db-coll`
@@ -38,7 +41,6 @@ Fundamentals
3841
- :ref:`csharp-atlas-search`
3942
- :ref:`csharp-stable-api`
4043
- :ref:`csharp-authentication-mechanisms`
41-
- :ref:`csharp-enterprise-authentication-mechanisms`
4244
- :ref:`csharp-aggregation`
4345
- :ref:`csharp-linq`
4446
- :ref:`csharp-bson`
@@ -50,3 +52,7 @@ Fundamentals
5052
- :ref:`csharp-time-series`
5153
- :ref:`Encrypt Fields <csharp-fle>`
5254
- :ref:`csharp-geo`
55+
- :ref:`csharp-gridfs`
56+
- :ref:`csharp-read-write-config`
57+
- :ref:`csharp-odata`
58+
- :ref:`csharp-monitoring`

source/fundamentals/atlas-search.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,28 @@ The search returns the following document:
335335
To learn more about the ``geoWithin`` operator, see the :atlas:`geoWithin </atlas-search/geoWithin>`
336336
Atlas guide.
337337

338+
In
339+
~~
340+
341+
Use the ``In()`` method to search for documents with field values that match a list
342+
of specified values.
343+
344+
The following example searches the ``guitars`` collection for documents that have a
345+
``make`` field value of either ``"Fender"`` or ``"Gibson"``.
346+
347+
.. literalinclude:: /includes/fundamentals/code-examples/atlas-search/AtlasSearchExamples.cs
348+
:start-after: start-in-search
349+
:end-before: end-in-search
350+
:language: csharp
351+
:dedent:
352+
353+
The search returns the following documents:
354+
355+
.. code-block:: json
356+
357+
{ "_id": 1, "make": "Fender", "description": "...", "establishedYear": 1946, "in_stock": true, "rating": 9 }
358+
{ "_id": 2, "make": "Gibson", "description": "...", "establishedYear": 1902, "in_stock": true, "rating": 8 }
359+
338360
MoreLikeThis
339361
~~~~~~~~~~~~
340362

0 commit comments

Comments
 (0)