-
Notifications
You must be signed in to change notification settings - Fork 11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Master #2
Open
LeeMacrofeng
wants to merge
2
commits into
yanglr:master
Choose a base branch
from
LeeMacrofeng:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Master #2
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"CurrentProjectSetting": null | ||
} |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
{ | ||
"version": "0.2.1", | ||
"defaults": {}, | ||
"configurations": [ | ||
{ | ||
"type": "managed", | ||
"name": "E:\\GitHub\\CaliburnMicro-Calculator", | ||
"project": "" | ||
} | ||
] | ||
} |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
CaliburnMicro-Calculator/CaliburnMicro-Calculator/obj/Debug/App.g.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "03935006F5F6FBA9207367BA39BB44A45C7D7667" | ||
//------------------------------------------------------------------------------ | ||
// <auto-generated> | ||
// This code was generated by a tool. | ||
// Runtime Version:4.0.30319.42000 | ||
// | ||
// Changes to this file may cause incorrect behavior and will be lost if | ||
// the code is regenerated. | ||
// </auto-generated> | ||
//------------------------------------------------------------------------------ | ||
|
||
using CaliburnMicro_Calculator; | ||
using System; | ||
using System.Diagnostics; | ||
using System.Windows; | ||
using System.Windows.Automation; | ||
using System.Windows.Controls; | ||
using System.Windows.Controls.Primitives; | ||
using System.Windows.Data; | ||
using System.Windows.Documents; | ||
using System.Windows.Ink; | ||
using System.Windows.Input; | ||
using System.Windows.Markup; | ||
using System.Windows.Media; | ||
using System.Windows.Media.Animation; | ||
using System.Windows.Media.Effects; | ||
using System.Windows.Media.Imaging; | ||
using System.Windows.Media.Media3D; | ||
using System.Windows.Media.TextFormatting; | ||
using System.Windows.Navigation; | ||
using System.Windows.Shapes; | ||
using System.Windows.Shell; | ||
|
||
|
||
namespace CaliburnMicro_Calculator { | ||
|
||
|
||
/// <summary> | ||
/// App | ||
/// </summary> | ||
public partial class App : System.Windows.Application { | ||
|
||
private bool _contentLoaded; | ||
|
||
/// <summary> | ||
/// InitializeComponent | ||
/// </summary> | ||
[System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] | ||
public void InitializeComponent() { | ||
if (_contentLoaded) { | ||
return; | ||
} | ||
_contentLoaded = true; | ||
System.Uri resourceLocater = new System.Uri("/CaliburnMicro-Calculator;component/app.xaml", System.UriKind.Relative); | ||
|
||
#line 1 "..\..\App.xaml" | ||
System.Windows.Application.LoadComponent(this, resourceLocater); | ||
|
||
#line default | ||
#line hidden | ||
} | ||
|
||
/// <summary> | ||
/// Application Entry Point. | ||
/// </summary> | ||
[System.STAThreadAttribute()] | ||
[System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] | ||
public static void Main() { | ||
CaliburnMicro_Calculator.App app = new CaliburnMicro_Calculator.App(); | ||
app.InitializeComponent(); | ||
app.Run(); | ||
} | ||
} | ||
} | ||
|
77 changes: 77 additions & 0 deletions
77
CaliburnMicro-Calculator/CaliburnMicro-Calculator/obj/Debug/App.g.i.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
#pragma checksum "..\..\App.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "03935006F5F6FBA9207367BA39BB44A45C7D7667" | ||
//------------------------------------------------------------------------------ | ||
// <auto-generated> | ||
// This code was generated by a tool. | ||
// Runtime Version:4.0.30319.42000 | ||
// | ||
// Changes to this file may cause incorrect behavior and will be lost if | ||
// the code is regenerated. | ||
// </auto-generated> | ||
//------------------------------------------------------------------------------ | ||
|
||
using CaliburnMicro_Calculator; | ||
using System; | ||
using System.Diagnostics; | ||
using System.Windows; | ||
using System.Windows.Automation; | ||
using System.Windows.Controls; | ||
using System.Windows.Controls.Primitives; | ||
using System.Windows.Data; | ||
using System.Windows.Documents; | ||
using System.Windows.Ink; | ||
using System.Windows.Input; | ||
using System.Windows.Markup; | ||
using System.Windows.Media; | ||
using System.Windows.Media.Animation; | ||
using System.Windows.Media.Effects; | ||
using System.Windows.Media.Imaging; | ||
using System.Windows.Media.Media3D; | ||
using System.Windows.Media.TextFormatting; | ||
using System.Windows.Navigation; | ||
using System.Windows.Shapes; | ||
using System.Windows.Shell; | ||
|
||
|
||
namespace CaliburnMicro_Calculator { | ||
|
||
|
||
/// <summary> | ||
/// App | ||
/// </summary> | ||
public partial class App : System.Windows.Application { | ||
|
||
private bool _contentLoaded; | ||
|
||
/// <summary> | ||
/// InitializeComponent | ||
/// </summary> | ||
[System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] | ||
public void InitializeComponent() { | ||
if (_contentLoaded) { | ||
return; | ||
} | ||
_contentLoaded = true; | ||
System.Uri resourceLocater = new System.Uri("/CaliburnMicro-Calculator;component/app.xaml", System.UriKind.Relative); | ||
|
||
#line 1 "..\..\App.xaml" | ||
System.Windows.Application.LoadComponent(this, resourceLocater); | ||
|
||
#line default | ||
#line hidden | ||
} | ||
|
||
/// <summary> | ||
/// Application Entry Point. | ||
/// </summary> | ||
[System.STAThreadAttribute()] | ||
[System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] | ||
public static void Main() { | ||
CaliburnMicro_Calculator.App app = new CaliburnMicro_Calculator.App(); | ||
app.InitializeComponent(); | ||
app.Run(); | ||
} | ||
} | ||
} | ||
|
1 change: 1 addition & 0 deletions
1
...aliburnMicro-Calculator/obj/Debug/CaliburnMicro_Calculator.csproj.CoreCompileInputs.cache
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
2a8ec47ef7f6de6045613f0e9597a9ca0d37f00e |
6 changes: 6 additions & 0 deletions
6
...r/CaliburnMicro-Calculator/obj/Debug/CaliburnMicro_Calculator.csproj.FileListAbsolute.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
E:\GitHub\CaliburnMicro-Calculator\CaliburnMicro-Calculator\CaliburnMicro-Calculator\obj\Debug\CaliburnMicro_Calculator.csprojAssemblyReference.cache | ||
E:\GitHub\CaliburnMicro-Calculator\CaliburnMicro-Calculator\CaliburnMicro-Calculator\obj\Debug\Views\ShellView.g.cs | ||
E:\GitHub\CaliburnMicro-Calculator\CaliburnMicro-Calculator\CaliburnMicro-Calculator\obj\Debug\App.g.cs | ||
E:\GitHub\CaliburnMicro-Calculator\CaliburnMicro-Calculator\CaliburnMicro-Calculator\obj\Debug\GeneratedInternalTypeHelper.g.cs | ||
E:\GitHub\CaliburnMicro-Calculator\CaliburnMicro-Calculator\CaliburnMicro-Calculator\obj\Debug\CaliburnMicro-Calculator_MarkupCompile.cache | ||
E:\GitHub\CaliburnMicro-Calculator\CaliburnMicro-Calculator\CaliburnMicro-Calculator\obj\Debug\CaliburnMicro-Calculator_MarkupCompile.lref |
Binary file added
BIN
+2.48 KB
...CaliburnMicro-Calculator/obj/Debug/CaliburnMicro_Calculator.csprojAssemblyReference.cache
Binary file not shown.
62 changes: 62 additions & 0 deletions
62
CaliburnMicro-Calculator/CaliburnMicro-Calculator/obj/Debug/GeneratedInternalTypeHelper.g.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
//------------------------------------------------------------------------------ | ||
// <auto-generated> | ||
// This code was generated by a tool. | ||
// Runtime Version:4.0.30319.42000 | ||
// | ||
// Changes to this file may cause incorrect behavior and will be lost if | ||
// the code is regenerated. | ||
// </auto-generated> | ||
//------------------------------------------------------------------------------ | ||
|
||
namespace XamlGeneratedNamespace { | ||
|
||
|
||
/// <summary> | ||
/// GeneratedInternalTypeHelper | ||
/// </summary> | ||
[System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] | ||
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] | ||
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { | ||
|
||
/// <summary> | ||
/// CreateInstance | ||
/// </summary> | ||
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { | ||
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) | ||
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); | ||
} | ||
|
||
/// <summary> | ||
/// GetPropertyValue | ||
/// </summary> | ||
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { | ||
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); | ||
} | ||
|
||
/// <summary> | ||
/// SetPropertyValue | ||
/// </summary> | ||
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { | ||
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); | ||
} | ||
|
||
/// <summary> | ||
/// CreateDelegate | ||
/// </summary> | ||
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { | ||
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod | ||
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { | ||
delegateType, | ||
handler}, null))); | ||
} | ||
|
||
/// <summary> | ||
/// AddEventHandler | ||
/// </summary> | ||
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { | ||
eventInfo.AddEventHandler(target, handler); | ||
} | ||
} | ||
} | ||
|
62 changes: 62 additions & 0 deletions
62
...urnMicro-Calculator/CaliburnMicro-Calculator/obj/Debug/GeneratedInternalTypeHelper.g.i.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
//------------------------------------------------------------------------------ | ||
// <auto-generated> | ||
// This code was generated by a tool. | ||
// Runtime Version:4.0.30319.42000 | ||
// | ||
// Changes to this file may cause incorrect behavior and will be lost if | ||
// the code is regenerated. | ||
// </auto-generated> | ||
//------------------------------------------------------------------------------ | ||
|
||
namespace XamlGeneratedNamespace { | ||
|
||
|
||
/// <summary> | ||
/// GeneratedInternalTypeHelper | ||
/// </summary> | ||
[System.Diagnostics.DebuggerNonUserCodeAttribute()] | ||
[System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")] | ||
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] | ||
public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper { | ||
|
||
/// <summary> | ||
/// CreateInstance | ||
/// </summary> | ||
protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { | ||
return System.Activator.CreateInstance(type, ((System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.NonPublic) | ||
| (System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.CreateInstance)), null, null, culture); | ||
} | ||
|
||
/// <summary> | ||
/// GetPropertyValue | ||
/// </summary> | ||
protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { | ||
return propertyInfo.GetValue(target, System.Reflection.BindingFlags.Default, null, null, culture); | ||
} | ||
|
||
/// <summary> | ||
/// SetPropertyValue | ||
/// </summary> | ||
protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { | ||
propertyInfo.SetValue(target, value, System.Reflection.BindingFlags.Default, null, null, culture); | ||
} | ||
|
||
/// <summary> | ||
/// CreateDelegate | ||
/// </summary> | ||
protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { | ||
return ((System.Delegate)(target.GetType().InvokeMember("_CreateDelegate", (System.Reflection.BindingFlags.InvokeMethod | ||
| (System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance)), null, target, new object[] { | ||
delegateType, | ||
handler}, null))); | ||
} | ||
|
||
/// <summary> | ||
/// AddEventHandler | ||
/// </summary> | ||
protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { | ||
eventInfo.AddEventHandler(target, handler); | ||
} | ||
} | ||
} | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This path is specific, cannot be merged into master branch.