Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated the nuget files and added a license

  • Loading branch information...
commit 9b212d4b160546109b0b430e6ca45080f5a0d9d4 1 parent 57b3f53
@kmees authored
View
2  .gitignore
@@ -35,6 +35,8 @@ _ReSharper*/
*.resharper
[Tt]est[Rr]esult*
packages/
+nuget/package/*.nupkg
+nuget/package/lib
#Project files
[Bb]uild/
View
21 License.txt
@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2011 Kevin Mees
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
View
BIN  nuget/nuget.exe
Binary file not shown
View
8 nuget/package/caliburn.micro-contrib.nuspec
@@ -2,13 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Caliburn.Micro-Contrib</id>
- <version>0.8.0</version>
+ <version>0.9.0</version>
<authors>Kevin Mees</authors>
- <description>Contributions to Caliburn.Micro</description>
+ <description>Extensions for the Caliburn.Micro Framework</description>
<language>en-US</language>
+ <licenseUrl>http://github.com/kmees/CMContrib/blob/master/License.txt</licenseUrl>
+ <projectUrl>http://github.com/kmees/CMContrib</projectUrl>
<tags>Caliburn Caliburn.Micro MVVM Silverlight WPF</tags>
<dependencies>
- <dependency id="Caliburn.Micro" version="1.1.0" />
+ <dependency id="Caliburn.Micro" version="1.3.0" />
</dependencies>
<frameworkAssemblies>
<frameworkAssembly assemblyName="System.Drawing" targetFramework="net40" />
View
6 src/CMContrib.SL/CMContrib.SL.csproj
@@ -51,12 +51,6 @@
<HintPath>..\..\packages\Caliburn.Micro.1.3.0\lib\sl4\Caliburn.Micro.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
- <Reference Include="System.ComponentModel.Composition, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <Private>False</Private>
- </Reference>
- <Reference Include="System.ComponentModel.Composition.Initialization, Version=2.0.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <Private>False</Private>
- </Reference>
<Reference Include="System.Windows" />
<Reference Include="system" />
<Reference Include="System.Core" />
View
20 src/CMContrib.SL/Filters/AsyncCoroutineAttribute.cs
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Caliburn.Micro.Contrib.Decorators;
-
-namespace Caliburn.Micro.Contrib.Filters
-{
- /// <summary>
- /// Delegates the execution of the coroutine to the thread pool
- /// </summary>
- [AttributeUsage(AttributeTargets.Method)]
- public class AsyncCoroutineAttribute : DecorateCoroutineAttribute
- {
- public override IEnumerable<IResult> Decorate(IEnumerable<IResult> coroutine, ActionExecutionContext context)
- {
- var sequentialResult = new SequentialResult(coroutine.GetEnumerator());
-
- yield return new AsyncResultDecorator(sequentialResult);
- }
- }
-}
View
37 src/CMContrib.SL/Filters/BusyCoroutineAttribute.cs
@@ -1,37 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Caliburn.Micro.Contrib.Decorators;
-using Caliburn.Micro.Contrib.Results;
-
-namespace Caliburn.Micro.Contrib.Filters
-{
- /// <summary>
- /// Shows a busy indicator to the user while the coroutine is executed.
- /// Also delegates the execution of the coroutine to the ThreadPool b/c the ui would block during the execution otherwise
- /// </summary>
- [AttributeUsage(AttributeTargets.Method)]
- public class BusyCoroutineAttribute : AsyncCoroutineAttribute
- {
- public string Message { get; set; }
- public Type BusyIndicatorImplementation { get; set; }
-
- public BusyCoroutineAttribute()
- {
- Message = Localizer.GetString("DefaultBusyMessage");
- }
-
- public override IEnumerable<IResult> Decorate(IEnumerable<IResult> coroutine, ActionExecutionContext context)
- {
- var inner = new SequentialResult(coroutine.GetEnumerator());
-
- var busyDecorator = new BusyResultDecorator(inner, Message);
- if (BusyIndicatorImplementation != null)
- {
- busyDecorator.In(BusyIndicatorImplementation);
- }
-
- yield return busyDecorator;
- }
- }
-}
View
1  src/CMContrib.WPF/CMContrib.WPF.csproj
@@ -40,7 +40,6 @@
<HintPath>..\..\packages\Caliburn.Micro.1.3.0\lib\net40\Caliburn.Micro.dll</HintPath>
</Reference>
<Reference Include="System" />
- <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
Please sign in to comment.
Something went wrong with that request. Please try again.