Fix build after upgrading to NetStandard (#16)

dennisdoomen · Aug 3, 2016 · 36c5c97 · 36c5c97
1 parent ec4d4e1
commit 36c5c97
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 33 deletions.
diff --git a/.nuget/nuget.config b/.nuget/nuget.config
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <solution>
-    <add key="disableSourceControlIntegration" value="true" />
-  </solution>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
   </activePackageSource>

diff --git a/.nuget/packages.config b/.nuget/packages.config
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="StyleCop.MSBuild" version="4.7.49.0" />
 </packages>
diff --git a/Build/default.ps1 b/Build/default.ps1
@@ -55,14 +55,9 @@ task ApplyPackageVersioning -depends ExtractVersionsFromGit {
 }
 
 task RestoreNugetPackages {
-    $packageConfigs = Get-ChildItem $BaseDirectory -Recurse | where{$_.Name -eq "packages.config"}
 
-    foreach($packageConfig in $packageConfigs){
-    	Write-Host "Restoring" $packageConfig.FullName 
-    	exec { 
-            . "$Nuget" install $packageConfig.FullName -OutputDirectory "$BaseDirectory\Packages" -ConfigFile "$BaseDirectory\NuGet.Config"
-        }
-    }
+	& $Nuget restore "$BaseDirectory\FluidCaching.sln"  
+	& $Nuget install "$BaseDirectory\Build\packages.config" -OutputDirectory "$BaseDirectory\Packages" -ConfigFile "$BaseDirectory\NuGet.Config"
 }
 
 task Compile {

diff --git a/Samples/ConsoleApp/ConsoleApp.csproj b/Samples/ConsoleApp/ConsoleApp.csproj
@@ -32,12 +32,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FluentAssertions, Version=4.2.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentAssertions.4.2.2\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.2.2.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentAssertions.4.2.2\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/Samples/ConsoleApp/packages.config b/Samples/ConsoleApp/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="FluentAssertions" version="4.2.2" targetFramework="net45" />
+  <package id="FluentAssertions" version="4.13.0" targetFramework="net45" />
 </packages>
diff --git a/Src/.nuspec b/Src/.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>FluidCaching.Sources</id>
     <title>FluidCaching</title>
-    <version>0.1.0-fixxunitinbuild0001</version>
+    <version>0.1.0-fixcompile0001</version>
     <owners>Dennis Doomen</owners>
     <authors>Dennis Doomen</authors>
     <summary>

diff --git a/Src/FluidCaching/FluidCaching.csproj b/Src/FluidCaching/FluidCaching.csproj
@@ -49,11 +49,6 @@
     <Compile Include="Node.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System.Collections.Concurrent">
-      <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETPortable\v4.5\System.Collections.Concurrent.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="project.json" />
   </ItemGroup>

diff --git a/Tests/FluidCaching.Specs/FluidCaching.Specs.csproj b/Tests/FluidCaching.Specs/FluidCaching.Specs.csproj
@@ -33,16 +33,16 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Chill, Version=2.3.0.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Chill.2.3.0-pullrequest0037\Lib\net45\Chill.dll</HintPath>
+    <Reference Include="Chill, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Chill.2.2.0\lib\net45\Chill.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=4.1.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\FluentAssertions.4.1.1\lib\net45\FluentAssertions.Core.dll</HintPath>
+    <Reference Include="FluentAssertions.Core, Version=4.13.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\FluentAssertions.4.13.0\lib\net45\FluentAssertions.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

diff --git a/Tests/FluidCaching.Specs/LoadTests.cs b/Tests/FluidCaching.Specs/LoadTests.cs
@@ -24,9 +24,10 @@ public void When_scenario_it_should_behavior()
             //-----------------------------------------------------------------------------------------------------------
             // Act
             //-----------------------------------------------------------------------------------------------------------
-            Parallel.For(0, 10000, key =>
+            Parallel.For(0, 10000, async key =>
             {
                 cache.Get("index", key, k => k.ToString());
+                await Task.Delay(100);
             });
 
             //-----------------------------------------------------------------------------------------------------------

diff --git a/Tests/FluidCaching.Specs/packages.config b/Tests/FluidCaching.Specs/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Chill" version="2.3.0-pullrequest0037" targetFramework="net45" />
-  <package id="FluentAssertions" version="4.1.1" targetFramework="net45" />
+  <package id="Chill" version="2.2.0" targetFramework="net45" />
+  <package id="FluentAssertions" version="4.13.0" targetFramework="net45" />
   <package id="xunit" version="2.1.0" targetFramework="net45" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
   <package id="xunit.assert" version="2.1.0" targetFramework="net45" />

diff --git a/nuget.config b/nuget.config
@@ -4,8 +4,6 @@
     <add key="All" value="(Aggregate source)" />
   </activePackageSource>
   <packageSources>
-    <add key="Chill (Myget)" value="https://www.myget.org/F/chill_tmp/api/v2" />
-    <add key="chill ci" value="https://ci.appveyor.com/nuget/chill-7wsig5hcea6a" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>