Fix Roslyn compatibility (#18)

Weakly.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Weakly", "src\Weakly\Weakly.csproj", "{AA37F0C0-AA8C-46DE-AC8A-DB844C9AC556}"
 EndProject
@@ -13,11 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		build\Weakly.nuspec = build\Weakly.nuspec
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{CD637C73-7382-48F9-BFA2-20CD9469DB23}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\packages.config = .nuget\packages.config
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

build/Weakly.nuspec

@@ -3,15 +3,15 @@
   <metadata>
     <id>Weakly</id>
     <title>Weakly</title>
-    <version>2.5.1</version>
+    <version>2.6.0</version>
     <authors>Thomas Ibel</authors>
     <description>Weakly is a collection of some useful weak-reference types available as portable class library for net45+win8+wp8+wpa81.</description>
     <language>en-US</language>
     <licenseUrl>https://raw.github.com/tibel/Weakly/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/tibel/Weakly</projectUrl>
     <iconUrl>https://raw.github.com/tibel/Weakly/master/build/weakly_icon.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <releaseNotes>add APM pattern helper</releaseNotes>
+    <releaseNotes>First Roslyn compatible release</releaseNotes>
     <copyright>Copyright Thomas Ibel 2013-2015</copyright>
     <tags>
       Weakly WeakReference WeakAction WeakFunc WeakDelegate WeakCollection WeakValueDictionary WeakEventHandler WeakEventSource Async Task

build/create-package.cmd

@@ -1,4 +1,4 @@
 @ECHO OFF
 del *.nupkg
-..\packages\NuGet.CommandLine.2.8.5\tools\NuGet.exe pack Weakly.nuspec -Symbols
+..\packages\NuGet.CommandLine.2.8.6\tools\NuGet.exe pack Weakly.nuspec -Symbols
 pause

build/publish-package.cmd

@@ -1,4 +1,4 @@
 @ECHO OFF
 for /f "delims=" %%F in ('dir *.nupkg /b /o-n') do set PACKAGE=%%F
-..\packages\NuGet.CommandLine.2.8.5\tools\NuGet.exe push %PACKAGE%
+..\packages\NuGet.CommandLine.2.8.6\tools\NuGet.exe push %PACKAGE%
 pause

src/GlobalAssemblyInfo.cs

@@ -12,5 +12,5 @@
 
 [assembly: CLSCompliant(true)]
 
-[assembly: AssemblyVersion("2.5.0.0")]
-[assembly: AssemblyFileVersion("2.5.1.0")]
+[assembly: AssemblyVersion("2.6.0.0")]
+[assembly: AssemblyFileVersion("2.6.0.0")]

src/Weakly/Delegates/WeakAction.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Reflection;
 
 namespace Weakly
 {
@@ -18,14 +17,12 @@ public sealed class WeakAction<TTarget>
         /// </summary>
         /// <param name="target">The class instance on which the current delegate invokes the instance method.</param>
         /// <param name="weakAction">The method represented by the delegate.</param>
-        public WeakAction(TTarget target, Action<TTarget> weakAction)
+        public WeakAction(TTarget target, [EmptyCapture] Action<TTarget> weakAction)
         {
             if (target == null)
                 throw new ArgumentNullException("target");
             if (weakAction == null)
                 throw new ArgumentNullException("weakAction");
-            if (weakAction.Target != null)
-                throw new ArgumentException("The delegate is not a static method or lambda.", "weakAction");
 
             _target = new WeakReference<TTarget>(target);
             _weakAction = weakAction;

src/Weakly/Delegates/WeakFunc.cs

@@ -18,14 +18,12 @@ public sealed class WeakFunc<TTarget, TResult>
         /// </summary>
         /// <param name="target">The class instance on which the current delegate invokes the instance method.</param>
         /// <param name="weakFunc">The method represented by the delegate.</param>
-        public WeakFunc(TTarget target, Func<TTarget, TResult> weakFunc)
+        public WeakFunc(TTarget target, [EmptyCapture] Func<TTarget, TResult> weakFunc)
         {
             if (target == null)
                 throw new ArgumentNullException("target");
             if (weakFunc == null)
                 throw new ArgumentNullException("weakFunc");
-            if (weakFunc.Target != null)
-                throw new ArgumentException("The delegate is not a static method or lambda.", "weakFunc");
 
             _target = new WeakReference<TTarget>(target);
             _weakFunc = weakFunc;

src/Weakly/EmptyCaptureAttribute.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace Weakly
+{
+    /// <summary>
+    /// Indicates that the delegate parameter should not be an instance method or closure (captures no context).
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Parameter, AllowMultiple = false)]
+    public sealed class EmptyCaptureAttribute : Attribute
+    {
+    }
+}

src/Weakly/Events/WeakCanExecuteChangedHandler.cs

@@ -8,7 +8,7 @@ internal sealed class WeakCanExecuteChangedHandler<TSubscriber> :
         where TSubscriber : class
     {
         public WeakCanExecuteChangedHandler(ICommand source, TSubscriber subscriber,
-            Action<TSubscriber, object, EventArgs> weakHandler)
+            [EmptyCapture] Action<TSubscriber, object, EventArgs> weakHandler)
             : base(source, subscriber, weakHandler)
         {
             source.CanExecuteChanged += OnEvent;

src/Weakly/Events/WeakEventHandler.cs

@@ -19,7 +19,7 @@ public static class WeakEventHandler
         /// <param name="weakHandler">The weak handler.</param>
         /// <returns>A registration object that can be used to deregister from the event.</returns>
         public static IDisposable RegisterPropertyChangedWeak<TSubscriber>(this INotifyPropertyChanged source,
-            TSubscriber subscriber, Action<TSubscriber, object, PropertyChangedEventArgs> weakHandler)
+            TSubscriber subscriber, [EmptyCapture] Action<TSubscriber, object, PropertyChangedEventArgs> weakHandler)
             where TSubscriber : class
         {
             return new WeakNotifyPropertyChangedHandler<TSubscriber>(source, subscriber, weakHandler);
@@ -34,7 +34,7 @@ public static IDisposable RegisterPropertyChangedWeak<TSubscriber>(this INotifyP
         /// <param name="weakHandler">The weak handler.</param>
         /// <returns>A registration object that can be used to deregister from the event.</returns>
         public static IDisposable RegisterCollectionChangedWeak<TSubscriber>(this INotifyCollectionChanged source,
-            TSubscriber subscriber, Action<TSubscriber, object, NotifyCollectionChangedEventArgs> weakHandler)
+            TSubscriber subscriber, [EmptyCapture] Action<TSubscriber, object, NotifyCollectionChangedEventArgs> weakHandler)
             where TSubscriber : class
         {
             return new WeakNotifyCollectionChangedHandler<TSubscriber>(source, subscriber, weakHandler);
@@ -49,7 +49,7 @@ public static IDisposable RegisterCollectionChangedWeak<TSubscriber>(this INotif
         /// <param name="weakHandler">The weak handler.</param>
         /// <returns>A registration object that can be used to deregister from the event.</returns>
         public static IDisposable RegisterCanExecuteChangedWeak<TSubscriber>(this ICommand source,
-            TSubscriber subscriber, Action<TSubscriber, object, EventArgs> weakHandler)
+            TSubscriber subscriber, [EmptyCapture] Action<TSubscriber, object, EventArgs> weakHandler)
             where TSubscriber : class
         {
             return new WeakCanExecuteChangedHandler<TSubscriber>(source, subscriber, weakHandler);

src/Weakly/Events/WeakEventHandlerBase.cs

@@ -18,14 +18,12 @@ public abstract class WeakEventHandlerBase<TSubscriber, TEventArgs> : IWeakEvent
         /// </summary>
         /// <param name="subscriber">The event subscriber.</param>
         /// <param name="weakHandler">The weak handler.</param>
-        protected WeakEventHandlerBase(TSubscriber subscriber, Action<TSubscriber, object, TEventArgs> weakHandler)
+        protected WeakEventHandlerBase(TSubscriber subscriber, [EmptyCapture] Action<TSubscriber, object, TEventArgs> weakHandler)
         {
             if (subscriber == null)
                 throw new ArgumentNullException("subscriber");
             if (weakHandler == null)
                 throw new ArgumentNullException("weakHandler");
-            if (weakHandler.Target != null)
-                throw new ArgumentException("Cannot create weak event handler from an instance method or closure.", "weakHandler");
 
             _subscriber = new WeakReference<TSubscriber>(subscriber);
             _weakHandler = weakHandler;
@@ -84,16 +82,14 @@ public abstract class WeakEventHandlerBase<TSource, TSubscriber, TEventArgs> : I
         /// <param name="source">The event source.</param>
         /// <param name="subscriber">The event subscriber.</param>
         /// <param name="weakHandler">The weak handler.</param>
-        protected WeakEventHandlerBase(TSource source, TSubscriber subscriber, Action<TSubscriber, object, TEventArgs> weakHandler)
+        protected WeakEventHandlerBase(TSource source, TSubscriber subscriber, [EmptyCapture] Action<TSubscriber, object, TEventArgs> weakHandler)
         {
             if (source == null)
                 throw new ArgumentNullException("source");
             if (subscriber == null)
                 throw new ArgumentNullException("subscriber");
             if (weakHandler == null)
                 throw new ArgumentNullException("weakHandler");
-            if (weakHandler.Target != null)
-                throw new ArgumentException("Cannot create weak event handler from an instance method or closure.", "weakHandler");
 
             _source = new WeakReference<TSource>(source);
             _subscriber = new WeakReference<TSubscriber>(subscriber);

src/Weakly/Events/WeakNotifyCollectionChangedHandler.cs

@@ -8,7 +8,7 @@ internal sealed class WeakNotifyCollectionChangedHandler<TSubscriber> :
         where TSubscriber : class
     {
         public WeakNotifyCollectionChangedHandler(INotifyCollectionChanged source, TSubscriber subscriber,
-            Action<TSubscriber, object, NotifyCollectionChangedEventArgs> weakHandler)
+            [EmptyCapture] Action<TSubscriber, object, NotifyCollectionChangedEventArgs> weakHandler)
             : base(source, subscriber, weakHandler)
         {
             source.CollectionChanged += OnEvent;

src/Weakly/Events/WeakNotifyPropertyChangedHandler.cs

@@ -8,7 +8,7 @@ internal sealed class WeakNotifyPropertyChangedHandler<TSubscriber> :
         where TSubscriber : class
     {
         public WeakNotifyPropertyChangedHandler(INotifyPropertyChanged source, TSubscriber subscriber,
-            Action<TSubscriber, object, PropertyChangedEventArgs> weakHandler)
+            [EmptyCapture] Action<TSubscriber, object, PropertyChangedEventArgs> weakHandler)
             : base(source, subscriber, weakHandler)
         {
             source.PropertyChanged += OnEvent;

src/Weakly/Reflection/ReflectionHelper.cs

@@ -20,26 +20,6 @@ public static bool IsCompilerGenerated(this MemberInfo memberInfo)
             return memberInfo.IsDefined(typeof (CompilerGeneratedAttribute));
         }
 
-        /// <summary>
-        /// Determines whether the specified method is a lambda.
-        /// </summary>
-        /// <param name="methodInfo">The method to examine.</param>
-        /// <returns>True, if the method is a lambda; otherwise false.</returns>
-        public static bool IsLambda(this MethodInfo methodInfo)
-        {
-            return methodInfo.IsStatic && methodInfo.IsCompilerGenerated();
-        }
-
-        /// <summary>
-        /// Determines whether the specified method is closure.
-        /// </summary>
-        /// <param name="methodInfo">The method to examine.</param>
-        /// <returns>True, if the method is a closure; otherwise false.</returns>
-        public static bool IsClosure(this MethodInfo methodInfo)
-        {
-            return !methodInfo.IsStatic && methodInfo.DeclaringType.GetTypeInfo().IsCompilerGenerated();
-        }
-
         /// <summary>
         /// Determines whether the specified method is an async method.
         /// </summary>

src/Weakly/Weakly.csproj

@@ -45,6 +45,7 @@
     <None Include="..\Weakly.snk">
       <Link>Weakly.snk</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs">
@@ -74,6 +75,7 @@
     <Compile Include="Builders\IOpenActionBuilder.cs" />
     <Compile Include="Builders\IOpenFuncBuilder.cs" />
     <Compile Include="Delegates\WeakFunc.cs" />
+    <Compile Include="EmptyCaptureAttribute.cs" />
     <Compile Include="Events\IWeakEventHandler.cs" />
     <Compile Include="Delegates\WeakAction.cs" />
     <Compile Include="Events\WeakCanExecuteChangedHandler.cs" />

src/Weakly/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NuGet.CommandLine" version="2.8.6" targetFramework="portable45-net45+win8+wp8+wpa81" />
+</packages>