[REEF-120] Added x64 configuration options, add build properties JIRA: [REEF-120] https://issues.apache.org/jira/browse/REEF-120
Pull request: Closes #59 Author: tmajest <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/a7b0722d Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/a7b0722d Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/a7b0722d Branch: refs/heads/master Commit: a7b0722dab093e56ca1254e242898625d529685d Parents: 2ae282d Author: tmajest <[email protected]> Authored: Thu Jan 29 15:51:18 2015 -0800 Committer: Julia Wang <[email protected]> Committed: Thu Jan 29 17:13:47 2015 -0800 ---------------------------------------------------------------------- lang/cs/ReefDotNet.sln | 105 ++++++++++++------- .../CLRBridgeClient/CLRBridgeClient.csproj | 48 ++++++--- .../Evaluator/Evaluator.csproj | 43 +++++--- .../reef-common/ReefCommon/ReefCommon.csproj | 50 ++++++--- .../reef-common/ReefDriver/ReefDriver.csproj | 44 +++++--- .../HelloCLRBridge/HelloCLRBridge.csproj | 44 +++++--- .../RetainedEvalCLRBridge.csproj | 40 +++++-- .../Source/REEF/reef-io/Network/Network.csproj | 54 ++++++---- .../Source/REEF/reef-tasks/Tasks/Tasks.csproj | 36 +++++-- lang/cs/Source/TANG/Examples/Examples.csproj | 34 ++++-- lang/cs/Source/TANG/Tang/Tang.csproj | 42 +++++--- .../ClassHierarchyBuilder.csproj | 37 +++++-- lang/cs/Source/Tools/ReefAll/ReefAll.csproj | 45 +++++--- lang/cs/Source/Utilities/Utilities.csproj | 35 +++++-- lang/cs/Source/WAKE/Wake/Wake.csproj | 58 +++++----- lang/cs/Source/build.props | 35 +++++++ lang/cs/Tests/ReefTests/ReefTests.csproj | 27 ++++- lang/cs/Tests/TangTests/TangTests.csproj | 27 ++++- lang/cs/Tests/WakeTests/WakeTests.csproj | 27 ++++- 19 files changed, 599 insertions(+), 232 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/ReefDotNet.sln ---------------------------------------------------------------------- diff --git a/lang/cs/ReefDotNet.sln b/lang/cs/ReefDotNet.sln index bbd2250..799d022 100644 --- a/lang/cs/ReefDotNet.sln +++ b/lang/cs/ReefDotNet.sln @@ -1,5 +1,4 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 @@ -54,106 +53,140 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Debug|x64.ActiveCfg = Debug|Any CPU + {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Debug|x64.ActiveCfg = Debug|x64 + {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Debug|x64.Build.0 = Debug|x64 {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Release|Any CPU.ActiveCfg = Release|Any CPU {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Release|Any CPU.Build.0 = Release|Any CPU - {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Release|x64.ActiveCfg = Release|Any CPU + {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Release|x64.ActiveCfg = Release|x64 + {79E7F89A-1DFB-45E1-8D43-D71A954AEB98}.Release|x64.Build.0 = Release|x64 {CDFB3464-4041-42B1-9271-83AF24CD5008}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CDFB3464-4041-42B1-9271-83AF24CD5008}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CDFB3464-4041-42B1-9271-83AF24CD5008}.Debug|x64.ActiveCfg = Debug|Any CPU + {CDFB3464-4041-42B1-9271-83AF24CD5008}.Debug|x64.ActiveCfg = Debug|x64 + {CDFB3464-4041-42B1-9271-83AF24CD5008}.Debug|x64.Build.0 = Debug|x64 {CDFB3464-4041-42B1-9271-83AF24CD5008}.Release|Any CPU.ActiveCfg = Release|Any CPU {CDFB3464-4041-42B1-9271-83AF24CD5008}.Release|Any CPU.Build.0 = Release|Any CPU - {CDFB3464-4041-42B1-9271-83AF24CD5008}.Release|x64.ActiveCfg = Release|Any CPU + {CDFB3464-4041-42B1-9271-83AF24CD5008}.Release|x64.ActiveCfg = Release|x64 + {CDFB3464-4041-42B1-9271-83AF24CD5008}.Release|x64.Build.0 = Release|x64 {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Debug|x64.ActiveCfg = Debug|Any CPU + {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Debug|x64.ActiveCfg = Debug|x64 + {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Debug|x64.Build.0 = Debug|x64 {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Release|Any CPU.ActiveCfg = Release|Any CPU {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Release|Any CPU.Build.0 = Release|Any CPU - {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Release|x64.ActiveCfg = Release|Any CPU + {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Release|x64.ActiveCfg = Release|x64 + {97DBB573-3994-417A-9F69-FFA25F00D2A6}.Release|x64.Build.0 = Release|x64 {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Debug|x64.ActiveCfg = Debug|Any CPU + {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Debug|x64.ActiveCfg = Debug|x64 + {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Debug|x64.Build.0 = Debug|x64 {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Release|Any CPU.ActiveCfg = Release|Any CPU {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Release|Any CPU.Build.0 = Release|Any CPU - {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Release|x64.ActiveCfg = Release|Any CPU + {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Release|x64.ActiveCfg = Release|x64 + {31B4389E-925A-4181-A1F6-21A1A0AD8A1C}.Release|x64.Build.0 = Release|x64 {545A0582-4105-44CE-B99C-B1379514A630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {545A0582-4105-44CE-B99C-B1379514A630}.Debug|Any CPU.Build.0 = Debug|Any CPU - {545A0582-4105-44CE-B99C-B1379514A630}.Debug|x64.ActiveCfg = Debug|Any CPU + {545A0582-4105-44CE-B99C-B1379514A630}.Debug|x64.ActiveCfg = Debug|x64 + {545A0582-4105-44CE-B99C-B1379514A630}.Debug|x64.Build.0 = Debug|x64 {545A0582-4105-44CE-B99C-B1379514A630}.Release|Any CPU.ActiveCfg = Release|Any CPU {545A0582-4105-44CE-B99C-B1379514A630}.Release|Any CPU.Build.0 = Release|Any CPU - {545A0582-4105-44CE-B99C-B1379514A630}.Release|x64.ActiveCfg = Release|Any CPU + {545A0582-4105-44CE-B99C-B1379514A630}.Release|x64.ActiveCfg = Release|x64 + {545A0582-4105-44CE-B99C-B1379514A630}.Release|x64.Build.0 = Release|x64 {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Debug|x64.ActiveCfg = Debug|Any CPU + {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Debug|x64.ActiveCfg = Debug|x64 + {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Debug|x64.Build.0 = Debug|x64 {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Release|Any CPU.ActiveCfg = Release|Any CPU {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Release|Any CPU.Build.0 = Release|Any CPU - {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Release|x64.ActiveCfg = Release|Any CPU + {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Release|x64.ActiveCfg = Release|x64 + {A6BAA2A7-F52F-4329-884E-1BCF711D6805}.Release|x64.Build.0 = Release|x64 {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Debug|x64.ActiveCfg = Debug|Any CPU + {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Debug|x64.ActiveCfg = Debug|x64 + {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Debug|x64.Build.0 = Debug|x64 {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Release|Any CPU.ActiveCfg = Release|Any CPU {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Release|Any CPU.Build.0 = Release|Any CPU - {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Release|x64.ActiveCfg = Release|Any CPU + {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Release|x64.ActiveCfg = Release|x64 + {883CE800-6A6A-4E0A-B7FE-C054F4F2C1DC}.Release|x64.Build.0 = Release|x64 {75503F90-7B82-4762-9997-94B5C68F15DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {75503F90-7B82-4762-9997-94B5C68F15DB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {75503F90-7B82-4762-9997-94B5C68F15DB}.Debug|x64.ActiveCfg = Debug|Any CPU + {75503F90-7B82-4762-9997-94B5C68F15DB}.Debug|x64.ActiveCfg = Debug|x64 + {75503F90-7B82-4762-9997-94B5C68F15DB}.Debug|x64.Build.0 = Debug|x64 {75503F90-7B82-4762-9997-94B5C68F15DB}.Release|Any CPU.ActiveCfg = Release|Any CPU {75503F90-7B82-4762-9997-94B5C68F15DB}.Release|Any CPU.Build.0 = Release|Any CPU - {75503F90-7B82-4762-9997-94B5C68F15DB}.Release|x64.ActiveCfg = Release|Any CPU + {75503F90-7B82-4762-9997-94B5C68F15DB}.Release|x64.ActiveCfg = Release|x64 + {75503F90-7B82-4762-9997-94B5C68F15DB}.Release|x64.Build.0 = Release|x64 {5094C35B-4FDB-4322-AC05-45D684501CBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5094C35B-4FDB-4322-AC05-45D684501CBF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5094C35B-4FDB-4322-AC05-45D684501CBF}.Debug|x64.ActiveCfg = Debug|Any CPU + {5094C35B-4FDB-4322-AC05-45D684501CBF}.Debug|x64.ActiveCfg = Debug|x64 + {5094C35B-4FDB-4322-AC05-45D684501CBF}.Debug|x64.Build.0 = Debug|x64 {5094C35B-4FDB-4322-AC05-45D684501CBF}.Release|Any CPU.ActiveCfg = Release|Any CPU {5094C35B-4FDB-4322-AC05-45D684501CBF}.Release|Any CPU.Build.0 = Release|Any CPU - {5094C35B-4FDB-4322-AC05-45D684501CBF}.Release|x64.ActiveCfg = Release|Any CPU + {5094C35B-4FDB-4322-AC05-45D684501CBF}.Release|x64.ActiveCfg = Release|x64 + {5094C35B-4FDB-4322-AC05-45D684501CBF}.Release|x64.Build.0 = Release|x64 {1B983182-9C30-464C-948D-F87EB93A8240}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B983182-9C30-464C-948D-F87EB93A8240}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1B983182-9C30-464C-948D-F87EB93A8240}.Debug|x64.ActiveCfg = Debug|Any CPU + {1B983182-9C30-464C-948D-F87EB93A8240}.Debug|x64.ActiveCfg = Debug|x64 + {1B983182-9C30-464C-948D-F87EB93A8240}.Debug|x64.Build.0 = Debug|x64 {1B983182-9C30-464C-948D-F87EB93A8240}.Release|Any CPU.ActiveCfg = Release|Any CPU {1B983182-9C30-464C-948D-F87EB93A8240}.Release|Any CPU.Build.0 = Release|Any CPU - {1B983182-9C30-464C-948D-F87EB93A8240}.Release|x64.ActiveCfg = Release|Any CPU + {1B983182-9C30-464C-948D-F87EB93A8240}.Release|x64.ActiveCfg = Release|x64 + {1B983182-9C30-464C-948D-F87EB93A8240}.Release|x64.Build.0 = Release|x64 {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Debug|x64.ActiveCfg = Debug|Any CPU + {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Debug|x64.ActiveCfg = Debug|x64 + {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Debug|x64.Build.0 = Debug|x64 {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Release|Any CPU.ActiveCfg = Release|Any CPU {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Release|Any CPU.Build.0 = Release|Any CPU - {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Release|x64.ActiveCfg = Release|Any CPU + {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Release|x64.ActiveCfg = Release|x64 + {A78DD8E8-31D0-4506-8738-DAA9DA86D55B}.Release|x64.Build.0 = Release|x64 {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Debug|x64.ActiveCfg = Debug|Any CPU + {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Debug|x64.ActiveCfg = Debug|x64 + {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Debug|x64.Build.0 = Debug|x64 {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Release|Any CPU.ActiveCfg = Release|Any CPU {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Release|Any CPU.Build.0 = Release|Any CPU - {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Release|x64.ActiveCfg = Release|Any CPU + {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Release|x64.ActiveCfg = Release|x64 + {A33C20FB-A76E-494C-80C5-BCE4BAD876D3}.Release|x64.Build.0 = Release|x64 {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Debug|x64.ActiveCfg = Debug|Any CPU + {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Debug|x64.ActiveCfg = Debug|x64 + {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Debug|x64.Build.0 = Debug|x64 {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Release|Any CPU.ActiveCfg = Release|Any CPU {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Release|Any CPU.Build.0 = Release|Any CPU - {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Release|x64.ActiveCfg = Release|Any CPU + {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Release|x64.ActiveCfg = Release|x64 + {34A9CD98-0D15-4CA0-AEA5-E53593A31047}.Release|x64.Build.0 = Release|x64 {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Debug|x64.ActiveCfg = Debug|Any CPU + {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Debug|x64.ActiveCfg = Debug|x64 + {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Debug|x64.Build.0 = Debug|x64 {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Release|Any CPU.Build.0 = Release|Any CPU - {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Release|x64.ActiveCfg = Release|Any CPU + {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Release|x64.ActiveCfg = Release|x64 + {4C137C79-3A28-47D2-BFB9-A3CAB1EEDACE}.Release|x64.Build.0 = Release|x64 {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Debug|x64.ActiveCfg = Debug|Any CPU + {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Debug|x64.ActiveCfg = Debug|x64 + {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Debug|x64.Build.0 = Debug|x64 {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Release|Any CPU.ActiveCfg = Release|Any CPU {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Release|Any CPU.Build.0 = Release|Any CPU - {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Release|x64.ActiveCfg = Release|Any CPU + {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Release|x64.ActiveCfg = Release|x64 + {D5EB94D0-3ABA-4853-9050-E36B196E17D2}.Release|x64.Build.0 = Release|x64 {214C64C6-04E5-4867-B69A-E3502EA50871}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {214C64C6-04E5-4867-B69A-E3502EA50871}.Debug|Any CPU.Build.0 = Debug|Any CPU - {214C64C6-04E5-4867-B69A-E3502EA50871}.Debug|x64.ActiveCfg = Debug|Any CPU + {214C64C6-04E5-4867-B69A-E3502EA50871}.Debug|x64.ActiveCfg = Debug|x64 + {214C64C6-04E5-4867-B69A-E3502EA50871}.Debug|x64.Build.0 = Debug|x64 {214C64C6-04E5-4867-B69A-E3502EA50871}.Release|Any CPU.ActiveCfg = Release|Any CPU {214C64C6-04E5-4867-B69A-E3502EA50871}.Release|Any CPU.Build.0 = Release|Any CPU - {214C64C6-04E5-4867-B69A-E3502EA50871}.Release|x64.ActiveCfg = Release|Any CPU + {214C64C6-04E5-4867-B69A-E3502EA50871}.Release|x64.ActiveCfg = Release|x64 + {214C64C6-04E5-4867-B69A-E3502EA50871}.Release|x64.Build.0 = Release|x64 {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Debug|x64.ActiveCfg = Debug|Any CPU + {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Debug|x64.ActiveCfg = Debug|x64 + {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Debug|x64.Build.0 = Debug|x64 {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Release|Any CPU.ActiveCfg = Release|Any CPU {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Release|Any CPU.Build.0 = Release|Any CPU - {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Release|x64.ActiveCfg = Release|Any CPU + {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Release|x64.ActiveCfg = Release|x64 + {988F90CF-A48D-4938-A4D2-FA3B758FB5A7}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/REEF/reef-applications/CLRBridgeClient/CLRBridgeClient.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-applications/CLRBridgeClient/CLRBridgeClient.csproj b/lang/cs/Source/REEF/reef-applications/CLRBridgeClient/CLRBridgeClient.csproj index 0f333d3..9ee6246 100644 --- a/lang/cs/Source/REEF/reef-applications/CLRBridgeClient/CLRBridgeClient.csproj +++ b/lang/cs/Source/REEF/reef-applications/CLRBridgeClient/CLRBridgeClient.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,13 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.CLRBridgeClient</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\..\bin\Debug\Org.Apache.Reef.CLRBridgeClient\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -44,7 +55,16 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\..\bin\Release\Microsoft.Reef.CLRBridgeClient\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -66,39 +86,39 @@ under the License. <None Include="run.cmd" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> - <ProjectReference Include="..\..\..\WAKE\Wake\Wake.csproj"> + <ProjectReference Include="$(SourceDir)\WAKE\Wake\Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> <Name>Wake</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefCommon\ReefCommon.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefCommon\ReefCommon.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> <Name>ReefCommon</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefDriver\ReefDriver.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefDriver\ReefDriver.csproj"> <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project> <Name>ReefDriver</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-examples\HelloCLRBridge\HelloCLRBridge.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-examples\HelloCLRBridge\HelloCLRBridge.csproj"> <Project>{a78dd8e8-31d0-4506-8738-daa9da86d55b}</Project> <Name>HelloCLRBridge</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-examples\RetainedEvalCLRBridge\RetainedEvalCLRBridge.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-examples\RetainedEvalCLRBridge\RetainedEvalCLRBridge.csproj"> <Project>{a33c20fb-a76e-494c-80c5-bce4bad876d3}</Project> <Name>RetainedEvalCLRBridge</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-io\NetWork\NetWork.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-io\NetWork\NetWork.csproj"> <Project>{883ce800-6a6a-4e0a-b7fe-c054f4f2c1dc}</Project> <Name>NetWork</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-tasks\Tasks\Tasks.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-tasks\Tasks\Tasks.csproj"> <Project>{75503f90-7b82-4762-9997-94b5c68f15db}</Project> <Name>Tasks</Name> </ProjectReference> @@ -111,4 +131,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/REEF/reef-applications/Evaluator/Evaluator.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-applications/Evaluator/Evaluator.csproj b/lang/cs/Source/REEF/reef-applications/Evaluator/Evaluator.csproj index dc9c703..cc21ac9 100644 --- a/lang/cs/Source/REEF/reef-applications/Evaluator/Evaluator.csproj +++ b/lang/cs/Source/REEF/reef-applications/Evaluator/Evaluator.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,15 +27,27 @@ under the License. <AssemblyName>Org.Apache.Reef.Evaluator</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir> + <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..</SolutionDir> <RestorePackages>true</RestorePackages> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\..\bin\Debug\Org.Apache.Reef.Evaluator\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -46,14 +56,23 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\..\bin\Release\Microsoft.Reef.Evaluator\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="protobuf-net"> - <HintPath>..\..\..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath> + <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Configuration" /> @@ -72,23 +91,23 @@ under the License. <None Include="packages.config" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> - <ProjectReference Include="..\..\..\WAKE\Wake\Wake.csproj"> + <ProjectReference Include="$(SourceDir)\WAKE\Wake\Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> <Name>Wake</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefCommon\ReefCommon.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefCommon\ReefCommon.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> <Name>ReefCommon</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefDriver\ReefDriver.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefDriver\ReefDriver.csproj"> <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project> <Name>ReefDriver</Name> </ProjectReference> @@ -102,4 +121,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/REEF/reef-common/ReefCommon/ReefCommon.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-common/ReefCommon/ReefCommon.csproj b/lang/cs/Source/REEF/reef-common/ReefCommon/ReefCommon.csproj index 6dc5b4b..0b2299d 100644 --- a/lang/cs/Source/REEF/reef-common/ReefCommon/ReefCommon.csproj +++ b/lang/cs/Source/REEF/reef-common/ReefCommon/ReefCommon.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,15 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.Common</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir> <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\..\bin\Debug\Org.Apache.Reef.Common\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -46,29 +55,38 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\..\bin\Release\Microsoft.Reef.Common\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>..\..\..\..\packages\Microsoft.Hadoop.Avro.1.4.0.0\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.1.4.0.0\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> + <HintPath>$(PackagesDir)\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="protobuf-net"> - <HintPath>..\..\..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath> + <HintPath>$(PackagesDir)\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath> </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> <Reference Include="System.Reactive.Core"> - <HintPath>..\..\..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath> + <HintPath>$(PackagesDir)\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath> </Reference> <Reference Include="System.Reactive.Interfaces"> - <HintPath>..\..\..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath> + <HintPath>$(PackagesDir)\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath> </Reference> + <Reference Include="System" /> + <Reference Include="System.Core" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> @@ -190,15 +208,15 @@ under the License. <Folder Include="protobuf\tools\" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> - <ProjectReference Include="..\..\..\WAKE\Wake\Wake.csproj"> + <ProjectReference Include="$(SourceDir)\WAKE\Wake\Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> <Name>Wake</Name> </ProjectReference> @@ -212,4 +230,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/REEF/reef-common/ReefDriver/ReefDriver.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-common/ReefDriver/ReefDriver.csproj b/lang/cs/Source/REEF/reef-common/ReefDriver/ReefDriver.csproj index bc41253..3f73a0f 100644 --- a/lang/cs/Source/REEF/reef-common/ReefDriver/ReefDriver.csproj +++ b/lang/cs/Source/REEF/reef-common/ReefDriver/ReefDriver.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,15 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.Driver</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..</SolutionDir> <RestorePackages>true</RestorePackages> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\..\bin\Debug\Org.Apache.Reef.Driver\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -46,20 +55,29 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\..\bin\Release\Microsoft.Reef.Driver\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>..\..\..\..\packages\Microsoft.Hadoop.Avro.1.4.0.0\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.1.4.0.0\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> + <HintPath>$(PackagesDir)\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="protobuf-net"> - <HintPath>..\..\..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath> + <HintPath>$(PackagesDir)\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -179,19 +197,19 @@ under the License. <None Include="packages.config" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> - <ProjectReference Include="..\..\..\WAKE\Wake\Wake.csproj"> + <ProjectReference Include="$(SourceDir)\WAKE\Wake\Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> <Name>Wake</Name> </ProjectReference> - <ProjectReference Include="..\ReefCommon\ReefCommon.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefCommon\ReefCommon.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> <Name>ReefCommon</Name> </ProjectReference> @@ -205,4 +223,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/REEF/reef-examples/HelloCLRBridge/HelloCLRBridge.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-examples/HelloCLRBridge/HelloCLRBridge.csproj b/lang/cs/Source/REEF/reef-examples/HelloCLRBridge/HelloCLRBridge.csproj index 09c8b0b..6248c08 100644 --- a/lang/cs/Source/REEF/reef-examples/HelloCLRBridge/HelloCLRBridge.csproj +++ b/lang/cs/Source/REEF/reef-examples/HelloCLRBridge/HelloCLRBridge.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,13 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.Examples.HelloCLRBridge</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\..\bin\Debug\Org.Apache.Reef.Examples.HelloCLRBridge\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -44,7 +55,16 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\..\bin\Release\Microsoft.Reef.Examples.HelloCLRBridge\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -78,31 +98,31 @@ under the License. <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> - <ProjectReference Include="..\..\..\WAKE\Wake\Wake.csproj"> + <ProjectReference Include="$(SourceDir)\WAKE\Wake\Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> <Name>Wake</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefCommon\ReefCommon.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefCommon\ReefCommon.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> <Name>ReefCommon</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefDriver\ReefDriver.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefDriver\ReefDriver.csproj"> <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project> <Name>ReefDriver</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-io\NetWork\NetWork.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-io\NetWork\NetWork.csproj"> <Project>{883ce800-6a6a-4e0a-b7fe-c054f4f2c1dc}</Project> <Name>NetWork</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-tasks\Tasks\Tasks.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-tasks\Tasks\Tasks.csproj"> <Project>{75503f90-7b82-4762-9997-94b5c68f15db}</Project> <Name>Tasks</Name> </ProjectReference> @@ -115,4 +135,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/REEF/reef-examples/RetainedEvalCLRBridge/RetainedEvalCLRBridge.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-examples/RetainedEvalCLRBridge/RetainedEvalCLRBridge.csproj b/lang/cs/Source/REEF/reef-examples/RetainedEvalCLRBridge/RetainedEvalCLRBridge.csproj index c463f84..5b21473 100644 --- a/lang/cs/Source/REEF/reef-examples/RetainedEvalCLRBridge/RetainedEvalCLRBridge.csproj +++ b/lang/cs/Source/REEF/reef-examples/RetainedEvalCLRBridge/RetainedEvalCLRBridge.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,13 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.Examples.RetainedEvalCLRBridge</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\..\bin\Debug\Org.Apache.Reef.Examples.RetainedEvalCLRBridge\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -44,7 +55,16 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\..\bin\Release\Microsoft.Reef.Examples.RetainedEvalCLRBridge\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -66,23 +86,23 @@ under the License. <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefCommon\ReefCommon.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefCommon\ReefCommon.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> <Name>ReefCommon</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefDriver\ReefDriver.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefDriver\ReefDriver.csproj"> <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project> <Name>ReefDriver</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-tasks\Tasks\Tasks.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-tasks\Tasks\Tasks.csproj"> <Project>{75503f90-7b82-4762-9997-94b5c68f15db}</Project> <Name>Tasks</Name> </ProjectReference> @@ -95,4 +115,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/REEF/reef-io/Network/Network.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-io/Network/Network.csproj b/lang/cs/Source/REEF/reef-io/Network/Network.csproj index 6ab99d8..c857c92 100644 --- a/lang/cs/Source/REEF/reef-io/Network/Network.csproj +++ b/lang/cs/Source/REEF/reef-io/Network/Network.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,15 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.IO.Network</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir> <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\..\bin\Debug\Org.Apache.Reef.IO.Network\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -46,29 +55,38 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\..\bin\Release\Microsoft.Reef.IO.Network\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>..\..\..\..\packages\Microsoft.Hadoop.Avro.1.4.0.0\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> + <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="protobuf-net"> - <HintPath>..\..\..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath> + <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath> </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> <Reference Include="System.Reactive.Core"> - <HintPath>..\..\..\..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath> + <HintPath>$(PackagesDir)\Rx-Core.$(RxVersion)\lib\net45\System.Reactive.Core.dll</HintPath> </Reference> <Reference Include="System.Reactive.Interfaces"> - <HintPath>..\..\..\..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath> + <HintPath>$(PackagesDir)\Rx-Interfaces.$(RxVersion)\lib\net45\System.Reactive.Interfaces.dll</HintPath> </Reference> + <Reference Include="System" /> + <Reference Include="System.Core" /> <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> @@ -126,23 +144,23 @@ under the License. <None Include="packages.config" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> - <ProjectReference Include="..\..\..\WAKE\Wake\Wake.csproj"> + <ProjectReference Include="$(SourceDir)\WAKE\Wake\Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> <Name>Wake</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefCommon\ReefCommon.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefCommon\ReefCommon.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> <Name>ReefCommon</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefDriver\ReefDriver.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefDriver\ReefDriver.csproj"> <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project> <Name>ReefDriver</Name> </ProjectReference> @@ -156,4 +174,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/REEF/reef-tasks/Tasks/Tasks.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/REEF/reef-tasks/Tasks/Tasks.csproj b/lang/cs/Source/REEF/reef-tasks/Tasks/Tasks.csproj index 8cae084..6e73620 100644 --- a/lang/cs/Source/REEF/reef-tasks/Tasks/Tasks.csproj +++ b/lang/cs/Source/REEF/reef-tasks/Tasks/Tasks.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,13 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.Tasks</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\..\bin\Debug\Org.Apache.Reef.Tasks\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -44,7 +55,16 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\..\bin\Release\Microsoft.Reef.Tasks\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -69,15 +89,15 @@ under the License. <Compile Include="StreamingTasks\StreamTask2.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> - <ProjectReference Include="..\..\reef-common\ReefCommon\ReefCommon.csproj"> + <ProjectReference Include="$(SourceDir)\Reef\reef-common\ReefCommon\ReefCommon.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> <Name>ReefCommon</Name> </ProjectReference> @@ -90,4 +110,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/TANG/Examples/Examples.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/TANG/Examples/Examples.csproj b/lang/cs/Source/TANG/Examples/Examples.csproj index ac5a7e3..47d7a7a 100644 --- a/lang/cs/Source/TANG/Examples/Examples.csproj +++ b/lang/cs/Source/TANG/Examples/Examples.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,13 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.Tang.Examples</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\bin\Debug\Org.Apache.Reef.Tang.Examples\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -44,7 +55,16 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\bin\Release\Microsoft.Tang.Examples\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -75,11 +95,11 @@ under the License. <Compile Include="TweetExample.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\WAKE\Wake\Wake.csproj"> + <ProjectReference Include="$(SourceDir)\WAKE\Wake\Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> <Name>Wake</Name> </ProjectReference> - <ProjectReference Include="..\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> @@ -92,4 +112,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/TANG/Tang/Tang.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/TANG/Tang/Tang.csproj b/lang/cs/Source/TANG/Tang/Tang.csproj index bb88f2c..bc63f18 100644 --- a/lang/cs/Source/TANG/Tang/Tang.csproj +++ b/lang/cs/Source/TANG/Tang/Tang.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,15 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.Tang</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\bin\Debug\Org.Apache.Reef.Tang\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -46,20 +55,29 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\bin\Release\Microsoft.Tang\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>..\..\..\packages\Microsoft.Hadoop.Avro.1.4.0.0\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> + <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="protobuf-net"> - <HintPath>..\..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath> + <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net40\protobuf-net.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -157,12 +175,10 @@ under the License. <Compile Include="Util\SetValuedKey.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config"> - <SubType>Designer</SubType> - </None> + <None Include="packages.config" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> @@ -176,4 +192,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/Tools/ClassHierarchyBuilder/ClassHierarchyBuilder.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/Tools/ClassHierarchyBuilder/ClassHierarchyBuilder.csproj b/lang/cs/Source/Tools/ClassHierarchyBuilder/ClassHierarchyBuilder.csproj index c3ddf65..05809d2 100644 --- a/lang/cs/Source/Tools/ClassHierarchyBuilder/ClassHierarchyBuilder.csproj +++ b/lang/cs/Source/Tools/ClassHierarchyBuilder/ClassHierarchyBuilder.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,13 +27,26 @@ under the License. <AssemblyName>Org.Apache.Reef.Tools.ClassHierarchyBuilder</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\bin\Debug\Org.Apache.Reef.Tools.ClassHierarchyBuilder\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -44,13 +55,19 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\bin\Release\Microsoft.Reef.Tools.ClassHierarchyBuilder</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> - <PropertyGroup> - <StartupObject /> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="System" /> @@ -66,15 +83,15 @@ under the License. <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\REEF\reef-common\ReefCommon\ReefCommon.csproj"> + <ProjectReference Include="$(SourceDir)\REEF\reef-common\ReefCommon\ReefCommon.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> <Name>ReefCommon</Name> </ProjectReference> - <ProjectReference Include="..\..\REEF\reef-tasks\Tasks\Tasks.csproj"> + <ProjectReference Include="$(SourceDir)\REEF\reef-tasks\Tasks\Tasks.csproj"> <Project>{75503f90-7b82-4762-9997-94b5c68f15db}</Project> <Name>Tasks</Name> </ProjectReference> - <ProjectReference Include="..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> @@ -87,4 +104,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/Tools/ReefAll/ReefAll.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/Tools/ReefAll/ReefAll.csproj b/lang/cs/Source/Tools/ReefAll/ReefAll.csproj index 4f60fe6..4536bd6 100644 --- a/lang/cs/Source/Tools/ReefAll/ReefAll.csproj +++ b/lang/cs/Source/Tools/ReefAll/ReefAll.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,13 +27,27 @@ under the License. <AssemblyName>Org.Apache.Reef.All</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..</SolutionDir> + </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\..\bin\Debug\Org.Apache.Reef.All\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -44,7 +56,16 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\bin\Release\Microsoft.Reef.All\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -62,31 +83,31 @@ under the License. <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\REEF\reef-applications\Evaluator\Evaluator.csproj"> + <ProjectReference Include="$(SourceDir)\REEF\reef-applications\Evaluator\Evaluator.csproj"> <Project>{1b983182-9c30-464c-948d-f87eb93a8240}</Project> <Name>Evaluator</Name> </ProjectReference> - <ProjectReference Include="..\..\REEF\reef-common\ReefCommon\ReefCommon.csproj"> + <ProjectReference Include="$(SourceDir)\REEF\reef-common\ReefCommon\ReefCommon.csproj"> <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project> <Name>ReefCommon</Name> </ProjectReference> - <ProjectReference Include="..\..\REEF\reef-common\ReefDriver\ReefDriver.csproj"> + <ProjectReference Include="$(SourceDir)\REEF\reef-common\ReefDriver\ReefDriver.csproj"> <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project> <Name>ReefDriver</Name> </ProjectReference> - <ProjectReference Include="..\..\REEF\reef-io\NetWork\NetWork.csproj"> + <ProjectReference Include="$(SourceDir)\REEF\reef-io\NetWork\NetWork.csproj"> <Project>{883ce800-6a6a-4e0a-b7fe-c054f4f2c1dc}</Project> <Name>NetWork</Name> </ProjectReference> - <ProjectReference Include="..\..\Tang\Tang\Tang.csproj"> + <ProjectReference Include="$(SourceDir)\Tang\Tang\Tang.csproj"> <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> <Name>Tang</Name> </ProjectReference> - <ProjectReference Include="..\..\Utilities\Utilities.csproj"> + <ProjectReference Include="$(SourceDir)\Utilities\Utilities.csproj"> <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> <Name>Utilities</Name> </ProjectReference> - <ProjectReference Include="..\..\WAKE\Wake\Wake.csproj"> + <ProjectReference Include="$(SourceDir)\WAKE\Wake\Wake.csproj"> <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> <Name>Wake</Name> </ProjectReference> @@ -99,4 +120,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/Utilities/Utilities.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/Utilities/Utilities.csproj b/lang/cs/Source/Utilities/Utilities.csproj index f3fd129..d5b7898 100644 --- a/lang/cs/Source/Utilities/Utilities.csproj +++ b/lang/cs/Source/Utilities/Utilities.csproj @@ -7,9 +7,7 @@ regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -29,15 +27,27 @@ under the License. <AssemblyName>Org.Apache.Reef.Utilities</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <RestorePackages>true</RestorePackages> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..</SolutionDir> </PropertyGroup> + <Import Project="$(SolutionDir)\Source\build.props" /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\bin\Debug\Org.Apache.Reef.Utilities\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + <PlatformTarget>AnyCPU</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -47,17 +57,26 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\bin\Release\Microsoft.Reef.Utilities\</OutputPath> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> + <PlatformTarget>AnyCPU</PlatformTarget> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>..\..\packages\Microsoft.Hadoop.Avro.1.4.0.0\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> + <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net40\Microsoft.Hadoop.Avro.dll</HintPath> </Reference> <Reference Include="Newtonsoft.Json"> - <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath> + <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath> </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> @@ -94,4 +113,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project>
