Merge pull request #9 from naile/dotnetcore

add dotnet core support

README.md

@@ -35,7 +35,7 @@ Simply add the Nuget package:
 
 ## Requirements
 
-You'll need .NET Framework 4.5.1 or later on 64 bit Windows to use the precompiled binaries.
+You'll need .NET Framework 4.5.1 or dotnet core 2.0 or later on 64 bit Windows to use the precompiled binaries.
 
 ## License
 

appveyor.yml

@@ -0,0 +1,19 @@
+version: '1.0.{build}'
+image: Visual Studio 2017
+init:
+ - cmd: git config --global core.autocrlf true
+before_build:
+ # Display .NET Core version
+ - cmd: dotnet --version
+ #- dotnet restore RedisRetry.sln
+ - cmd: dotnet restore "source/Redis Inside.sln" --verbosity m
+build_script:
+ - cmd: dotnet pack -c Release --output ../../artifacts source/RedisInside/RedisInside.csproj
+test_script:
+ - cmd: dotnet test source/RedisInside.Tests/RedisInside.Tests.csproj
+artifacts:
+ - path: 'artifacts\**\*.nupkg'
+ type: NuGetPackage 
+skip_commits:
+ files:
+ - '**/*.md'

build/build-nuget.bat

@@ -2,4 +2,4 @@
 cd %1
 cd ..
 del *.nupkg
-build\tools\nuget.exe pack source\RedisInside\RedisInside.csproj
+dotnet pack -c Release -o %cd% source\RedisInside\RedisInside.csproj

build/push-new-version.bat

@@ -1,4 +1,4 @@
 @echo off
 del *.nupkg
-tools\nuget pack ..\source\RedisInside\RedisInside.csproj
-tools\nuget push *.nupkg
+dotnet pack -c Release -o %cd% source\RedisInside\RedisInside.csproj
+dotnet nuget push *.nupkg

source/Redis Inside.sln

@@ -1,34 +1,37 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2000
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C7885E53-BE51-4606-BC7A-EA33A5A3B001}"
  ProjectSection(SolutionItems) = preProject
  .nuget\NuGet.Config = .nuget\NuGet.Config
  .nuget\NuGet.exe = .nuget\NuGet.exe
  EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisInside", "RedisInside\RedisInside.csproj", "{10914026-5BEF-4407-B9AA-5B6306D81FC3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedisInside", "RedisInside\RedisInside.csproj", "{90E667F6-A081-4496-9931-6AB168863392}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedisInside.Tests", "RedisInside.Tests\RedisInside.Tests.csproj", "{2BF22A5A-26A7-4AC9-9AAF-305F8ED96776}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedisInside.Tests", "RedisInside.Tests\RedisInside.Tests.csproj", "{FE650C2E-B87F-43B0-A978-60A3CFB15B02}"
 EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
  Release|Any CPU = Release|Any CPU
  EndGlobalSection
  GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {10914026-5BEF-4407-B9AA-5B6306D81FC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {10914026-5BEF-4407-B9AA-5B6306D81FC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {10914026-5BEF-4407-B9AA-5B6306D81FC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {10914026-5BEF-4407-B9AA-5B6306D81FC3}.Release|Any CPU.Build.0 = Release|Any CPU
- {2BF22A5A-26A7-4AC9-9AAF-305F8ED96776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2BF22A5A-26A7-4AC9-9AAF-305F8ED96776}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2BF22A5A-26A7-4AC9-9AAF-305F8ED96776}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2BF22A5A-26A7-4AC9-9AAF-305F8ED96776}.Release|Any CPU.Build.0 = Release|Any CPU
+ {90E667F6-A081-4496-9931-6AB168863392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {90E667F6-A081-4496-9931-6AB168863392}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {90E667F6-A081-4496-9931-6AB168863392}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {90E667F6-A081-4496-9931-6AB168863392}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FE650C2E-B87F-43B0-A978-60A3CFB15B02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FE650C2E-B87F-43B0-A978-60A3CFB15B02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FE650C2E-B87F-43B0-A978-60A3CFB15B02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FE650C2E-B87F-43B0-A978-60A3CFB15B02}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
  EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {F39EB0EF-C792-4367-9A8E-D427EE3ED4E4}
+ EndGlobalSection
 EndGlobal

source/RedisInside.Tests/RedisInside.Tests.csproj

@@ -1,79 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{2BF22A5A-26A7-4AC9-9AAF-305F8ED96776}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>RedisInside.Tests</RootNamespace>
- <AssemblyName>RedisInside.Tests</AssemblyName>
- <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
+ <TargetFrameworks>net451;net46;netcoreapp2.0</TargetFrameworks>
+ <IsPackable>false</IsPackable>
  </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="StackExchange.Redis, Version=1.0.316.0, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\RedisInside\RedisInside.csproj">
- <Project>{10914026-5BEF-4407-B9AA-5B6306D81FC3}</Project>
- <Name>RedisInside</Name>
- </ProjectReference>
- </ItemGroup>
+
  <ItemGroup>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="RedisTests.cs" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+ <PackageReference Include="NUnit" Version="3.10.1" />
+ <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+ <PackageReference Include="StackExchange.Redis" Version="1.2.6" />
  </ItemGroup>
+
  <ItemGroup>
- <None Include="packages.config" />
+ <ProjectReference Include="..\RedisInside\RedisInside.csproj" />
  </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
+
+</Project>

source/RedisInside.Tests/RedisTests.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using NUnit.Framework;
 using StackExchange.Redis;

source/RedisInside/RedisInside.csproj

@@ -1,81 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
  <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProjectGuid>{10914026-5BEF-4407-B9AA-5B6306D81FC3}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>RedisInside</RootNamespace>
+ <TargetFrameworks>net451;net46;netstandard2.0</TargetFrameworks>
+ <Description>Start Redis from .NET for integration tests. Contains redis runtime embedded in the dll.</Description>
+ <PackageTags>redis, integration, redis-64, caching</PackageTags>
+ <Authors>Monzoom (Poul Foged)</Authors>
+ <PackageId>redis-inside</PackageId>
+ <PackageIconUrl>https://raw.githubusercontent.com/poulfoged/redis-inside/master/icon.png</PackageIconUrl>
+ <PackageProjectUrl>https://github.com/poulfoged/redis-inside</PackageProjectUrl>
+ <Product>Redis Inside</Product>
  <AssemblyName>RedisInside</AssemblyName>
- <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+ <RootNamespace>RedisInside</RootNamespace>
+ <Version>3.3.0</Version>
+ <Company />
  </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
+
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net451|AnyCPU'">
+ <DocumentationFile>bin\Debug\net451\RedisInside.xml</DocumentationFile>
+ <NoWarn>1701;1702;CS1591</NoWarn>
  </PropertyGroup>
+
  <ItemGroup>
- <Reference Include="LZ4PCL, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\LZ4PCL.1.0.0\lib\portable-net4+netcore45+wpa81+MonoAndroid1+MonoTouch1\LZ4PCL.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.IO.Compression" />
- <Reference Include="System.IO.Compression.FileSystem" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
+ <None Remove="Executables\redis-server.exe" />
  </ItemGroup>
+
  <ItemGroup>
  <EmbeddedResource Include="Executables\redis-server.exe" />
  </ItemGroup>
+
  <ItemGroup>
- <Compile Include="Executables\RessourceTarget.cs" />
- <Compile Include="IConfig.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Redis.cs" />
- <Compile Include="TemporaryFile.cs" />
+ <Folder Include="Properties\" />
  </ItemGroup>
- <ItemGroup>
- <None Include="RedisInside.nuspec" />
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
- <PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
- </PropertyGroup>
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
- Other similar extension points exist, see Microsoft.Common.targets.
- <Target Name="BeforeBuild">
- </Target>
- <Target Name="AfterBuild">
- </Target>
- -->
-</Project>
+
+</Project>