Skip to content

Commit 9b19759

Browse files
michael-damatovmichael-damatov
committed
Merge branch 'develop'
2 parents 41d826a + 2365d8b commit 9b19759

File tree

9 files changed

+135
-15
lines changed

9 files changed

+135
-15
lines changed

‎CONTRIBUTING.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
- For typos and spelling mistakes feel free to provide a fix and they will be merged as long they comply with the owner's style guide.
66
- For code changes always open an issue first. This will allow to determine whether or not the change should take place. The issue should be used to discuss the change.
77

8-
- If the pull request is accepted the project collaborators preserve the right to fix the code style before merging the changes
8+
- If the pull request is accepted the project collaborators preserve the right to fix the code style before merging the changes.
9+
10+
- Pull requests must target the `develop` branch. Pull requests to the `master` branch will be declined.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Shuriken [![NuGet](https://img.shields.io/nuget/v/Shuriken.svg)](https://www.nuget.org/packages/Shuriken) [![ReSharper-Gallery](https://img.shields.io/badge/resharper--gallery-v1.1.0-lightgrey.svg)](https://resharper-plugins.jetbrains.com/packages/Shuriken.Annotations)
1+
# Shuriken [![NuGet](https://img.shields.io/nuget/v/Shuriken.svg)](https://www.nuget.org/packages/Shuriken) [![ReSharper Extension](https://img.shields.io/resharper/v/Shuriken.Annotations.svg?label=ReSharper%20Extension)](https://plugins.jetbrains.com/plugin/11800-shuriken-annotations)
22

33
Fully automated MVVM library without code rewriting. There is no magic behind it: a background thread monitors object properties (explicitly annotated as `[Observable]`), checks their values by comparing with their previous values, and raises change notifications "in the name" of the object.
44

‎Sources/Demo.Shuriken.Wpf/Program.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System;
2+
using System.Diagnostics;
3+
using Shuriken.Diagnostics;
24
using Shuriken.Monitoring;
35

46
namespace Demo.Shuriken.Wpf

‎Sources/Shuriken.Deployment/Annotations/Shuriken.Wpf/1.2.0.0.xml‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<assembly name="Shuriken.Wpf, Version=1.2.0.0">
2+
<member name="M:Shuriken.AsyncCommand.#ctor(System.Func{System.Threading.Tasks.Task},System.Func{System.Boolean},Shuriken.CommandOptions)">
3+
<parameter name="execute">
4+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
5+
</parameter>
6+
</member>
7+
<member name="M:Shuriken.AsyncCommand.#ctor(System.Func{System.Threading.CancellationToken,System.Threading.Tasks.Task},System.Func{System.Boolean},Shuriken.CommandOptions)">
8+
<parameter name="execute">
9+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
10+
</parameter>
11+
</member>
12+
<member name="M:Shuriken.AsyncCommand.#ctor(System.Func{Shuriken.CommandExecutionController,System.Threading.CancellationToken,System.Threading.Tasks.Task},System.Func{System.Boolean},Shuriken.CommandOptions)">
13+
<parameter name="execute">
14+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
15+
</parameter>
16+
</member>
17+
<member name="M:Shuriken.AsyncCommand`1.#ctor(System.Func{`0,System.Threading.Tasks.Task},System.Func{`0,System.Boolean},Shuriken.CommandOptions)">
18+
<parameter name="execute">
19+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
20+
</parameter>
21+
</member>
22+
<member name="M:Shuriken.AsyncCommand`1.#ctor(System.Func{`0,System.Threading.CancellationToken,System.Threading.Tasks.Task},System.Func{`0,System.Boolean},Shuriken.CommandOptions)">
23+
<parameter name="execute">
24+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
25+
</parameter>
26+
</member>
27+
<member name="M:Shuriken.AsyncCommand`1.#ctor(System.Func{`0,Shuriken.CommandExecutionController,System.Threading.CancellationToken,System.Threading.Tasks.Task},System.Func{`0,System.Boolean},Shuriken.CommandOptions)">
28+
<parameter name="execute">
29+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
30+
</parameter>
31+
</member>
32+
<member name="M:Shuriken.Command.#ctor(System.Action,System.Func{System.Boolean},Shuriken.CommandOptions)">
33+
<parameter name="execute">
34+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
35+
</parameter>
36+
</member>
37+
<member name="M:Shuriken.Command.#ctor(System.Action{System.Threading.CancellationToken},System.Func{System.Boolean},Shuriken.CommandOptions)">
38+
<parameter name="execute">
39+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
40+
</parameter>
41+
</member>
42+
<member name="M:Shuriken.Command.#ctor(System.Action{Shuriken.CommandExecutionController,System.Threading.CancellationToken},System.Func{System.Boolean},Shuriken.CommandOptions)">
43+
<parameter name="execute">
44+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
45+
</parameter>
46+
</member>
47+
<member name="M:Shuriken.Command`1.#ctor(System.Action{`0},System.Func{`0,System.Boolean},Shuriken.CommandOptions)">
48+
<parameter name="execute">
49+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
50+
</parameter>
51+
</member>
52+
<member name="M:Shuriken.Command`1.#ctor(System.Action{`0,System.Threading.CancellationToken},System.Func{`0,System.Boolean},Shuriken.CommandOptions)">
53+
<parameter name="execute">
54+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
55+
</parameter>
56+
</member>
57+
<member name="M:Shuriken.Command`1.#ctor(System.Action{`0,Shuriken.CommandExecutionController,System.Threading.CancellationToken},System.Func{`0,System.Boolean},Shuriken.CommandOptions)">
58+
<parameter name="execute">
59+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
60+
</parameter>
61+
</member>
62+
<member name="P:Shuriken.CommandBase.Options">
63+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
64+
</member>
65+
<member name="P:Shuriken.CommandExecutionController.Execution">
66+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
67+
</member>
68+
<member name="M:Shuriken.ParameterizedCommand`1.CanExecute(`0)">
69+
<attribute ctor="M:JetBrains.Annotations.PureAttribute.#ctor" />
70+
</member>
71+
<member name="M:Shuriken.ParameterlessCommand.CanExecute">
72+
<attribute ctor="M:JetBrains.Annotations.PureAttribute.#ctor" />
73+
</member>
74+
<member name="P:Shuriken.RunningCommandExecution.CancelCommand">
75+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
76+
</member>
77+
<member name="M:Shuriken.Diagnostics.EventListener.ToDebugMessage(System.Diagnostics.Tracing.EventWrittenEventArgs)">
78+
<attribute ctor="M:JetBrains.Annotations.PureAttribute.#ctor" />
79+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
80+
</member>
81+
<member name="M:Shuriken.Monitoring.ApplicationMonitorScope.#ctor(Shuriken.Monitoring.INotificationContext)">
82+
<parameter name="notificationContext">
83+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
84+
</parameter>
85+
</member>
86+
<member name="P:Shuriken.Monitoring.ApplicationMonitorScope.NotificationContext">
87+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
88+
</member>
89+
<member name="M:Shuriken.Monitoring.ApplicationMonitorScope.Suspend">
90+
<attribute ctor="M:JetBrains.Annotations.MustUseReturnValueAttribute.#ctor" />
91+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
92+
</member>
93+
<member name="M:Shuriken.Monitoring.INotificationContext.Invoke(System.Action)">
94+
<parameter name="action">
95+
<attribute ctor="M:JetBrains.Annotations.InstantHandleAttribute.#ctor" />
96+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
97+
</parameter>
98+
</member>
99+
<member name="M:Shuriken.Monitoring.INotificationContext.InvokeAsync(System.Action)">
100+
<attribute ctor="M:JetBrains.Annotations.PureAttribute.#ctor" />
101+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
102+
<parameter name="action">
103+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
104+
</parameter>
105+
</member>
106+
<member name="M:Shuriken.Monitoring.WpfNotificationContext.#ctor(System.Windows.Threading.Dispatcher)">
107+
<parameter name="dispatcher">
108+
<attribute ctor="M:JetBrains.Annotations.NotNullAttribute.#ctor" />
109+
</parameter>
110+
</member>
111+
</assembly>

‎Sources/Shuriken.Deployment/Shuriken.Annotations.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package>
33
<metadata>
44
<id>Shuriken.Annotations</id>
5-
<version>1.1.0</version>
5+
<version>1.2.0</version>
66
<title>Shuriken Annotations</title>
77
<authors>Michael Damatov</authors>
88
<description>Annotations for the Shuriken library.</description>

‎Sources/Shuriken.Deployment/Shuriken.Deployment.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@
7777
</None>
7878
</ItemGroup>
7979
<ItemGroup>
80+
<Content Include="Annotations\Shuriken.Wpf\1.2.0.0.xml">
81+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
82+
</Content>
8083
<Content Include="Annotations\Shuriken.Wpf\1.1.0.0.xml">
8184
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8285
</Content>

‎Sources/Shuriken.Wpf/Properties/AssemblyInfo.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Reflection;
1+
using System;
2+
using System.Reflection;
23
using System.Runtime.InteropServices;
34
using System.Windows.Markup;
45

@@ -10,14 +11,15 @@
1011
[assembly: AssemblyConfiguration("")]
1112
[assembly: AssemblyCompany("")]
1213
[assembly: AssemblyProduct("Shuriken")]
13-
[assembly: AssemblyCopyright("© 2016-2017 Michael Damatov.")]
14+
[assembly: AssemblyCopyright("© 2016-2019 Michael Damatov.")]
1415
[assembly: AssemblyTrademark("")]
1516
[assembly: AssemblyCulture("")]
1617

1718
// Setting ComVisible to false makes the types in this assembly not visible
1819
// to COM components. If you need to access a type in this assembly from
1920
// COM, set the ComVisible attribute to true on that type.
2021
[assembly: ComVisible(false)]
22+
[assembly: CLSCompliant(true)]
2123

2224
// The following GUID is for the ID of the typelib if this project is exposed to COM
2325
[assembly: Guid("50F3B06C-90C5-4BFA-8652-F635959B7CFE")]
@@ -32,8 +34,8 @@
3234
// You can specify all the values or you can default the Build and Revision Numbers
3335
// by using the '*' as shown below:
3436
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.1.0.0")]
36-
[assembly: AssemblyFileVersion("1.1.0")]
37+
[assembly: AssemblyVersion("1.2.0.0")]
38+
[assembly: AssemblyFileVersion("1.2.0")]
3739

3840
[assembly: XmlnsDefinition("http://schemas.shuriken/view-models", @"Shuriken")]
3941
[assembly: XmlnsPrefix("http://schemas.shuriken/view-models", "sh")]

‎Sources/Tests.Shuriken.Wpf/Tests.Shuriken.Wpf.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" />
3+
<Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" />
44
<PropertyGroup>
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -46,10 +46,10 @@
4646
</Reference>
4747
<Reference Include="Microsoft.QualityTools.Testing.Fakes, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
4848
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
49-
<HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
49+
<HintPath>..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
5050
</Reference>
5151
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
52-
<HintPath>..\packages\MSTest.TestFramework.1.1.18\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
52+
<HintPath>..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
5353
</Reference>
5454
<Reference Include="PresentationFramework" />
5555
<Reference Include="System" />
@@ -122,10 +122,10 @@
122122
<PropertyGroup>
123123
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
124124
</PropertyGroup>
125-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.props'))" />
126-
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets'))" />
125+
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props'))" />
126+
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets'))" />
127127
</Target>
128-
<Import Project="..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.1.18\build\net45\MSTest.TestAdapter.targets')" />
128+
<Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" />
129129
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
130130
Other similar extension points exist, see Microsoft.Common.targets.
131131
<Target Name="BeforeBuild">

‎Sources/Tests.Shuriken.Wpf/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="JetBrains.Annotations" version="11.0.0" targetFramework="net46" />
4-
<package id="MSTest.TestAdapter" version="1.1.18" targetFramework="net46" />
5-
<package id="MSTest.TestFramework" version="1.1.18" targetFramework="net46" />
4+
<package id="MSTest.TestAdapter" version="1.4.0" targetFramework="net46" />
5+
<package id="MSTest.TestFramework" version="1.4.0" targetFramework="net46" />
66
</packages>

0 commit comments

Comments
 (0)