Skip to content

Commit 12dfa7e

Browse files
Merge branch 'master' into mhawker/fix-sample-app
2 parents 0023590 + 8661fae commit 12dfa7e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Microsoft.Toolkit.Uwp.SampleApp/Controls/XamlCodeEditor.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private void XamlCodeRenderer_InternalException(CodeEditor sender, Exception arg
7070

7171
// If you hit an issue here, please report repro steps along with all the info from the Exception object.
7272
#if DEBUG
73-
////Debugger.Break();
73+
Debugger.Break();
7474
#endif
7575
}
7676

@@ -150,4 +150,4 @@ public string Text
150150
112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123
151151
};
152152
}
153-
}
153+
}

Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -671,8 +671,8 @@ private static Type LookForTypeByName(string typeName)
671671
}
672672

673673
// Search in Microsoft.Toolkit.Graph.Controls
674-
var graphControlsProxyType = new UserToPersonConverter();
675-
assembly = graphControlsProxyType.GetType().GetTypeInfo().Assembly;
674+
var graphControlsProxyType = typeof(UserToPersonConverter);
675+
assembly = graphControlsProxyType.GetTypeInfo().Assembly;
676676

677677
foreach (var typeInfo in assembly.ExportedTypes)
678678
{
@@ -772,4 +772,4 @@ public class GitRefObject
772772
public string Sha { get; set; }
773773
}
774774
}
775-
}
775+
}

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/samples.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,7 @@
648648
"DocumentationUrl": "https://raw.githubusercontent.com/MicrosoftDocs/WindowsCommunityToolkitDocs/master/docs/services/Facebook.md"
649649
},
650650
{
651-
"Name": "Graph Service",
651+
"Name": "Microsoft Graph Service",
652652
"About": "These providers help you easily authenticate and connect to the Microsoft Graph.",
653653
"Icon": "/Assets/mslogo.png",
654654
"BadgeUpdateVersionRequired": "PREVIEW",

0 commit comments

Comments
 (0)