Skip to content

Commit 20bd7bb

Browse files
terrajobstViktorHofer
authored andcommittedMay 18, 2019
Enable C# mode command line diff (dotnet#37767)
* Remove trailing whitespace * Enable C# mode command line diff When diffing on the command line, enabling this ensures that hunk headers will use the containing construct (i.e. method, type, or namespace). For example, instead of this (pay attention to the @@ line): diff --git a/src/netstandard/ref/System.Security.Cryptography.cs b/src/netstandard/ref/System.Security.Cryptography.cs index 9f68653..19d239a 100644 --- a/src/netstandard/ref/System.Security.Cryptography.cs +++ b/src/netstandard/ref/System.Security.Cryptography.cs @@ -101,8 +101,20 @@ namespace System.Security.Cryptography public virtual byte[] ExportEncryptedPkcs8PrivateKey(System.ReadOnlySpan<char> password, System.Security.Cryptography.PbeParameters pbeParameters) { throw null; } public virtual byte[] ExportPkcs8PrivateKey() { throw null; } + public virtual byte[] ExportSubjectPublicKeyInfo() { throw null; } public virtual void FromXmlString(string xmlString) { } } public abstract partial class AsymmetricKeyExchangeDeformatter { you'll see this: diff --git a/src/netstandard/ref/System.Security.Cryptography.cs b/src/netstandard/ref/System.Security.Cryptography.cs index 9f68653..19d239a 100644 --- a/src/netstandard/ref/System.Security.Cryptography.cs +++ b/src/netstandard/ref/System.Security.Cryptography.cs @@ -101,8 +101,20 @@ public abstract partial class AsymmetricAlgorithm : System.IDisposable public virtual byte[] ExportEncryptedPkcs8PrivateKey(System.ReadOnlySpan<char> password, System.Security.Cryptography.PbeParameters pbeParameters) { throw null; } public virtual byte[] ExportPkcs8PrivateKey() { throw null; } + public virtual byte[] ExportSubjectPublicKeyInfo() { throw null; } public virtual void FromXmlString(string xmlString) { } } public abstract partial class AsymmetricKeyExchangeDeformatter {
1 parent 03a38b3 commit 20bd7bb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed
 

‎.gitattributes

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
# default for csharp files.
1111
# Note: This is only used by command line
1212
###############################################################################
13-
#*.cs diff=csharp
13+
*.cs diff=csharp
1414

1515
###############################################################################
1616
# Set the merge driver for project and solution files
1717
#
1818
# Merging from the command prompt will add diff markers to the files if there
1919
# are conflicts (Merging from VS is not affected by the settings below, in VS
20-
# the diff markers are never inserted). Diff markers may cause the following
20+
# the diff markers are never inserted). Diff markers may cause the following
2121
# file extensions to fail to load in VS. An alternative would be to treat
2222
# these files as binary and thus will always conflict and require user
2323
# intervention with every merge. To do so, just uncomment the entries below
@@ -46,9 +46,9 @@
4646

4747
###############################################################################
4848
# diff behavior for common document formats
49-
#
49+
#
5050
# Convert binary document formats to text before diffing them. This feature
51-
# is only available from the command line. Turn it on by uncommenting the
51+
# is only available from the command line. Turn it on by uncommenting the
5252
# entries below.
5353
###############################################################################
5454
#*.doc diff=astextplain

0 commit comments

Comments
 (0)
Please sign in to comment.