Repository: reef Updated Branches: refs/heads/master 5ed56eba3 -> fafc236bc
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.DotNet.csproj deleted file mode 100644 index 929de58..0000000 --- a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.DotNet.csproj +++ /dev/null @@ -1,31 +0,0 @@ -<Project> -<!-- -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. ---> - <PropertyGroup> - <AssemblyName>Org.Apache.REEF.Wake.Tests</AssemblyName> - </PropertyGroup> - <Import Project="..\build.DotNetTest.props" /> - <ItemGroup> - <PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" /> - <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> - </ItemGroup> - <Import Project="..\build.DotNetTest.targets" /> -</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj index 628ae91..6df9580 100644 --- a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -15,74 +15,17 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> - <ProjectGuid>{214C64C6-04E5-4867-B69A-E3502EA50871}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Org.Apache.REEF.Wake.Tests</RootNamespace> <AssemblyName>Org.Apache.REEF.Wake.Tests</AssemblyName> - <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..</SolutionDir> - <RestorePackages>true</RestorePackages> </PropertyGroup> - <Import Project="$(SolutionDir)\build.props" /> - <Import Project="$(SolutionDir)\xunit.targets" /> - <PropertyGroup> - <BuildPackage>false</BuildPackage> - </PropertyGroup> - <ItemGroup> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Data" /> - <Reference Include="System.Reactive.Core"> - <HintPath>$(PackagesDir)\System.Reactive.Core.$(SystemReactiveVersion)\lib\net45\System.Reactive.Core.dll</HintPath> - </Reference> - <Reference Include="System.Reactive.Interfaces"> - <HintPath>$(PackagesDir)\System.Reactive.Interfaces.$(SystemReactiveVersion)\lib\net45\System.Reactive.Interfaces.dll</HintPath> - </Reference> - <Reference Include="System.Runtime.Serialization" /> - <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath> - </Reference> - </ItemGroup> - <ItemGroup> - <Compile Include="$(SolutionDir)\SharedAssemblyInfo.cs"> - <Link>Properties\SharedAssemblyInfo.cs</Link> - </Compile> - <Compile Include="Message\AvroTestMessage.cs" /> - <Compile Include="ProtocolSerializerTest.cs" /> - <Compile Include="ClockTest.cs" /> - <Compile Include="MultiCodecTest.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="PubSubSubjectTest.cs" /> - <Compile Include="RemoteManagerTest.cs" /> - <Compile Include="StreamingRemoteManagerTest.cs" /> - <Compile Include="StreamingTransportTest.cs" /> - <Compile Include="TimerStageTest.cs" /> - <Compile Include="TimeTest.cs" /> - <Compile Include="TcpConnectionRetryTest.cs" /> - <Compile Include="TransportTest.cs" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj"> - <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> - <Name>Org.Apache.REEF.Tang</Name> - </ProjectReference> - <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj"> - <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project> - <Name>Org.Apache.REEF.Wake</Name> - </ProjectReference> - </ItemGroup> + <Import Project="..\build.Test.props" /> <ItemGroup> - <None Include="packages.config" /> + <PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" /> + <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> </ItemGroup> <ItemGroup> - <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj" /> </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> - <Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" /> + <Import Project="..\build.Test.targets" /> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake.Tests/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Wake.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 0ce705c..0000000 --- a/lang/cs/Org.Apache.REEF.Wake.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,29 +0,0 @@ -// 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. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Org.Apache.REEF.Wake.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyProduct("Org.Apache.REEF.Wake.Tests")] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("68a2ef80-e51b-4abb-9ccc-81354e152758")] http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake.Tests/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/packages.config b/lang/cs/Org.Apache.REEF.Wake.Tests/packages.config deleted file mode 100644 index 847e6d5..0000000 --- a/lang/cs/Org.Apache.REEF.Wake.Tests/packages.config +++ /dev/null @@ -1,32 +0,0 @@ -<?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. ---> -<packages> - <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45" developmentDependency="true" /> - <package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" /> - <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" /> - <package id="xunit" version="2.1.0" targetFramework="net45" /> - <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" /> - <package id="xunit.assert" version="2.1.0" targetFramework="net45" /> - <package id="xunit.core" version="2.1.0" targetFramework="net45" /> - <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" /> - <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" /> - <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" /> -</packages> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj deleted file mode 100644 index 777d41e..0000000 --- a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj +++ /dev/null @@ -1,35 +0,0 @@ -<Project> -<!-- -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. ---> - <PropertyGroup> - <AssemblyName>Org.Apache.REEF.Wake</AssemblyName> - <Description>Wake is an event-driven framework</Description> - <PackageTags>wake event-driven</PackageTags> - <DefineConstants>REEF_DOTNET_BUILD</DefineConstants> - </PropertyGroup> - <Import Project="..\build.DotNetLibrary.props" /> - <ItemGroup> - <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" /> - <PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Core" Version="$(TransientFaultHandlingVersion)" /> - <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> - </ItemGroup> - <ItemGroup> - <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> - <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> - </ItemGroup> - <Import Project="..\build.DotNet.targets" /> -</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj index ce171bc..c988cfd 100644 --- a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj +++ b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -15,211 +15,21 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <PropertyGroup> - <ProjectGuid>{CDFB3464-4041-42B1-9271-83AF24CD5008}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Org.Apache.REEF.Wake</RootNamespace> <AssemblyName>Org.Apache.REEF.Wake</AssemblyName> - <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - <RestorePackages>true</RestorePackages> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..</SolutionDir> - <AvroBinaryDirectory>..\packages\AvroBin</AvroBinaryDirectory> - <AvroSchemaDirectory>..\..\common\wake\avro</AvroSchemaDirectory> - <AvroTools>..\packages\Microsoft.Avro.Tools.0.1.0\lib\net451\Microsoft.Avro.Tools.exe</AvroTools> - <AvroLibrary>..\packages\Microsoft.Avro.Core.0.1.0\lib\net451\Microsoft.Avro.Core.dll</AvroLibrary> - <NewtonsoftLibrary>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</NewtonsoftLibrary> + <Description>Wake is an event-driven framework</Description> + <PackageTags>wake event-driven</PackageTags> + <DefineConstants>REEF_DOTNET_BUILD</DefineConstants> </PropertyGroup> - <Import Project="$(SolutionDir)\build.props" /> + <Import Project="..\build.Library.props" /> <ItemGroup> - <Reference Include="Microsoft.Hadoop.Avro"> - <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath> - </Reference> - <Reference Include="Microsoft.Practices.TransientFaultHandling.Core, Version=5.1.1209.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll</HintPath> - </Reference> - <Reference Include="protobuf-net"> - <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Data" /> - <Reference Include="System.Reactive.Core"> - <HintPath>$(PackagesDir)\System.Reactive.Core.$(SystemReactiveVersion)\lib\net45\System.Reactive.Core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="System.Reactive.Interfaces"> - <HintPath>$(PackagesDir)\System.Reactive.Interfaces.$(SystemReactiveVersion)\lib\net45\System.Reactive.Interfaces.dll</HintPath> - </Reference> - <Reference Include="System.Runtime.Serialization" /> - <Reference Include="System.Xml" /> + <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" /> + <PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Core" Version="$(TransientFaultHandlingVersion)" /> + <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> </ItemGroup> <ItemGroup> - <Compile Include="$(SolutionDir)\SharedAssemblyInfo.cs"> - <Link>Properties\SharedAssemblyInfo.cs</Link> - </Compile> - <Compile Include="AbstractEStage.cs" /> - <Compile Include="Avro\IMessageInstance.cs" /> - <Compile Include="Avro\MessageInstance.cs" /> - <Compile Include="Avro\Message\Header.cs" /> - <Compile Include="Avro\ProtocolSerializer.cs" /> - <Compile Include="Avro\SeializationException.cs" /> - <Compile Include="Examples\P2p\IEventSource.cs" /> - <Compile Include="Examples\P2p\Pull2Push.cs" /> - <Compile Include="IEStage.cs" /> - <Compile Include="IEventHandler.cs" /> - <Compile Include="IIdentifier.cs" /> - <Compile Include="IIdentifierFactory.cs" /> - <Compile Include="Remote\IConnectionRetryHandler.cs" /> - <Compile Include="Remote\Impl\RemoteConnectionRetryHandler.cs" /> - <Compile Include="Remote\ILocalAddressProvider.cs" /> - <Compile Include="Remote\Impl\DefaultLocalAddressProvider.cs" /> - <Compile Include="Remote\Impl\LoopbackLocalAddressProvider.cs" /> - <Compile Include="Remote\Impl\RemoteEventStreamingCodec.cs" /> - <Compile Include="Remote\Impl\StreamingRemoteManagerFactory.cs" /> - <Compile Include="Remote\Impl\DefaultRemoteManagerFactory.cs" /> - <Compile Include="Impl\LoggingEventHandler.cs" /> - <Compile Include="Impl\MissingStartHandlerHandler.cs" /> - <Compile Include="Impl\PeriodicEvent.cs" /> - <Compile Include="Impl\PubSubEventHandler.cs" /> - <Compile Include="Impl\SingleThreadStage.cs" /> - <Compile Include="Impl\SyncStage.cs" /> - <Compile Include="Impl\ThreadPoolStage.cs" /> - <Compile Include="Impl\TimerStage.cs" /> - <Compile Include="IObserverFactory.cs" /> - <Compile Include="IStage.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Remote\Impl\TcpClientConnectionException.cs" /> - <Compile Include="Remote\IRemoteObserver.cs" /> - <Compile Include="Remote\Impl\TcpClientConnectionFactory.cs" /> - <Compile Include="Remote\ITcpClientConnectionFactory.cs" /> - <Compile Include="Remote\ITcpPortProvider.cs" /> - <Compile Include="Remote\Parameters\ConnectionRetryCount.cs" /> - <Compile Include="Remote\Parameters\SleepTimeInMs.cs" /> - <Compile Include="Remote\Parameters\TcpPortRangeCount.cs" /> - <Compile Include="Remote\Parameters\TcpPortRangeSeed.cs" /> - <Compile Include="Remote\Parameters\TcpPortRangeStart.cs" /> - <Compile Include="Remote\Parameters\TcpPortRangeTryCount.cs" /> - <Compile Include="Remote\IDataReader.cs" /> - <Compile Include="Remote\IDataWriter.cs" /> - <Compile Include="Remote\Impl\StreamDataReader.cs" /> - <Compile Include="Remote\Impl\StreamDataWriter.cs" /> - <Compile Include="Remote\Impl\StreamingRemoteManager.cs" /> - <Compile Include="Remote\Impl\StreamingLink.cs" /> - <Compile Include="Remote\Impl\StreamingTransportClient.cs" /> - <Compile Include="Remote\Impl\StreamingTransportServer.cs" /> - <Compile Include="Remote\IRemoteManagerFactory.cs" /> - <Compile Include="Remote\Proto\WakeRemoteProtosGen.cs"> - <ExcludeFromStyleCop>true</ExcludeFromStyleCop> - </Compile> - <Compile Include="Remote\ICodec.cs" /> - <Compile Include="Remote\IDecoder.cs" /> - <Compile Include="Remote\IEncoder.cs" /> - <Compile Include="Remote\ILink.cs" /> - <Compile Include="Remote\Impl\ByteCodec.cs" /> - <Compile Include="Remote\Impl\Channel.cs" /> - <Compile Include="Remote\Impl\DefaultRemoteManager.cs" /> - <Compile Include="Remote\Impl\DefaultRemoteMessage.cs" /> - <Compile Include="Remote\Impl\IntCodec.cs" /> - <Compile Include="Remote\Impl\IPEndpointComparer.cs" /> - <Compile Include="Remote\Impl\Link.cs" /> - <Compile Include="Remote\Impl\MultiCodec.cs" /> - <Compile Include="Remote\Impl\MultiDecoder.cs" /> - <Compile Include="Remote\Impl\MultiEncoder.cs" /> - <Compile Include="Remote\Impl\ObserverContainer.cs" /> - <Compile Include="Remote\Impl\RemoteEvent.cs" /> - <Compile Include="Remote\Impl\RemoteEventCodec.cs" /> - <Compile Include="Remote\Impl\RemoteEventDecoder.cs" /> - <Compile Include="Remote\Impl\RemoteEventEncoder.cs" /> - <Compile Include="Remote\Impl\RemoteEventEndpoint.cs" /> - <Compile Include="Remote\Impl\SocketRemoteIdentifier.cs" /> - <Compile Include="Remote\Impl\StringCodec.cs" /> - <Compile Include="Remote\Impl\StringIdentifier.cs" /> - <Compile Include="Remote\Impl\StringIdentifierFactory.cs" /> - <Compile Include="Remote\Impl\TransportClient.cs" /> - <Compile Include="Remote\Impl\TransportEvent.cs" /> - <Compile Include="Remote\Impl\TransportServer.cs" /> - <Compile Include="Remote\IRemoteEvent.cs" /> - <Compile Include="Remote\IRemoteIdentifier.cs" /> - <Compile Include="Remote\IRemoteIdentifierFactory.cs" /> - <Compile Include="Remote\IRemoteManager.cs" /> - <Compile Include="Remote\IRemoteMessage.cs" /> - <Compile Include="Remote\ISubscriptionManager.cs" /> - <Compile Include="Remote\Proto\WakeRemoteProtos.cs" /> - <Compile Include="Remote\RemoteConfiguration.cs" /> - <Compile Include="Remote\RemoteRuntimeException.cs" /> - <Compile Include="Remote\TcpPortProvider.cs" /> - <Compile Include="RX\AbstractObserver.cs" /> - <Compile Include="RX\AbstractRxStage.cs" /> - <Compile Include="RX\Impl\PubSubSubject.cs" /> - <Compile Include="RX\Impl\RxSyncStage.cs" /> - <Compile Include="RX\Impl\RxThreadPoolStage.cs" /> - <Compile Include="RX\Impl\RxTimerStage.cs" /> - <Compile Include="RX\Impl\SimpleSubject.cs" /> - <Compile Include="RX\IRxStage.cs" /> - <Compile Include="RX\IStaticObservable.cs" /> - <Compile Include="RX\ISubject.cs" /> - <Compile Include="RX\ObserverCompletedException.cs" /> - <Compile Include="StreamingCodec\CodecToStreamingCodec.cs" /> - <Compile Include="StreamingCodec\CommonStreamingCodecs\DoubleArrayStreamingCodec.cs" /> - <Compile Include="StreamingCodec\CommonStreamingCodecs\DoubleStreamingCodec.cs" /> - <Compile Include="StreamingCodec\CommonStreamingCodecs\FloatArrayStreamingCodec.cs" /> - <Compile Include="StreamingCodec\CommonStreamingCodecs\FloatStreamingCodec.cs" /> - <Compile Include="StreamingCodec\CommonStreamingCodecs\IntArrayStreamingCodec.cs" /> - <Compile Include="StreamingCodec\CommonStreamingCodecs\IntStreamingCodec.cs" /> - <Compile Include="StreamingCodec\CommonStreamingCodecs\StringStreamingCodec.cs" /> - <Compile Include="StreamingCodec\IStreamingCodec.cs" /> - <Compile Include="Time\Event\Alarm.cs" /> - <Compile Include="Time\Event\StartTime.cs" /> - <Compile Include="Time\Event\StopTime.cs" /> - <Compile Include="Time\IClock.cs" /> - <Compile Include="Time\Parameters\IdleHandler.cs" /> - <Compile Include="Time\Parameters\RuntimeStartHandler.cs" /> - <Compile Include="Time\Parameters\RuntimeStopHandler.cs" /> - <Compile Include="Time\Parameters\StartHandler.cs" /> - <Compile Include="Time\Parameters\StopHandler.cs" /> - <Compile Include="Time\Runtime\Event\ClientAlarm.cs" /> - <Compile Include="Time\Runtime\Event\IdleClock.cs" /> - <Compile Include="Time\Runtime\Event\RuntimeAlarm.cs" /> - <Compile Include="Time\Runtime\Event\RuntimeStart.cs" /> - <Compile Include="Time\Runtime\Event\RuntimeStop.cs" /> - <Compile Include="Time\Runtime\ITimer.cs" /> - <Compile Include="Time\Runtime\LogicalTimer.cs" /> - <Compile Include="Time\Runtime\RealTimer.cs" /> - <Compile Include="Time\Runtime\RuntimeClock.cs" /> - <Compile Include="Time\Time.cs" /> - <Compile Include="Util\Actionable.cs" /> - <Compile Include="Util\Disposable.cs" /> - <Compile Include="Util\FixedThreadPoolTaskService.cs" /> - <Compile Include="Util\IStartable.cs" /> - <Compile Include="Util\ITaskService.cs" /> - <Compile Include="Util\LimitedConcurrencyLevelTaskScheduler.cs" /> - <Compile Include="Util\NetworkUtils.cs" /> - <Compile Include="Util\SerializationHelper.cs" /> - <Compile Include="Util\TimeHelper.cs" /> - <Compile Include="WakeRuntimeException.cs" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj" /> </ItemGroup> - <ItemGroup> - <None Include="Org.Apache.REEF.Wake.nuspec" /> - <None Include="packages.config" /> - <None Include="Remote\Proto\RemoteProtocol.proto" /> - </ItemGroup> - <ItemGroup /> - <ItemGroup> - <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj"> - <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project> - <Name>Org.Apache.REEF.Tang</Name> - </ProjectReference> - <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj"> - <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project> - <Name>Org.Apache.REEF.Utilities</Name> - </ProjectReference> - </ItemGroup> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> - <Import Project="$(SolutionDir)\AvroCodeGeneration.Targets" Condition="Exists('$(SolutionDir)\AvroCodeGeneration.Targets')" /> - <Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" /> + <Import Project="..\build.targets" /> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec deleted file mode 100644 index f648a5c..0000000 --- a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.nuspec +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0"?> -<!-- -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. ---> -<package > - <metadata> - <id>Org.Apache.REEF.Wake</id> - <version>$version$</version> - <title>Org.Apache.REEF.Wake</title> - <authors>The Apache REEF project</authors> - <owners>The Apache REEF project</owners> - <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl> - <projectUrl>http://reef.apache.org/</projectUrl> - <requireLicenseAcceptance>false</requireLicenseAcceptance> - <description>Wake is an event driven framework</description> - <copyright>The Apache Software Foundation</copyright> - <tags>wake event driven</tags> - <dependencies> - <dependency id="protobuf-net" version="2.1.0" /> - <dependency id="Rx-Core" version="2.2.5" /> - <dependency id="TransientFaultHandling.Core" version="5.1.1209.1" /> - <dependency id="Org.Apache.REEF.Utilities" version="$version$" /> - <dependency id="Org.Apache.REEF.Tang" version="$version$" /> - </dependencies> - </metadata> - <files> - <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.dll" target="lib\net45" /> - <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.pdb" target="lib\net45" /> - </files> -</package> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.DotNet.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.DotNet.cs b/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.DotNet.cs deleted file mode 100644 index 6caaaa2..0000000 --- a/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.DotNet.cs +++ /dev/null @@ -1,20 +0,0 @@ -// 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. - -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleToAttribute("Org.Apache.REEF.Wake.Tests")] http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs index 199c46b..6caaaa2 100644 --- a/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs +++ b/lang/cs/Org.Apache.REEF.Wake/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -// Licensed to the Apache Software Foundation (ASF) under one +// 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 @@ -15,23 +15,6 @@ // specific language governing permissions and limitations // under the License. -using System.Reflection; using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Org.Apache.REEF.Wake")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyProduct("Org.Apache.REEF.Wake")] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("86a66ac8-0c8e-4652-b533-670e800cb0ea")] - -// Allow the tests access to `internal` APIs -[assembly: InternalsVisibleTo("Org.Apache.REEF.Wake.Tests, publickey=" + - "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" + - "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" + - "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" + - "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")] +[assembly: InternalsVisibleToAttribute("Org.Apache.REEF.Wake.Tests")] http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Wake/packages.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/packages.config b/lang/cs/Org.Apache.REEF.Wake/packages.config deleted file mode 100644 index 6375661..0000000 --- a/lang/cs/Org.Apache.REEF.Wake/packages.config +++ /dev/null @@ -1,30 +0,0 @@ -<?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. ---> -<packages> - <package id="Microsoft.Avro.Core" version="0.1.0" targetFramework="net451" developmentDependency="true" /> - <package id="Microsoft.Avro.Tools" version="0.1.0" targetFramework="net451" developmentDependency="true" /> - <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" developmentDependency="true" /> - <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" /> - <package id="protobuf-net" version="2.1.0" targetFramework="net45" /> - <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45" developmentDependency="true" /> - <package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" /> - <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" /> - <package id="TransientFaultHandling.Core" version="5.1.1209.1" targetFramework="net45" /> -</packages> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.sln ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.sln b/lang/cs/Org.Apache.REEF.sln index 95fb5d0..631442c 100644 Binary files a/lang/cs/Org.Apache.REEF.sln and b/lang/cs/Org.Apache.REEF.sln differ http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/TestRunner.DotNet.proj ---------------------------------------------------------------------- diff --git a/lang/cs/TestRunner.DotNet.proj b/lang/cs/TestRunner.DotNet.proj deleted file mode 100644 index 5e853fe..0000000 --- a/lang/cs/TestRunner.DotNet.proj +++ /dev/null @@ -1,36 +0,0 @@ -<?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 DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <Import Project=".\build.DotNet.props" /> - <ItemGroup> - <ProjectReferences Include="*\*.Tests.DotNet.csproj" /> - </ItemGroup> - <PropertyGroup Condition=" '$(Configuration)' == '' "> - <Configuration>Debug</Configuration> - </PropertyGroup> - <PropertyGroup Condition=" '$(Platform)' == '' "> - <Platform>x64</Platform> - </PropertyGroup> - <PropertyGroup Condition=" '$(TargetFramework)' == '' "> - <TargetFramework>net461</TargetFramework> - </PropertyGroup> - <Target Name="Test"> - <MSBuild Projects="@(ProjectReferences)" - Targets="Test" Properties="Configuration=$(Configuration);Platform=$(Platform);TargetFramework=$(TargetFramework)" StopOnFirstFailure="false" /> - </Target> -</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/TestRunner.proj ---------------------------------------------------------------------- diff --git a/lang/cs/TestRunner.proj b/lang/cs/TestRunner.proj index 0ba9c99..9238bf5 100644 --- a/lang/cs/TestRunner.proj +++ b/lang/cs/TestRunner.proj @@ -16,6 +16,7 @@ specific language governing permissions and limitations under the License. --> <Project DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <Import Project=".\build.props" /> <ItemGroup> <ProjectReferences Include="*\*.Tests.csproj" /> </ItemGroup> @@ -25,8 +26,11 @@ under the License. <PropertyGroup Condition=" '$(Platform)' == '' "> <Platform>x64</Platform> </PropertyGroup> + <PropertyGroup Condition=" '$(TargetFramework)' == '' "> + <TargetFramework>net461</TargetFramework> + </PropertyGroup> <Target Name="Test"> <MSBuild Projects="@(ProjectReferences)" - Targets="Test" Properties="Configuration=$(Configuration);Platform=$(Platform)" StopOnFirstFailure="false" /> + Targets="Test" Properties="Configuration=$(Configuration);Platform=$(Platform);TargetFramework=$(TargetFramework)" StopOnFirstFailure="false" /> </Target> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.App.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.App.props b/lang/cs/build.App.props new file mode 100644 index 0000000..952bf66 --- /dev/null +++ b/lang/cs/build.App.props @@ -0,0 +1,47 @@ +<Project> +<!-- +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. +--> + +<Import Project="build.props"/> + +<!-- Settings for Linux platforms --> +<PropertyGroup Condition="'$(OS)' != 'Windows_NT'"> + <TargetFrameworks>netcoreapp2.0</TargetFrameworks> + <OutputType>Exe</OutputType> + <RuntimeIdentifiers>linux-x64</RuntimeIdentifiers> +</PropertyGroup> + +<!-- Settings for Windows platforms --> +<PropertyGroup Condition="'$(OS)' == 'Windows_NT'"> + <TargetFrameworks>net461</TargetFrameworks> + <!-- If EnableDotNetBuild is true, override the target frameworks to include dot net core --> + <TargetFrameworks Condition="'$(EnableDotNetBuild)' == 'true'">netcoreapp2.0;net461</TargetFrameworks> + <OutputType>Exe</OutputType> + + <!-- This is required to copy all referenced assemblies to the bin folder --> + <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> + <!-- REEF-1888: win7-x64 is needed for .net46 and .net451. Target a newer version of windows once net46 and 451 are removed" --> + <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers> +</PropertyGroup> + +<ItemGroup> + <None Include="$(SolutionDir)App.config"> + <Link>App.config</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> +</ItemGroup> +</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.Common.DotNet.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.Common.DotNet.props b/lang/cs/build.Common.DotNet.props deleted file mode 100644 index 7664c72..0000000 --- a/lang/cs/build.Common.DotNet.props +++ /dev/null @@ -1,69 +0,0 @@ -<Project> -<!-- -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. ---> - - <PropertyGroup> - <SnapshotNumber>01</SnapshotNumber> - <IsSnapshot>true</IsSnapshot> - <VersionPrefix>0.17.0</VersionPrefix> - <VersionSuffix Condition="'$(IsSnapshot)' == true">SNAPSHOT-$(SnapshotNumber)</VersionSuffix> - - <Authors>Apache Software Foundation</Authors> - <Owners>The Apache REEF project</Owners> - <Product>Apache REEF</Product> - <ProductId>$(AssemblyName)</ProductId> - <AssemblyVersion>$(Version)</AssemblyVersion> - <FileVersion>$(Version)</FileVersion> - <NeutralLanguage>en</NeutralLanguage> - <Copyright>The Apache Software Foundation</Copyright> - <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl> - <PackageProjectUrl>https://reef.apache.org</PackageProjectUrl> - <PackageIconUrl>https://reef.apache.org/ApacheREEF_logo_no_margin_small.png</PackageIconUrl> - <RepositoryUrl>https://github.com/apache/reef.git</RepositoryUrl> - <PackageReleaseNotes>Contact the Apache REEF development alias d...@reef.apache.org for questions or issues.</PackageReleaseNotes> - <DefaultItemExcludes>$(DefaultItemExcludes);**/AssemblyInfo.cs;**/Resources.xml;packages.config;*.nuspec</DefaultItemExcludes> - </PropertyGroup> - - <PropertyGroup> - <Platforms>x64</Platforms> - <PlatformTarget>x64</PlatformTarget> - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildThisFileDirectory)\</SolutionDir> - <BinDir Condition="$(BinDir) == '' Or $(BinDir) == '*Undefined*'">$(SolutionDir)bin\.netcore\</BinDir> - <PackagesDir Condition="$(PackagesDir) == '' Or $(PackagesDir) == '*Undefined*'">$(SolutionDir)\packages\</PackagesDir> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <DefineConstants>$(DefineConstants);REEF_DOTNET_BUILD</DefineConstants> - <NoWarn>NU1701;NU1603</NoWarn> - <OutputPath>$(BinDir)$(Configuration)\$(AssemblyName)\</OutputPath> - </PropertyGroup> - - <!-- For linux builds, always enable the dot net build --> - <PropertyGroup Condition="'$(OS)' != 'Windows_NT'"> - <EnableDotNetBuild>true</EnableDotNetBuild> - </PropertyGroup> - - <!-- For window builds, we are defaulting the dot net build to false until dot net core is fully supported --> - <PropertyGroup Condition="'$(OS)' == 'Windows_NT'"> - <EnableDotNetBuild>false</EnableDotNetBuild> - </PropertyGroup> - - <!-- Locations --> - <PropertyGroup> - <!--The root directory of the REEF source tree. --> - <REEF_Source_Folder>$([System.IO.Path]::GetFullPath($(MSBuildProjectDirectory)\..\..\..))</REEF_Source_Folder> - </PropertyGroup> - -</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.Common.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.Common.props b/lang/cs/build.Common.props new file mode 100644 index 0000000..520ecbc --- /dev/null +++ b/lang/cs/build.Common.props @@ -0,0 +1,69 @@ +<Project> +<!-- +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. +--> + + <PropertyGroup> + <SnapshotNumber>01</SnapshotNumber> + <IsSnapshot>true</IsSnapshot> + <VersionPrefix>0.17.0</VersionPrefix> + <VersionSuffix Condition="'$(IsSnapshot)' == true">SNAPSHOT-$(SnapshotNumber)</VersionSuffix> + + <Authors>Apache Software Foundation</Authors> + <Owners>The Apache REEF project</Owners> + <Product>Apache REEF</Product> + <ProductId>$(AssemblyName)</ProductId> + <AssemblyVersion>$(Version)</AssemblyVersion> + <FileVersion>$(Version)</FileVersion> + <NeutralLanguage>en</NeutralLanguage> + <Copyright>The Apache Software Foundation</Copyright> + <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl> + <PackageProjectUrl>https://reef.apache.org</PackageProjectUrl> + <PackageIconUrl>https://reef.apache.org/ApacheREEF_logo_no_margin_small.png</PackageIconUrl> + <RepositoryUrl>https://github.com/apache/reef.git</RepositoryUrl> + <PackageReleaseNotes>Contact the Apache REEF development alias d...@reef.apache.org for questions or issues.</PackageReleaseNotes> + <DefaultItemExcludes>$(DefaultItemExcludes);packages.config;*.nuspec</DefaultItemExcludes> + </PropertyGroup> + + <PropertyGroup> + <Platforms>x64</Platforms> + <PlatformTarget>x64</PlatformTarget> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildThisFileDirectory)\</SolutionDir> + <BinDir Condition="$(BinDir) == '' Or $(BinDir) == '*Undefined*'">$(SolutionDir)bin\.netcore\</BinDir> + <PackagesDir Condition="$(PackagesDir) == '' Or $(PackagesDir) == '*Undefined*'">$(SolutionDir)\packages\</PackagesDir> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <DefineConstants>$(DefineConstants);REEF_DOTNET_BUILD</DefineConstants> + <NoWarn>NU1701;NU1603</NoWarn> + <OutputPath>$(BinDir)$(Configuration)\$(AssemblyName)\</OutputPath> + </PropertyGroup> + + <!-- For linux builds, always enable the dot net build --> + <PropertyGroup Condition="'$(OS)' != 'Windows_NT'"> + <EnableDotNetBuild>true</EnableDotNetBuild> + </PropertyGroup> + + <!-- For window builds, we are defaulting the dot net build to false until dot net core is fully supported --> + <PropertyGroup Condition="'$(OS)' == 'Windows_NT'"> + <EnableDotNetBuild>false</EnableDotNetBuild> + </PropertyGroup> + + <!-- Locations --> + <PropertyGroup> + <!--The root directory of the REEF source tree. --> + <REEF_Source_Folder>$([System.IO.Path]::GetFullPath($(MSBuildProjectDirectory)\..\..\..))</REEF_Source_Folder> + </PropertyGroup> + +</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.DotNet.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNet.props b/lang/cs/build.DotNet.props deleted file mode 100644 index 0946942..0000000 --- a/lang/cs/build.DotNet.props +++ /dev/null @@ -1,37 +0,0 @@ -<Project> -<!-- -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. ---> - <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> - <Import Project="build.Common.DotNet.props" /> - - <!-- Allow for C# 7.2 language constructs --> - <PropertyGroup> - <LangVersion>7.2</LangVersion> - </PropertyGroup> - - <PropertyGroup> - <AvroVersion>0.1.0</AvroVersion> - <MicrosoftDataLakeStoreVersion>1.1.3</MicrosoftDataLakeStoreVersion> - <NewtonsoftJsonVersion>10.0.3</NewtonsoftJsonVersion> - <ProtobufVersion>2.1.0</ProtobufVersion> - <SystemReactiveVersion>3.1.1</SystemReactiveVersion> - <StyleCopVersion>5.0.0</StyleCopVersion> - <TransientFaultHandlingVersion>1.0.0</TransientFaultHandlingVersion> - <NSubstituteVersion>3.1.0</NSubstituteVersion> - <WindowsAzureStorageVersion>8.1.3</WindowsAzureStorageVersion> - </PropertyGroup> -</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.DotNet.targets ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNet.targets b/lang/cs/build.DotNet.targets deleted file mode 100644 index 4332f6e..0000000 --- a/lang/cs/build.DotNet.targets +++ /dev/null @@ -1,21 +0,0 @@ -<?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> - <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> -</Project> - http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.DotNetApp.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetApp.props b/lang/cs/build.DotNetApp.props deleted file mode 100644 index 81ff791..0000000 --- a/lang/cs/build.DotNetApp.props +++ /dev/null @@ -1,47 +0,0 @@ -<Project> -<!-- -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. ---> - -<Import Project="build.DotNet.props"/> - -<!-- Settings for Linux platforms --> -<PropertyGroup Condition="'$(OS)' != 'Windows_NT'"> - <TargetFrameworks>netcoreapp2.0</TargetFrameworks> - <OutputType>Exe</OutputType> - <RuntimeIdentifiers>linux-x64</RuntimeIdentifiers> -</PropertyGroup> - -<!-- Settings for Windows platforms --> -<PropertyGroup Condition="'$(OS)' == 'Windows_NT'"> - <TargetFrameworks>net461</TargetFrameworks> - <!-- If EnableDotNetBuild is true, override the target frameworks to include dot net core --> - <TargetFrameworks Condition="'$(EnableDotNetBuild)' == 'true'">netcoreapp2.0;net461</TargetFrameworks> - <OutputType>Exe</OutputType> - - <!-- This is required to copy all referenced assemblies to the bin folder --> - <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> - <!-- REEF-1888: win7-x64 is needed for .net46 and .net451. Target a newer version of windows once net46 and 451 are removed" --> - <RuntimeIdentifiers>win7-x64</RuntimeIdentifiers> -</PropertyGroup> - -<ItemGroup> - <None Include="$(SolutionDir)App.config"> - <Link>App.config</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> -</ItemGroup> -</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.DotNetLibrary.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetLibrary.props b/lang/cs/build.DotNetLibrary.props deleted file mode 100644 index 7122375..0000000 --- a/lang/cs/build.DotNetLibrary.props +++ /dev/null @@ -1,23 +0,0 @@ -<Project> -<!-- -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. ---> - -<Import Project="build.DotNet.props"/> -<PropertyGroup> - <TargetFrameworks>netstandard2.0</TargetFrameworks> -</PropertyGroup> -</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.DotNetTest.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetTest.props b/lang/cs/build.DotNetTest.props deleted file mode 100644 index 444ed1a..0000000 --- a/lang/cs/build.DotNetTest.props +++ /dev/null @@ -1,36 +0,0 @@ -<Project> -<!-- -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. ---> - -<Import Project="build.DotNet.props"/> -<Import Project="xunit.DotNet.props"/> -<PropertyGroup> - <TargetFrameworks>net461</TargetFrameworks> - - <!-- If EnableDotNetBuild is true, override the target frameworks to include dot net core --> - <TargetFrameworks Condition="'$(EnableDotNetBuild)' == 'true'">netcoreapp2.0;net461</TargetFrameworks> - - <!-- If on Linux, override the target frameworks to netcoreapp2.0 --> - <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks> - - <!-- This is required to copy all referenced assemblies to the bin folder --> - <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> - - <!-- Set this attribute to prevent test projects from being packaged --> - <IsTestProject>true</IsTestProject> -</PropertyGroup> -</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.DotNetTest.targets ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetTest.targets b/lang/cs/build.DotNetTest.targets deleted file mode 100644 index 4be3d8c..0000000 --- a/lang/cs/build.DotNetTest.targets +++ /dev/null @@ -1,25 +0,0 @@ -<Project> -<!-- -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. ---> - -<Import Project="build.DotNet.targets"/> -<Target Name="Test"> - <Exec Command="$(PackagesDir)\xunit.runner.console\2.2.0\tools\xunit.console.exe $(OutputPath)\$(AssemblyName).dll -notrait Environment=Yarn -html $(OutputPath)\xunit_report.html" - IgnoreStandardErrorWarningFormat="true"/> -</Target> - -</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.Library.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.Library.props b/lang/cs/build.Library.props new file mode 100644 index 0000000..32be08e --- /dev/null +++ b/lang/cs/build.Library.props @@ -0,0 +1,23 @@ +<Project> +<!-- +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. +--> + +<Import Project="build.props"/> +<PropertyGroup> + <TargetFrameworks>netstandard2.0</TargetFrameworks> +</PropertyGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.Test.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.Test.props b/lang/cs/build.Test.props new file mode 100644 index 0000000..f68d2e2 --- /dev/null +++ b/lang/cs/build.Test.props @@ -0,0 +1,36 @@ +<Project> +<!-- +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. +--> + +<Import Project="build.props"/> +<Import Project="xunit.props"/> +<PropertyGroup> + <TargetFrameworks>net461</TargetFrameworks> + + <!-- If EnableDotNetBuild is true, override the target frameworks to include dot net core --> + <TargetFrameworks Condition="'$(EnableDotNetBuild)' == 'true'">netcoreapp2.0;net461</TargetFrameworks> + + <!-- If on Linux, override the target frameworks to netcoreapp2.0 --> + <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks> + + <!-- This is required to copy all referenced assemblies to the bin folder --> + <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies> + + <!-- Set this attribute to prevent test projects from being packaged --> + <IsTestProject>true</IsTestProject> +</PropertyGroup> +</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.Test.targets ---------------------------------------------------------------------- diff --git a/lang/cs/build.Test.targets b/lang/cs/build.Test.targets new file mode 100644 index 0000000..4fd197f --- /dev/null +++ b/lang/cs/build.Test.targets @@ -0,0 +1,25 @@ +<Project> +<!-- +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. +--> + +<Import Project="build.targets"/> +<Target Name="Test"> + <Exec Command="$(PackagesDir)\xunit.runner.console\2.2.0\tools\xunit.console.exe $(OutputPath)\$(AssemblyName).dll -notrait Environment=Yarn -html $(OutputPath)\xunit_report.html" + IgnoreStandardErrorWarningFormat="true"/> +</Target> + +</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.props b/lang/cs/build.props index 9cfe502..8eea4b5 100644 --- a/lang/cs/build.props +++ b/lang/cs/build.props @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -15,74 +15,23 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <!-- Common build paths --> - <PropertyGroup> - <Prefer32Bit>false</Prefer32Bit> - <PlatformTarget>x64</PlatformTarget> - <BinDir Condition="$(BinDir) == '' Or $(BinDir) == '*Undefined*'">$(SolutionDir)\bin</BinDir> - <PackagesDir Condition="$(PackagesDir) == '' Or $(PackagesDir) == '*Undefined*'">$(SolutionDir)\packages</PackagesDir> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <OutputPath>$(BinDir)\$(Platform)\$(Configuration)\$(RootNamespace)</OutputPath> - <BaseIntermediateOutputPath>$(BinDir)\Temp\$(RootNamespace)\$(Platform)\</BaseIntermediateOutputPath> - <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath> - <SignAssembly>true</SignAssembly> - <AssemblyOriginatorKeyFile>$(SolutionDir)\keyfile.snk</AssemblyOriginatorKeyFile> - <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings> - <BuildDotPropsIsImported>true</BuildDotPropsIsImported> - </PropertyGroup> - - <!-- Common build configurations --> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> - <PlatformTarget>x64</PlatformTarget> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <WarningsNotAsErrors>612,618</WarningsNotAsErrors> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> - <BuildPackage>true</BuildPackage> - <PlatformTarget>x64</PlatformTarget> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <TreatWarningsAsErrors>true</TreatWarningsAsErrors> - <WarningsNotAsErrors>612,618</WarningsNotAsErrors> - </PropertyGroup> + <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> + <Import Project="build.Common.props" /> <!-- Allow for C# 7.2 language constructs --> <PropertyGroup> <LangVersion>7.2</LangVersion> </PropertyGroup> - <!-- REEF NuGet properties --> <PropertyGroup> - <IsSnapshot>true</IsSnapshot> - <SnapshotNumber>01</SnapshotNumber> - <PushPackages>false</PushPackages> - <NuGetRepository>https://www.nuget.org</NuGetRepository> - <NuGetError>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</NuGetError> - </PropertyGroup> - - <!-- Package versions --> - <PropertyGroup> - <AvroVersion>1.5.6</AvroVersion> + <AvroVersion>0.1.0</AvroVersion> + <MicrosoftDataLakeStoreVersion>1.1.3</MicrosoftDataLakeStoreVersion> <NewtonsoftJsonVersion>10.0.3</NewtonsoftJsonVersion> <ProtobufVersion>2.1.0</ProtobufVersion> <SystemReactiveVersion>3.1.1</SystemReactiveVersion> <StyleCopVersion>5.0.0</StyleCopVersion> - <NSubstituteVersion>1.8.2.0</NSubstituteVersion> - </PropertyGroup> - - <!-- Locations --> - <PropertyGroup> - <!--The root directory of the REEF source tree. --> - <REEF_Source_Folder>$([System.IO.Path]::GetFullPath($(MSBuildProjectDirectory)\..\..\..))</REEF_Source_Folder> + <TransientFaultHandlingVersion>1.0.0</TransientFaultHandlingVersion> + <NSubstituteVersion>3.1.0</NSubstituteVersion> + <WindowsAzureStorageVersion>8.1.3</WindowsAzureStorageVersion> </PropertyGroup> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/build.targets ---------------------------------------------------------------------- diff --git a/lang/cs/build.targets b/lang/cs/build.targets index 4cec084..4332f6e 100644 --- a/lang/cs/build.targets +++ b/lang/cs/build.targets @@ -15,56 +15,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<Project InitialTargets="ExtractPOMVersion" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <!-- - ######################################################################## - Extract the REEF Version from the POM file - ######################################################################## - --> - <!--A Task that extracts the version from the pom in a given folder.--> - <UsingTask - TaskName="GetMavenProjectVersion" - TaskFactory="CodeTaskFactory" - AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" > - <ParameterGroup> - <SnapshotNumber/> - <ProjectFolder Required="true"/> - <Version Output="true"/> - <NugetVersion Output="true"/> - </ParameterGroup> - <Task> - <Reference Include="System.Xml"/> - <Reference Include="System.Xml.Linq"/> - <Using Namespace="System"/> - <Using Namespace="System.IO"/> - <Using Namespace="System.Linq"/> - <Using Namespace="System.Xml.Linq"/> - <Code Type="Fragment" Language="cs"> - <![CDATA[ - Version = XDocument.Load(Path.Combine(ProjectFolder, "pom.xml")).Descendants() - .Where(x => x.Name.ToString().Contains("version")) - .FirstOrDefault().Value; - var snapshotNumberAsString = ($(SnapshotNumber) >= 0 && $(SnapshotNumber) <=9) ? "0" + $(SnapshotNumber) : $(SnapshotNumber).ToString(); - NugetVersion = $(IsSnapshot) ? Version + "-" + snapshotNumberAsString : Version.Replace("-SNAPSHOT",""); - ]]> - </Code> - </Task> - </UsingTask> - <!-- - A Target that extract the REEF version from the pom and makes it available as REEF_Version - --> - <Target Name="ExtractPOMVersion"> - <Message Text="MSBuildProjectName is $(MSBuildProjectName)" /> - <Message Text="MSBuildProjectDirectory is $(MSBuildProjectDirectory)" /> - <Message Text="SnapshotNumber is $(SnapshotNumber)" /> - <Message Text="The root directory of the source tree is $(REEF_Source_Folder)" /> - <GetMavenProjectVersion SnapshotNumber="$(SnapshotNumber)" ProjectFolder="$(REEF_Source_Folder)"> - <Output PropertyName="REEF_Version" TaskParameter="Version"/> - <Output PropertyName="REEF_NugetVersion" TaskParameter="NugetVersion"/> - </GetMavenProjectVersion> - <Message Text="Extracted the following version from the POM: $(REEF_Version)"/> - </Target> - <PropertyGroup> - <BuildDotTargetsIsImported>true</BuildDotTargetsIsImported> - </PropertyGroup> +<Project> + <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> </Project> + http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/pomversion.DotNet.targets ---------------------------------------------------------------------- diff --git a/lang/cs/pomversion.DotNet.targets b/lang/cs/pomversion.DotNet.targets deleted file mode 100644 index 6a35e6c..0000000 --- a/lang/cs/pomversion.DotNet.targets +++ /dev/null @@ -1,72 +0,0 @@ -<?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 InitialTargets="ExtractPOMVersion" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <!-- - ######################################################################## - Extract the REEF Version from the POM file - ######################################################################## - --> - <!--A Task that extracts the version from the pom in a given folder.--> - <UsingTask - TaskName="GetMavenProjectVersion" - TaskFactory="CodeTaskFactory" - AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" > - <ParameterGroup> - <SnapshotNumber/> - <ProjectFolder Required="true"/> - <Version Output="true"/> - <NugetVersion Output="true"/> - </ParameterGroup> - <Task> - <Reference Include="System.Xml"/> - <Reference Include="System.Xml.Linq"/> - <Using Namespace="System"/> - <Using Namespace="System.IO"/> - <Using Namespace="System.Linq"/> - <Using Namespace="System.Xml.Linq"/> - <Code Type="Fragment" Language="cs"> - <![CDATA[ - Version = XDocument.Load(Path.Combine(ProjectFolder, "pom.xml")).Descendants() - .Where(x => x.Name.ToString().Contains("version")) - .FirstOrDefault().Value; - var snapshotNumberAsString = ($(SnapshotNumber) >= 0 && $(SnapshotNumber) <=9) ? "0" + $(SnapshotNumber) : $(SnapshotNumber).ToString(); - NugetVersion = $(IsSnapshot) ? Version + "-" + snapshotNumberAsString : Version.Replace("-SNAPSHOT",""); - ]]> - </Code> - </Task> - </UsingTask> - <!-- - A Target that extract the REEF version from the pom and makes it available as REEF_Version - --> - <Target Name="ExtractPOMVersion"> - <Message Text="MSBuildProjectName is $(MSBuildProjectName)" /> - <Message Text="MSBuildProjectDirectory is $(MSBuildProjectDirectory)" /> - <Message Text="SnapshotNumber is $(SnapshotNumber)" /> - <Message Text="The root directory of the source tree is $(REEF_Source_Folder)" /> - <GetMavenProjectVersion SnapshotNumber="$(SnapshotNumber)" ProjectFolder="$(REEF_Source_Folder)"> - <Output PropertyName="REEF_Version" TaskParameter="Version"/> - <Output PropertyName="REEF_NugetVersion" TaskParameter="NugetVersion"/> - </GetMavenProjectVersion> - <Message Text="Extracted the following version from the POM: $(REEF_Version)"/> - </Target> - <PropertyGroup> - <BuildDotTargetsIsImported>true</BuildDotTargetsIsImported> - </PropertyGroup> -</Project> - - http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/pomversion.targets ---------------------------------------------------------------------- diff --git a/lang/cs/pomversion.targets b/lang/cs/pomversion.targets new file mode 100644 index 0000000..6a35e6c --- /dev/null +++ b/lang/cs/pomversion.targets @@ -0,0 +1,72 @@ +<?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 InitialTargets="ExtractPOMVersion" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> + <!-- + ######################################################################## + Extract the REEF Version from the POM file + ######################################################################## + --> + <!--A Task that extracts the version from the pom in a given folder.--> + <UsingTask + TaskName="GetMavenProjectVersion" + TaskFactory="CodeTaskFactory" + AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" > + <ParameterGroup> + <SnapshotNumber/> + <ProjectFolder Required="true"/> + <Version Output="true"/> + <NugetVersion Output="true"/> + </ParameterGroup> + <Task> + <Reference Include="System.Xml"/> + <Reference Include="System.Xml.Linq"/> + <Using Namespace="System"/> + <Using Namespace="System.IO"/> + <Using Namespace="System.Linq"/> + <Using Namespace="System.Xml.Linq"/> + <Code Type="Fragment" Language="cs"> + <![CDATA[ + Version = XDocument.Load(Path.Combine(ProjectFolder, "pom.xml")).Descendants() + .Where(x => x.Name.ToString().Contains("version")) + .FirstOrDefault().Value; + var snapshotNumberAsString = ($(SnapshotNumber) >= 0 && $(SnapshotNumber) <=9) ? "0" + $(SnapshotNumber) : $(SnapshotNumber).ToString(); + NugetVersion = $(IsSnapshot) ? Version + "-" + snapshotNumberAsString : Version.Replace("-SNAPSHOT",""); + ]]> + </Code> + </Task> + </UsingTask> + <!-- + A Target that extract the REEF version from the pom and makes it available as REEF_Version + --> + <Target Name="ExtractPOMVersion"> + <Message Text="MSBuildProjectName is $(MSBuildProjectName)" /> + <Message Text="MSBuildProjectDirectory is $(MSBuildProjectDirectory)" /> + <Message Text="SnapshotNumber is $(SnapshotNumber)" /> + <Message Text="The root directory of the source tree is $(REEF_Source_Folder)" /> + <GetMavenProjectVersion SnapshotNumber="$(SnapshotNumber)" ProjectFolder="$(REEF_Source_Folder)"> + <Output PropertyName="REEF_Version" TaskParameter="Version"/> + <Output PropertyName="REEF_NugetVersion" TaskParameter="NugetVersion"/> + </GetMavenProjectVersion> + <Message Text="Extracted the following version from the POM: $(REEF_Version)"/> + </Target> + <PropertyGroup> + <BuildDotTargetsIsImported>true</BuildDotTargetsIsImported> + </PropertyGroup> +</Project> + + http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/xunit.DotNet.props ---------------------------------------------------------------------- diff --git a/lang/cs/xunit.DotNet.props b/lang/cs/xunit.DotNet.props deleted file mode 100644 index 230bd60..0000000 --- a/lang/cs/xunit.DotNet.props +++ /dev/null @@ -1,25 +0,0 @@ -<Project> -<!-- -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. ---> - <ItemGroup> - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" NoWarn="NU1701"/> - <PackageReference Include="xunit" Version="2.2.0" NoWarn="NU1701"/> - <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" NoWarn="NU1701"/> - <PackageReference Include="xunit.runner.console" Version="2.2.0" NoWarn="NU1701"/> - </ItemGroup> -</Project> - http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/xunit.props ---------------------------------------------------------------------- diff --git a/lang/cs/xunit.props b/lang/cs/xunit.props new file mode 100644 index 0000000..230bd60 --- /dev/null +++ b/lang/cs/xunit.props @@ -0,0 +1,25 @@ +<Project> +<!-- +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. +--> + <ItemGroup> + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" NoWarn="NU1701"/> + <PackageReference Include="xunit" Version="2.2.0" NoWarn="NU1701"/> + <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" NoWarn="NU1701"/> + <PackageReference Include="xunit.runner.console" Version="2.2.0" NoWarn="NU1701"/> + </ItemGroup> +</Project> + http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/xunit.targets ---------------------------------------------------------------------- diff --git a/lang/cs/xunit.targets b/lang/cs/xunit.targets deleted file mode 100644 index f75ef14..0000000 --- a/lang/cs/xunit.targets +++ /dev/null @@ -1,56 +0,0 @@ -<?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="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> - <!-- Properties and targets related to xUnit testing --> - <PropertyGroup> - <xUnitVersion>2.1.0</xUnitVersion> - <xUnitAbstractionsVersion>2.0.0</xUnitAbstractionsVersion> - </PropertyGroup> - <Import Project="$(PackagesDir)\xunit.runner.visualstudio.$(xUnitVersion)\build\net20\xunit.runner.visualstudio.props" Condition="Exists('$(PackagesDir)\xunit.runner.visualstudio.$(xUnitVersion)\build\net20\xunit.runner.visualstudio.props')" /> - <Import Project="$(PackagesDir)\xunit.core.$(xUnitVersion)\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('$(PackagesDir)\xunit.core.$(xUnitVersion)\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" /> - <ItemGroup> - <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\xunit.abstractions.$(xUnitAbstractionsVersion)\lib\net35\xunit.abstractions.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\xunit.assert.$(xUnitVersion)\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\xunit.extensibility.core.$(xUnitVersion)\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath> - <Private>True</Private> - </Reference> - <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL"> - <HintPath>$(PackagesDir)\xunit.extensibility.execution.$(xUnitVersion)\lib\net45\xunit.execution.desktop.dll</HintPath> - <Private>True</Private> - </Reference> - </ItemGroup> - <Target Name="EnsureNuGetPackageBuildImports_xUnit" BeforeTargets="PrepareForBuild"> - <Error Condition="!Exists('$(PackagesDir)\xunit.core.$(xUnitVersion)\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" Text="$([System.String]::Format('$(NuGetError)', '$(PackagesDir)\xunit.core.$(xUnitVersion)\build\portable-net45+win8+wp8+wpa81\xunit.core.props'))" /> - <Error Condition="!Exists('$(PackagesDir)\xunit.runner.visualstudio.$(xUnitVersion)\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(NuGetError)', '$(PackagesDir)\xunit.runner.visualstudio.$(xUnitVersion)\build\net20\xunit.runner.visualstudio.props'))" /> - </Target> - <Target Name="InstallXunitConsoleRunner" BeforeTargets="Test"> - <Exec Command="$(SolutionDir)\.nuget\nuget.exe restore $(SolutionDir)\.nuget\packages.config -o $(PackagesDir)" /> - </Target> - <Target Name="Test"> - <Exec Command="$(PackagesDir)\xunit.runner.console.$(xUnitVersion)\tools\xunit.console.exe $(OutputPath)\$(AssemblyName).dll -notrait Environment=Yarn -html $(OutputPath)\xunit_report.html" - IgnoreStandardErrorWarningFormat="true" - /> - </Target> -</Project> \ No newline at end of file
