Repository: reef Updated Branches: refs/heads/REEF-335 b759764c7 -> 8c6a6535d
http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj b/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj index 049d10f..9dffe68 100644 --- a/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -24,7 +24,7 @@ under the License. </PropertyGroup> <Import Project="..\build.DotNetLibrary.props" /> <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> - <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml.Linq" /> @@ -41,5 +41,6 @@ under the License. <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> </ItemGroup> + <Import Project="..\build.DotNet.targets"/> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj index 94cb86a..5b286e9 100644 --- a/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -24,10 +24,9 @@ under the License. <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> </ItemGroup> <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> - <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> </ItemGroup> - <Import Project="..\xunit.DotNet.props" /> <ItemGroup> <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" /> @@ -36,4 +35,5 @@ under the License. <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/0f7a1cf7/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj index 0a449a3..230cf8c 100644 --- a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -31,7 +31,7 @@ under the License. <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.2" /> </ItemGroup> <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> - <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Runtime.Serialization" /> @@ -44,5 +44,6 @@ under the License. <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> </ItemGroup> + <Import Project="..\build.DotNet.targets"/> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj index 28b7ba8..6160d31 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -24,7 +24,7 @@ under the License. </PropertyGroup> <Import Project="..\build.DotNetLibrary.props" /> <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> - <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> </ItemGroup> @@ -32,4 +32,5 @@ under the License. <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.DotNet.targets"/> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj index 6f04a04..b3b5d68 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -24,9 +24,8 @@ under the License. <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" /> <PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" /> </ItemGroup> - <Import Project="..\xunit.DotNet.props" /> <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> - <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> </ItemGroup> @@ -42,4 +41,5 @@ under the License. <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/0f7a1cf7/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.DotNet.csproj index 4b95544..2cb2f8d 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.DotNet.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -19,7 +19,6 @@ under the License. <AssemblyName>Org.Apache.REEF.Tang.Tools</AssemblyName> <Description>Tools for Tang</Description> <PackageTags>Apache REEF Tang dependency injection</PackageTags> - <OutputType>Exe</OutputType> </PropertyGroup> <Import Project="..\build.DotNetApp.props" /> <ItemGroup> @@ -27,5 +26,6 @@ under the License. <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" /> </ItemGroup> + <Import Project="..\build.DotNet.targets"/> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj index ebc50ad..1d40e8e 100644 --- a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -29,7 +29,7 @@ under the License. <PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" /> </ItemGroup> <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> - <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Runtime.Serialization" /> @@ -38,4 +38,5 @@ under the License. <ItemGroup> <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/0f7a1cf7/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj index da79ee7..f03a11f 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -17,11 +17,6 @@ under the License. --> <PropertyGroup> <AssemblyName>Org.Apache.REEF.Tests</AssemblyName> - <FileUpgradeFlags> - </FileUpgradeFlags> - <UpgradeBackupLocation> - </UpgradeBackupLocation> - <OldToolsVersion>2.0</OldToolsVersion> </PropertyGroup> <Import Project="..\build.DotNetTest.props" /> <ItemGroup> @@ -36,12 +31,11 @@ under the License. <PackageReference Include="System.Spatial" Version="5.8.2" /> </ItemGroup> <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> - <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Data" /> </ItemGroup> - <Import Project="..\xunit.DotNet.props" /> <ItemGroup> <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> @@ -59,4 +53,5 @@ under the License. <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> <ProjectReference Include="..\Org.Apache.REEF.Examples.HelloREEF\Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj" /> </ItemGroup> + <Import Project="..\build.DotNetTest.targets" /> </Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.REEF.Utilities.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.REEF.Utilities.DotNet.csproj b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.REEF.Utilities.DotNet.csproj index ae531e4..d2a944f 100644 --- a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.REEF.Utilities.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.REEF.Utilities.DotNet.csproj @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -24,4 +24,5 @@ under the License. <ItemGroup> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> </ItemGroup> + <Import Project="..\build.DotNet.targets"/> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/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 index fdeb129..929de58 100644 --- 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 @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -23,9 +23,9 @@ under the License. <PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" /> <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> </ItemGroup> - <Import Project="..\xunit.DotNet.props" /> <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/0f7a1cf7/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 index 1ce1d7d..34ad138 100644 --- 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 @@ -1,4 +1,4 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project> <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file @@ -19,6 +19,7 @@ under the License. <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> @@ -27,7 +28,7 @@ under the License. <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> </ItemGroup> <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> - <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> <Reference Include="System.Xml" /> @@ -36,4 +37,5 @@ under the License. <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/0f7a1cf7/lang/cs/Org.Apache.REEF.Wake/Remote/IConnectionRetryHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/IConnectionRetryHandler.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/IConnectionRetryHandler.cs index 80be721..7e01f6d 100644 --- a/lang/cs/Org.Apache.REEF.Wake/Remote/IConnectionRetryHandler.cs +++ b/lang/cs/Org.Apache.REEF.Wake/Remote/IConnectionRetryHandler.cs @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#if DOTNET_BUILD +#if REEF_DOTNET_BUILD using Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling; #else using Microsoft.Practices.TransientFaultHandling; http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteConnectionRetryHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteConnectionRetryHandler.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteConnectionRetryHandler.cs index 802e0d7..860c341 100644 --- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteConnectionRetryHandler.cs +++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteConnectionRetryHandler.cs @@ -16,7 +16,7 @@ // under the License. using System; -#if DOTNET_BUILD +#if REEF_DOTNET_BUILD using Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling; #else using Microsoft.Practices.TransientFaultHandling; http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/TestRunner.DotNet.proj ---------------------------------------------------------------------- diff --git a/lang/cs/TestRunner.DotNet.proj b/lang/cs/TestRunner.DotNet.proj new file mode 100644 index 0000000..c141813 --- /dev/null +++ b/lang/cs/TestRunner.DotNet.proj @@ -0,0 +1,36 @@ +<?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>net452</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/0f7a1cf7/lang/cs/build.Common.DotNet.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.Common.DotNet.props b/lang/cs/build.Common.DotNet.props new file mode 100644 index 0000000..e713cbe --- /dev/null +++ b/lang/cs/build.Common.DotNet.props @@ -0,0 +1,67 @@ +<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> + <Version>0.17.0</Version> + <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 [email protected] for questions or issues.</PackageReleaseNotes> + <DefaultItemExcludes>$(DefaultItemExcludes);**/AssemblyInfo.cs;**/Resources.xml;packages.config;*.nuspec</DefaultItemExcludes> + <IsSnapshot>true</IsSnapshot> + <SnapshotNumber>01</SnapshotNumber> + </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/0f7a1cf7/lang/cs/build.DotNet.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNet.props b/lang/cs/build.DotNet.props index 6e37cef..ed01b8d 100644 --- a/lang/cs/build.DotNet.props +++ b/lang/cs/build.DotNet.props @@ -15,36 +15,17 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - <PropertyGroup> - <Version>0.17.0</Version> - <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 [email protected] for questions or issues.</PackageReleaseNotes> - <DefaultItemExcludes>$(DefaultItemExcludes);**/AssemblyInfo.cs;packages.config;*.nuspec</DefaultItemExcludes> - </PropertyGroup> + <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> - <Platforms>x64</Platforms> - <PlatformTarget>x64</PlatformTarget> - <NoWarn>NU1701;NU1603</NoWarn> - <DefineConstants>DOTNET_BUILD</DefineConstants> - <OutputPath>..\bin\.netcore\$(Configruation)\$(AssemblyName)</OutputPath> <AvroVersion>0.1.0</AvroVersion> + <MicrosoftDataLakeStoreVersion>1.1.3</MicrosoftDataLakeStoreVersion> <NewtonsoftJsonVersion>10.0.3</NewtonsoftJsonVersion> <NSubstituteVersion>1.8.2.0</NSubstituteVersion> <ProtobufVersion>2.1.0</ProtobufVersion> @@ -54,5 +35,4 @@ under the License. <NSubstituteVersion>2.0.3</NSubstituteVersion> <WindowsAzureStorageVersion>8.1.3</WindowsAzureStorageVersion> </PropertyGroup> - </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/build.DotNet.targets ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNet.targets b/lang/cs/build.DotNet.targets new file mode 100644 index 0000000..4332f6e --- /dev/null +++ b/lang/cs/build.DotNet.targets @@ -0,0 +1,21 @@ +<?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/0f7a1cf7/lang/cs/build.DotNetApp.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetApp.props b/lang/cs/build.DotNetApp.props index 9f6d908..aa1a6fc 100644 --- a/lang/cs/build.DotNetApp.props +++ b/lang/cs/build.DotNetApp.props @@ -27,9 +27,18 @@ under the License. <!-- Settings for Windows platforms --> <PropertyGroup Condition="'$(OS)' == 'Windows_NT'"> - <TargetFrameworks>netcoreapp2.0;net46;net451</TargetFrameworks> + <TargetFrameworks>net452</TargetFrameworks> + <!-- If EnableDotNetBuild is true, override the target frameworks to include dot net core --> + <TargetFrameworks Condition="'$(EnableDotNetBuild)' == 'true'">net452;netcoreapp2.0</TargetFrameworks> <OutputType>Exe</OutputType> <!-- 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/0f7a1cf7/lang/cs/build.DotNetLibrary.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetLibrary.props b/lang/cs/build.DotNetLibrary.props index 8df151e..1bee8c7 100644 --- a/lang/cs/build.DotNetLibrary.props +++ b/lang/cs/build.DotNetLibrary.props @@ -17,8 +17,17 @@ under the License. --> <Import Project="build.DotNet.props"/> -<PropertyGroup> - <TargetFrameworks>netstandard2.0;net46;net451</TargetFrameworks> - <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks> + +<!-- Settings for Linux platform --> +<PropertyGroup Condition="'$(OS)' != 'Windows_NT'"> + <TargetFrameworks>netstandard2.0</TargetFrameworks> +</PropertyGroup> + +<!-- Settings for Windows platform --> +<PropertyGroup Condition="'$(OS)' == 'Windows_NT'"> + <TargetFrameworks>net452</TargetFrameworks> + <!-- If EnableDotNetBuild is true, override the target frameworks to include dot net core --> + <TargetFrameworks Condition="'$(EnableDotNetBuild)' == 'true'">net452;netstandard2.0</TargetFrameworks> </PropertyGroup> + </Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/build.DotNetTest.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetTest.props b/lang/cs/build.DotNetTest.props index 82e26fd..d7c58b6 100644 --- a/lang/cs/build.DotNetTest.props +++ b/lang/cs/build.DotNetTest.props @@ -17,8 +17,9 @@ under the License. --> <Import Project="build.DotNet.props"/> +<Import Project="xunit.DotNet.props"/> <PropertyGroup> - <TargetFrameworks>netcoreapp2.0;net46;net451</TargetFrameworks> + <TargetFrameworks>net452</TargetFrameworks> <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks> </PropertyGroup> </Project> http://git-wip-us.apache.org/repos/asf/reef/blob/0f7a1cf7/lang/cs/build.DotNetTest.targets ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetTest.targets b/lang/cs/build.DotNetTest.targets new file mode 100644 index 0000000..3787bbc --- /dev/null +++ b/lang/cs/build.DotNetTest.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.DotNet.targets"/> +<Target Name="Test"> + <Exec Command="$(PackagesDir)\xunit.runner.console\2.1.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/0f7a1cf7/lang/cs/pomversion.DotNet.targets ---------------------------------------------------------------------- diff --git a/lang/cs/pomversion.DotNet.targets b/lang/cs/pomversion.DotNet.targets new file mode 100644 index 0000000..6a35e6c --- /dev/null +++ b/lang/cs/pomversion.DotNet.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/0f7a1cf7/lang/cs/xunit.DotNet.props ---------------------------------------------------------------------- diff --git a/lang/cs/xunit.DotNet.props b/lang/cs/xunit.DotNet.props index a08dd54..2fb4fab 100644 --- a/lang/cs/xunit.DotNet.props +++ b/lang/cs/xunit.DotNet.props @@ -24,11 +24,13 @@ under the License. <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.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> - <ItemGroup Condition="'$(TargetFramework)' == 'net451'"> + <ItemGroup Condition="'$(TargetFramework)' == 'net452'"> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" NoWarn="NU1701"/> <PackageReference Include="xunit" Version="2.1.0" NoWarn="NU1701"/> <PackageReference Include="xunit.runner.visualstudio" Version="2.1.0" NoWarn="NU1701"/> + <PackageReference Include="xunit.runner.console" Version="2.1.0" NoWarn="NU1701"/> </ItemGroup> </Project>
