From d152fa196f58768b8f384a1241fe49ca281a11ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enner=20P=C3=A9rez?= <ennerperez@gmail.com>
Date: Fri, 27 May 2016 00:49:26 -0400
Subject: [PATCH] NuGet Fix

---
 .gitignore                         |  40 ++++++--
 .nuget/NuGet.Config                |   6 ++
 .nuget/NuGet.targets               | 151 +++++++++++++++++++++++++++++
 CHANGELOG.md                       |   2 +-
 CameraToolkit/CameraToolkit.csproj |  11 ++-
 CameraToolkit/packages.config      |   2 +-
 README.md                          |   2 +-
 camera-toolkit.sln                 |  14 ++-
 8 files changed, 213 insertions(+), 15 deletions(-)
 create mode 100644 .nuget/NuGet.Config
 create mode 100644 .nuget/NuGet.targets

diff --git a/.gitignore b/.gitignore
index 1ce22ce..61fdd38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,10 +17,10 @@
 [Rr]eleases/
 x64/
 x86/
-build/
 bld/
 [Bb]in/
 [Oo]bj/
+[Ll]og/
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -76,9 +76,12 @@ _Chutzpah*
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
 *.cachefile
+*.VC.db
+*.VC.VC.opendb
 
 # Visual Studio profiler
 *.psess
@@ -137,11 +140,16 @@ publish/
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
+# TODO: Comment the next line if you want to checkin your web deploy settings
 # but database connection strings (with potential passwords) will be unencrypted
 *.pubxml
 *.publishproj
 
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
@@ -150,17 +158,23 @@ publish/
 !**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
 
-# Windows Azure Build Output
+# Microsoft Azure Build Output
 csx/
 *.build.csdef
 
-# Windows Azure Emulator
-efc/
-rfc/
+# Microsoft Azure Emulator
+ecf/
+rcf/
 
-# Windows Store app package directory
+# Windows Store app package directories and files
 AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -170,7 +184,6 @@ AppPackages/
 
 # Others
 ClientBin/
-[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
@@ -180,6 +193,10 @@ ClientBin/
 node_modules/
 orleans.codegen.cs
 
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
 # RIA/Silverlight projects
 Generated_Code/
 
@@ -225,6 +242,11 @@ _Pvt_Extensions
 
 # Paket dependency manager
 .paket/paket.exe
+paket-files/
 
 # FAKE - F# Make
-.fake/
\ No newline at end of file
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
\ No newline at end of file
diff --git a/.nuget/NuGet.Config b/.nuget/NuGet.Config
new file mode 100644
index 0000000..67f8ea0
--- /dev/null
+++ b/.nuget/NuGet.Config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>
\ No newline at end of file
diff --git a/.nuget/NuGet.targets b/.nuget/NuGet.targets
new file mode 100644
index 0000000..3988dc6
--- /dev/null
+++ b/.nuget/NuGet.targets
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+    
+    <!-- Enable the restore command to run before builds -->
+    <RestorePackages Condition="  '$(RestorePackages)' == '' ">true</RestorePackages>
+    
+    <!-- Property that enables building a package from a project -->
+    <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
+    
+    <!-- Determines if package restore consent is required to restore packages -->
+    <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
+    
+    <!-- Download NuGet.exe if it does not already exist -->
+    <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">true</DownloadNuGetExe>
+  </PropertyGroup>
+  
+  <ItemGroup Condition=" '$(PackageSources)' == '' ">
+    <!-- Package sources used to restore packages. By default, registered sources under %APPDATA%\NuGet\NuGet.Config will be used -->
+    <!-- The official NuGet package source (https://www.nuget.org/api/v2/) will be excluded if package sources are specified and it does not appear in the list -->
+    <!--
+            <PackageSource Include="https://www.nuget.org/api/v2/" />
+            <PackageSource Include="https://my-nuget-source/nuget/" />
+        -->
+  </ItemGroup>
+  
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
+    <!-- Windows specific commands -->
+    <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
+    <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+    <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <PackagesProjectConfig>packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
+  </PropertyGroup>
+  
+  <Choose>
+    <When Condition="Exists('$(PackagesProjectConfig)')">
+      <PropertyGroup>
+        <PackagesConfig>$(PackagesProjectConfig)</PackagesConfig>
+      </PropertyGroup>
+    </When>
+    <When Condition="Exists('packages.config')">
+      <PropertyGroup>
+        <PackagesConfig>packages.config</PackagesConfig>
+      </PropertyGroup>
+    </When>
+  </Choose>
+    
+  <PropertyGroup>
+    <!-- NuGet command -->
+    <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\NuGet.exe</NuGetExePath>
+    <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
+    
+    <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+    <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+    
+    <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+    
+    <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
+    <NonInteractiveSwitch Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' ">-NonInteractive</NonInteractiveSwitch>
+    
+    <PaddedSolutionDir Condition=" '$(OS)' == 'Windows_NT'">"$(SolutionDir) "</PaddedSolutionDir>
+    <PaddedSolutionDir Condition=" '$(OS)' != 'Windows_NT' ">"$(SolutionDir)"</PaddedSolutionDir>
+    
+    <!-- Commands -->
+    <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)"  $(NonInteractiveSwitch) $(RequireConsentSwitch) -solutionDir $(PaddedSolutionDir)</RestoreCommand>
+    <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)"</BuildCommand>
+    
+    <!-- We need to ensure packages are restored prior to assembly resolve -->
+    <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+      RestorePackages;      
+      $(BuildDependsOn);    
+    </BuildDependsOn>
+    
+    <!-- Make the build depend on restore packages -->
+    <BuildDependsOn Condition="$(BuildPackage) == 'true'">      
+      $(BuildDependsOn);      
+      BuildPackage;    
+    </BuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="CheckPrerequisites" Condition=" '$(OS)' == 'Windows_NT'">
+    <!-- Raise an error if we're unable to locate nuget.exe  -->
+    <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+    <!--
+        Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
+        This effectively acts as a lock that makes sure that the download operation will only happen once and all
+        parallel builds will have to wait for it to complete.
+        -->
+    <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadNuGetExe=$(DownloadNuGetExe)" />
+  </Target>
+
+  <Target Name="_DownloadNuGet">
+    <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
+  </Target>
+  
+  <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+    <Exec Command="$(RestoreCommand)"
+          Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+    <Exec Command="$(RestoreCommand)"
+          LogStandardErrorAsError="true"
+          Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+  </Target>
+  
+  <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites" Condition="Exists('$(ProjectDir)Package.nuspec') AND $(ConfigurationName) == 'Release' ">
+            <Exec Command="$(BuildCommand)" 
+          Condition=" '$(OS)' != 'Windows_NT' " />
+    
+    <Exec Command="$(BuildCommand)" 
+          LogStandardErrorAsError="true" 
+          Condition=" '$(OS)' == 'Windows_NT' " />
+  </Target>
+  
+  <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+    <ParameterGroup>
+      <OutputFilename ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Reference Include="System.Core" />
+      <Using Namespace="System" />
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Net" />
+      <Using Namespace="Microsoft.Build.Framework" />
+      <Using Namespace="Microsoft.Build.Utilities" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+                try {
+                    OutputFilename = Path.GetFullPath(OutputFilename);
+
+                    Log.LogMessage("Downloading latest version of NuGet.exe...");
+                    WebClient webClient = new WebClient();
+                    webClient.DownloadFile("https://www.nuget.org/nuget.exe", OutputFilename);
+
+                    return true;
+                }
+                catch (Exception ex) {
+                    Log.LogErrorFromException(ex);
+                    return false;
+                }
+            ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+</Project>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9cfe780..a3d3915 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [1.0.3] - [2016-05-27]
+## [1.0.4] - [2016-05-27]
 ### Changed
 - AppIcon Update
 - Ask for album name
diff --git a/CameraToolkit/CameraToolkit.csproj b/CameraToolkit/CameraToolkit.csproj
index f96313e..45d4376 100644
--- a/CameraToolkit/CameraToolkit.csproj
+++ b/CameraToolkit/CameraToolkit.csproj
@@ -52,8 +52,8 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Drawing.Pictograms, Version=1.0.0.3, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Drawing.Pictograms.1.0.0.3\lib\net20\System.Drawing.Pictograms.dll</HintPath>
+    <Reference Include="System.Drawing.Pictograms, Version=1.1.14.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Drawing.Pictograms.1.1.14.0\lib\net40\System.Drawing.Pictograms.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Xml.Linq" />
@@ -149,6 +149,13 @@
     <Content Include="App.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\.nuget\NuGet.targets" Condition="Exists('..\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\.nuget\NuGet.targets'))" />
+  </Target>
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>
diff --git a/CameraToolkit/packages.config b/CameraToolkit/packages.config
index 599ad4e..e07077d 100644
--- a/CameraToolkit/packages.config
+++ b/CameraToolkit/packages.config
@@ -3,5 +3,5 @@
   <package id="AForge" version="2.2.5" targetFramework="net40" />
   <package id="AForge.Video" version="2.2.5" targetFramework="net40" />
   <package id="AForge.Video.DirectShow" version="2.2.5" targetFramework="net40" />
-  <package id="System.Drawing.Pictograms" version="1.0.0.3" targetFramework="net40" />
+  <package id="System.Drawing.Pictograms" version="1.1.14.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/README.md b/README.md
index f8d548f..9c8fa7c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 # Camera Toolkit for Devigners
 
-Camera Toolkit is an simple application for fast capturing images from cameras.
+Camera Toolkit is a simple application for fast capturing images from cameras.
 
 [![Build status](https://ci.appveyor.com/api/projects/status/59jrgu2cvdorne9u?svg=true)](https://ci.appveyor.com/project/ennerperez/camera-toolkit)
 
diff --git a/camera-toolkit.sln b/camera-toolkit.sln
index f39b7cd..9cb2235 100644
--- a/camera-toolkit.sln
+++ b/camera-toolkit.sln
@@ -5,13 +5,25 @@ VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CameraToolkit", "CameraToolkit\CameraToolkit.csproj", "{04B1CED5-D352-4438-A849-608838453DCC}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D5360716-B88F-4567-B486-B455B97D8FCB}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".docs", ".docs", "{D5360716-B88F-4567-B486-B455B97D8FCB}"
 	ProjectSection(SolutionItems) = preProject
 		CHANGELOG.md = CHANGELOG.md
 		LICENSE = LICENSE
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{A74329A9-78D1-47FD-8C9F-2E23C9DE56C5}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\NuGet.targets = .nuget\NuGet.targets
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".files", ".files", "{3272744A-9CF1-451C-8F22-261FA59C29BB}"
+	ProjectSection(SolutionItems) = preProject
+		.editoricon.png = .editoricon.png
+		.gitignore = .gitignore
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU