Skip to content

Commit 175b261

Browse files
committed
Merge branch 'master' into publish-28087
2 parents 8cee08e + 57ebe4b commit 175b261

File tree

475 files changed

+41677
-8406
lines changed

Some content is hidden

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

475 files changed

+41677
-8406
lines changed

.github/dependabot.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Generated by https://github.com/richlander/dependadotnet
2+
version: 2
3+
updates:
4+
- package-ecosystem: nuget
5+
directory: "/samples/snippets/fsharp/VS_Snippets_CLR_System/system.console.class/fs" # fontlink1.fsproj
6+
schedule:
7+
interval: daily
8+
open-pull-requests-limit: 10
9+
- package-ecosystem: nuget
10+
directory: "/samples/snippets/csharp/VS_Snippets_CLR_System/system.collections.generic.equalitycomparer.default/cs" # cs.csproj
11+
schedule:
12+
interval: daily
13+
open-pull-requests-limit: 10
14+
- package-ecosystem: nuget
15+
directory: "/samples/snippets/csharp/VS_Snippets_CLR_System/system.invalidoperationexception.threading.uwp/cs" # UWPCrossThreadSolutionCS.csproj
16+
schedule:
17+
interval: daily
18+
open-pull-requests-limit: 10
19+
- package-ecosystem: nuget
20+
directory: "/samples/snippets/visualbasic/VS_Snippets_CLR_System/system.collections.generic.equalitycomparer.default/vb" # vb.vbproj
21+
schedule:
22+
interval: daily
23+
open-pull-requests-limit: 10

samples/snippets/csharp/VS_Snippets_CLR_Classic/classic MethodBase.IsAssembly Example/CS/source.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public void m_public() {}
88
internal void m_internal() {}
99
protected void m_protected() {}
1010
protected internal void m_protected_public() {}
11+
private protected void m_private_protected() {}
1112

1213
public static void Main()
1314
{
@@ -42,5 +43,6 @@ m_public True False False False False
4243
m_internal False True False False False
4344
m_protected False False True False False
4445
m_protected_public False False False True False
46+
m_private_protected False False False False True
4547
*/
4648
// </Snippet1>

samples/snippets/csharp/VS_Snippets_CLR_System/system.collections.concurrent.blockingcollection/cs/blockingcoll.cs

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,32 +27,30 @@ public static async Task BC_AddTakeCompleteAdding()
2727
using (BlockingCollection<int> bc = new BlockingCollection<int>())
2828
{
2929
// Spin up a Task to populate the BlockingCollection
30-
using (Task t1 = Task.Run(() =>
30+
Task t1 = Task.Run(() =>
3131
{
3232
bc.Add(1);
3333
bc.Add(2);
3434
bc.Add(3);
3535
bc.CompleteAdding();
36-
}))
36+
});
37+
38+
// Spin up a Task to consume the BlockingCollection
39+
Task t2 = Task.Run(() =>
3740
{
38-
// Spin up a Task to consume the BlockingCollection
39-
using (Task t2 = Task.Run(() =>
41+
try
4042
{
41-
try
42-
{
43-
// Consume consume the BlockingCollection
44-
while (true) Console.WriteLine(bc.Take());
45-
}
46-
catch (InvalidOperationException)
47-
{
48-
// An InvalidOperationException means that Take() was called on a completed collection
49-
Console.WriteLine("That's All!");
50-
}
51-
}))
43+
// Consume consume the BlockingCollection
44+
while (true) Console.WriteLine(bc.Take());
45+
}
46+
catch (InvalidOperationException)
5247
{
53-
await Task.WhenAll(t1, t2);
48+
// An InvalidOperationException means that Take() was called on a completed collection
49+
Console.WriteLine("That's All!");
5450
}
55-
}
51+
});
52+
53+
await Task.WhenAll(t1, t2);
5654
}
5755
}
5856
}

samples/snippets/csharp/VS_Snippets_Winforms/Classic TypeConverter Example/CS/source.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void Method1()
2929
{
3030
// <Snippet3>
3131
Color c = Color.Red;
32-
Console.WriteLine(TypeDescriptor.GetConverter(c).ConvertToString(c));
32+
Console.WriteLine(TypeDescriptor.GetConverter(typeof(Color)).ConvertToString(c));
3333
// </Snippet3>
3434
}
3535
public void Method2()

samples/snippets/visualbasic/VS_Snippets_CLR_Classic/classic MethodBase.IsAssembly Example/VB/source.vb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Public class Example
1111
End Sub
1212
Protected Friend Sub m_Protected_Friend()
1313
End Sub
14+
Private Protected Sub m_Private_Protected()
15+
End Sub
1416

1517
Public Shared Sub Main()
1618

@@ -46,5 +48,6 @@ End Class
4648
'm_Friend False True False False False
4749
'm_Protected False False True False False
4850
'm_Protected_Friend False False False True False
51+
'm_Private_Protected False False False False True
4952
' </Snippet1>
5053

xml/FrameworksIndex/msbuild-15-netcore.xml

Lines changed: 3008 additions & 0 deletions
Large diffs are not rendered by default.

xml/FrameworksIndex/msbuild-15.xml

Lines changed: 1412 additions & 0 deletions
Large diffs are not rendered by default.

xml/FrameworksIndex/msbuild-16-netcore.xml

Lines changed: 3535 additions & 0 deletions
Large diffs are not rendered by default.

xml/FrameworksIndex/msbuild-16.xml

Lines changed: 1405 additions & 0 deletions
Large diffs are not rendered by default.

xml/Microsoft.Build.BuildEngine/ConsoleLogger.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<Interface>
2424
<InterfaceName>Microsoft.Build.Framework.ILogger</InterfaceName>
2525
</Interface>
26-
<Interface>
26+
<Interface FrameworkAlternate="netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8">
2727
<InterfaceName>Microsoft.Build.Framework.INodeLogger</InterfaceName>
2828
</Interface>
2929
</Interfaces>

0 commit comments

Comments
 (0)