Merge branch 'develop'

.files/AssemblyInfo.Common.cs

@@ -2,30 +2,37 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Security;
+#if PORTABLE
+using Platform.Support.Core;
+using Platform.Support.Core.Attributes;
+#else
+using Platform.Support;
+using Platform.Support.Attributes;
+#endif
 
 #if (!COMPANY)
 
 [assembly: AssemblyCompany("Enner Pérez")]
-[assembly: Platform.Support.Attributes.Id("J-18384909-0")]
-[assembly: AssemblyCopyright("© Enner Pérez. All rights reserved.")]
-[assembly: AssemblyTrademark("© Enner Pérez")]
+[assembly: Id("J-18384909-0")]
+[assembly: AssemblyCopyright("Copyright © Enner Pérez")]
+[assembly: AssemblyTrademark("Enner Pérez")]
 
-[assembly: Platform.Support.Attributes.Contact("Twitter", "@ennerperez")]
-[assembly: Platform.Support.Attributes.Contact("584146328236")]
-[assembly: Platform.Support.Attributes.Mail("[email protected]")]
+[assembly: Contact("Twitter", "@ennerperez")]
+[assembly: Contact("584146328236")]
+[assembly: Mail("[email protected]")]
 
-//[assembly: Platform.Support.Attributes.Url("")]
+//[assembly: Url("")]
 
 #else
 
 [assembly: AssemblyCompany("Argument")]
-[assembly: Platform.Support.Attributes.Id("J-18384909-0")]
-[assembly: AssemblyCopyright("© Argument C.A. All rights reserved.")]
-[assembly: AssemblyTrademark("© Argument C.A.")]
+[assembly: Id("J-18384909-0")]
+[assembly: AssemblyCopyright("Copyright © Argument C.A.")]
+[assembly: AssemblyTrademark("Argument C.A.")]
 
-//[assembly: Platform.Support.Attributes.Url("")]
+//[assembly: Url("")]
 
 #endif
 
-[assembly: Platform.Support.Attributes.MadeIn("Venezuela", "VE")]
-[assembly: Platform.Support.Attributes.Developer("Enner Pérez", "@ennerperez")]
+[assembly: MadeIn("Venezuela", "VE")]
+[assembly: Developer("Enner Pérez", "@ennerperez")]

.files/AssemblyInfo.Platform.cs

@@ -9,15 +9,12 @@
 [assembly: ComVisible(false)]
 #endif
 [assembly: CLSCompliant(false)]
-//[assembly: SecurityRules(SecurityRuleSet.Level2)] 
 
 #if (DEBUG)
-[assembly: AssemblyConfiguration("Debug")]
+[assembly: AssemblyConfiguration("DEBUG")]
 #else
-[assembly: AssemblyConfiguration("Release")]
+[assembly: AssemblyConfiguration("RELEASE")]
 #endif
 
-//#if (NETFX_40 || NETFX_45 || NETFX_451)
-//[assembly: AllowPartiallyTrustedCallers()]
-//#endif
-[assembly: NeutralResourcesLanguageAttribute("en")]
+[assembly: AssemblyCulture("")]
+[assembly: NeutralResourcesLanguage("en")]

.files/AssemblyInfo.Version.cs

@@ -1,4 +1,11 @@
 using System.Reflection;
+#if PORTABLE
+using Platform.Support.Core;
+using Platform.Support.Core.Attributes;
+#else
+using Platform.Support;
+using Platform.Support.Attributes;
+#endif
 
 // Version information for an assembly consists of the following four values:
 //
@@ -13,7 +20,7 @@
 //[assembly: AssemblyInformationalVersion("3.1.0-master")]
 
 #if (!DEBUG)
-[assembly: Platform.Support.Attributes.ProductLevel(Platform.Support.ProductLevels.RTW)]
+[assembly: ProductLevel(ProductLevels.RTW)]
 #else
-[assembly: Platform.Support.Attributes.ProductLevel(Platform.Support.ProductLevels.Preview)]
+[assembly: ProductLevel(ProductLevels.Preview)]
 #endif

.gitignore

@@ -17,7 +17,6 @@
 [Rr]eleases/
 x64/
 x86/
-build/
 bld/
 [Bb]in/
 [Oo]bj/
@@ -76,6 +75,7 @@ _Chutzpah*
 ipch/
 *.aps
 *.ncb
+*.opendb
 *.opensdf
 *.sdf
 *.cachefile
@@ -137,7 +137,7 @@ 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
@@ -150,13 +150,25 @@ 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
+.nuget/NuGet.exe
 
-# Windows Azure Build Output
+# Microsoft Azure Build Output
 csx/
 *.build.csdef
 
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Microsoft Azure ApplicationInsights config file
+ApplicationInsights.config
+
 # Windows Store app package directory
 AppPackages/
+BundleArtifacts/
 
 # Visual Studio cache files
 # files ending in .cache can be ignored
@@ -166,7 +178,6 @@ AppPackages/
 
 # Others
 ClientBin/
-[Ss]tyle[Cc]op.*
 ~$*
 *~
 *.dbmdl
@@ -199,6 +210,9 @@ UpgradeLog*.htm
 # Microsoft Fakes
 FakesAssemblies/
 
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
 
@@ -215,3 +229,9 @@ FakesAssemblies/
 **/*.Server/GeneratedArtifacts
 **/*.Server/ModelManifest.xml
 _Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+
+# FAKE - F# Make
+.fake/

.nuget/NuGet.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>

.nuget/NuGet.targets

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+***********************************************************************************************
+  <Import Project="$(SolutionDir).nuget\NuGet.targets" Condition="Exists('$(SolutionDir).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('$(SolutionDir).nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir).nuget\NuGet.targets'))" />
+  </Target>
+***********************************************************************************************
+-->
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
@@ -13,7 +24,11 @@
     <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
 
     <!-- Download NuGet.exe if it does not already exist -->
-    <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
+    <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">true</DownloadNuGetExe>
+
+    <!-- Exclude files in BuildPackage command -->
+    <ExcludeFiles Condition="'$(BuildPackage)' "></ExcludeFiles>
+
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(PackageSources)' == '' ">
@@ -36,22 +51,29 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackagesProjectConfig Condition=" '$(OS)' == 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
-    <PackagesProjectConfig Condition=" '$(OS)' != 'Windows_NT'">$(MSBuildProjectDirectory)\packages.$(MSBuildProjectName).config</PackagesProjectConfig>
+    <PackagesProjectConfig>packages.$(MSBuildProjectName.Replace(' ', '_')).config</PackagesProjectConfig>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <PackagesConfig Condition="Exists('$(MSBuildProjectDirectory)\packages.config')">$(MSBuildProjectDirectory)\packages.config</PackagesConfig>
-    <PackagesConfig Condition="Exists('$(PackagesProjectConfig)')">$(PackagesProjectConfig)</PackagesConfig>
-  </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>
+    <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
 
     <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
 
@@ -63,7 +85,8 @@
 
     <!-- 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>
+    <ExcludeArgs Condition="'$(ExcludeFiles)' != ''">-Exclude $(ExcludeFiles)</ExcludeArgs>
+    <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" $(ExcludeArgs) -Properties "Configuration=$(Configuration);Platform=$(Platform)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)"</BuildCommand>
 
     <!-- We need to ensure packages are restored prior to assembly resolve -->
     <BuildDependsOn Condition="$(RestorePackages) == 'true'">
@@ -78,7 +101,7 @@
     </BuildDependsOn>
   </PropertyGroup>
 
-  <Target Name="CheckPrerequisites">
+  <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)'" />
     <!--
@@ -102,9 +125,9 @@
           Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
   </Target>
 
-  <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites" Condition="Exists('$(ProjectDir)Package.nuspec') AND $(ConfigurationName) == 'Release'">
+  <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites" Condition="Exists('$(ProjectDir)Package.nuspec') AND $(ConfigurationName) == 'Release' ">
     <Exec Command="$(BuildCommand)"
-          Condition=" '$(OS)' != 'Windows_NT' " />
+  Condition=" '$(OS)' != 'Windows_NT' " />
 
     <Exec Command="$(BuildCommand)"
           LogStandardErrorAsError="true"

Bootstrapper/Bootstrapper.wixproj

@@ -70,12 +70,12 @@
     <EmbeddedResource Include="Globalization\ClassicTheme.wxl" />
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
-  <Import Project="..\packages\Microsoft.Bcl.Build.Symbols.1.0.14.0\build\Microsoft.Bcl.Build.Symbols.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.Symbols.1.0.14.0\build\Microsoft.Bcl.Build.Symbols.targets')" />
+  <Import Project="..\packages\Microsoft.Bcl.Build.Symbols.1.0.15.0\build\Microsoft.Bcl.Build.Symbols.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.Symbols.1.0.15.0\build\Microsoft.Bcl.Build.Symbols.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.Symbols.1.0.14.0\build\Microsoft.Bcl.Build.Symbols.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.Symbols.1.0.14.0\build\Microsoft.Bcl.Build.Symbols.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.Symbols.1.0.15.0\build\Microsoft.Bcl.Build.Symbols.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.Symbols.1.0.15.0\build\Microsoft.Bcl.Build.Symbols.targets'))" />
   </Target>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

Bootstrapper/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl.Build.Symbols" version="1.0.14.0" />
+  <package id="Microsoft.Bcl.Build.Symbols" version="1.0.15.0" />
 </packages>