Permalink
Browse files

Merge pull request #190 from Caliburn-Micro/3.0.0

Release 3.0.0
  • Loading branch information...
2 parents e59223f + d06f9d4 commit 81820d0641f2a35f51c1502d0f88c52cbcca518b @nigel-sampson nigel-sampson committed Feb 29, 2016
Showing 318 changed files with 17,500 additions and 1,897 deletions.
View
@@ -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
View
@@ -1,45 +1,47 @@
-*.suo
-*.user
-*.FileListAbsolute.txt
-*\bin\*
-*\obj\*
-*.ncb
-*.nlb
-*.aps
-*.clw
-*.pdb
-*.obj
-*.exe
-*.pch
-*.vspscc
-*_i.c
-*_p.c
-*.tlb
-*.tlh
-*.bak
-*.cache
-*.Cache
-*.ilk
-*.log
-*.lib
-*.sbr
-*.scc
-*.sig
-*.xap
-_ReSharper*
-[Bb]in
-[Dd]ebug*/
-obj/
-[Rr]elease*/
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-glob:desktop.ini
-generated-templates
-nuget/*.nupkg
-nuget/*/lib/
-*.*~
-*.vs10x
-*.docstates
-packages/
+*.suo
+*.user
+*.FileListAbsolute.txt
+*\bin\*
+*\obj\*
+*.ncb
+*.nlb
+*.aps
+*.clw
+*.pdb
+*.obj
+*.exe
+*.pch
+*.vspscc
+*_i.c
+*_p.c
+*.tlb
+*.tlh
+*.bak
+*.cache
+*.Cache
+*.ilk
+*.log
+*.lib
+*.sbr
+*.scc
+*.sig
+*.xap
+_ReSharper*
+[Bb]in
+[Dd]ebug*/
+obj/
+[Rr]elease*/
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+glob:desktop.ini
+generated-templates
+nuget/*.nupkg
+nuget/*/lib/
+*.*~
+*.vs10x
+*.docstates
+packages/
+*.project.lock.json
+project.lock.json
.vs
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Caliburn.Micro.Core</id>
- <version>2.0.2</version>
+ <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>
@@ -16,7 +16,7 @@
</metadata>
<files>
- <file src="..\bin\portable\Release\Caliburn.Micro.*" target="lib\portable-net45+win8+wp8+wpa81" />
+ <file src="..\bin\portable\Release\Caliburn.Micro.*" target="lib\portable-net45+win8+wp8+wpa81+MonoAndroid10+Xamarin.iOS10+MonoTouch10+uap10.0" />
<file src="..\bin\sl5\Release\Caliburn.Micro.*" exclude="**\Caliburn.Micro.*.*" target="lib\sl5" />
<file src="..\bin\net40\Release\Caliburn.Micro.*" exclude="**\Caliburn.Micro.*.*" target="lib\net40" />
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Caliburn.Micro.Start</id>
- <version>2.0.2</version>
+ <version>3.0.0</version>
<authors>Rob Eisenberg, Marco Amendola, Chin Bae, Ryan Cromwell, Nigel Sampson, Thomas Ibel, Matt Hidinger</authors>
<description>A startup sample for Caliburn.Micro.</description>
<language>en-US</language>
@@ -20,7 +20,7 @@
<dependencies>
<group>
- <dependency id="Caliburn.Micro" version="[2.0.2]" />
+ <dependency id="Caliburn.Micro" version="[3.0.0]" />
</group>
</dependencies>
</metadata>
@@ -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>
@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>Caliburn.Micro</id>
- <version>2.0.2</version>
+ <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>
@@ -20,15 +20,11 @@
<dependencies>
<group>
- <dependency id="Caliburn.Micro.Core" version="[2.0.2]" />
+ <dependency id="Caliburn.Micro.Core" version="[3.0.0]" />
</group>
- <group targetFramework="win8">
- <dependency id="Caliburn.Micro.Core" version="[2.0.2]" />
- <dependency id="Windows.UI.Interactivity" version="[1.3.0]" />
- <dependency id="Callisto" version="[1.3.1]" />
- </group>
- <group targetFramework="win81">
- <dependency id="Caliburn.Micro.Core" version="[2.0.2]" />
+ <group targetFramework="uap10.0">
+ <dependency id="Caliburn.Micro.Core" version="[3.0.0]" />
+ <dependency id="Microsoft.Xaml.Behaviors.Uwp.Managed" version="1.1.0" />
</group>
</dependencies>
</metadata>
@@ -43,8 +39,6 @@
<file src="..\bin\sl5\Release\Caliburn.Micro.*.*" target="lib\sl5" />
<file src="..\bin\sl5\Release\System.Windows.Interactivity.*" target="lib\sl5" />
- <file src="..\bin\win8\Release\Caliburn.Micro.*.*" target="lib\win8" />
-
<file src="..\bin\win81\Release\Caliburn.Micro.*.*" target="lib\win81" />
<file src="..\bin\win81\Release\Microsoft.Xaml.*.*" target="lib\win81" />
@@ -53,9 +47,15 @@
<file src="..\bin\wpa81\Release\Caliburn.Micro.*.*" target="lib\wpa81" />
<file src="..\bin\wpa81\Release\Microsoft.Xaml.*.*" target="lib\wpa81" />
-
- <file src="tools\**" target="tools" />
-
+
+ <file src="..\bin\android\Release\Caliburn.Micro.*.*" target="lib\MonoAndroid10" />
+
+ <file src="..\bin\iOS\Release\Caliburn.Micro.*.*" target="lib\Xamarin.iOS10" />
+ <file src="..\bin\iOS\Release\Caliburn.Micro.*.*" target="lib\MonoTouch10" />
+
+ <file src="..\bin\uwp\Release\Caliburn.Micro.*.*" target="lib\uap10.0" />
+ <file src="..\bin\uwp\Release\Caliburn.Micro.Platform.UWP\Properties\Caliburn.Micro.Platform.UWP.rd.xml" target="lib\uap10.0\Caliburn.Micro.Platform.UWP\Properties\Caliburn.Micro.Platform.UWP.rd.xml" />
+
<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" />
@@ -2,4 +2,5 @@
del *.nupkg
.\nuget.exe pack .\Caliburn.Micro.Core.nuspec -symbols
.\nuget.exe pack .\Caliburn.Micro.nuspec -symbols
+.\nuget.exe pack .\Caliburn.Micro.Xamarin.Forms.nuspec -symbols
.\nuget.exe pack .\Caliburn.Micro.Start.nuspec
View
Binary file not shown.
@@ -124,12 +124,12 @@
<Reference Include="Caliburn.Micro">
<HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.dll</HintPath>
</Reference>
- <Reference Include="Caliburn.Micro.Extensions">
- <HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Extensions.dll</HintPath>
- </Reference>
<Reference Include="Caliburn.Micro.Platform">
<HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.dll</HintPath>
</Reference>
+ <Reference Include="Caliburn.Micro.Platform.Core">
+ <HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Xaml.Interactions">
<HintPath>..\..\..\..\bin\win81\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
</Reference>
@@ -102,12 +102,12 @@
<Reference Include="Caliburn.Micro">
<HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.dll</HintPath>
</Reference>
- <Reference Include="Caliburn.Micro.Extensions">
- <HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Extensions.dll</HintPath>
- </Reference>
<Reference Include="Caliburn.Micro.Platform">
<HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.dll</HintPath>
</Reference>
+ <Reference Include="Caliburn.Micro.Platform.Core">
+ <HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Xaml.Interactions">
<HintPath>..\..\..\..\bin\wpa81\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
</Reference>
@@ -1,3 +1,6 @@
-<settings>
- <repositoryPath>..\packages</repositoryPath>
-</settings>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <config>
+ <add key="repositorypath" value="..\packages" />
+ </config>
+</configuration>
@@ -128,12 +128,13 @@
<Reference Include="Caliburn.Micro">
<HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.dll</HintPath>
</Reference>
- <Reference Include="Caliburn.Micro.Extensions">
- <HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Extensions.dll</HintPath>
- </Reference>
<Reference Include="Caliburn.Micro.Platform">
<HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.dll</HintPath>
</Reference>
+ <Reference Include="Caliburn.Micro.Platform.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\bin\win81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Xaml.Interactions">
<HintPath>..\..\..\..\bin\win81\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
</Reference>
@@ -90,12 +90,13 @@
<Reference Include="Caliburn.Micro">
<HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.dll</HintPath>
</Reference>
- <Reference Include="Caliburn.Micro.Extensions">
- <HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Extensions.dll</HintPath>
- </Reference>
<Reference Include="Caliburn.Micro.Platform">
<HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.dll</HintPath>
</Reference>
+ <Reference Include="Caliburn.Micro.Platform.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=8e5891231f2ed21f, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\bin\wpa81\Debug\Caliburn.Micro.Platform.Core.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Xaml.Interactions">
<HintPath>..\..\..\..\bin\wpa81\Debug\Microsoft.Xaml.Interactions.dll</HintPath>
</Reference>
@@ -1,3 +1,6 @@
-<settings>
- <repositoryPath>..\packages</repositoryPath>
-</settings>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <config>
+ <add key="repositorypath" value="..\packages" />
+ </config>
+</configuration>
@@ -1,3 +1,6 @@
-<settings>
- <repositoryPath>..\packages</repositoryPath>
-</settings>
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <config>
+ <add key="repositorypath" value="..\packages" />
+ </config>
+</configuration>
Oops, something went wrong.

0 comments on commit 81820d0

Please sign in to comment.