From 515b0b63e190c171122d10e5885eba3664b920ec Mon Sep 17 00:00:00 2001 From: yangxiaodong Date: Tue, 14 Mar 2017 14:01:06 +0800 Subject: [PATCH] upgrade to visual studio 2017 --- Cap.sln | 23 +++++----- global.json | 6 --- ...Cap.Consistency.EntityFrameworkCore.csproj | 24 +++++++++++ .../Cap.Consistency.EntityFrameworkCore.xproj | 21 --------- .../project.json | 17 -------- .../Cap.Consistency.Server.csproj | 25 +++++++++++ .../Cap.Consistency.Server.xproj | 22 ---------- src/Cap.Consistency.Server/project.json | 18 -------- src/Cap.Consistency/Cap.Consistency.csproj | 22 ++++++++++ src/Cap.Consistency/Cap.Consistency.xproj | 19 -------- src/Cap.Consistency/ConsistencyBuilder.cs | 7 ++- src/Cap.Consistency/project.json | 16 ------- ...onsistency.EntityFrameworkCore.Test.csproj | 43 +++++++++++++++++++ ...Consistency.EntityFrameworkCore.Test.xproj | 22 ---------- .../project.json | 41 ------------------ .../Cap.Consistency.Test.csproj | 31 +++++++++++++ .../Cap.Consistency.Test.xproj | 22 ---------- test/Cap.Consistency.Test/project.json | 32 -------------- 18 files changed, 158 insertions(+), 253 deletions(-) delete mode 100644 global.json create mode 100644 src/Cap.Consistency.EntityFrameworkCore/Cap.Consistency.EntityFrameworkCore.csproj delete mode 100644 src/Cap.Consistency.EntityFrameworkCore/Cap.Consistency.EntityFrameworkCore.xproj delete mode 100644 src/Cap.Consistency.EntityFrameworkCore/project.json create mode 100644 src/Cap.Consistency.Server/Cap.Consistency.Server.csproj delete mode 100644 src/Cap.Consistency.Server/Cap.Consistency.Server.xproj delete mode 100644 src/Cap.Consistency.Server/project.json create mode 100644 src/Cap.Consistency/Cap.Consistency.csproj delete mode 100644 src/Cap.Consistency/Cap.Consistency.xproj delete mode 100644 src/Cap.Consistency/project.json create mode 100644 test/Cap.Consistency.EntityFrameworkCore.Test/Cap.Consistency.EntityFrameworkCore.Test.csproj delete mode 100644 test/Cap.Consistency.EntityFrameworkCore.Test/Cap.Consistency.EntityFrameworkCore.Test.xproj delete mode 100644 test/Cap.Consistency.EntityFrameworkCore.Test/project.json create mode 100644 test/Cap.Consistency.Test/Cap.Consistency.Test.csproj delete mode 100644 test/Cap.Consistency.Test/Cap.Consistency.Test.xproj delete mode 100644 test/Cap.Consistency.Test/project.json diff --git a/Cap.sln b/Cap.sln index 177f7e3..ac08b09 100644 --- a/Cap.sln +++ b/Cap.sln @@ -1,20 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.4 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9B2AE124-6636-4DE9-83A3-70360DABD0C4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C09CDAB0-6DD4-46E9-B7F3-3EF2A4741EA0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{57A8A8E5-5715-41BF-A0A6-46B819933FBC}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - EndProjectSection -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cap.Consistency", "src\Cap.Consistency\Cap.Consistency.xproj", "{E8AF8611-0EA4-4B19-BC48-87C57A87DC66}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cap.Consistency.Test", "test\Cap.Consistency.Test\Cap.Consistency.Test.xproj", "{3A444CF8-1611-407F-8D32-5D0CDC3DD49D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9E5A7F49-8E31-4A71-90CC-1DA9AEDA99EE}" ProjectSection(SolutionItems) = preProject @@ -23,11 +16,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{9E5A7F test\Shared\TestLogger.cs = test\Shared\TestLogger.cs EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cap.Consistency.Server", "src\Cap.Consistency.Server\Cap.Consistency.Server.xproj", "{55CF2C48-D390-40CF-8AD9-FA39F90E9217}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cap.Consistency", "src\Cap.Consistency\Cap.Consistency.csproj", "{E8AF8611-0EA4-4B19-BC48-87C57A87DC66}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cap.Consistency.EntityFrameworkCore", "src\Cap.Consistency.EntityFrameworkCore\Cap.Consistency.EntityFrameworkCore.xproj", "{96111249-C4C3-4DC9-A887-32D583723AB1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cap.Consistency.Test", "test\Cap.Consistency.Test\Cap.Consistency.Test.csproj", "{3A444CF8-1611-407F-8D32-5D0CDC3DD49D}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Cap.Consistency.EntityFrameworkCore.Test", "test\Cap.Consistency.EntityFrameworkCore.Test\Cap.Consistency.EntityFrameworkCore.Test.xproj", "{7442C942-1DDC-40E4-8F1B-654E721EAA45}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cap.Consistency.Server", "src\Cap.Consistency.Server\Cap.Consistency.Server.csproj", "{55CF2C48-D390-40CF-8AD9-FA39F90E9217}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cap.Consistency.EntityFrameworkCore", "src\Cap.Consistency.EntityFrameworkCore\Cap.Consistency.EntityFrameworkCore.csproj", "{96111249-C4C3-4DC9-A887-32D583723AB1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cap.Consistency.EntityFrameworkCore.Test", "test\Cap.Consistency.EntityFrameworkCore.Test\Cap.Consistency.EntityFrameworkCore.Test.csproj", "{7442C942-1DDC-40E4-8F1B-654E721EAA45}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -60,9 +57,9 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {9E5A7F49-8E31-4A71-90CC-1DA9AEDA99EE} = {C09CDAB0-6DD4-46E9-B7F3-3EF2A4741EA0} {E8AF8611-0EA4-4B19-BC48-87C57A87DC66} = {9B2AE124-6636-4DE9-83A3-70360DABD0C4} {3A444CF8-1611-407F-8D32-5D0CDC3DD49D} = {C09CDAB0-6DD4-46E9-B7F3-3EF2A4741EA0} - {9E5A7F49-8E31-4A71-90CC-1DA9AEDA99EE} = {C09CDAB0-6DD4-46E9-B7F3-3EF2A4741EA0} {55CF2C48-D390-40CF-8AD9-FA39F90E9217} = {9B2AE124-6636-4DE9-83A3-70360DABD0C4} {96111249-C4C3-4DC9-A887-32D583723AB1} = {9B2AE124-6636-4DE9-83A3-70360DABD0C4} {7442C942-1DDC-40E4-8F1B-654E721EAA45} = {C09CDAB0-6DD4-46E9-B7F3-3EF2A4741EA0} diff --git a/global.json b/global.json deleted file mode 100644 index b6dc362..0000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src", "test" ], - "sdk": { - "version": "1.0.0-preview2-1-003177" - } -} diff --git a/src/Cap.Consistency.EntityFrameworkCore/Cap.Consistency.EntityFrameworkCore.csproj b/src/Cap.Consistency.EntityFrameworkCore/Cap.Consistency.EntityFrameworkCore.csproj new file mode 100644 index 0000000..b486e4b --- /dev/null +++ b/src/Cap.Consistency.EntityFrameworkCore/Cap.Consistency.EntityFrameworkCore.csproj @@ -0,0 +1,24 @@ + + + + netstandard1.6 + Cap.Consistency.EntityFrameworkCore + Cap.Consistency.EntityFrameworkCore + 1.6.1 + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + + + diff --git a/src/Cap.Consistency.EntityFrameworkCore/Cap.Consistency.EntityFrameworkCore.xproj b/src/Cap.Consistency.EntityFrameworkCore/Cap.Consistency.EntityFrameworkCore.xproj deleted file mode 100644 index 3f37e4a..0000000 --- a/src/Cap.Consistency.EntityFrameworkCore/Cap.Consistency.EntityFrameworkCore.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 96111249-c4c3-4dc9-a887-32d583723ab1 - Cap.Consistency.EntityFrameworkCore - .\obj - .\bin\ - v4.6 - - - - 2.0 - - - diff --git a/src/Cap.Consistency.EntityFrameworkCore/project.json b/src/Cap.Consistency.EntityFrameworkCore/project.json deleted file mode 100644 index 6a10217..0000000 --- a/src/Cap.Consistency.EntityFrameworkCore/project.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "Cap.Consistency": "1.0.0-*", - "Microsoft.EntityFrameworkCore": "1.1.0-*", - "Microsoft.EntityFrameworkCore.Relational": "1.1.0", - "NETStandard.Library": "1.6.1", - "System.ComponentModel.TypeConverter": "4.3.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} \ No newline at end of file diff --git a/src/Cap.Consistency.Server/Cap.Consistency.Server.csproj b/src/Cap.Consistency.Server/Cap.Consistency.Server.csproj new file mode 100644 index 0000000..176cb07 --- /dev/null +++ b/src/Cap.Consistency.Server/Cap.Consistency.Server.csproj @@ -0,0 +1,25 @@ + + + + netstandard1.6 + portable + Cap.Consistency.Server + Cap.Consistency.Server + 1.6.1 + $(PackageTargetFallback);dnxcore50 + false + false + false + false + false + false + + + + + + + + + + diff --git a/src/Cap.Consistency.Server/Cap.Consistency.Server.xproj b/src/Cap.Consistency.Server/Cap.Consistency.Server.xproj deleted file mode 100644 index 783b29a..0000000 --- a/src/Cap.Consistency.Server/Cap.Consistency.Server.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - {55CF2C48-D390-40CF-8AD9-FA39F90E9217} - {8BB2217D-0F2D-49D1-97BC-3654ED321F3B} - Cap.Consistency.Server - .\obj - .\bin\ - v4.5.1 - - - - 2.0 - - - diff --git a/src/Cap.Consistency.Server/project.json b/src/Cap.Consistency.Server/project.json deleted file mode 100644 index bab92de..0000000 --- a/src/Cap.Consistency.Server/project.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "debugType": "portable" - }, - "dependencies": { - "Microsoft.AspNetCore.Hosting": "1.1.0-*", - "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*", - "Microsoft.Extensions.Options": "1.1.0", - "NETStandard.Library": "1.6.1", - "RdKafka": "0.9.2-ci-189" - }, - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} \ No newline at end of file diff --git a/src/Cap.Consistency/Cap.Consistency.csproj b/src/Cap.Consistency/Cap.Consistency.csproj new file mode 100644 index 0000000..3e0af40 --- /dev/null +++ b/src/Cap.Consistency/Cap.Consistency.csproj @@ -0,0 +1,22 @@ + + + + netstandard1.6 + Cap.Consistency + Cap.Consistency + 1.6.1 + $(PackageTargetFallback);dnxcore50 + false + false + false + + + + + + + + + + + diff --git a/src/Cap.Consistency/Cap.Consistency.xproj b/src/Cap.Consistency/Cap.Consistency.xproj deleted file mode 100644 index 583e1cd..0000000 --- a/src/Cap.Consistency/Cap.Consistency.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e8af8611-0ea4-4b19-bc48-87c57a87dc66 - Cap.Consistency - .\obj - .\bin\ - v4.5 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Cap.Consistency/ConsistencyBuilder.cs b/src/Cap.Consistency/ConsistencyBuilder.cs index ac68e23..4663d72 100644 --- a/src/Cap.Consistency/ConsistencyBuilder.cs +++ b/src/Cap.Consistency/ConsistencyBuilder.cs @@ -51,11 +51,10 @@ namespace Cap.Consistency var provider = Services.BuildServiceProvider(); var finder = provider.GetRequiredService(); - - finder.GetQMessageMethods(Services); + finder.GetQMessageMethods(Services); return null; - // Services.AddSingleton(serviceType, concreteType); - // return Add(typeof(IConsistencyMessageStore<>).MakeGenericType(MessageType), typeof(T)); + // Services.AddSingleton(serviceType, concreteType); + // return Add(typeof(IConsistencyMessageStore<>).MakeGenericType(MessageType), typeof(T)); } /// diff --git a/src/Cap.Consistency/project.json b/src/Cap.Consistency/project.json deleted file mode 100644 index 57ee45f..0000000 --- a/src/Cap.Consistency/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "Microsoft.AspNetCore.Http.Abstractions": "1.1.0-*", - "Microsoft.Extensions.Options": "1.1.0-*", - "Microsoft.Extensions.DependencyInjection.Abstractions": "1.1.0", - "Microsoft.Extensions.Logging.Abstractions": "1.1.0-*", - "NETStandard.Library": "1.6.1", - "Microsoft.Extensions.DependencyInjection": "1.1.0" - }, - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} \ No newline at end of file diff --git a/test/Cap.Consistency.EntityFrameworkCore.Test/Cap.Consistency.EntityFrameworkCore.Test.csproj b/test/Cap.Consistency.EntityFrameworkCore.Test/Cap.Consistency.EntityFrameworkCore.Test.csproj new file mode 100644 index 0000000..ac2c1df --- /dev/null +++ b/test/Cap.Consistency.EntityFrameworkCore.Test/Cap.Consistency.EntityFrameworkCore.Test.csproj @@ -0,0 +1,43 @@ + + + + netcoreapp1.1 + true + Cap.Consistency.EntityFrameworkCore.Test + Cap.Consistency.EntityFrameworkCore.Test + true + $(PackageTargetFallback);dnxcore50;portable-net451+win8 + 1.1.1 + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Cap.Consistency.EntityFrameworkCore.Test/Cap.Consistency.EntityFrameworkCore.Test.xproj b/test/Cap.Consistency.EntityFrameworkCore.Test/Cap.Consistency.EntityFrameworkCore.Test.xproj deleted file mode 100644 index 19c53e0..0000000 --- a/test/Cap.Consistency.EntityFrameworkCore.Test/Cap.Consistency.EntityFrameworkCore.Test.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7442c942-1ddc-40e4-8f1b-654e721eaa45 - Cap.Consistency.EntityFrameworkCore.Test - .\obj - .\bin\ - v4.6 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Cap.Consistency.EntityFrameworkCore.Test/project.json b/test/Cap.Consistency.EntityFrameworkCore.Test/project.json deleted file mode 100644 index 737b87a..0000000 --- a/test/Cap.Consistency.EntityFrameworkCore.Test/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "version": "1.0.0-*", - - "buildOptions": { - "warningsAsErrors": true, - "compile": { - "include": "../Shared/*.cs" - } - }, - "dependencies": { - "xunit": "2.2.0-*", - "Microsoft.AspNetCore.Http": "1.1.0-*", - "Microsoft.Extensions.DependencyInjection": "1.1.0-*", - "dotnet-test-xunit": "2.2.0-*", - "Cap.Consistency": "1.0.0-*", - "Moq": "4.6.36-*", - "Microsoft.Extensions.Logging": "1.1.0-*", - "Cap.Consistency.EntityFrameworkCore": "1.0.0-*", - "Microsoft.Extensions.Configuration.Abstractions": "1.1.0-*", - "Microsoft.Extensions.Configuration": "1.1.0-*", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0-*", - "Microsoft.Extensions.Configuration.Json": "1.1.0-*", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0-*", - "System.Data.SqlClient": "4.3.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.1.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-preview1-22815" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ "dnxcore50", "portable-net451+win8" ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - } - } - } - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Cap.Consistency.Test/Cap.Consistency.Test.csproj b/test/Cap.Consistency.Test/Cap.Consistency.Test.csproj new file mode 100644 index 0000000..7f2e537 --- /dev/null +++ b/test/Cap.Consistency.Test/Cap.Consistency.Test.csproj @@ -0,0 +1,31 @@ + + + + netcoreapp1.1 + true + Cap.Consistency.Test + Cap.Consistency.Test + true + $(PackageTargetFallback);dnxcore50;portable-net451+win8 + 1.1.1 + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Cap.Consistency.Test/Cap.Consistency.Test.xproj b/test/Cap.Consistency.Test/Cap.Consistency.Test.xproj deleted file mode 100644 index b60fe61..0000000 --- a/test/Cap.Consistency.Test/Cap.Consistency.Test.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 3a444cf8-1611-407f-8d32-5d0cdc3dd49d - Cap.Consistency.Test - .\obj - .\bin\ - v4.6 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Cap.Consistency.Test/project.json b/test/Cap.Consistency.Test/project.json deleted file mode 100644 index 249e079..0000000 --- a/test/Cap.Consistency.Test/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "1.0.0-*", - - "buildOptions": { - "warningsAsErrors": true, - "compile": { - "include": "../Shared/TestConsistencyMessage.cs" - } - }, - "dependencies": { - "xunit": "2.2.0-*", - "Microsoft.AspNetCore.Http": "1.1.0-*", - "Microsoft.Extensions.DependencyInjection": "1.1.0-*", - "dotnet-test-xunit": "2.2.0-*", - "Cap.Consistency": "1.0.0-*", - "Moq": "4.6.36-*", - "Microsoft.Extensions.Logging": "1.1.0-*" - }, - - "frameworks": { - "netcoreapp1.1": { - "imports": [ "dnxcore50", "portable-net451+win8" ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.1.0", - "type": "platform" - } - } - } - }, - "testRunner": "xunit" -} \ No newline at end of file