diff --git a/README.md b/README.md index 933d785..604c000 100755 --- a/README.md +++ b/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 diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..580c73b --- /dev/null +++ b/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' \ No newline at end of file diff --git a/build/build-nuget.bat b/build/build-nuget.bat index 7381b02..6656283 100755 --- a/build/build-nuget.bat +++ b/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 diff --git a/build/push-new-version.bat b/build/push-new-version.bat index 4208fb0..8528330 100755 --- a/build/push-new-version.bat +++ b/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 diff --git a/build/tools/NuGet.exe b/build/tools/NuGet.exe deleted file mode 100755 index 9ca6659..0000000 Binary files a/build/tools/NuGet.exe and /dev/null differ diff --git a/source/Redis Inside.sln b/source/Redis Inside.sln index 21069ac..7737a47 100755 --- a/source/Redis Inside.sln +++ b/source/Redis Inside.sln @@ -1,7 +1,7 @@  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 @@ -9,9 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{C7885E .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 @@ -19,16 +19,19 @@ Global 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 diff --git a/source/RedisInside.Tests/Properties/AssemblyInfo.cs b/source/RedisInside.Tests/Properties/AssemblyInfo.cs deleted file mode 100755 index 9927f81..0000000 --- a/source/RedisInside.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("RedisInside.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("RedisInside.Tests")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: Guid("2fbc98c1-6a6f-4925-a2cb-220bde180436")] -[assembly: AssemblyVersion("2.8.2101.0")] -[assembly: AssemblyFileVersion("2.8.2101.0")] diff --git a/source/RedisInside.Tests/RedisInside.Tests.csproj b/source/RedisInside.Tests/RedisInside.Tests.csproj index 6788a34..7c4e656 100755 --- a/source/RedisInside.Tests/RedisInside.Tests.csproj +++ b/source/RedisInside.Tests/RedisInside.Tests.csproj @@ -1,79 +1,19 @@ - - - + + - Debug - AnyCPU - {2BF22A5A-26A7-4AC9-9AAF-305F8ED96776} - Library - Properties - RedisInside.Tests - RedisInside.Tests - v4.5.1 - 512 - ..\ - true + net451;net46;netcoreapp2.0 + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\NUnit.2.6.4\lib\nunit.framework.dll - True - - - ..\packages\StackExchange.Redis.1.0.481\lib\net45\StackExchange.Redis.dll - True - - - - - - - - - - - - {10914026-5BEF-4407-B9AA-5B6306D81FC3} - RedisInside - - + - - + + + + + - + - - - - - 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}. - - - - - \ No newline at end of file + + diff --git a/source/RedisInside.Tests/RedisTests.cs b/source/RedisInside.Tests/RedisTests.cs index 0dbf9ef..818136e 100755 --- a/source/RedisInside.Tests/RedisTests.cs +++ b/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; diff --git a/source/RedisInside.Tests/packages.config b/source/RedisInside.Tests/packages.config deleted file mode 100755 index fce0b9f..0000000 --- a/source/RedisInside.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/source/RedisInside/Properties/AssemblyInfo.cs b/source/RedisInside/Properties/AssemblyInfo.cs deleted file mode 100755 index abfa131..0000000 --- a/source/RedisInside/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("RedisInside")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("RedisInside")] -[assembly: AssemblyCopyright("Copyright © 2015")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: Guid("10e7016a-c115-4718-9250-8219b49374c4")] -[assembly: AssemblyVersion("3.2.100")] \ No newline at end of file diff --git a/source/RedisInside/RedisInside.csproj b/source/RedisInside/RedisInside.csproj index fb658c7..0046431 100755 --- a/source/RedisInside/RedisInside.csproj +++ b/source/RedisInside/RedisInside.csproj @@ -1,81 +1,35 @@ - - - + + - Debug - AnyCPU - {10914026-5BEF-4407-B9AA-5B6306D81FC3} - Library - Properties - RedisInside + net451;net46;netstandard2.0 + Start Redis from .NET for integration tests. Contains redis runtime embedded in the dll. + redis, integration, redis-64, caching + Monzoom (Poul Foged) + redis-inside + https://raw.githubusercontent.com/poulfoged/redis-inside/master/icon.png + https://github.com/poulfoged/redis-inside + Redis Inside RedisInside - v4.5.1 - 512 - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 + RedisInside + 3.3.0 + - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + + bin\Debug\net451\RedisInside.xml + 1701;1702;CS1591 + - - False - ..\packages\LZ4PCL.1.0.0\lib\portable-net4+netcore45+wpa81+MonoAndroid1+MonoTouch1\LZ4PCL.dll - - - - - - - - - - + + + - - - - - + - - - - - - - - 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}. - - - - - - - - - \ No newline at end of file + + diff --git a/source/RedisInside/RedisInside.nuspec b/source/RedisInside/RedisInside.nuspec deleted file mode 100755 index 3d80c4d..0000000 --- a/source/RedisInside/RedisInside.nuspec +++ /dev/null @@ -1,19 +0,0 @@ - - - - redis-inside - $version$ - Redis Inside - Monzoom (Poul Foged) - Monzoom (Poul Foged) - https://github.com/poulfoged/redis-inside - https://raw.githubusercontent.com/poulfoged/redis-inside/master/icon.png - false - Start Redis from .NET for integration tests. Contains redis runtime embedded in the dll. - Copyright 2015 - redis, integration, redis-64, caching - - Updated to Redis $version$ - - - \ No newline at end of file