Merge remote-tracking branch 'refs/remotes/origin/dev-pomma89'

# Conflicts: # ObjectPool.NuGet/Package.nuspec # Platform Specific/ObjectPool.NET40/Properties/AssemblyInfo.cs # Platform Specific/ObjectPool.NET45/Properties/AssemblyInfo.cs # Platform Specific/ObjectPool.NET46/Properties/AssemblyInfo.cs # Platform Specific/ObjectPool.Portable/Properties/AssemblyInfo.cs # Platform Specific/ObjectPool.UnitTests.NET40/app.config
pomma89 · Feb 6, 2016 · 3b78e58 · 3b78e58
2 parents d4bc440 + 018738e
commit 3b78e58
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 36 deletions.
diff --git a/.klondike/Packages/Thrower/Thrower.2.1.4.nupkg b/.klondike/Packages/Thrower/Thrower.2.1.4.nupkg
diff --git a/.klondike/Publish.bat b/.klondike/Publish.bat
@@ -1 +1 @@
-PommaLabs.KlondikePackager.exe "..\Nuget Packagers" Packages
+PommaLabs.KlondikePackager.exe .. Packages
diff --git a/ObjectPool.NuGet/Package.nuspec b/ObjectPool.NuGet/Package.nuspec
@@ -3,7 +3,7 @@
 <package>
     <metadata>
         <id>CodeProject.ObjectPool</id>
-        <version>1.9.2</version>
+        <version>1.9.3</version>
         <title>Generic and concurrent Object Pool</title>
         <authors>Ofir Makmal &lt;Ofir.Makmal@gmail.com&gt;</authors>
         <owners>Alessio Parma &lt;alessio.parma@gmail.com&gt;</owners>
@@ -25,13 +25,13 @@ Many thanks to Ofir Makmal for his great work.
 A generic, concurrent, portable and flexible Object Pool for the .NET Framework.
         </summary>
         <language>en-US</language>
-        <projectUrl>https://bitbucket.org/pomma89/objectpool/overview</projectUrl>
+        <projectUrl>https://github.com/pomma89/ObjectPool</projectUrl>
         <iconUrl>https://googledrive.com/host/0B8v0ikF4z2BiR29YQmxfSlE1Sms/Progetti/ObjectPool/logo-128.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <licenseUrl>http://www.codeproject.com/info/cpol10.aspx</licenseUrl>
         <copyright>Copyright (c) 2013 Ofir Makmal &lt;Ofir.Makmal@gmail.com&gt;</copyright>
         <dependencies>
-            <dependency id="Finsa.CodeServices.Common" version="[4.0.1, 6.0.0)" />
+            <dependency id="Finsa.CodeServices.Common" version="[4.1.0, 6.0.0)" />
         </dependencies>
         <references></references>
         <frameworkAssemblies></frameworkAssemblies>

diff --git a/ObjectPool/doxyfile.txt b/ObjectPool/doxyfile.txt
@@ -38,7 +38,7 @@ PROJECT_NAME           = "Generic and concurrent Object Pool"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.9.2
+PROJECT_NUMBER         = 1.9.3
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

diff --git a/Platform Specific/ObjectPool.NET40/ObjectPool.NET40.csproj b/Platform Specific/ObjectPool.NET40/ObjectPool.NET40.csproj
@@ -130,8 +130,8 @@
     <AssemblyOriginatorKeyFile>..\..\pomma89.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Finsa.CodeServices.Common">
-      <HintPath>..\..\packages\Finsa.CodeServices.Common.4.0.9\lib\net40\Finsa.CodeServices.Common.dll</HintPath>
+    <Reference Include="Finsa.CodeServices.Common, Version=4.1.0.0, Culture=neutral, PublicKeyToken=db894830fb4e4dbb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Finsa.CodeServices.Common.4.1.0\lib\net40\Finsa.CodeServices.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

diff --git a/Platform Specific/ObjectPool.NET40/Properties/AssemblyInfo.cs b/Platform Specific/ObjectPool.NET40/Properties/AssemblyInfo.cs
@@ -34,8 +34,8 @@
 // 
 // You can specify all the values or you can default the Build and Revision Numbers by using the '*'
 // as shown below: [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.2")]
-[assembly: AssemblyFileVersion("1.9.2")]
+[assembly: AssemblyVersion("1.9.3")]
+[assembly: AssemblyFileVersion("1.9.3")]
 
 // Common Language Specification (CLS) compliance generally refers to the claim that CLS rules and
 // restrictions are being followed.

diff --git a/Platform Specific/ObjectPool.NET40/app.config b/Platform Specific/ObjectPool.NET40/app.config
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="PommaLabs.Thrower" publicKeyToken="2f204b7110a52060" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.1.4.0" newVersion="2.1.4.0"/>
+        <assemblyIdentity name="PommaLabs.Thrower" publicKeyToken="2f204b7110a52060" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.4.0" newVersion="2.1.4.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0"/>
+        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0"/>
+        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/Platform Specific/ObjectPool.NET40/packages.config b/Platform Specific/ObjectPool.NET40/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Finsa.CodeServices.Common" version="4.0.9" targetFramework="net40" />
+  <package id="Finsa.CodeServices.Common" version="4.1.0" targetFramework="net40" />
   <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net4-client" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
   <package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net4-client" />

diff --git a/Platform Specific/ObjectPool.NET45/ObjectPool.NET45.csproj b/Platform Specific/ObjectPool.NET45/ObjectPool.NET45.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\..\pomma89.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Finsa.CodeServices.Common, Version=4.0.9.0, Culture=neutral, PublicKeyToken=db894830fb4e4dbb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Finsa.CodeServices.Common.4.0.9\lib\net45\Finsa.CodeServices.Common.dll</HintPath>
+    <Reference Include="Finsa.CodeServices.Common, Version=4.1.0.0, Culture=neutral, PublicKeyToken=db894830fb4e4dbb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Finsa.CodeServices.Common.4.1.0\lib\net45\Finsa.CodeServices.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PommaLabs.Thrower, Version=2.1.4.0, Culture=neutral, PublicKeyToken=2f204b7110a52060, processorArchitecture=MSIL">

diff --git a/Platform Specific/ObjectPool.NET45/Properties/AssemblyInfo.cs b/Platform Specific/ObjectPool.NET45/Properties/AssemblyInfo.cs
@@ -34,8 +34,8 @@
 // 
 // You can specify all the values or you can default the Build and Revision Numbers by using the '*'
 // as shown below: [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.2")]
-[assembly: AssemblyFileVersion("1.9.2")]
+[assembly: AssemblyVersion("1.9.3")]
+[assembly: AssemblyFileVersion("1.9.3")]
 
 // Common Language Specification (CLS) compliance generally refers to the claim that CLS rules and
 // restrictions are being followed.

diff --git a/Platform Specific/ObjectPool.NET45/packages.config b/Platform Specific/ObjectPool.NET45/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Finsa.CodeServices.Common" version="4.0.9" targetFramework="net45" />
+  <package id="Finsa.CodeServices.Common" version="4.1.0" targetFramework="net45" />
   <package id="Thrower" version="2.1.4" targetFramework="net45" />
   <package id="Troschuetz.Random" version="4.0.3" targetFramework="net45" />
 </packages>
diff --git a/Platform Specific/ObjectPool.NET46/ObjectPool.NET46.csproj b/Platform Specific/ObjectPool.NET46/ObjectPool.NET46.csproj
@@ -38,8 +38,8 @@
     <AssemblyOriginatorKeyFile>..\..\pomma89.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Finsa.CodeServices.Common, Version=4.0.9.0, Culture=neutral, PublicKeyToken=db894830fb4e4dbb, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Finsa.CodeServices.Common.4.0.9\lib\net46\Finsa.CodeServices.Common.dll</HintPath>
+    <Reference Include="Finsa.CodeServices.Common, Version=4.1.0.0, Culture=neutral, PublicKeyToken=db894830fb4e4dbb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Finsa.CodeServices.Common.4.1.0\lib\net46\Finsa.CodeServices.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PommaLabs.Thrower, Version=2.1.4.0, Culture=neutral, PublicKeyToken=2f204b7110a52060, processorArchitecture=MSIL">

diff --git a/Platform Specific/ObjectPool.NET46/Properties/AssemblyInfo.cs b/Platform Specific/ObjectPool.NET46/Properties/AssemblyInfo.cs
@@ -34,8 +34,8 @@
 // 
 // You can specify all the values or you can default the Build and Revision Numbers by using the '*'
 // as shown below: [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.2")]
-[assembly: AssemblyFileVersion("1.9.2")]
+[assembly: AssemblyVersion("1.9.3")]
+[assembly: AssemblyFileVersion("1.9.3")]
 
 // Common Language Specification (CLS) compliance generally refers to the claim that CLS rules and
 // restrictions are being followed.

diff --git a/Platform Specific/ObjectPool.NET46/packages.config b/Platform Specific/ObjectPool.NET46/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Finsa.CodeServices.Common" version="4.0.9" targetFramework="net46" />
+  <package id="Finsa.CodeServices.Common" version="4.1.0" targetFramework="net46" />
   <package id="Thrower" version="2.1.4" targetFramework="net46" />
   <package id="Troschuetz.Random" version="4.0.3" targetFramework="net46" />
 </packages>
diff --git a/Platform Specific/ObjectPool.Portable/ObjectPool.Portable.csproj b/Platform Specific/ObjectPool.Portable/ObjectPool.Portable.csproj
@@ -147,8 +147,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Finsa.CodeServices.Common">
-      <HintPath>..\..\packages\Finsa.CodeServices.Common.4.0.9\lib\portable-net45+win8+wp8+wpa81\Finsa.CodeServices.Common.dll</HintPath>
+    <Reference Include="Finsa.CodeServices.Common, Version=4.1.0.0, Culture=neutral, PublicKeyToken=db894830fb4e4dbb, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Finsa.CodeServices.Common.4.1.0\lib\portable-net45+win8+wp8+wpa81\Finsa.CodeServices.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PommaLabs.Thrower">

diff --git a/Platform Specific/ObjectPool.Portable/Properties/AssemblyInfo.cs b/Platform Specific/ObjectPool.Portable/Properties/AssemblyInfo.cs
@@ -34,8 +34,8 @@
 // 
 // You can specify all the values or you can default the Build and Revision Numbers by using the '*'
 // as shown below: [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.2")]
-[assembly: AssemblyFileVersion("1.9.2")]
+[assembly: AssemblyVersion("1.9.3")]
+[assembly: AssemblyFileVersion("1.9.3")]
 
 // Common Language Specification (CLS) compliance generally refers to the claim that CLS rules and
 // restrictions are being followed.

diff --git a/Platform Specific/ObjectPool.Portable/packages.config b/Platform Specific/ObjectPool.Portable/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Finsa.CodeServices.Common" version="4.0.9" targetFramework="portable45-net45+win8+wp8+wpa81" />
+  <package id="Finsa.CodeServices.Common" version="4.1.0" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Thrower" version="2.1.4" targetFramework="portable45-net45+win8+wp8+wpa81" />
   <package id="Troschuetz.Random" version="4.0.3" targetFramework="portable45-net45+win8+wp8+wpa81" />
 </packages>
diff --git a/Platform Specific/ObjectPool.UnitTests.NET40/app.config b/Platform Specific/ObjectPool.UnitTests.NET40/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="PommaLabs.Thrower" publicKeyToken="2f204b7110a52060" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.4.0" newVersion="2.1.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

diff --git a/VERSION.md b/VERSION.md
@@ -1 +1 @@
-1.9.2
+1.9.3
diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@
 #---------------------------------#
 
 # version format
-version: 1.9.2.{build}
+version: 1.9.3.{build}
 
 # branches to build
 branches:
@@ -25,7 +25,7 @@ branches:
 assembly_info:
   patch: true
   file: AssemblyInfo.*
-  assembly_version: "1.9.2.{build}"
+  assembly_version: "1.9.3.{build}"
   assembly_file_version: "{version}"
   assembly_informational_version: "{version}"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		PommaLabs.KlondikePackager.exe "..\Nuget Packagers" Packages
		PommaLabs.KlondikePackager.exe .. Packages