Skip to content

Commit 0c4a3cd

Browse files
reisenbergerreisenberger
authored
Merge pull request #2 from reisenberger/reisenberger/setup/referencelatestPolly
Reference latest Polly, from Polly.Caching.MemoryCache
2 parents d81bcc6 + 51b870a commit 0c4a3cd

File tree

11 files changed

+80
-1
lines changed

11 files changed

+80
-1
lines changed

‎src/Polly.Caching.MemoryCache.Net40Async.Specs/Polly.Caching.MemoryCache.Net40Async.Specs.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,22 @@
4444
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
47+
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll</HintPath>
49+
<Private>True</Private>
50+
</Reference>
51+
<Reference Include="Nito.AsyncEx.Concurrent, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll</HintPath>
53+
<Private>True</Private>
54+
</Reference>
55+
<Reference Include="Nito.AsyncEx.Enlightenment, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll</HintPath>
57+
<Private>True</Private>
58+
</Reference>
59+
<Reference Include="Polly.Net40Async, Version=5.0.6.0, Culture=neutral, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Polly.Net40Async.5.0.6\lib\net40\Polly.Net40Async.dll</HintPath>
61+
<Private>True</Private>
62+
</Reference>
4763
<Reference Include="System" />
4864
<Reference Include="System.Core" />
4965
<Reference Include="System.Net" />

‎src/Polly.Caching.MemoryCache.Net40Async.Specs/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
66
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
77
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />
8+
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net45" />
9+
<package id="Polly.Net40Async" version="5.0.6" targetFramework="net45" />
810
<package id="xunit" version="2.1.0" targetFramework="net45" />
911
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
1012
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

‎src/Polly.Caching.MemoryCache.Net40Async/Polly.Caching.MemoryCache.Net40Async.csproj‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,22 @@
4848
<HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
4949
<Private>True</Private>
5050
</Reference>
51+
<Reference Include="Nito.AsyncEx, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net40\Nito.AsyncEx.dll</HintPath>
53+
<Private>True</Private>
54+
</Reference>
55+
<Reference Include="Nito.AsyncEx.Concurrent, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net40\Nito.AsyncEx.Concurrent.dll</HintPath>
57+
<Private>True</Private>
58+
</Reference>
59+
<Reference Include="Nito.AsyncEx.Enlightenment, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
60+
<HintPath>..\packages\Nito.AsyncEx.3.0.1\lib\net40\Nito.AsyncEx.Enlightenment.dll</HintPath>
61+
<Private>True</Private>
62+
</Reference>
63+
<Reference Include="Polly.Net40Async, Version=5.0.6.0, Culture=neutral, processorArchitecture=MSIL">
64+
<HintPath>..\packages\Polly.Net40Async.5.0.6\lib\net40\Polly.Net40Async.dll</HintPath>
65+
<Private>True</Private>
66+
</Reference>
5167
<Reference Include="System" />
5268
<Reference Include="System.Core" />
5369
<Reference Include="System.IO, Version=2.6.10.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎src/Polly.Caching.MemoryCache.Net40Async/packages.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net40" />
44
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net40" />
55
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net40" />
6+
<package id="Nito.AsyncEx" version="3.0.1" targetFramework="net40" />
7+
<package id="Polly.Net40Async" version="5.0.6" targetFramework="net40" />
68
</packages>

‎src/Polly.Caching.MemoryCache.Net45.Specs/Polly.Caching.MemoryCache.Net45.Specs.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33+
<Reference Include="Polly, Version=5.0.6.0, Culture=neutral, processorArchitecture=MSIL">
34+
<HintPath>..\packages\Polly.5.0.6\lib\net45\Polly.dll</HintPath>
35+
<Private>True</Private>
36+
</Reference>
3337
<Reference Include="System" />
3438
<Reference Include="System.Core" />
3539
<Reference Include="System.Xml.Linq" />

‎src/Polly.Caching.MemoryCache.Net45.Specs/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<packages>
33
<package id="FluentAssertions" version="4.17.0" targetFramework="net45" />
44
<package id="GitVersionTask" version="3.1.2" targetFramework="net45" developmentDependency="true" />
5+
<package id="Polly" version="5.0.6" targetFramework="net45" />
56
<package id="xunit" version="2.1.0" targetFramework="net45" />
67
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
78
<package id="xunit.assert" version="2.1.0" targetFramework="net45" />

‎src/Polly.Caching.MemoryCache.Net45/Polly.Caching.MemoryCache.Net45.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
</AssemblyOriginatorKeyFile>
4242
</PropertyGroup>
4343
<ItemGroup>
44+
<Reference Include="Polly, Version=5.0.6.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Polly.5.0.6\lib\net45\Polly.dll</HintPath>
46+
<Private>True</Private>
47+
</Reference>
4448
<Reference Include="System" />
4549
</ItemGroup>
4650
<ItemGroup>
@@ -49,6 +53,9 @@
4953
</Compile>
5054
<Compile Include="Properties\AssemblyInfo.cs" />
5155
</ItemGroup>
56+
<ItemGroup>
57+
<None Include="packages.config" />
58+
</ItemGroup>
5259
<Import Project="..\Polly.Caching.MemoryCache.Shared\Polly.Caching.MemoryCache.Shared.projitems" Label="Shared" />
5360
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
5461
<Import Project="..\packages\GitVersionTask.3.1.2\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.1.2\build\dotnet\GitVersionTask.targets')" />

‎src/Polly.Caching.MemoryCache.Net45/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="GitVersionTask" version="3.1.2" targetFramework="net45" developmentDependency="true" />
4+
<package id="Polly" version="5.0.6" targetFramework="net45" />
45
</packages>

‎src/Polly.Caching.MemoryCache.NetStandard10/project.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"supports": {},
33
"dependencies": {
4-
"NETStandard.Library": "1.6.1"
4+
"NETStandard.Library": "1.6.1",
5+
"Polly": "5.0.6"
56
},
67
"frameworks": {
78
"netstandard1.0": {}

‎src/Polly.Caching.MemoryCache.Pcl.Specs/Polly.Caching.MemoryCache.Pcl.Specs.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
<HintPath>..\packages\FluentAssertions.4.17.0\lib\portable-net40+sl5+win8+wp8+wpa81\FluentAssertions.Core.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
54+
<Reference Include="Polly, Version=5.0.6.0, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>..\packages\Polly.5.0.6\lib\netstandard1.0\Polly.dll</HintPath>
56+
<Private>True</Private>
57+
</Reference>
5458
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
5559
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.abstractions.dll</HintPath>
5660
<Private>True</Private>

0 commit comments

Comments
 (0)