Merge branch 'development' into portable

cureos · Jun 7, 2016 · 7495a02 · 7495a02
2 parents 560b0e0 + 93836d0
commit 7495a02
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/Setup/NuGet/Build.cmd b/Setup/NuGet/Build.cmd
@@ -26,6 +26,6 @@ forfiles /p %output% /m *.nupkg /c "cmd /c del @file"
 echo.
 echo Creating packages...
 
-forfiles /m *.nuspec /c "cmd /c nuget.exe pack @File -Symbols -Version %version% -OutputDirectory %output%"
+forfiles /m *.nuspec /c "cmd /c nuget.exe pack @File -Version %version% -OutputDirectory %output%"
 
 :eof
diff --git a/Setup/NuGet/NuGet.exe b/Setup/NuGet/NuGet.exe
diff --git a/Setup/NuGet/Push.cmd b/Setup/NuGet/Push.cmd
@@ -19,6 +19,6 @@ echo Current directory: %current%
 echo Output  directory: %output%
 echo.
 
-forfiles /p %output% /m *.nupkg /c "cmd /c %current%\NuGet.exe push @file"
+forfiles /p %output% /m *.nupkg /c "cmd /c %current%\NuGet.exe push @file -Source https://www.nuget.org/api/v2/package"
 
 pause
diff --git a/Setup/version.cmd b/Setup/version.cmd
@@ -1 +1 @@
-set version=3.0.2
+set version=3.1.0-alpha
diff --git a/Sources/Accord.Docs/Accord.Documentation/Accord.Documentation.shfbproj b/Sources/Accord.Docs/Accord.Documentation/Accord.Documentation.shfbproj
@@ -8,7 +8,7 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{048acc63-3b91-4e14-b5a3-38e7898426fe}</ProjectGuid>
-    <SHFBSchemaVersion>1.9.9.0</SHFBSchemaVersion>
+    <SHFBSchemaVersion>2015.6.5.0</SHFBSchemaVersion>
     <!-- AssemblyName, Name, and RootNamespace are not used by SHFB but Visual
          Studio adds them anyway -->
     <AssemblyName>Documentation</AssemblyName>
@@ -73,7 +73,7 @@
       <DocumentationSource sourceFile="..\..\..\Release\net45\Accord.Audio.DirectSound.dll" />
       <DocumentationSource sourceFile="..\..\..\Release\net45\Accord.Audio.DirectSound.xml" />
     </DocumentationSources>
-    <CopyrightText>Accord.NET Framework &amp;#169%3b 2009-2015. All documentation is licensed under the Creative Commons Attribution/Share-Alike License.</CopyrightText>
+    <CopyrightText>Accord.NET Framework &amp;#169%3b 2009-2016. All documentation is licensed under the Creative Commons Attribution/Share-Alike License.</CopyrightText>
     <FeedbackEMailAddress>feedback%40accord-framework.net</FeedbackEMailAddress>
     <NamespaceSummaries>
       <NamespaceSummaryItem name="(global)" isDocumented="True">&lt;b&gt;Accord.NET Framework&lt;/b&gt;</NamespaceSummaryItem>
@@ -252,22 +252,21 @@
     <RootNamespaceContainer>True</RootNamespaceContainer>
     <RootNamespaceTitle>Framework modules</RootNamespaceTitle>
     <ApiFilter>
-      <Filter entryType="Namespace" fullName="Accord.Music" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="Accord.Music.Melody" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="Accord.Music.Notation" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="Accord.Music.Scales" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="Accord.Music.Sets" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge.Imaging" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge.Imaging.ComplexFilters" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge.Imaging.Filters" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge.Imaging.Textures" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge.Math" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge.Math.Geometry" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge.Math.Random" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge.Neuro" isExposed="False" xmlns="" />
-      <Filter entryType="Namespace" fullName="AForge.Neuro.Learning" isExposed="False" xmlns="" />
-    </ApiFilter>
+      <Filter entryType="Namespace" fullName="Accord.Music" isExposed="False" />
+<Filter entryType="Namespace" fullName="Accord.Music.Melody" isExposed="False" />
+<Filter entryType="Namespace" fullName="Accord.Music.Notation" isExposed="False" />
+<Filter entryType="Namespace" fullName="Accord.Music.Scales" isExposed="False" />
+<Filter entryType="Namespace" fullName="Accord.Music.Sets" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge.Imaging" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge.Imaging.ComplexFilters" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge.Imaging.Filters" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge.Imaging.Textures" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge.Math" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge.Math.Geometry" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge.Math.Random" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge.Neuro" isExposed="False" />
+<Filter entryType="Namespace" fullName="AForge.Neuro.Learning" isExposed="False" /></ApiFilter>
     <HelpFileFormat>HtmlHelp1, Website</HelpFileFormat>
     <ComponentConfigurations>
       <ComponentConfig id="Code Block Component" enabled="True">
@@ -284,7 +283,7 @@
     <PresentationStyle>VS2013</PresentationStyle>
     <SyntaxFilters>C#, Visual Basic</SyntaxFilters>
     <NamingMethod>MemberName</NamingMethod>
-    <HelpFileVersion>3.0.0.0</HelpFileVersion>
+    <HelpFileVersion>3.1.0.0</HelpFileVersion>
     <FrameworkVersion>.NET Framework 4.5</FrameworkVersion>
     <VisibleItems>Attributes, ExplicitInterfaceImplementations, InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected</VisibleItems>
     <PlugInNamespaces>ms.vsipcc+, ms.vsexpresscc+</PlugInNamespaces>
@@ -314,6 +313,10 @@
     <BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
     <DisableCodeBlockComponent>False</DisableCodeBlockComponent>
     <CppCommentsFixup>False</CppCommentsFixup>
+    <WebsiteSdkLinkType>None</WebsiteSdkLinkType>
+    <HtmlSdkLinkType>Msdn</HtmlSdkLinkType>
+    <IncludeFavorites>False</IncludeFavorites>
+    <BinaryTOC>True</BinaryTOC>
   </PropertyGroup>
   <!-- There are no properties for these groups.  AnyCPU needs to appear in
        order for Visual Studio to perform the build.  The others are optional