v2.2.1 release

.github/CONTRIBUTING.md

@@ -0,0 +1,21 @@
+You have found an issue? You want to contribute to that project?
+Fine, you're at the right place
+
+# Writing an issue
+You don't have much time? Neither do we.
+
+We would appreciate that you follow the issue template to report a bug. Hopefully, if the bug is well written and can be reproduced easily, it will be fixed quite quickly.
+
+However, this project is maintained by volunteers who work on this project on their spare time. Please be patient and please provide enough info so that we can help you.
+
+We also welcome pull requests.
+
+# Writing a pull request
+- Fork the project
+- Create a branch based on `develop`, like `feature/support-for-xxx`
+- Write your code there
+- Update the changelog
+- create a PR on `develop`, explaining what you've done and how can we test your change
+
+# Writing sample codes or documentation on the wiki
+You are welcome!

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,17 @@
+I have an issue / a question (pick one) about Vlc.DotNet.
+
+# Generic information
+
+- **Vlc.DotNet version** : (Please fill)
+- **Vlc.DotNet project used** : (WinForms/WPF/Core)
+- **libvlc version** : (Please fill) (x86/x64) + how did you get it?
+- **.net version** : (Please fill)
+- **Project language** : (C#/VB.net)
+- **Project build architecture** : (x86/x64/AnyCPU/AnyCPU (prefer 32bits))
+- **Operating system** : (Windows ...) (x86/x64)
+
+# Summary
+
+(What happens, when, how? Steps to reproduce (with sample codes))
+
+- [ ] I confirm that my issue doesn't happen in VLC itself.

CHANGELOG.md

@@ -0,0 +1,31 @@
+# 2.2.1
+- FIXED assembly file version that was incorrect #[326](https://github.com/ZeBobo5/Vlc.DotNet/pull/326)
+
+# 2.2.0
+- CHANGED versionning model to adopt [SEMVER 2.0](http://semver.org/)
+- FIXED #[74](https://github.com/ZeBobo5/Vlc.DotNet/issues/74) by adding support for UTF-8 in options #[302](https://github.com/ZeBobo5/Vlc.DotNet/pull/302)
+- FIXED #[305](https://github.com/ZeBobo5/Vlc.DotNet/issues/305) by String interop conversions are now made in UTF-8 and avoid memory leaks #[306](https://github.com/ZeBobo5/Vlc.DotNet/pull/306) #[310](https://github.com/ZeBobo5/Vlc.DotNet/pull/310)
+- FIXED #[276](https://github.com/ZeBobo5/Vlc.DotNet/issues/276) by changing NuGet package folder structure #[309](https://github.com/ZeBobo5/Vlc.DotNet/pull/309)
+- FIXED potential NullReferenceException when using an uninitialized instance #[312](https://github.com/ZeBobo5/Vlc.DotNet/pull/312)
+- ADDED support for netstandard 1.3 and 2.0 #[308](https://github.com/ZeBobo5/Vlc.DotNet/pull/308)
+- ADDED Playing from a Stream object #[315](https://github.com/ZeBobo5/Vlc.DotNet/pull/315) and #[317](https://github.com/ZeBobo5/Vlc.DotNet/pull/317)
+- ADDED a method `VlcManager.CreateNewMediaFromFileDescriptor` #[314](https://github.com/ZeBobo5/Vlc.DotNet/pull/314)
+- ADDED methods `VlcMediaPlayerInstance.SetVideoCallbacks` and `VlcMediaPlayerInstance.SetVideoFormatCallbacks` #[313](https://github.com/ZeBobo5/Vlc.DotNet/pull/313)
+- ADDED overload methods to `TakeSnapshot` to be able to specify the size of the snapshot (Fixes #[211](https://github.com/ZeBobo5/Vlc.DotNet/issues/211)) #[320](https://github.com/ZeBobo5/Vlc.DotNet/pull/320)
+- ADDED public getter `VlcMediaPlayer` on WinForms `VlcControl` #[321](https://github.com/ZeBobo5/Vlc.DotNet/pull/321)
+- CHANGED visibility of `Manager` in `VlcMediaPlayer` to make it public #[321](https://github.com/ZeBobo5/Vlc.DotNet/pull/321)
+
+# 2.1.154
+- Nothing, just a few commits to change README files
+
+# 2.1.151
+- FIXED: Log messages are emitted on another thread to avoid locking VLC #[284](https://github.com/ZeBobo5/Vlc.DotNet/pull/284)
+
+# 2.1.149
+- ADDED: Feature to get VLC logs from Vlc.DotNet #[278](https://github.com/ZeBobo5/Vlc.DotNet/pull/278)
+
+# 2.1.144
+- Nothing for the library, just a modification for the code examples #[277](https://github.com/ZeBobo5/Vlc.DotNet/pull/277)
+
+# 2.1.142
+- FIXED: Library is now AnyCPU! #[271](https://github.com/ZeBobo5/Vlc.DotNet/pull/271)

README.md

@@ -3,29 +3,44 @@ Vlc.DotNet
 
 [![Join the chat at https://gitter.im/Vlc-DotNet/Lobby](https://badges.gitter.im/Vlc-DotNet/Lobby.svg)](https://gitter.im/Vlc-DotNet/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-.NET control that hosts the audio/video capabilities of the VLC libraries
+Vlc.DotNet is a .net library that hosts the audio/video capabilities of the VLC libraries. In other words, it's a .net wrapper around `libvlc`.
+
+It can work on any .net framework version starting from .net 2.0. (.net standard support is currently in beta (use prerelease packages!))
+
+On the front-end side, two components are currently available to make it easy to integrate in your apps. One is for WinForms, the other for WPF.
+
+How to use
+----------
+It all starts with those three steps :
+- Install one of the NuGet Packages below
+- Install `libvlc` libraries from one of the official distributions (To be improved, see #288)
+- Integrate it into your app
+
+See the [Getting started wiki](https://github.com/ZeBobo5/Vlc.DotNet/wiki/Getting-started)
+
+Continuous Integration
+----------------------
 
-This is the new repository for the next version of VideoLan DotNet for WinForm & WPF which is currently in dev.
 
 Branch | Build | Description
 --- | --- | ---
-master | [![Build status](https://ci.appveyor.com/api/projects/status/lkx1ojkcgq51yfro/branch/master?svg=true)](https://ci.appveyor.com/project/ZeBobo5/vlc-dotnet/branch/master) | use the latest version of libvlc
+master | [![Build status](https://ci.appveyor.com/api/projects/status/lkx1ojkcgq51yfro/branch/master?svg=true)](https://ci.appveyor.com/project/ZeBobo5/vlc-dotnet/branch/master) | Latest stable version
+develop | [![Build status](https://ci.appveyor.com/api/projects/status/lkx1ojkcgq51yfro/branch/develop?svg=true)](https://ci.appveyor.com/project/ZeBobo5/vlc-dotnet/branch/develop) | Latest features (may be experimental)
 
 NuGet Packages
 --------------
 Packages are available for Vlc libraries
 
-[Vlc.DotNet.Core.Interops](https://www.nuget.org/packages/Vlc.DotNet.Core.Interops/)
-
-[Vlc.DotNet.Core](https://www.nuget.org/packages/Vlc.DotNet.Core/)
+- [Vlc.DotNet.Core.Interops](https://www.nuget.org/packages/Vlc.DotNet.Core.Interops/) : You probably don't want to use this one directly
+- [Vlc.DotNet.Core](https://www.nuget.org/packages/Vlc.DotNet.Core/) : If you don't want to have a video interface, this might be the package to use.
+- [Vlc.DotNet.Forms](https://www.nuget.org/packages/Vlc.DotNet.Forms/) : To be used in WinForms projects
+- [Vlc.DotNet.Wpf](https://www.nuget.org/packages/Vlc.DotNet.Wpf/) : You guessed it, for WPF applications
 
-[Vlc.DotNet.Forms](https://www.nuget.org/packages/Vlc.DotNet.Forms/)
+Prereleases packages are built each time a push is made on `develop`
 
-[Vlc.DotNet.Wpf](https://www.nuget.org/packages/Vlc.DotNet.Wpf/)
-
-Latest News
---------------
-21-12-2015
-- Merge pull requests. Thanks for your contributions
-- Auto deployment of NuGet Packages on each master branch push
+# Other links
 
+- [Contributing](https://github.com/ZeBobo5/Vlc.DotNet/blob/develop/.github/CONTRIBUTING.md)
+- [Changelog](https://github.com/ZeBobo5/Vlc.DotNet/blob/develop/CHANGELOG.md)
+- [Wiki](https://github.com/ZeBobo5/Vlc.DotNet/wiki)
+- [Ask questions](https://gitter.im/Vlc-DotNet/Lobby)

appveyor.yml

@@ -1,49 +1,45 @@
-version: 2.1.{build}
-
-branches:
-  only: 
-    - master
+environment:
+  version_prefix: 2.2.1
+version: $(version_prefix)-{branch}{build}
 
+image: Visual Studio 2017
 skip_tags: true
-
 init:
   - git config --global core.autocrlf input
-
 clone_folder: C:\projects\vlc-dotnet-master\
-
 shallow_clone: true
-
-assembly_info:
-  patch: true
-  file: AssemblyInfo.*
-  assembly_version: "2.1.{build}"
-  assembly_file_version: "2.1.0.0"
-  assembly_informational_version: "2.1.0.0"
-
-build_script:
-  - msbuild "src\Vlc.DotNet.sln" /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /p:Configuration=Release;Platform=AnyCPU
-  - ps: 7z a "C:\projects\vlc-dotnet-master\Vlc.DotNet for Vlc 2.1.x - AnyCPU - .Net 2.0.zip" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Core\Release - AnyCPU - .Net 2.0\Vlc.DotNet.Core.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Core.Interops\Release - AnyCPU - .Net 2.0\Vlc.DotNet.Core.Interops.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Forms\Release - AnyCPU - .Net 2.0\Vlc.DotNet.Forms.dll" 
-  - ps: 7z a "C:\projects\vlc-dotnet-master\Vlc.DotNet for Vlc 2.1.x - AnyCPU - .Net 3.5.zip" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Core\Release - AnyCPU - .Net 3.5\Vlc.DotNet.Core.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Core.Interops\Release - AnyCPU - .Net 3.5\Vlc.DotNet.Core.Interops.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Forms\Release - AnyCPU - .Net 3.5\Vlc.DotNet.Forms.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Wpf\Release - AnyCPU - .Net 3.5\Vlc.DotNet.Wpf.dll"
-  - ps: 7z a "C:\projects\vlc-dotnet-master\Vlc.DotNet for Vlc 2.1.x - AnyCPU - .Net 4.0.zip" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Core\Release - AnyCPU - .Net 4.0\Vlc.DotNet.Core.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Core.Interops\Release - AnyCPU - .Net 4.0\Vlc.DotNet.Core.Interops.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Forms\Release - AnyCPU - .Net 4.0\Vlc.DotNet.Forms.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Wpf\Release - AnyCPU - .Net 4.0\Vlc.DotNet.Wpf.dll"
-  - ps: 7z a "C:\projects\vlc-dotnet-master\Vlc.DotNet for Vlc 2.1.x - AnyCPU - .Net 4.5.zip" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Core\Release - AnyCPU - .Net 4.5\Vlc.DotNet.Core.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Core.Interops\Release - AnyCPU - .Net 4.5\Vlc.DotNet.Core.Interops.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Forms\Release - AnyCPU - .Net 4.5\Vlc.DotNet.Forms.dll" "C:\projects\vlc-dotnet-master\build\Vlc.DotNet.Wpf\Release - AnyCPU - .Net 4.5\Vlc.DotNet.Wpf.dll"
-  - ps: (Get-Content 'C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Core.Interops.nuspec') | Foreach-Object {$_ -replace '\$version\$',$env:APPVEYOR_BUILD_VERSION}  | Out-File 'C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Core.Interops.nuspec'
-  - ps: (Get-Content 'C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Core.nuspec') | Foreach-Object {$_ -replace '\$version\$',$env:APPVEYOR_BUILD_VERSION}  | Out-File 'C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Core.nuspec'
-  - ps: (Get-Content 'C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Forms.nuspec') | Foreach-Object {$_ -replace '\$version\$',$env:APPVEYOR_BUILD_VERSION}  | Out-File 'C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Forms.nuspec'
-  - ps: (Get-Content 'C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Wpf.nuspec') | Foreach-Object {$_ -replace '\$version\$',$env:APPVEYOR_BUILD_VERSION}  | Out-File 'C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Wpf.nuspec'
-  - ps: nuget pack C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Core.Interops.nuspec
-  - ps: nuget pack C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Core.nuspec
-  - ps: nuget pack C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Forms.nuspec
-  - ps: nuget pack C:\projects\vlc-dotnet-master\nuget\Vlc.DotNet.Wpf.nuspec
-  - ps: 7z a "C:\projects\vlc-dotnet-master\nuget-packages.zip" *.nupkg 
-
 artifacts:
-  - path: "**/*.zip"
-    name: "Vlc.DotNet for Vlc 2.1.x"
   - path: "**/*.nupkg"
-    name: "Vlc.DotNet for Vlc 2.1.x NuGet Packages"
-
+    name: "Vlc.DotNet NuGet Packages"
 deploy:
   - provider: NuGet
     api_key:
         secure: OriZXhNZQOSzNsBXQsoUBOScm5K9AJ9HLZBGL+Gcsrj5VcVCAXpA1Rv3vaGHmnRE
-    artifact: /.*\.nupkg/
+    artifact: /.*\.nupkg/
+
+for:
+  -
+    branches:
+      only:
+        - master
+
+    build_script:
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Restore /p:VersionPrefix=%version_prefix% /Verbosity:Minimal "src\Vlc.DotNet.sln"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Build /p:VersionPrefix=%version_prefix% /p:Configuration=Release "src\Vlc.DotNet.sln"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Pack /p:VersionPrefix=%version_prefix% /p:Configuration=Release "src\Vlc.DotNet.Core.Interops\Vlc.DotNet.Core.Interops.csproj"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Pack /p:VersionPrefix=%version_prefix% /p:Configuration=Release "src\Vlc.DotNet.Core\Vlc.DotNet.Core.csproj"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Pack /p:VersionPrefix=%version_prefix% /p:Configuration=Release "src\Vlc.DotNet.Forms\Vlc.DotNet.Forms.csproj"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Pack /p:VersionPrefix=%version_prefix% /p:Configuration=Release "src\Vlc.DotNet.Wpf\Vlc.DotNet.Wpf.csproj"
+
+  -
+    branches:
+      only:
+        - develop
+
+    build_script:
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Restore /p:VersionPrefix=%version_prefix% /p:VersionSuffix=develop%APPVEYOR_BUILD_NUMBER% /Verbosity:Minimal "src\Vlc.DotNet.sln"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Build /p:Configuration=Release /p:VersionPrefix=%version_prefix% /p:VersionSuffix=develop%APPVEYOR_BUILD_NUMBER% "src\Vlc.DotNet.sln"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Pack /p:Configuration=Release /p:VersionPrefix=%version_prefix% /p:VersionSuffix=develop%APPVEYOR_BUILD_NUMBER% "src\Vlc.DotNet.Core.Interops\Vlc.DotNet.Core.Interops.csproj"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Pack /p:Configuration=Release /p:VersionPrefix=%version_prefix% /p:VersionSuffix=develop%APPVEYOR_BUILD_NUMBER% "src\Vlc.DotNet.Core\Vlc.DotNet.Core.csproj"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Pack /p:Configuration=Release /p:VersionPrefix=%version_prefix% /p:VersionSuffix=develop%APPVEYOR_BUILD_NUMBER% "src\Vlc.DotNet.Forms\Vlc.DotNet.Forms.csproj"
+      - msbuild /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /t:Pack /p:Configuration=Release /p:VersionPrefix=%version_prefix% /p:VersionSuffix=develop%APPVEYOR_BUILD_NUMBER% "src\Vlc.DotNet.Wpf\Vlc.DotNet.Wpf.csproj"