diff --git a/src/NLog.Redis.Tests/NLog.Redis.Tests.csproj b/src/NLog.Redis.Tests/NLog.Redis.Tests.csproj deleted file mode 100644 index 38cf0c6..0000000 --- a/src/NLog.Redis.Tests/NLog.Redis.Tests.csproj +++ /dev/null @@ -1,84 +0,0 @@ - - - - - Debug - AnyCPU - {CCBDD3DB-912A-4B22-9C14-E464FDF6FFDF} - Library - Properties - NLog.Redis.Tests - NLog.Redis.Tests - v4.5 - 512 - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\NLog.4.2.3\lib\net45\NLog.dll - True - - - ..\packages\NUnit.2.6.3\lib\nunit.framework.dll - - - ..\packages\StackExchange.Redis.1.0.488\lib\net45\StackExchange.Redis.dll - True - - - - - - - - - - - - - - - - - - - - - {D30CC839-170F-4B66-A075-A0EB3FA31FC6} - NLog.Redis - - - - - - - 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/src/NLog.Redis.Tests/NLog.Redis.Tests.xproj b/src/NLog.Redis.Tests/NLog.Redis.Tests.xproj new file mode 100644 index 0000000..1c68779 --- /dev/null +++ b/src/NLog.Redis.Tests/NLog.Redis.Tests.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 4b128ca7-7e6d-4cf9-954d-46dab726ce64 + NLog.Redis.Tests + .\obj + .\bin\ + v4.5 + + + + 2.0 + + + diff --git a/src/NLog.Redis.Tests/Properties/AssemblyInfo.cs b/src/NLog.Redis.Tests/Properties/AssemblyInfo.cs index 3c975c6..93c8218 100644 --- a/src/NLog.Redis.Tests/Properties/AssemblyInfo.cs +++ b/src/NLog.Redis.Tests/Properties/AssemblyInfo.cs @@ -22,15 +22,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("b87df9ca-ad43-4126-a23a-dfa6f5a883f6")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/NLog.Redis.Tests/RedisTargetSecurityTests.cs b/src/NLog.Redis.Tests/RedisTargetSecurityTests.cs index 8b86a25..4f44ae5 100644 --- a/src/NLog.Redis.Tests/RedisTargetSecurityTests.cs +++ b/src/NLog.Redis.Tests/RedisTargetSecurityTests.cs @@ -8,7 +8,7 @@ namespace NLog.Redis.Tests { - [TestFixture, Ignore] + [TestFixture, Ignore("")] public class RedisTargetSecurityTests : RedisTargetTests { [SetUp] diff --git a/src/NLog.Redis.Tests/RedisTargetWithoutSecurityTests.cs b/src/NLog.Redis.Tests/RedisTargetWithoutSecurityTests.cs index 6ff41ab..2a247a2 100644 --- a/src/NLog.Redis.Tests/RedisTargetWithoutSecurityTests.cs +++ b/src/NLog.Redis.Tests/RedisTargetWithoutSecurityTests.cs @@ -8,7 +8,7 @@ namespace NLog.Redis.Tests { - [TestFixture, Ignore] + [TestFixture, Ignore("")] public class RedisTargetWithoutSecurityTests : RedisTargetTests { [Test] diff --git a/src/NLog.Redis.Tests/packages.config b/src/NLog.Redis.Tests/packages.config deleted file mode 100644 index bb732f2..0000000 --- a/src/NLog.Redis.Tests/packages.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/NLog.Redis.Tests/project.json b/src/NLog.Redis.Tests/project.json new file mode 100644 index 0000000..16f09d3 --- /dev/null +++ b/src/NLog.Redis.Tests/project.json @@ -0,0 +1,18 @@ +{ + "version": "1.0.0-*", + + "dependencies": { + "NETStandard.Library": "1.6.1", + "NLog": "5.0.0-beta03", + "NLog.Redis": "1.0.3-*", + "NUnit": "3.5.0", + "StackExchange.Redis": "1.1.608" + }, + + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" + }, + "net45": {} + } +} diff --git a/src/NLog.Redis.sln b/src/NLog.Redis.sln index a22ce71..f674212 100644 --- a/src/NLog.Redis.sln +++ b/src/NLog.Redis.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLog.Redis", "NLog.Redis\NLog.Redis.csproj", "{D30CC839-170F-4B66-A075-A0EB3FA31FC6}" -EndProject +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{E1A93518-A7EE-4ED8-9093-634C95BD23A8}" ProjectSection(SolutionItems) = preProject .nuget\NuGet.Config = .nuget\NuGet.Config @@ -10,7 +10,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{E1A935 .nuget\NuGet.targets = .nuget\NuGet.targets EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLog.Redis.Tests", "NLog.Redis.Tests\NLog.Redis.Tests.csproj", "{CCBDD3DB-912A-4B22-9C14-E464FDF6FFDF}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NLog.Redis", "NLog.Redis\NLog.Redis.xproj", "{6BB60303-A38F-40C3-8CC9-E7E59BEE6308}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NLog.Redis.Tests", "NLog.Redis.Tests\NLog.Redis.Tests.xproj", "{4B128CA7-7E6D-4CF9-954D-46DAB726CE64}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -18,14 +20,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D30CC839-170F-4B66-A075-A0EB3FA31FC6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D30CC839-170F-4B66-A075-A0EB3FA31FC6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D30CC839-170F-4B66-A075-A0EB3FA31FC6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D30CC839-170F-4B66-A075-A0EB3FA31FC6}.Release|Any CPU.Build.0 = Release|Any CPU - {CCBDD3DB-912A-4B22-9C14-E464FDF6FFDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CCBDD3DB-912A-4B22-9C14-E464FDF6FFDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CCBDD3DB-912A-4B22-9C14-E464FDF6FFDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CCBDD3DB-912A-4B22-9C14-E464FDF6FFDF}.Release|Any CPU.Build.0 = Release|Any CPU + {6BB60303-A38F-40C3-8CC9-E7E59BEE6308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6BB60303-A38F-40C3-8CC9-E7E59BEE6308}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6BB60303-A38F-40C3-8CC9-E7E59BEE6308}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6BB60303-A38F-40C3-8CC9-E7E59BEE6308}.Release|Any CPU.Build.0 = Release|Any CPU + {4B128CA7-7E6D-4CF9-954D-46DAB726CE64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4B128CA7-7E6D-4CF9-954D-46DAB726CE64}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4B128CA7-7E6D-4CF9-954D-46DAB726CE64}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B128CA7-7E6D-4CF9-954D-46DAB726CE64}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/NLog.Redis/NLog.Redis.csproj b/src/NLog.Redis/NLog.Redis.csproj deleted file mode 100644 index 9f097a2..0000000 --- a/src/NLog.Redis/NLog.Redis.csproj +++ /dev/null @@ -1,69 +0,0 @@ - - - - - Debug - AnyCPU - {D30CC839-170F-4B66-A075-A0EB3FA31FC6} - Library - Properties - NLog.Redis - NLog.Redis - v4.5 - 512 - ..\ - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\NLog.4.2.3\lib\net45\NLog.dll - True - - - ..\packages\StackExchange.Redis.1.0.488\lib\net45\StackExchange.Redis.dll - True - - - - - - - - - - - - - - - - - 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/src/NLog.Redis/NLog.Redis.nuspec b/src/NLog.Redis/NLog.Redis.nuspec deleted file mode 100644 index b7a82ef..0000000 --- a/src/NLog.Redis/NLog.Redis.nuspec +++ /dev/null @@ -1,21 +0,0 @@ - - - - NLog.Redis - $version$ - NLog Target for Redis - Rich Clement - Rich Clement - https://raw.githubusercontent.com/richclement/NLog.Redis/master/LICENSE - https://github.com/richclement/NLog.Redis - false - $description$ - 1.0.2 - Update dependencies - Copyright 2014 - NLog Redis - - - - - - \ No newline at end of file diff --git a/src/NLog.Redis/NLog.Redis.xproj b/src/NLog.Redis/NLog.Redis.xproj new file mode 100644 index 0000000..6b8542a --- /dev/null +++ b/src/NLog.Redis/NLog.Redis.xproj @@ -0,0 +1,21 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + + 6bb60303-a38f-40c3-8cc9-e7e59bee6308 + NLog.Redis + .\obj + .\bin\ + v4.5 + + + + 2.0 + + + diff --git a/src/NLog.Redis/Properties/AssemblyInfo.cs b/src/NLog.Redis/Properties/AssemblyInfo.cs index d0b8dec..82e4e99 100644 --- a/src/NLog.Redis/Properties/AssemblyInfo.cs +++ b/src/NLog.Redis/Properties/AssemblyInfo.cs @@ -24,16 +24,3 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("cd9e781e-e999-4547-b43f-788c562055be")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.2.0")] -[assembly: AssemblyFileVersion("1.0.2.0")] diff --git a/src/NLog.Redis/packages.config b/src/NLog.Redis/packages.config deleted file mode 100644 index 3b7f7fe..0000000 --- a/src/NLog.Redis/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/NLog.Redis/project.json b/src/NLog.Redis/project.json new file mode 100644 index 0000000..44fe52d --- /dev/null +++ b/src/NLog.Redis/project.json @@ -0,0 +1,30 @@ +{ + "version": "1.0.3-*", + "title": "NLog.Redis", + "description": "NLog target for Redis", + "authors": [ "Rich Clement" ], + + "packOptions": { + "projectUrl": "https://github.com/richclement/NLog.Redis", + "licenseUrl": "https://raw.githubusercontent.com/richclement/NLog.Redis/master/LICENSE", + "tags": [ "NLog", "Redis" ] + }, + + "dependencies": { + "NETStandard.Library": "1.6.1", + "NLog": "5.0.0-beta03", + "StackExchange.Redis": "1.1.608" + }, + + "frameworks": { + "netstandard1.6": { + "imports": "dnxcore50" + }, + "net45": {} + }, + "scripts": { + "postcompile": [ + "dotnet pack --no-build --configuration Release -o NuGet" + ] + } +}