Skip to content

The solutions wasn't build due to some merge error. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andyliau wants to merge 2 commits into
base: master
Choose a base branch
from
Open

The solutions wasn't build due to some merge error. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
86af368
The solutions wasn't build due to some merge error.
andyliau Apr 14, 2016
6d79353
upgrade entityframework 6.1.3
andyliau Apr 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 69 additions & 61 deletions MyGet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}"
Expand Down Expand Up @@ -73,22 +75,20 @@ 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
RemoteMachine = COD494L25714
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
4 changes: 2 additions & 2 deletions ...ollers.EntityFramework/Framework/OpenRiaServices.DomainControllers.EntityFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.dll</HintPath>
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\EntityFramework.6.1.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<HintPath>..\..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
Expand Down
2 changes: 1 addition & 1 deletion OpenRiaServices.DomainControllers.EntityFramework/Framework/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="EntityFramework" version="6.1.1" targetFramework="net451" />
<package id="EntityFramework" version="6.1.3" targetFramework="net451" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.1.2" targetFramework="net451" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.1.2" targetFramework="net451" />
<package id="Microsoft.Bcl" version="1.1.7" targetFramework="net451" />
Expand Down
2 changes: 1 addition & 1 deletion OpenRiaServices.DomainServices.EntityFramework/Framework/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
</configuration>
<startup><supportedRuntime version="v2.0.50727" /></startup></configuration>
2 changes: 1 addition & 1 deletion OpenRiaServices.DomainServices.EntityFramework/Framework/DbResource.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion OpenRiaServices.DomainServices.EntityFramework/Framework/MetadataResource.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading