From 86af368ae8206a1f02be24f031f4417eecec2733 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Thu, 14 Apr 2016 16:39:13 +0930 Subject: [PATCH 1/2] The solutions wasn't build due to some merge error. I've fix the build. --- MyGet.sln | 130 ++++++++++-------- .../Framework/App.config | 10 +- .../Framework/DbResource.Designer.cs | 2 +- .../Framework/MetadataResource.Designer.cs | 2 +- ...ices.DomainServices.EntityFramework.csproj | 35 +++-- .../Framework/Resource.Designer.cs | 2 +- .../Framework/DbContextExtensions.cs | 2 +- 7 files changed, 101 insertions(+), 82 deletions(-) diff --git a/MyGet.sln b/MyGet.sln index 4a428df..56fb9f1 100644 --- a/MyGet.sln +++ b/MyGet.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{1CED8364-77AC-4254-869F-1E4EC5A33416}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRiaServices.DomainServices.Server", "OpenRiaServices.DomainServices.Server\Framework\OpenRiaServices.DomainServices.Server.csproj", "{72E74082-7928-4A70-83C1-49806B942FCB}" @@ -73,7 +75,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRiaServices.DomainServi EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRiaServices.NuGet", "OpenRiaServices.NuGet\OpenRiaServices.NuGet.csproj", "{D3C7E499-6087-41EB-91E7-A10B1559EF60}" EndProject -Project("{911E67C6-3D85-4FCE-B560-20A9C3E3FF48}") = "MSBuild", "..\..\..\..\..\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe", "{F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}" +Project("{911E67C6-3D85-4FCE-B560-20A9C3E3FF48}") = "MSBuild", "..\..\..\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe", "{F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}" ProjectSection(DebuggerProjectSystem) = preProject PortSupplier = 00000000-0000-0000-0000-000000000000 Executable = C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe @@ -81,14 +83,12 @@ Project("{911E67C6-3D85-4FCE-B560-20A9C3E3FF48}") = "MSBuild", "..\..\..\..\..\W StartingDirectory = c:\code\AdventureWorksTest Environment = Default LaunchingEngine = 00000000-0000-0000-0000-000000000000 + UseLegacyDebugEngines = No LaunchSQLEngine = No AttachLaunchAction = No EndProjectSection EndProject Global - GlobalSection(TestCaseManagementSettings) = postSolution - CategoryFile = Desktop.vsmdi - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution CodeCov|Any CPU = CodeCov|Any CPU CodeCov|Mixed Platforms = CodeCov|Mixed Platforms @@ -828,41 +828,46 @@ Global {E078A28C-0C43-48E4-AFE0-37101C07B9BD}.ReleaseNet40|Mixed Platforms.ActiveCfg = ReleaseNet40|Any CPU {E078A28C-0C43-48E4-AFE0-37101C07B9BD}.ReleaseNet40|Mixed Platforms.Build.0 = ReleaseNet40|Any CPU {E078A28C-0C43-48E4-AFE0-37101C07B9BD}.ReleaseNet40|x86.ActiveCfg = ReleaseNet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|Any CPU.ActiveCfg = CodeCov|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|Any CPU.Build.0 = CodeCov|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|Mixed Platforms.ActiveCfg = CodeCov|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|Mixed Platforms.Build.0 = CodeCov|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|x86.ActiveCfg = CodeCov|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|Any CPU.ActiveCfg = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|Any CPU.Build.0 = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|Mixed Platforms.ActiveCfg = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|Mixed Platforms.Build.0 = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|x86.ActiveCfg = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.CodeCov|x86.Build.0 = Signed|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Debug|Any CPU.Build.0 = Debug|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Debug|x86.ActiveCfg = Debug|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|Any CPU.ActiveCfg = DebugNet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|Any CPU.Build.0 = DebugNet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|Mixed Platforms.ActiveCfg = DebugNet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|Mixed Platforms.Build.0 = DebugNet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|x86.ActiveCfg = DebugNet40|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|Any CPU.ActiveCfg = Debug|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|Any CPU.Build.0 = Debug|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|Mixed Platforms.ActiveCfg = Debug|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|Mixed Platforms.Build.0 = Debug|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|x86.ActiveCfg = Debug|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.DebugNet40|x86.Build.0 = Debug|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet|Any CPU.ActiveCfg = Release|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet|Any CPU.Build.0 = Release|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet|Mixed Platforms.ActiveCfg = MyGet|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet|Mixed Platforms.Build.0 = MyGet|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet|x86.ActiveCfg = MyGet|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|Any CPU.ActiveCfg = MyGet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|Any CPU.Build.0 = MyGet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|Mixed Platforms.ActiveCfg = MyGet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|Mixed Platforms.Build.0 = MyGet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|x86.ActiveCfg = MyGet40|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet|Mixed Platforms.ActiveCfg = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet|Mixed Platforms.Build.0 = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet|x86.ActiveCfg = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet|x86.Build.0 = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|Any CPU.ActiveCfg = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|Any CPU.Build.0 = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|Mixed Platforms.ActiveCfg = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|Mixed Platforms.Build.0 = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|x86.ActiveCfg = Signed|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.MyGet40|x86.Build.0 = Signed|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Release|Any CPU.ActiveCfg = Release|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Release|Any CPU.Build.0 = Release|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Release|Mixed Platforms.Build.0 = Release|Any CPU {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.Release|x86.ActiveCfg = Release|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|Any CPU.ActiveCfg = ReleaseNet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|Any CPU.Build.0 = ReleaseNet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|Mixed Platforms.ActiveCfg = ReleaseNet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|Mixed Platforms.Build.0 = ReleaseNet40|Any CPU - {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|x86.ActiveCfg = ReleaseNet40|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|Any CPU.ActiveCfg = Release|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|Any CPU.Build.0 = Release|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|Mixed Platforms.ActiveCfg = Release|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|Mixed Platforms.Build.0 = Release|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|x86.ActiveCfg = Release|Any CPU + {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8}.ReleaseNet40|x86.Build.0 = Release|Any CPU {D3C7E499-6087-41EB-91E7-A10B1559EF60}.CodeCov|Any CPU.ActiveCfg = Release|Any CPU {D3C7E499-6087-41EB-91E7-A10B1559EF60}.CodeCov|Any CPU.Build.0 = Release|Any CPU {D3C7E499-6087-41EB-91E7-A10B1559EF60}.CodeCov|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -898,57 +903,60 @@ Global {D3C7E499-6087-41EB-91E7-A10B1559EF60}.ReleaseNet40|Mixed Platforms.ActiveCfg = Release|Any CPU {D3C7E499-6087-41EB-91E7-A10B1559EF60}.ReleaseNet40|Mixed Platforms.Build.0 = Release|Any CPU {D3C7E499-6087-41EB-91E7-A10B1559EF60}.ReleaseNet40|x86.ActiveCfg = Release|Any CPU - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.CodeCov|Any CPU.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.CodeCov|Mixed Platforms.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.CodeCov|x86.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Debug|Any CPU.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Debug|x86.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.DebugNet40|Any CPU.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.DebugNet40|Mixed Platforms.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.DebugNet40|x86.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet|Any CPU.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet|Mixed Platforms.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet|x86.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet40|Any CPU.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet40|Mixed Platforms.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet40|x86.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Release|Any CPU.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Release|Mixed Platforms.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Release|x86.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.ReleaseNet40|Any CPU.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.ReleaseNet40|Mixed Platforms.ActiveCfg = Debug|x86 - {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.ReleaseNet40|x86.ActiveCfg = Debug|x86 + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.CodeCov|Any CPU.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.CodeCov|Mixed Platforms.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.CodeCov|x86.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Debug|Any CPU.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Debug|Mixed Platforms.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Debug|x86.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.DebugNet40|Any CPU.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.DebugNet40|Mixed Platforms.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.DebugNet40|x86.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet|Any CPU.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet|Mixed Platforms.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet|x86.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet40|Any CPU.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet40|Mixed Platforms.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.MyGet40|x86.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Release|Any CPU.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Release|Mixed Platforms.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.Release|x86.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.ReleaseNet40|Any CPU.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.ReleaseNet40|Mixed Platforms.ActiveCfg = Release + {F5B3F13F-D1FE-4561-9AFB-346B4E3FA5EF}.ReleaseNet40|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {2095B11C-903C-47FF-B812-82DFA7A068AC} = {1CED8364-77AC-4254-869F-1E4EC5A33416} - {4449F469-F1E9-4241-A444-B2BBAC7667EC} = {1CED8364-77AC-4254-869F-1E4EC5A33416} - {0254F915-6CD6-43E8-8639-B925CE5233A6} = {1CED8364-77AC-4254-869F-1E4EC5A33416} + {72E74082-7928-4A70-83C1-49806B942FCB} = {2095B11C-903C-47FF-B812-82DFA7A068AC} {20790A5F-1DD7-4D1C-8303-C34256E12C68} = {2095B11C-903C-47FF-B812-82DFA7A068AC} {B33BF27F-7DF7-46FF-A1DA-F12A873E124F} = {2095B11C-903C-47FF-B812-82DFA7A068AC} {E3844512-48A8-451A-9BE4-AC7793016B9D} = {2095B11C-903C-47FF-B812-82DFA7A068AC} - {72E74082-7928-4A70-83C1-49806B942FCB} = {2095B11C-903C-47FF-B812-82DFA7A068AC} + {4449F469-F1E9-4241-A444-B2BBAC7667EC} = {1CED8364-77AC-4254-869F-1E4EC5A33416} + {B15B8171-0EDC-4D96-A126-E086E4F3EA2C} = {4449F469-F1E9-4241-A444-B2BBAC7667EC} + {174DE0B6-BBA8-43DF-8755-BC8927EB9138} = {4449F469-F1E9-4241-A444-B2BBAC7667EC} + {2095B11C-903C-47FF-B812-82DFA7A068AC} = {1CED8364-77AC-4254-869F-1E4EC5A33416} {3F4FBBD2-A634-44C7-9DEF-D71F349E706C} = {2095B11C-903C-47FF-B812-82DFA7A068AC} + {7F427301-D243-4034-9181-27E6004F9669} = {1D11E83D-73E1-4194-B3B1-65BFF5DEE834} + {596C0361-054B-46CA-BA40-E01716F5042C} = {1D11E83D-73E1-4194-B3B1-65BFF5DEE834} + {35CD82F0-3886-4F94-A2AA-F7CA72B2F8FC} = {1D11E83D-73E1-4194-B3B1-65BFF5DEE834} {0EE13EF8-BD66-4095-926C-A81B6350F8EA} = {2095B11C-903C-47FF-B812-82DFA7A068AC} {E9141C78-4083-4ED9-B0C3-591BF5986488} = {2095B11C-903C-47FF-B812-82DFA7A068AC} + {6428863A-11FE-48EA-AE51-B2BA5DD29E57} = {4449F469-F1E9-4241-A444-B2BBAC7667EC} {BDB2F9A3-5FC7-45FD-8496-B23752232688} = {2095B11C-903C-47FF-B812-82DFA7A068AC} {063022B7-FAF8-43FB-B605-30A5F29910C1} = {2095B11C-903C-47FF-B812-82DFA7A068AC} {82539B51-6BB5-4C04-B37D-4FA850E397CF} = {2095B11C-903C-47FF-B812-82DFA7A068AC} {1D3AE529-961A-47FD-834B-7893FE6FF479} = {2095B11C-903C-47FF-B812-82DFA7A068AC} + {835586F6-F1F4-4A3F-A24E-795D37143F4B} = {4449F469-F1E9-4241-A444-B2BBAC7667EC} {72137DB5-8A91-4FF8-A292-5F6E73A66CD6} = {2095B11C-903C-47FF-B812-82DFA7A068AC} {707294BD-86CF-4C3D-B9C9-A869A34AA6E0} = {2095B11C-903C-47FF-B812-82DFA7A068AC} - {B15B8171-0EDC-4D96-A126-E086E4F3EA2C} = {4449F469-F1E9-4241-A444-B2BBAC7667EC} - {174DE0B6-BBA8-43DF-8755-BC8927EB9138} = {4449F469-F1E9-4241-A444-B2BBAC7667EC} - {6428863A-11FE-48EA-AE51-B2BA5DD29E57} = {4449F469-F1E9-4241-A444-B2BBAC7667EC} - {835586F6-F1F4-4A3F-A24E-795D37143F4B} = {4449F469-F1E9-4241-A444-B2BBAC7667EC} - {D3C7E499-6087-41EB-91E7-A10B1559EF60} = {E2A65FE6-AFA6-4742-A839-3DFF47893599} - {7F427301-D243-4034-9181-27E6004F9669} = {1D11E83D-73E1-4194-B3B1-65BFF5DEE834} - {596C0361-054B-46CA-BA40-E01716F5042C} = {1D11E83D-73E1-4194-B3B1-65BFF5DEE834} - {35CD82F0-3886-4F94-A2AA-F7CA72B2F8FC} = {1D11E83D-73E1-4194-B3B1-65BFF5DEE834} {E078A28C-0C43-48E4-AFE0-37101C07B9BD} = {9FBE785E-A32B-454B-82BB-147D2F0B7FFF} + {0254F915-6CD6-43E8-8639-B925CE5233A6} = {1CED8364-77AC-4254-869F-1E4EC5A33416} {EFDFCFAE-D785-4A99-AA90-F6A6E56E6BD8} = {0254F915-6CD6-43E8-8639-B925CE5233A6} + {D3C7E499-6087-41EB-91E7-A10B1559EF60} = {E2A65FE6-AFA6-4742-A839-3DFF47893599} + EndGlobalSection + GlobalSection(TestCaseManagementSettings) = postSolution + CategoryFile = Desktop.vsmdi EndGlobalSection EndGlobal diff --git a/OpenRiaServices.DomainServices.EntityFramework/Framework/App.config b/OpenRiaServices.DomainServices.EntityFramework/Framework/App.config index 01f6c9b..d5265b7 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Framework/App.config +++ b/OpenRiaServices.DomainServices.EntityFramework/Framework/App.config @@ -1,13 +1,13 @@ - + -
+
- + - + - \ No newline at end of file + diff --git a/OpenRiaServices.DomainServices.EntityFramework/Framework/DbResource.Designer.cs b/OpenRiaServices.DomainServices.EntityFramework/Framework/DbResource.Designer.cs index bb09200..8705f1f 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Framework/DbResource.Designer.cs +++ b/OpenRiaServices.DomainServices.EntityFramework/Framework/DbResource.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/OpenRiaServices.DomainServices.EntityFramework/Framework/MetadataResource.Designer.cs b/OpenRiaServices.DomainServices.EntityFramework/Framework/MetadataResource.Designer.cs index fe8ef71..212183e 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Framework/MetadataResource.Designer.cs +++ b/OpenRiaServices.DomainServices.EntityFramework/Framework/MetadataResource.Designer.cs @@ -39,7 +39,7 @@ internal MetadataResource() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRiaServices.VisualStudio.DomainServices.Tools.MetadataResource", typeof(MetadataResource).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OpenRiaServices.DomainServices.EntityFramework.MetadataResource", typeof(MetadataResource).Assembly); resourceMan = temp; } return resourceMan; diff --git a/OpenRiaServices.DomainServices.EntityFramework/Framework/OpenRiaServices.DomainServices.EntityFramework.csproj b/OpenRiaServices.DomainServices.EntityFramework/Framework/OpenRiaServices.DomainServices.EntityFramework.csproj index 0d125b3..2bd30f9 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Framework/OpenRiaServices.DomainServices.EntityFramework.csproj +++ b/OpenRiaServices.DomainServices.EntityFramework/Framework/OpenRiaServices.DomainServices.EntityFramework.csproj @@ -1,8 +1,9 @@  - + $(MSBuildProjectDirectory)\..\.. + v4.0 @@ -16,6 +17,7 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false v4.0 @@ -29,6 +31,7 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false v4.0 @@ -42,6 +45,7 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false v4.0 @@ -55,6 +59,7 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false v4.0 @@ -68,6 +73,7 @@ AnyCPU prompt MinimumRecommendedRules.ruleset + false @@ -98,6 +104,7 @@ false TRACE;DEBUG;SERVERFX;DBCONTEXT ..\..\bin\Debug\Desktop\OpenRiaServices.DomainServices.EntityFramework.xml + false v4.0 @@ -107,9 +114,10 @@ true TRACE;SERVERFX;DBCONTEXT ..\..\bin\Release\Desktop\OpenRiaServices.DomainServices.EntityFramework.xml + false - v4.0 + v4.5.1 True $(TargetFrameworkVersion.Replace("v", "NET").Replace(".", "")) true @@ -117,23 +125,14 @@ false DEBUG;TRACE;SERVERFX;CODECOV;DBCONTEXT ..\..\bin\CodeCov\Desktop\OpenRiaServices.DomainServices.EntityFramework.xml + false $(DefineConstants);$(Framework) - - False - ..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll - - - False - ..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll - True - - @@ -184,6 +183,15 @@ 4.0 + + 4.0 + + + ..\..\packages\EntityFramework.6.1.0\lib\net40\EntityFramework.dll + + + ..\..\packages\EntityFramework.6.1.0\lib\net40\EntityFramework.SqlServer.dll + @@ -195,6 +203,9 @@ 4.5 + + 4.5 + diff --git a/OpenRiaServices.DomainServices.EntityFramework/Framework/Resource.Designer.cs b/OpenRiaServices.DomainServices.EntityFramework/Framework/Resource.Designer.cs index c5c5f4f..1521185 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Framework/Resource.Designer.cs +++ b/OpenRiaServices.DomainServices.EntityFramework/Framework/Resource.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/RiaServicesContrib.DomainServices.EntityFramework/Framework/DbContextExtensions.cs b/RiaServicesContrib.DomainServices.EntityFramework/Framework/DbContextExtensions.cs index 820ee58..12ebb05 100644 --- a/RiaServicesContrib.DomainServices.EntityFramework/Framework/DbContextExtensions.cs +++ b/RiaServicesContrib.DomainServices.EntityFramework/Framework/DbContextExtensions.cs @@ -53,7 +53,7 @@ public static void AttachAsModified(this DbSet dbSet, T current, T origina } ObjectContext objectContext = (dbContext as IObjectContextAdapter).ObjectContext; - ObjectStateEntry stateEntry = ObjectContextUtilities.AttachAsModifiedInternal(current, original, objectContext); + ObjectStateEntry stateEntry = ObjectContextUtilities.AttachAsModifiedInternal(current, original, objectContext); if (stateEntry.State != EntityState.Modified) { From 6d793533c860cb8fe4a5515cf3df45fa46780c54 Mon Sep 17 00:00:00 2001 From: Andy Li Date: Thu, 14 Apr 2016 17:11:11 +0930 Subject: [PATCH 2/2] upgrade entityframework 6.1.3 --- ...rvices.DomainControllers.EntityFramework.csproj | 4 ++-- .../Framework/packages.config | 2 +- .../Framework/App.config | 10 +++++----- ...aServices.DomainServices.EntityFramework.csproj | 14 ++++++++------ .../Framework/packages.config | 2 +- .../Test/CodeFirstModel/EFCodeFirstModels.csproj | 4 ++-- .../Test/CodeFirstModel/packages.config | 2 +- .../Test/DbContextModel/EFDbContextModels.csproj | 4 ++-- .../Test/DbContextModel/packages.config | 2 +- ...nRiaServices.DomainServices.Hosting.Test.csproj | 4 ++-- .../Test/packages.config | 2 +- ...enRiaServices.DomainServices.Server.Test.csproj | 4 ++-- .../Test/packages.config | 2 +- ...s.DomainServices.Tools.TextTemplate.Test.csproj | 4 ++-- .../Test/packages.config | 2 +- ...penRiaServices.DomainServices.Tools.Test.csproj | 4 ++-- .../Test/packages.config | 2 +- ...rvices.VisualStudio.DomainServices.Tools.csproj | 4 ++-- .../Framework/packages.config | 2 +- ...esContrib.DomainServices.EntityFramework.csproj | 8 ++++---- .../Framework/packages.config | 2 +- Test/Desktop/EFPOCOModels/EFPOCOModels.csproj | 4 ++-- Test/Desktop/EFPOCOModels/packages.config | 2 +- 23 files changed, 46 insertions(+), 44 deletions(-) diff --git a/OpenRiaServices.DomainControllers.EntityFramework/Framework/OpenRiaServices.DomainControllers.EntityFramework.csproj b/OpenRiaServices.DomainControllers.EntityFramework/Framework/OpenRiaServices.DomainControllers.EntityFramework.csproj index c4f739b..9bcfdeb 100644 --- a/OpenRiaServices.DomainControllers.EntityFramework/Framework/OpenRiaServices.DomainControllers.EntityFramework.csproj +++ b/OpenRiaServices.DomainControllers.EntityFramework/Framework/OpenRiaServices.DomainControllers.EntityFramework.csproj @@ -70,11 +70,11 @@ False - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll False - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll ..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll diff --git a/OpenRiaServices.DomainControllers.EntityFramework/Framework/packages.config b/OpenRiaServices.DomainControllers.EntityFramework/Framework/packages.config index b1f5561..b8a6abf 100644 --- a/OpenRiaServices.DomainControllers.EntityFramework/Framework/packages.config +++ b/OpenRiaServices.DomainControllers.EntityFramework/Framework/packages.config @@ -1,6 +1,6 @@  - + diff --git a/OpenRiaServices.DomainServices.EntityFramework/Framework/App.config b/OpenRiaServices.DomainServices.EntityFramework/Framework/App.config index d5265b7..ba99351 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Framework/App.config +++ b/OpenRiaServices.DomainServices.EntityFramework/Framework/App.config @@ -1,13 +1,13 @@ - + -
+
- + - + - + diff --git a/OpenRiaServices.DomainServices.EntityFramework/Framework/OpenRiaServices.DomainServices.EntityFramework.csproj b/OpenRiaServices.DomainServices.EntityFramework/Framework/OpenRiaServices.DomainServices.EntityFramework.csproj index 2bd30f9..c8aef50 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Framework/OpenRiaServices.DomainServices.EntityFramework.csproj +++ b/OpenRiaServices.DomainServices.EntityFramework/Framework/OpenRiaServices.DomainServices.EntityFramework.csproj @@ -131,6 +131,14 @@ $(DefineConstants);$(Framework) + + ..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll + True + + + ..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll + True + @@ -186,12 +194,6 @@ 4.0 - - ..\..\packages\EntityFramework.6.1.0\lib\net40\EntityFramework.dll - - - ..\..\packages\EntityFramework.6.1.0\lib\net40\EntityFramework.SqlServer.dll - diff --git a/OpenRiaServices.DomainServices.EntityFramework/Framework/packages.config b/OpenRiaServices.DomainServices.EntityFramework/Framework/packages.config index 16578b4..8db729b 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Framework/packages.config +++ b/OpenRiaServices.DomainServices.EntityFramework/Framework/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/OpenRiaServices.DomainServices.EntityFramework/Test/CodeFirstModel/EFCodeFirstModels.csproj b/OpenRiaServices.DomainServices.EntityFramework/Test/CodeFirstModel/EFCodeFirstModels.csproj index 8ce6e0c..0c1a9c9 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Test/CodeFirstModel/EFCodeFirstModels.csproj +++ b/OpenRiaServices.DomainServices.EntityFramework/Test/CodeFirstModel/EFCodeFirstModels.csproj @@ -88,11 +88,11 @@ False - ..\..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll + ..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll False - ..\..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll + ..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll True diff --git a/OpenRiaServices.DomainServices.EntityFramework/Test/CodeFirstModel/packages.config b/OpenRiaServices.DomainServices.EntityFramework/Test/CodeFirstModel/packages.config index 16578b4..8db729b 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Test/CodeFirstModel/packages.config +++ b/OpenRiaServices.DomainServices.EntityFramework/Test/CodeFirstModel/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/OpenRiaServices.DomainServices.EntityFramework/Test/DbContextModel/EFDbContextModels.csproj b/OpenRiaServices.DomainServices.EntityFramework/Test/DbContextModel/EFDbContextModels.csproj index b97f932..bcf7327 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Test/DbContextModel/EFDbContextModels.csproj +++ b/OpenRiaServices.DomainServices.EntityFramework/Test/DbContextModel/EFDbContextModels.csproj @@ -87,12 +87,12 @@ - ..\..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll + ..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll True False - ..\..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll + ..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll diff --git a/OpenRiaServices.DomainServices.EntityFramework/Test/DbContextModel/packages.config b/OpenRiaServices.DomainServices.EntityFramework/Test/DbContextModel/packages.config index 16578b4..8db729b 100644 --- a/OpenRiaServices.DomainServices.EntityFramework/Test/DbContextModel/packages.config +++ b/OpenRiaServices.DomainServices.EntityFramework/Test/DbContextModel/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/OpenRiaServices.DomainServices.Hosting/Test/OpenRiaServices.DomainServices.Hosting.Test.csproj b/OpenRiaServices.DomainServices.Hosting/Test/OpenRiaServices.DomainServices.Hosting.Test.csproj index d9c69ec..b5017f3 100644 --- a/OpenRiaServices.DomainServices.Hosting/Test/OpenRiaServices.DomainServices.Hosting.Test.csproj +++ b/OpenRiaServices.DomainServices.Hosting/Test/OpenRiaServices.DomainServices.Hosting.Test.csproj @@ -88,12 +88,12 @@ False - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll True False - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll diff --git a/OpenRiaServices.DomainServices.Hosting/Test/packages.config b/OpenRiaServices.DomainServices.Hosting/Test/packages.config index 04b3bca..9e8db31 100644 --- a/OpenRiaServices.DomainServices.Hosting/Test/packages.config +++ b/OpenRiaServices.DomainServices.Hosting/Test/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/OpenRiaServices.DomainServices.Server/Test/OpenRiaServices.DomainServices.Server.Test.csproj b/OpenRiaServices.DomainServices.Server/Test/OpenRiaServices.DomainServices.Server.Test.csproj index 853703f..8ecd3ff 100644 --- a/OpenRiaServices.DomainServices.Server/Test/OpenRiaServices.DomainServices.Server.Test.csproj +++ b/OpenRiaServices.DomainServices.Server/Test/OpenRiaServices.DomainServices.Server.Test.csproj @@ -87,10 +87,10 @@ - ..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll + ..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll - ..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll True diff --git a/OpenRiaServices.DomainServices.Server/Test/packages.config b/OpenRiaServices.DomainServices.Server/Test/packages.config index 16578b4..8db729b 100644 --- a/OpenRiaServices.DomainServices.Server/Test/packages.config +++ b/OpenRiaServices.DomainServices.Server/Test/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/OpenRiaServices.DomainServices.Tools.TextTemplate/Test/OpenRiaServices.DomainServices.Tools.TextTemplate.Test.csproj b/OpenRiaServices.DomainServices.Tools.TextTemplate/Test/OpenRiaServices.DomainServices.Tools.TextTemplate.Test.csproj index 2aa056f..c346336 100644 --- a/OpenRiaServices.DomainServices.Tools.TextTemplate/Test/OpenRiaServices.DomainServices.Tools.TextTemplate.Test.csproj +++ b/OpenRiaServices.DomainServices.Tools.TextTemplate/Test/OpenRiaServices.DomainServices.Tools.TextTemplate.Test.csproj @@ -93,12 +93,12 @@ False - ..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll + ..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll True False - ..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll True diff --git a/OpenRiaServices.DomainServices.Tools.TextTemplate/Test/packages.config b/OpenRiaServices.DomainServices.Tools.TextTemplate/Test/packages.config index 16578b4..8db729b 100644 --- a/OpenRiaServices.DomainServices.Tools.TextTemplate/Test/packages.config +++ b/OpenRiaServices.DomainServices.Tools.TextTemplate/Test/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/OpenRiaServices.DomainServices.Tools/Test/OpenRiaServices.DomainServices.Tools.Test.csproj b/OpenRiaServices.DomainServices.Tools/Test/OpenRiaServices.DomainServices.Tools.Test.csproj index 78acddb..60b161f 100644 --- a/OpenRiaServices.DomainServices.Tools/Test/OpenRiaServices.DomainServices.Tools.Test.csproj +++ b/OpenRiaServices.DomainServices.Tools/Test/OpenRiaServices.DomainServices.Tools.Test.csproj @@ -95,10 +95,10 @@ - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll diff --git a/OpenRiaServices.DomainServices.Tools/Test/packages.config b/OpenRiaServices.DomainServices.Tools/Test/packages.config index 04b3bca..9e8db31 100644 --- a/OpenRiaServices.DomainServices.Tools/Test/packages.config +++ b/OpenRiaServices.DomainServices.Tools/Test/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/OpenRiaServices.VisualStudio.DomainServices.Tools/Framework/OpenRiaServices.VisualStudio.DomainServices.Tools.csproj b/OpenRiaServices.VisualStudio.DomainServices.Tools/Framework/OpenRiaServices.VisualStudio.DomainServices.Tools.csproj index 37c9806..5f75dfe 100644 --- a/OpenRiaServices.VisualStudio.DomainServices.Tools/Framework/OpenRiaServices.VisualStudio.DomainServices.Tools.csproj +++ b/OpenRiaServices.VisualStudio.DomainServices.Tools/Framework/OpenRiaServices.VisualStudio.DomainServices.Tools.csproj @@ -122,11 +122,11 @@ - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll False - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll True diff --git a/OpenRiaServices.VisualStudio.DomainServices.Tools/Framework/packages.config b/OpenRiaServices.VisualStudio.DomainServices.Tools/Framework/packages.config index 123fb69..0f81390 100644 --- a/OpenRiaServices.VisualStudio.DomainServices.Tools/Framework/packages.config +++ b/OpenRiaServices.VisualStudio.DomainServices.Tools/Framework/packages.config @@ -1,6 +1,6 @@  - + diff --git a/RiaServicesContrib.DomainServices.EntityFramework/Framework/RiaServicesContrib.DomainServices.EntityFramework.csproj b/RiaServicesContrib.DomainServices.EntityFramework/Framework/RiaServicesContrib.DomainServices.EntityFramework.csproj index 99f4570..16a4d32 100644 --- a/RiaServicesContrib.DomainServices.EntityFramework/Framework/RiaServicesContrib.DomainServices.EntityFramework.csproj +++ b/RiaServicesContrib.DomainServices.EntityFramework/Framework/RiaServicesContrib.DomainServices.EntityFramework.csproj @@ -98,23 +98,23 @@ False - ..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll + ..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll True False - ..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll False - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll True False - ..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll + ..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll 4.5 diff --git a/RiaServicesContrib.DomainServices.EntityFramework/Framework/packages.config b/RiaServicesContrib.DomainServices.EntityFramework/Framework/packages.config index 9452523..3ea1d37 100644 --- a/RiaServicesContrib.DomainServices.EntityFramework/Framework/packages.config +++ b/RiaServicesContrib.DomainServices.EntityFramework/Framework/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/Test/Desktop/EFPOCOModels/EFPOCOModels.csproj b/Test/Desktop/EFPOCOModels/EFPOCOModels.csproj index 779549f..73a1533 100644 --- a/Test/Desktop/EFPOCOModels/EFPOCOModels.csproj +++ b/Test/Desktop/EFPOCOModels/EFPOCOModels.csproj @@ -74,11 +74,11 @@ - ..\..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.dll + ..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.dll False - ..\..\..\packages\EntityFramework.6.1.1\lib\net40\EntityFramework.SqlServer.dll + ..\..\..\packages\EntityFramework.6.1.3\lib\net40\EntityFramework.SqlServer.dll diff --git a/Test/Desktop/EFPOCOModels/packages.config b/Test/Desktop/EFPOCOModels/packages.config index 16578b4..8db729b 100644 --- a/Test/Desktop/EFPOCOModels/packages.config +++ b/Test/Desktop/EFPOCOModels/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file