Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #190 from Caliburn-Micro/3.0.0
Release 3.0.0
- Loading branch information
Showing
318 changed files
with
17,500 additions
and
1,897 deletions.
There are no files selected for viewing
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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,63 @@ | |||
| ############################################################################### | |||
| # Set default behavior to automatically normalize line endings. | |||
| ############################################################################### | |||
| * text=auto | |||
|
|
|||
| ############################################################################### | |||
| # Set default behavior for command prompt diff. | |||
| # | |||
| # This is need for earlier builds of msysgit that does not have it on by | |||
| # default for csharp files. | |||
| # Note: This is only used by command line | |||
| ############################################################################### | |||
| #*.cs diff=csharp | |||
|
|
|||
| ############################################################################### | |||
| # Set the merge driver for project and solution files | |||
| # | |||
| # Merging from the command prompt will add diff markers to the files if there | |||
| # are conflicts (Merging from VS is not affected by the settings below, in VS | |||
| # the diff markers are never inserted). Diff markers may cause the following | |||
| # file extensions to fail to load in VS. An alternative would be to treat | |||
| # these files as binary and thus will always conflict and require user | |||
| # intervention with every merge. To do so, just uncomment the entries below | |||
| ############################################################################### | |||
| #*.sln merge=binary | |||
| #*.csproj merge=binary | |||
| #*.vbproj merge=binary | |||
| #*.vcxproj merge=binary | |||
| #*.vcproj merge=binary | |||
| #*.dbproj merge=binary | |||
| #*.fsproj merge=binary | |||
| #*.lsproj merge=binary | |||
| #*.wixproj merge=binary | |||
| #*.modelproj merge=binary | |||
| #*.sqlproj merge=binary | |||
| #*.wwaproj merge=binary | |||
|
|
|||
| ############################################################################### | |||
| # behavior for image files | |||
| # | |||
| # image files are treated as binary by default. | |||
| ############################################################################### | |||
| #*.jpg binary | |||
| #*.png binary | |||
| #*.gif binary | |||
|
|
|||
| ############################################################################### | |||
| # diff behavior for common document formats | |||
| # | |||
| # Convert binary document formats to text before diffing them. This feature | |||
| # is only available from the command line. Turn it on by uncommenting the | |||
| # entries below. | |||
| ############################################################################### | |||
| #*.doc diff=astextplain | |||
| #*.DOC diff=astextplain | |||
| #*.docx diff=astextplain | |||
| #*.DOCX diff=astextplain | |||
| #*.dot diff=astextplain | |||
| #*.DOT diff=astextplain | |||
| #*.pdf diff=astextplain | |||
| #*.PDF diff=astextplain | |||
| #*.rtf diff=astextplain | |||
| #*.RTF diff=astextplain | |||
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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,45 +1,47 @@ | |||
| *.suo | *.suo | ||
| *.user | *.user | ||
| *.FileListAbsolute.txt | *.FileListAbsolute.txt | ||
| *\bin\* | *\bin\* | ||
| *\obj\* | *\obj\* | ||
| *.ncb | *.ncb | ||
| *.nlb | *.nlb | ||
| *.aps | *.aps | ||
| *.clw | *.clw | ||
| *.pdb | *.pdb | ||
| *.obj | *.obj | ||
| *.exe | *.exe | ||
| *.pch | *.pch | ||
| *.vspscc | *.vspscc | ||
| *_i.c | *_i.c | ||
| *_p.c | *_p.c | ||
| *.tlb | *.tlb | ||
| *.tlh | *.tlh | ||
| *.bak | *.bak | ||
| *.cache | *.cache | ||
| *.Cache | *.Cache | ||
| *.ilk | *.ilk | ||
| *.log | *.log | ||
| *.lib | *.lib | ||
| *.sbr | *.sbr | ||
| *.scc | *.scc | ||
| *.sig | *.sig | ||
| *.xap | *.xap | ||
| _ReSharper* | _ReSharper* | ||
| [Bb]in | [Bb]in | ||
| [Dd]ebug*/ | [Dd]ebug*/ | ||
| obj/ | obj/ | ||
| [Rr]elease*/ | [Rr]elease*/ | ||
| [Tt]est[Rr]esult* | [Tt]est[Rr]esult* | ||
| [Bb]uild[Ll]og.* | [Bb]uild[Ll]og.* | ||
| *.[Pp]ublish.xml | *.[Pp]ublish.xml | ||
| glob:desktop.ini | glob:desktop.ini | ||
| generated-templates | generated-templates | ||
| nuget/*.nupkg | nuget/*.nupkg | ||
| nuget/*/lib/ | nuget/*/lib/ | ||
| *.*~ | *.*~ | ||
| *.vs10x | *.vs10x | ||
| *.docstates | *.docstates | ||
| packages/ | packages/ | ||
| *.project.lock.json | |||
| project.lock.json | |||
| .vs | .vs | ||
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
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
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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,32 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | |||
| <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> | |||
| <metadata> | |||
| <id>Caliburn.Micro.Xamarin.Forms</id> | |||
| <version>3.0.0</version> | |||
| <authors>Rob Eisenberg, Marco Amendola, Chin Bae, Ryan Cromwell, Nigel Sampson, Thomas Ibel, Matt Hidinger</authors> | |||
| <description>A small, yet powerful framework designed for Xaml platforms, Caliburn.Micro implements a variety of UI patterns for solving real-world problems. Patterns that are highlighted include MVVM (Presentation Model), MVP and MVC.</description> | |||
| <language>en-US</language> | |||
| <licenseUrl>https://raw.githubusercontent.com/Caliburn-Micro/Caliburn.Micro/master/License.txt</licenseUrl> | |||
| <projectUrl>http://caliburnmicro.com/</projectUrl> | |||
| <iconUrl>https://raw.githubusercontent.com/Caliburn-Micro/Caliburn.Micro/master/CaliburnIcon.png</iconUrl> | |||
| <requireLicenseAcceptance>false</requireLicenseAcceptance> | |||
| <releaseNotes></releaseNotes> | |||
| <copyright>Copyright (c) 2010 Blue Spire Consulting, Inc.</copyright> | |||
| <tags>MVVM Silverlight WPF WP8 WinRT Metro SL5 SL MVC CoC Convention MVP PM Screen Coroutine Behavior Model-View-ViewModel Presentation UI ViewModel Phone Caliburn</tags> | |||
|
|
|||
| <dependencies> | |||
| <group> | |||
| <dependency id="Caliburn.Micro.Core" version="[3.0.0]" /> | |||
| <dependency id="Xamarin.Forms" version="2.0.1.6505" /> | |||
| </group> | |||
| </dependencies> | |||
| </metadata> | |||
|
|
|||
| <files> | |||
| <file src="..\bin\xamarin-forms\Release\Caliburn.Micro.Platform.Xamarin.Forms.*" target="lib\portable-net45+win8+wp8+wpa81+MonoAndroid10+Xamarin.iOS10+MonoTouch10" /> | |||
|
|
|||
| <file src="..\src\*.cs" target="src" /> | |||
| <file src="..\src\Caliburn.Micro.Platform*\**\*.cs" exclude="**\obj\**\*.*" target="src" /> | |||
| <file src="..\src\Caliburn.Micro.Extensions*\**\*.cs" exclude="**\obj\**\*.*" target="src" /> | |||
| </files> | |||
| </package> | |||
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
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
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
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
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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,3 +1,6 @@ | |||
| <settings> | <?xml version="1.0" encoding="utf-8"?> | ||
| <repositoryPath>..\packages</repositoryPath> | <configuration> | ||
| </settings> | <config> | ||
| <add key="repositorypath" value="..\packages" /> | |||
| </config> | |||
| </configuration> | |||
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
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
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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,3 +1,6 @@ | |||
| <settings> | <?xml version="1.0" encoding="utf-8"?> | ||
| <repositoryPath>..\packages</repositoryPath> | <configuration> | ||
| </settings> | <config> | ||
| <add key="repositorypath" value="..\packages" /> | |||
| </config> | |||
| </configuration> | |||
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 | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,3 +1,6 @@ | |||
| <settings> | <?xml version="1.0" encoding="utf-8"?> | ||
| <repositoryPath>..\packages</repositoryPath> | <configuration> | ||
| </settings> | <config> | ||
| <add key="repositorypath" value="..\packages" /> | |||
| </config> | |||
| </configuration> | |||
Oops, something went wrong.