Created
July 15, 2017 20:52
-
-
Save ChaosEngine/bef70215f30b3faa082a4cdf7ed4efae to your computer and use it in GitHub Desktop.
https://github.com/aspnet/Caching: dev 2.0.0 patch for building on *nix and Win
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/samples/MemoryCacheConcurencySample/MemoryCacheConcurencySample.csproj b/samples/MemoryCacheConcurencySample/MemoryCacheConcurencySample.csproj | |
| index b024bae..c758d72 100644 | |
| --- a/samples/MemoryCacheConcurencySample/MemoryCacheConcurencySample.csproj | |
| +++ b/samples/MemoryCacheConcurencySample/MemoryCacheConcurencySample.csproj | |
| @@ -3,7 +3,8 @@ | |
| <Import Project="..\..\build\dependencies.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| <OutputType>Exe</OutputType> | |
| </PropertyGroup> | |
| diff --git a/samples/MemoryCacheFileWatchSample/MemoryCacheFileWatchSample.csproj b/samples/MemoryCacheFileWatchSample/MemoryCacheFileWatchSample.csproj | |
| index 7b56766..2a7cf3a 100644 | |
| --- a/samples/MemoryCacheFileWatchSample/MemoryCacheFileWatchSample.csproj | |
| +++ b/samples/MemoryCacheFileWatchSample/MemoryCacheFileWatchSample.csproj | |
| @@ -3,7 +3,8 @@ | |
| <Import Project="..\..\build\dependencies.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| <OutputType>Exe</OutputType> | |
| </PropertyGroup> | |
| diff --git a/samples/MemoryCacheSample/MemoryCacheSample.csproj b/samples/MemoryCacheSample/MemoryCacheSample.csproj | |
| index b024bae..c758d72 100644 | |
| --- a/samples/MemoryCacheSample/MemoryCacheSample.csproj | |
| +++ b/samples/MemoryCacheSample/MemoryCacheSample.csproj | |
| @@ -3,7 +3,8 @@ | |
| <Import Project="..\..\build\dependencies.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| <OutputType>Exe</OutputType> | |
| </PropertyGroup> | |
| diff --git a/samples/ProfilingSample/ProfilingSample.csproj b/samples/ProfilingSample/ProfilingSample.csproj | |
| index b024bae..c758d72 100644 | |
| --- a/samples/ProfilingSample/ProfilingSample.csproj | |
| +++ b/samples/ProfilingSample/ProfilingSample.csproj | |
| @@ -3,7 +3,8 @@ | |
| <Import Project="..\..\build\dependencies.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| <OutputType>Exe</OutputType> | |
| </PropertyGroup> | |
| diff --git a/samples/RedisCacheSample/RedisCacheSample.csproj b/samples/RedisCacheSample/RedisCacheSample.csproj | |
| index 79431b9..137509a 100644 | |
| --- a/samples/RedisCacheSample/RedisCacheSample.csproj | |
| +++ b/samples/RedisCacheSample/RedisCacheSample.csproj | |
| @@ -3,7 +3,8 @@ | |
| <Import Project="..\..\build\dependencies.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| <OutputType>Exe</OutputType> | |
| </PropertyGroup> | |
| diff --git a/samples/SqlServerCacheConcurencySample/SqlServerCacheConcurencySample.csproj b/samples/SqlServerCacheConcurencySample/SqlServerCacheConcurencySample.csproj | |
| index 706895e..a48a94f 100644 | |
| --- a/samples/SqlServerCacheConcurencySample/SqlServerCacheConcurencySample.csproj | |
| +++ b/samples/SqlServerCacheConcurencySample/SqlServerCacheConcurencySample.csproj | |
| @@ -3,7 +3,8 @@ | |
| <Import Project="..\..\build\dependencies.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| <OutputType>Exe</OutputType> | |
| </PropertyGroup> | |
| diff --git a/samples/SqlServerCacheSample/SqlServerCacheSample.csproj b/samples/SqlServerCacheSample/SqlServerCacheSample.csproj | |
| index 2676c76..9263cee 100644 | |
| --- a/samples/SqlServerCacheSample/SqlServerCacheSample.csproj | |
| +++ b/samples/SqlServerCacheSample/SqlServerCacheSample.csproj | |
| @@ -3,7 +3,8 @@ | |
| <Import Project="..\..\build\dependencies.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| <OutputType>Exe</OutputType> | |
| </PropertyGroup> | |
| diff --git a/test/Microsoft.Extensions.Caching.Memory.Tests/Microsoft.Extensions.Caching.Memory.Tests.csproj b/test/Microsoft.Extensions.Caching.Memory.Tests/Microsoft.Extensions.Caching.Memory.Tests.csproj | |
| index ad826a9..db80eda 100644 | |
| --- a/test/Microsoft.Extensions.Caching.Memory.Tests/Microsoft.Extensions.Caching.Memory.Tests.csproj | |
| +++ b/test/Microsoft.Extensions.Caching.Memory.Tests/Microsoft.Extensions.Caching.Memory.Tests.csproj | |
| @@ -3,7 +3,7 @@ | |
| <Import Project="..\..\build\common.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| </PropertyGroup> | |
| diff --git a/test/Microsoft.Extensions.Caching.Redis.Tests/Microsoft.Extensions.Caching.Redis.Tests.csproj b/test/Microsoft.Extensions.Caching.Redis.Tests/Microsoft.Extensions.Caching.Redis.Tests.csproj | |
| index ce14c78..f7d154b 100644 | |
| --- a/test/Microsoft.Extensions.Caching.Redis.Tests/Microsoft.Extensions.Caching.Redis.Tests.csproj | |
| +++ b/test/Microsoft.Extensions.Caching.Redis.Tests/Microsoft.Extensions.Caching.Redis.Tests.csproj | |
| @@ -3,7 +3,7 @@ | |
| <Import Project="..\..\build\common.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| </PropertyGroup> | |
| diff --git a/test/Microsoft.Extensions.Caching.SqlServer.Tests/Microsoft.Extensions.Caching.SqlServer.Tests.csproj b/test/Microsoft.Extensions.Caching.SqlServer.Tests/Microsoft.Extensions.Caching.SqlServer.Tests.csproj | |
| index 6fe0e16..35b8aba 100644 | |
| --- a/test/Microsoft.Extensions.Caching.SqlServer.Tests/Microsoft.Extensions.Caching.SqlServer.Tests.csproj | |
| +++ b/test/Microsoft.Extensions.Caching.SqlServer.Tests/Microsoft.Extensions.Caching.SqlServer.Tests.csproj | |
| @@ -3,7 +3,7 @@ | |
| <Import Project="..\..\build\common.props" /> | |
| <PropertyGroup> | |
| - <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks> | |
| + <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net461</TargetFrameworks> | |
| <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks> | |
| </PropertyGroup> | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment