Skip to content

Commit 49c4ba6

Browse files
gewarrengewarren
committed
resolve merge conflicts
2 parents 23e3858 + 5bc6ad4 commit 49c4ba6

File tree

9,969 files changed

+468054
-374946
lines changed

Some content is hidden

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

9,969 files changed

+468054
-374946
lines changed

‎.github/copilot-instructions.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Code comments should end with a period.
2+
3+
When you add a code snippet to the XML remarks of an API, add the code as a separate code file (.cs file) and not as an inline (```) code block. Also add a .csproj file to compile the code if one doesn't already exist in the snippet folder.
4+
5+
Don't use the word "may". Use "might" to indicate possibility or "can" to indicate permission.
6+
7+
There should always be a comma before a clause that begins with "which".
8+
9+
Use a conversational tone with contractions.
10+
11+
Be concise.
12+
13+
Break up long sentences.
14+
15+
Use the present tense for instructions and descriptions. For example, "The method returns a value" instead of "The method will return a value."
16+
17+
Use the Oxford comma in lists of three or more items.

‎.github/policies/mention-owners.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,6 @@ configuration:
359359
- mentionUsers:
360360
mentionees:
361361
- roji
362-
- ajcvickers
363362
replyTemplate: >-
364363
Tagging subscribers to this area: ${mentionees}
365364
assignMentionees: False
@@ -370,7 +369,6 @@ configuration:
370369
- mentionUsers:
371370
mentionees:
372371
- roji
373-
- ajcvickers
374372
replyTemplate: >-
375373
Tagging subscribers to this area: ${mentionees}
376374
assignMentionees: False
@@ -381,7 +379,6 @@ configuration:
381379
- mentionUsers:
382380
mentionees:
383381
- roji
384-
- ajcvickers
385382
replyTemplate: >-
386383
Tagging subscribers to this area: ${mentionees}
387384
assignMentionees: False
@@ -402,7 +399,7 @@ configuration:
402399
then:
403400
- mentionUsers:
404401
mentionees:
405-
- ajcvickers
402+
- dotnet/area-system-componentmodel-dataannotations
406403
replyTemplate: >-
407404
Tagging subscribers to this area: ${mentionees}
408405
assignMentionees: False

‎includes/remarks/System.IO.Compression/CompressionLevel/CompressionLevel.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,16 @@ Compression operations usually involve a tradeoff between the speed and the effe
33
The following methods of the <xref:System.IO.Compression.DeflateStream>, <xref:System.IO.Compression.GZipStream>, <xref:System.IO.Compression.ZipArchive>, <xref:System.IO.Compression.ZipFile>, and <xref:System.IO.Compression.ZipFileExtensions> classes include a parameter named `compressionLevel` that lets you specify the compression level:
44

55
- <xref:System.IO.Compression.DeflateStream.%23ctor%28System.IO.Stream%2CSystem.IO.Compression.CompressionLevel%29?displayProperty=nameWithType>
6-
76
- <xref:System.IO.Compression.DeflateStream.%23ctor%28System.IO.Stream%2CSystem.IO.Compression.CompressionLevel%2CSystem.Boolean%29?displayProperty=nameWithType>
8-
97
- <xref:System.IO.Compression.GZipStream.%23ctor%28System.IO.Stream%2CSystem.IO.Compression.CompressionLevel%29?displayProperty=nameWithType>
10-
118
- <xref:System.IO.Compression.GZipStream.%23ctor%28System.IO.Stream%2CSystem.IO.Compression.CompressionLevel%2CSystem.Boolean%29?displayProperty=nameWithType>
12-
139
- <xref:System.IO.Compression.ZipArchive.CreateEntry%28System.String%2CSystem.IO.Compression.CompressionLevel%29?displayProperty=nameWithType>
14-
1510
- <xref:System.IO.Compression.ZipFile.CreateFromDirectory%28System.String%2CSystem.String%2CSystem.IO.Compression.CompressionLevel%2CSystem.Boolean%29?displayProperty=nameWithType>
16-
1711
- <xref:System.IO.Compression.ZipFileExtensions.CreateEntryFromFile%28System.IO.Compression.ZipArchive%2CSystem.String%2CSystem.String%2CSystem.IO.Compression.CompressionLevel%29?displayProperty=nameWithType>
1812

1913
## Examples
2014

2115
The following example shows how to set the compression level when creating a zip archive by using the <xref:System.IO.Compression.ZipFile> class.
2216

2317
:::code language="csharp" source="~/snippets/csharp/System.IO.Compression/ZipFile/CreateFromDirectory/program3.cs" id="Snippet3":::
24-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.zipfile/vb/program3.vb" id="Snippet3":::
18+
:::code language="vb" source="~/snippets/visualbasic/System.IO.Compression/ZipFile/CreateFromDirectory/program3.vb" id="Snippet3":::

‎includes/remarks/System.IO.Compression/ZipArchive/.ctor_Stream_ZipArchiveMode_Boolean_Encoding.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,17 @@ If the `mode` parameter is set to <xref:System.IO.Compression.ZipArchiveMode.Rea
22

33
When you open a zip archive file for reading and `entryNameEncoding` is set to `null`, entry names and comments are decoded according to the following rules:
44

5-
- When the language encoding flag (in the general-purpose bit flag of the local file header) is not set, the current system default code page is used to decode the entry name and comment.
6-
7-
- When the language encoding flag is set, UTF-8 is used to decode the entry name and comment.
5+
- When the language encoding flag (in the general-purpose bit flag of the local file header) is not set, the current system default code page is used to decode the entry name and comment.
6+
- When the language encoding flag is set, UTF-8 is used to decode the entry name and comment.
87

98
When you open a zip archive file for reading and `entryNameEncoding` is set to a value other than `null`, entry names and comments are decoded according to the following rules:
109

11-
- When the language encoding flag is not set, the specified `entryNameEncoding` is used to decode the entry name and comment.
12-
13-
- When the language encoding flag is set, UTF-8 is used to decode the entry name and comment.
10+
- When the language encoding flag is not set, the specified `entryNameEncoding` is used to decode the entry name and comment.
11+
- When the language encoding flag is set, UTF-8 is used to decode the entry name and comment.
1412

1513
When you write to archive files and `entryNameEncoding` is set to `null`, entry names and comments are encoded according to the following rules:
1614

17-
- For entry names and comments that contain characters outside the ASCII range, the language encoding flag is set, and entry names and comments are encoded by using UTF-8.
18-
19-
- For entry names and comments that contain only ASCII characters, the language encoding flag is not set, and entry names and comments are encoded by using the current system default code page.
15+
- For entry names and comments that contain characters outside the ASCII range, the language encoding flag is set, and entry names and comments are encoded by using UTF-8.
16+
- For entry names and comments that contain only ASCII characters, the language encoding flag is not set, and entry names and comments are encoded by using the current system default code page.
2017

2118
When you write to archive files and `entryNameEncoding` is set to a value other than `null`, the specified `entryNameEncoding` is used to encode the entry names and comments into bytes. The language encoding flag (in the general-purpose bit flag of the local file header) is set only when the specified encoding is a UTF-8 encoding.

‎includes/remarks/System.IO.Compression/ZipFile/Open.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@ When you set the `mode` parameter to <xref:System.IO.Compression.ZipArchiveMode.
77
When you open a zip archive file for reading and `entryNameEncoding` is set to `null`, entry names and comments are decoded according to the following rules:
88

99
- When the language encoding flag (in the general-purpose bit flag of the local file header) is not set, the current system default code page is used to decode the entry name and comment.
10-
1110
- When the language encoding flag is set, UTF-8 is used to decode the entry name and comment.
1211

1312
When you open a zip archive file for reading and `entryNameEncoding` is set to a value other than `null`, entry names and comments are decoded according to the following rules:
1413

1514
- When the language encoding flag is not set, the specified `entryNameEncoding` is used to decode the entry name and comment.
16-
1715
- When the language encoding flag is set, UTF-8 is used to decode the entry name and comment.
1816

1917
When you write to archive files and `entryNameEncoding` is set to `null`, entry names and comments are encoded according to the following rules:
2018

2119
- For entry names or comments that contain characters outside the ASCII range, the language encoding flag is set, and entry names and comments are encoded by using UTF-8.
22-
2320
- For entry names or comments that contain only ASCII characters, the language encoding flag is not set, and entry names and comments are encoded by using the current system default code page.
2421

2522
When you write to archive files and `entryNameEncoding` is set to a value other than `null`, the specified `entryNameEncoding` is used to encode the entry names and comments into bytes. The language encoding flag (in the general-purpose bit flag of the local file header) is set only when the specified encoding is a UTF-8 encoding.

‎includes/remarks/System.IO.Compression/ZipFile/ZipFile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ The methods for manipulating zip archives and their files are spread across thre
1818
This example shows how to create and extract a zip archive by using the <xref:System.IO.Compression.ZipFile> class. It compresses the contents of a folder into a zip archive, and then extracts that content to a new folder.
1919

2020
:::code language="csharp" source="~/snippets/csharp/System.IO.Compression/ZipFile/CreateFromDirectory/program1.cs" id="Snippet1":::
21-
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR_System/system.io.compression.zipfile/vb/program1.vb" id="Snippet1":::
21+
:::code language="vb" source="~/snippets/visualbasic/System.IO.Compression/ZipFile/CreateFromDirectory/program1.vb" id="Snippet1":::

‎snippets/cpp/VS_Snippets_CLR/IO.DiretoryInfo.GetAccessControl-SetAccessControl/cpp/sample.cpp

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

‎snippets/cpp/VS_Snippets_CLR/IsolatedStoragePermissionAttribute/cpp/IsolatedStoragePermissionAttribute.cpp

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

‎snippets/cpp/VS_Snippets_CLR/ModuleBuilder_DefineDocument/CPP/modulebuilder_definedocument.cpp

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

0 commit comments

Comments
 (0)