Repository: incubator-reef Updated Branches: refs/heads/master 2ae282de1 -> a7b0722da
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Source/WAKE/Wake/Wake.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Source/WAKE/Wake/Wake.csproj b/lang/cs/Source/WAKE/Wake/Wake.csproj index 689df3c..cd15289 100644 --- a/lang/cs/Source/WAKE/Wake/Wake.csproj +++ b/lang/cs/Source/WAKE/Wake/Wake.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.Wake</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.Wake\</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,22 +55,31 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\..\bin\Release\Microsoft.Wake\</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.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.Runtime.Serialization" /> <Reference Include="System.Xml.Linq" /> @@ -88,7 +106,6 @@ under the License. <Compile Include="IObserverFactory.cs" /> <Compile Include="IStage.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Protobuf\WakeRemoteProtosGen.cs" /> <Compile Include="Remote\ICodec.cs" /> <Compile Include="Remote\ICodecFactory.cs" /> <Compile Include="Remote\IDecoder.cs" /> @@ -141,6 +158,7 @@ under the License. <Compile Include="src\main\cs\Examples\P2p\IEventSource.cs" /> <Compile Include="src\main\cs\Examples\P2p\Pull2Push.cs" /> <Compile Include="src\main\cs\PeriodicEvent.cs" /> + <Compile Include="Protobuf\WakeRemoteProtosGen.cs" /> <Compile Include="Time\Event\Alarm.cs" /> <Compile Include="Time\Event\StartTime.cs" /> <Compile Include="Time\Event\StopTime.cs" /> @@ -170,40 +188,24 @@ under the License. <ItemGroup> <None Include="packages.config" /> <None Include="Protobuf\RemoteProtocol.proto" /> - <None Include="testkey.snk" /> </ItemGroup> <ItemGroup> - <Folder Include="Impl\Impl\" /> - <Folder Include="RX\RX\Impl\" /> <Folder Include="Time\Time\Event\" /> <Folder Include="Time\Time\Runtime\Event\" /> <Folder Include="Util\Util\" /> </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> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> - <PropertyGroup> - <MainProtoBufDir>.\target\generated-sources\proto\main\cs\Wake</MainProtoBufDir> - <TestProtoBufDir>.\target\generated-sources\proto\test\cs\Wake</TestProtoBufDir> - <TestRemoteDir>..\..\wake\target\generated-sources\proto\test\cs\Wake</TestRemoteDir> - </PropertyGroup> - <Target Name="ProtoBuf"> - <MakeDir Directories="$(MainProtoBufDir)" Condition="!Exists('$(MainProtoBufDir)')" /> - <MakeDir Directories="$(TestProtoBufDir)" Condition="!Exists('$(TestProtoBufDir)')" /> - <MakeDir Directories="$(TestRemoteDir)" Condition="!Exists('$(TestRemoteDir)')" /> - <Exec Command="protogen -i:.\src\main\proto\RemoteProtocol.proto -o:$(MainProtoBufDir)\WakeRemoteProtosGen.cs -ns:Wake.Remote.Proto.WakeRemoteProtos" /> - <!--<Exec Command="protogen -i:.\src\test\proto\TestProtocol.proto -o:$(TestProtoBufDir)\TestProtosGen.cs -ns:Wake.Test.Proto.TestProtos" /> - <Exec Command="protogen -i:.\src\test\proto\TestEvent1.proto -o:$(TestRemoteDir)\TestEvent1.pb.cs -ns:Wake.Test.Remote.TestRemote" />--> - </Target> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. Other similar extension points exist, see Microsoft.Common.targets. <Target Name="BeforeBuild"> @@ -211,4 +213,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/build.props ---------------------------------------------------------------------- diff --git a/lang/cs/Source/build.props b/lang/cs/Source/build.props new file mode 100644 index 0000000..95bd261 --- /dev/null +++ b/lang/cs/Source/build.props @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +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 +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + + <!-- Common build paths --> + <PropertyGroup> + <BinDir Condition="$(BinDir) == '' Or $(BinDir) == '*Undefined*'">$(SolutionDir)\bin</BinDir> + <SourceDir Condition="$(SourceDir) == '' Or $(SourceDir) == '*Undefined*'">$(SolutionDir)\Source</SourceDir> + <PackagesDir Condition="$(PackagesDir) == '' Or $(PackagesDir) == '*Undefined*'">$(SolutionDir)\packages</PackagesDir> + </PropertyGroup> + + <!-- Package versions --> + <PropertyGroup> + <AvroVersion>1.4.0.0</AvroVersion> + <NewtonsoftJsonVersion>6.0.8</NewtonsoftJsonVersion> + <ProtobufVersion>2.0.0.668</ProtobufVersion> + <RxVersion>2.2.5</RxVersion> + </PropertyGroup> +</Project> + http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/a7b0722d/lang/cs/Tests/ReefTests/ReefTests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/ReefTests/ReefTests.csproj b/lang/cs/Tests/ReefTests/ReefTests.csproj index 221dd0b..cd5cb06 100644 --- a/lang/cs/Tests/ReefTests/ReefTests.csproj +++ b/lang/cs/Tests/ReefTests/ReefTests.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 @@ -37,7 +35,17 @@ under the License. <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\bin\Debug\Org.Apache.Reef.Test\</OutputPath> + <OutputPath>..\..\bin\$(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>..\..\bin\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -46,7 +54,16 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\bin\Release\Microsoft.Reef.Tests\</OutputPath> + <OutputPath>..\..\bin\$(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>..\..\bin\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -189,4 +206,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/Tests/TangTests/TangTests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/TangTests/TangTests.csproj b/lang/cs/Tests/TangTests/TangTests.csproj index ee925b8..ed7eb65 100644 --- a/lang/cs/Tests/TangTests/TangTests.csproj +++ b/lang/cs/Tests/TangTests/TangTests.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 @@ -37,7 +35,17 @@ under the License. <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\bin\Debug\Org.Apache.Reef.Tang.Test\</OutputPath> + <OutputPath>..\..\bin\$(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>..\..\bin\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -46,7 +54,16 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\bin\Release\Microsoft.Tang.Tests\</OutputPath> + <OutputPath>..\..\bin\$(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>..\..\bin\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -177,4 +194,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/Tests/WakeTests/WakeTests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Tests/WakeTests/WakeTests.csproj b/lang/cs/Tests/WakeTests/WakeTests.csproj index 0f90252..f2eefe1 100644 --- a/lang/cs/Tests/WakeTests/WakeTests.csproj +++ b/lang/cs/Tests/WakeTests/WakeTests.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 @@ -37,7 +35,17 @@ under the License. <DebugSymbols>true</DebugSymbols> <DebugType>full</DebugType> <Optimize>false</Optimize> - <OutputPath>..\..\bin\Debug\Org.Apache.Reef.Wake.Test\</OutputPath> + <OutputPath>..\..\bin\$(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>..\..\bin\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -46,7 +54,16 @@ under the License. <PlatformTarget>AnyCPU</PlatformTarget> <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> - <OutputPath>..\..\bin\Release\Microsoft.Wake.Tests\</OutputPath> + <OutputPath>..\..\bin\$(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>..\..\bin\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> @@ -100,4 +117,4 @@ under the License. <Target Name="AfterBuild"> </Target> --> -</Project> \ No newline at end of file +</Project>
