Merge branch 'release/2.1.0' into development

rickyah · Apr 18, 2014 · 4c4b6ef · 4c4b6ef
2 parents 58b2349 + 0b31c1e
commit 4c4b6ef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/IniFileParser/INIFileParser.csproj b/src/IniFileParser/INIFileParser.csproj
@@ -81,6 +81,7 @@
     <Compile Include="Model\Formatting\IIniDataFormatter.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="INIFileParser.nuspec" />
     <None Include="Properties\publickey.snk" />
   </ItemGroup>
   <ItemGroup>
@@ -109,7 +110,5 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-  <ItemGroup>
-    <Folder Include="Model\Formatting\" />
-  </ItemGroup>
+  <ItemGroup />
 </Project>
diff --git a/INIFileParser.nuspec → src/IniFileParser/INIFileParser.nuspec b/INIFileParser.nuspec → src/IniFileParser/INIFileParser.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
-    <version>2.0.3</version>
+    <version>2.1.0</version>
     <authors>Ricardo Amores Hernández</authors>
     <owners>rickyah</owners>
     <licenseUrl>https://github.com/rickyah/ini-parser/master/blob/LICENSE.txt</licenseUrl>

diff --git a/src/IniFileParser/Properties/AssemblyInfo.cs b/src/IniFileParser/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.0.3.0")]
-[assembly: AssemblyFileVersion("2.0.3.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]