Repository: reef Updated Branches: refs/heads/master 85bae60ab -> 23d9b960a
[REEF-1810] Migrate remaining project to .net core - Added DotNet projects for the remaining projects - Projects are targeting the Bridge.CLR project - Code does build, but there are some test issues. - Some tests moved as skipped and marked with JIRAs. This only affects .net builds - Added TODO comments to the projects to track a JIRA for removing the .net451/.net46 platforms. JIRA: [REEF-1810](https://issues.apache.org/jira/browse/REEF-1810) Pull Request: This closes #1382 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/23d9b960 Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/23d9b960 Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/23d9b960 Branch: refs/heads/master Commit: 23d9b960a533c7cd2986fe086142cbd437a5a9e5 Parents: 85bae60 Author: Scott Inglis <[email protected]> Authored: Tue Oct 3 13:34:53 2017 -0700 Committer: Markus Weimer <[email protected]> Committed: Tue Oct 10 15:14:57 2017 +0200 ---------------------------------------------------------------------- .../Org.Apache.REEF.Bridge.CLR.DotNet.csproj | 62 +++++++++++++++ .../Org.Apache.REEF.Client.Tests.DotNet.csproj | 49 ++++++++++++ .../Org.Apache.REEF.Client.DotNet.csproj | 56 +++++++++++++ .../Properties/AssemblyInfo.DotNet.cs | 26 ++++++ .../YARN/RESTClient/HttpClientRetryHandler.cs | 5 ++ .../Org.Apache.REEF.Common.Tests.DotNet.csproj | 42 ++++++++++ .../Jar/ResourceHelper.cs | 2 +- .../Org.Apache.REEF.Common.DotNet.csproj | 1 + lang/cs/Org.Apache.REEF.DotNet.sln | 84 ++++++++++++++++++++ .../Org.Apache.REEF.Driver.DotNet.csproj | 1 + ...rg.Apache.REEF.Evaluator.Tests.DotNet.csproj | 11 ++- .../Org.Apache.REEF.Evaluator.DotNet.csproj | 1 + ...ache.REEF.Examples.AllHandlers.DotNet.csproj | 48 +++++++++++ ...he.REEF.Examples.DriverRestart.DotNet.csproj | 47 +++++++++++ ...Apache.REEF.Examples.HelloREEF.DotNet.csproj | 46 +++++++++++ .../Org.Apache.REEF.Examples.DotNet.csproj | 1 + .../Org.Apache.REEF.FatNuGet.DotNet.csproj | 51 ++++++++++++ .../Org.Apache.REEF.IMRU.Examples.DotNet.csproj | 48 +++++++++++ .../Properties/AssemblyInfo.DotNet.cs | 20 +++++ .../Org.Apache.REEF.IMRU.Tests.DotNet.csproj | 49 ++++++++++++ .../Org.Apache.REEF.IMRU.DotNet.csproj | 53 ++++++++++++ .../Properties/AssemblyInfo.DotNet.cs | 21 +++++ .../Org.Apache.REEF.IO.TestClient.DotNet.csproj | 49 ++++++++++++ .../Org.Apache.REEF.IO.Tests.DotNet.csproj | 3 +- .../Org.Apache.REEF.IO.DotNet.csproj | 2 + ...e.REEF.Network.Examples.Client.DotNet.csproj | 48 +++++++++++ ...g.Apache.REEF.Network.Examples.DotNet.csproj | 1 + .../Org.Apache.REEF.Network.Tests.DotNet.csproj | 3 +- .../Org.Apache.REEF.Network.DotNet.csproj | 1 + .../Org.Apache.REEF.Tang.Examples.DotNet.csproj | 1 + .../Org.Apache.REEF.Tang.Tests.DotNet.csproj | 3 +- .../Org.Apache.REEF.Tang.DotNet.csproj | 1 + .../Functional/ReefFunctionalTest.cs | 6 +- .../Org.Apache.REEF.Tests.DotNet.csproj | 62 +++++++++++++++ .../Org.Apache.REEF.Wake.Tests.DotNet.csproj | 2 +- .../Org.Apache.REEF.Wake.DotNet.csproj | 3 +- lang/cs/build.DotNet.props | 3 +- lang/cs/build.DotNetApp.props | 17 +++- lang/cs/build.DotNetTest.props | 24 ++++++ lang/cs/nuget.config | 7 ++ 40 files changed, 943 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj b/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj new file mode 100644 index 0000000..1e745a8 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj @@ -0,0 +1,62 @@ +<Project Sdk="Microsoft.NET.Sdk"> +<!-- +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.Bridge</AssemblyName> + <Description>Avro bridge for REEF.NET</Description> + <PackageTags>REEF Bridge</PackageTags> + </PropertyGroup> + <Import Project="..\build.DotNetLibrary.props" /> + <PropertyGroup> + <AvroBinaryDirectory>..\packages\AvroBin</AvroBinaryDirectory> + <AvroSchemaDirectory>..\..\common\bridge\avro</AvroSchemaDirectory> + <AvroTools>..\packages\microsoft.avro.tools\$(AvroVersion)\lib\net451\Microsoft.Avro.Tools.exe</AvroTools> + <AvroLibrary>..\packages\microsoft.avro.core\$(AvroVersion)\lib\net451\Microsoft.Avro.Core.dll</AvroLibrary> + <NewtonsoftLibrary>..\packages\newtonsoft.json\$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</NewtonsoftLibrary> + </PropertyGroup> + <ItemGroup> + <PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" /> + <PackageReference Include="Microsoft.Avro.Tools" Version="$(AvroVersion)" /> + <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> + </ItemGroup> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetGramework)' == 'net46'"> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Data" /> + <Reference Include="System.Drawing" /> + <Reference Include="System.IO.Compression.FileSystem" /> + <Reference Include="System.Numerics" /> + <Reference Include="System.Runtime.Serialization" /> + <Reference Include="System.Xml" /> + <Reference Include="System.Xml.Linq" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> +</ItemGroup> + + <!-- REEF-1893, custom task needs to be moved into a binary, note to remove DependsOnTargets="RestorePackages" in AvroCodeGeneration.targets + <Import Project="$(SolutionDir)\AvroCodeGeneration.targets" Condition="Exists('$(SolutionDir)\AvroCodeGeneration.targets')" /> + --> +</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj new file mode 100644 index 0000000..5995b51 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj @@ -0,0 +1,49 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <!-- +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.Client.Tests</AssemblyName> + <Description>REEF Client Tests</Description> + <PackageTags>REEF Client</PackageTags> + </PropertyGroup> + <Import Project="..\build.DotNetTest.props" /> + <ItemGroup> + <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> + <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" /> + </ItemGroup> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'"> + <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" /> + </ItemGroup> + <!-- TODO: REEF-1888 Remove ItemGroup when removing net451 and net46 targets --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <Reference Include="System" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.ServiceProcess" /> + </ItemGroup> + <Import Project="..\xunit.DotNet.props" /> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <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> +</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj new file mode 100644 index 0000000..0d47ef3 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj @@ -0,0 +1,56 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <!-- +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 (thee +"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.Client</AssemblyName> + <Description>Client for REEF.NET</Description> + <PackageTags>REEF Client</PackageTags> + </PropertyGroup> + <Import Project="..\build.DotNetLibrary.props" /> + <ItemGroup> + <PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" /> + <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> + <PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Core" Version="$(TransientFaultHandlingVersion)" /> + </ItemGroup> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetGramework)' == 'net46'"> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.IO.Compression" /> + <Reference Include="System.IO.Compression.FileSystem" /> + <Reference Include="System.Net.Http" /> + <Reference Include="System.Net.Http.WebRequest" /> + <Reference Include="System.Xml" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Runtime.Serialization" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> + </ItemGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.DotNet.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.DotNet.cs b/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.DotNet.cs new file mode 100644 index 0000000..3c33105 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.DotNet.cs @@ -0,0 +1,26 @@ +// 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; + +// Allow the tests access to `internal` APIs +[assembly: InternalsVisibleTo("Org.Apache.REEF.Tests")] +[assembly: InternalsVisibleTo("Org.Apache.REEF.Client.Tests")] + +// Allow NSubstitute to create proxy implementations +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] + http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Client/YARN/RESTClient/HttpClientRetryHandler.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Client/YARN/RESTClient/HttpClientRetryHandler.cs b/lang/cs/Org.Apache.REEF.Client/YARN/RESTClient/HttpClientRetryHandler.cs index ccc9052..da4eaa8 100644 --- a/lang/cs/Org.Apache.REEF.Client/YARN/RESTClient/HttpClientRetryHandler.cs +++ b/lang/cs/Org.Apache.REEF.Client/YARN/RESTClient/HttpClientRetryHandler.cs @@ -19,7 +19,12 @@ using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; + +#if DOTNET_BUILD +using Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling; +#else using Microsoft.Practices.TransientFaultHandling; +#endif namespace Org.Apache.REEF.Client.YARN.RestClient { http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj new file mode 100644 index 0000000..4f131c0 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj @@ -0,0 +1,42 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <!-- +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.Common.Tests</AssemblyName> + </PropertyGroup> + <Import Project="..\build.DotNetTest.props" /> + <ItemGroup> + <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" /> + <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" /> + </ItemGroup> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <Import Project="..\xunit.DotNet.props" /> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + </ItemGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Common/Jar/ResourceHelper.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Jar/ResourceHelper.cs b/lang/cs/Org.Apache.REEF.Common/Jar/ResourceHelper.cs index e6aafec..555c91d 100644 --- a/lang/cs/Org.Apache.REEF.Common/Jar/ResourceHelper.cs +++ b/lang/cs/Org.Apache.REEF.Common/Jar/ResourceHelper.cs @@ -60,7 +60,7 @@ namespace Org.Apache.REEF.Common.Jar public ResourceHelper(Assembly assembly) { var names = assembly.GetManifestResourceNames(); - if (null == names[0]) + if (names == null || names.Length == 0 || null == names[0]) { throw new ApplicationException("Could not retrieve Assembly Manifest Resource names"); } http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj index d74f611..aef690a 100644 --- a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj @@ -30,6 +30,7 @@ under the License. <PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" /> <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'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.DotNet.sln ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.DotNet.sln b/lang/cs/Org.Apache.REEF.DotNet.sln index 0ca35da..bd77b58 100644 --- a/lang/cs/Org.Apache.REEF.DotNet.sln +++ b/lang/cs/Org.Apache.REEF.DotNet.sln @@ -35,6 +35,34 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Evaluator.D EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Driver.DotNet", "Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj", "{4AFF480F-006F-4229-8565-DB8F0E5F0C1D}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Bridge.CLR.DotNet", "Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj", "{604FF656-9A64-4516-9742-7A7FA963C985}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Client.DotNet", "Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj", "{A23F679F-233A-41A1-9964-61A0576E5D93}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Client.Tests.DotNet", "Org.Apache.REEF.Client.Tests\Org.Apache.REEF.Client.Tests.DotNet.csproj", "{C3F0F0F8-0001-44C3-998F-89992361FA43}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Common.Tests.DotNet", "Org.Apache.REEF.Common.Tests\Org.Apache.REEF.Common.Tests.DotNet.csproj", "{EB9E67A8-0D79-4355-8699-724FF8F40D39}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Examples.HelloREEF.DotNet", "Org.Apache.REEF.Examples.HelloREEF\Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj", "{D5E2987D-234B-4EAB-85FA-BB377FE63C42}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.IMRU.DotNet", "Org.Apache.REEF.IMRU\Org.Apache.REEF.IMRU.DotNet.csproj", "{80036B79-DAF4-4EDD-854E-1ADCBEBEB803}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.IMRU.Examples.DotNet", "Org.Apache.REEF.IMRU.Examples\Org.Apache.REEF.IMRU.Examples.DotNet.csproj", "{880CF3D8-B8A8-4350-A067-50A589563848}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.IMRU.Tests.DotNet", "Org.Apache.REEF.IMRU.Tests\Org.Apache.REEF.IMRU.Tests.DotNet.csproj", "{CF4985C6-A06B-4F20-B5C3-489889170DB7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Evaluator.Tests.DotNet", "Org.Apache.REEF.Evaluator.Tests\Org.Apache.REEF.Evaluator.Tests.DotNet.csproj", "{F98C05F8-584B-4BA1-ABC1-74C04B03932D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Examples.AllHandlers.DotNet", "Org.Apache.REEF.Examples.AllHandlers\Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj", "{704D00D3-9B85-46E5-BA68-7DE9CC484AA8}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Examples.DriverRestart.DotNet", "Org.Apache.REEF.Examples.DriverRestart\Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj", "{8E4F8CA1-26FF-4877-8446-0312F1CBDB85}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.IO.TestClient.DotNet", "Org.Apache.REEF.IO.TestClient\Org.Apache.REEF.IO.TestClient.DotNet.csproj", "{D9F9E9BA-DCFF-44CB-81E8-91E5FF5BADBA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Network.Examples.Client.DotNet", "Org.Apache.REEF.Network.Examples.Client\Org.Apache.REEF.Network.Examples.Client.DotNet.csproj", "{C22416C6-AF4C-47C6-BBE1-EF23D981AA44}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Tests.DotNet", "Org.Apache.REEF.Tests\Org.Apache.REEF.Tests.DotNet.csproj", "{C80B4A96-BAAD-4526-921C-FB5DADBC135E}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -105,6 +133,62 @@ Global {4AFF480F-006F-4229-8565-DB8F0E5F0C1D}.Debug|x64.Build.0 = Debug|x64 {4AFF480F-006F-4229-8565-DB8F0E5F0C1D}.Release|x64.ActiveCfg = Release|x64 {4AFF480F-006F-4229-8565-DB8F0E5F0C1D}.Release|x64.Build.0 = Release|x64 + {604FF656-9A64-4516-9742-7A7FA963C985}.Debug|x64.ActiveCfg = Debug|x64 + {604FF656-9A64-4516-9742-7A7FA963C985}.Debug|x64.Build.0 = Debug|x64 + {604FF656-9A64-4516-9742-7A7FA963C985}.Release|x64.ActiveCfg = Release|x64 + {604FF656-9A64-4516-9742-7A7FA963C985}.Release|x64.Build.0 = Release|x64 + {A23F679F-233A-41A1-9964-61A0576E5D93}.Debug|x64.ActiveCfg = Debug|x64 + {A23F679F-233A-41A1-9964-61A0576E5D93}.Debug|x64.Build.0 = Debug|x64 + {A23F679F-233A-41A1-9964-61A0576E5D93}.Release|x64.ActiveCfg = Release|x64 + {A23F679F-233A-41A1-9964-61A0576E5D93}.Release|x64.Build.0 = Release|x64 + {C3F0F0F8-0001-44C3-998F-89992361FA43}.Debug|x64.ActiveCfg = Debug|x64 + {C3F0F0F8-0001-44C3-998F-89992361FA43}.Debug|x64.Build.0 = Debug|x64 + {C3F0F0F8-0001-44C3-998F-89992361FA43}.Release|x64.ActiveCfg = Release|x64 + {C3F0F0F8-0001-44C3-998F-89992361FA43}.Release|x64.Build.0 = Release|x64 + {EB9E67A8-0D79-4355-8699-724FF8F40D39}.Debug|x64.ActiveCfg = Debug|x64 + {EB9E67A8-0D79-4355-8699-724FF8F40D39}.Debug|x64.Build.0 = Debug|x64 + {EB9E67A8-0D79-4355-8699-724FF8F40D39}.Release|x64.ActiveCfg = Release|x64 + {EB9E67A8-0D79-4355-8699-724FF8F40D39}.Release|x64.Build.0 = Release|x64 + {D5E2987D-234B-4EAB-85FA-BB377FE63C42}.Debug|x64.ActiveCfg = Debug|x64 + {D5E2987D-234B-4EAB-85FA-BB377FE63C42}.Debug|x64.Build.0 = Debug|x64 + {D5E2987D-234B-4EAB-85FA-BB377FE63C42}.Release|x64.ActiveCfg = Release|x64 + {D5E2987D-234B-4EAB-85FA-BB377FE63C42}.Release|x64.Build.0 = Release|x64 + {80036B79-DAF4-4EDD-854E-1ADCBEBEB803}.Debug|x64.ActiveCfg = Debug|x64 + {80036B79-DAF4-4EDD-854E-1ADCBEBEB803}.Debug|x64.Build.0 = Debug|x64 + {80036B79-DAF4-4EDD-854E-1ADCBEBEB803}.Release|x64.ActiveCfg = Release|x64 + {80036B79-DAF4-4EDD-854E-1ADCBEBEB803}.Release|x64.Build.0 = Release|x64 + {880CF3D8-B8A8-4350-A067-50A589563848}.Debug|x64.ActiveCfg = Debug|x64 + {880CF3D8-B8A8-4350-A067-50A589563848}.Debug|x64.Build.0 = Debug|x64 + {880CF3D8-B8A8-4350-A067-50A589563848}.Release|x64.ActiveCfg = Release|x64 + {880CF3D8-B8A8-4350-A067-50A589563848}.Release|x64.Build.0 = Release|x64 + {CF4985C6-A06B-4F20-B5C3-489889170DB7}.Debug|x64.ActiveCfg = Debug|x64 + {CF4985C6-A06B-4F20-B5C3-489889170DB7}.Debug|x64.Build.0 = Debug|x64 + {CF4985C6-A06B-4F20-B5C3-489889170DB7}.Release|x64.ActiveCfg = Release|x64 + {CF4985C6-A06B-4F20-B5C3-489889170DB7}.Release|x64.Build.0 = Release|x64 + {F98C05F8-584B-4BA1-ABC1-74C04B03932D}.Debug|x64.ActiveCfg = Debug|x64 + {F98C05F8-584B-4BA1-ABC1-74C04B03932D}.Debug|x64.Build.0 = Debug|x64 + {F98C05F8-584B-4BA1-ABC1-74C04B03932D}.Release|x64.ActiveCfg = Release|x64 + {F98C05F8-584B-4BA1-ABC1-74C04B03932D}.Release|x64.Build.0 = Release|x64 + {704D00D3-9B85-46E5-BA68-7DE9CC484AA8}.Debug|x64.ActiveCfg = Debug|x64 + {704D00D3-9B85-46E5-BA68-7DE9CC484AA8}.Debug|x64.Build.0 = Debug|x64 + {704D00D3-9B85-46E5-BA68-7DE9CC484AA8}.Release|x64.ActiveCfg = Release|x64 + {704D00D3-9B85-46E5-BA68-7DE9CC484AA8}.Release|x64.Build.0 = Release|x64 + {8E4F8CA1-26FF-4877-8446-0312F1CBDB85}.Debug|x64.ActiveCfg = Debug|x64 + {8E4F8CA1-26FF-4877-8446-0312F1CBDB85}.Debug|x64.Build.0 = Debug|x64 + {8E4F8CA1-26FF-4877-8446-0312F1CBDB85}.Release|x64.ActiveCfg = Release|x64 + {8E4F8CA1-26FF-4877-8446-0312F1CBDB85}.Release|x64.Build.0 = Release|x64 + {D9F9E9BA-DCFF-44CB-81E8-91E5FF5BADBA}.Debug|x64.ActiveCfg = Debug|x64 + {D9F9E9BA-DCFF-44CB-81E8-91E5FF5BADBA}.Debug|x64.Build.0 = Debug|x64 + {D9F9E9BA-DCFF-44CB-81E8-91E5FF5BADBA}.Release|x64.ActiveCfg = Release|x64 + {D9F9E9BA-DCFF-44CB-81E8-91E5FF5BADBA}.Release|x64.Build.0 = Release|x64 + {C22416C6-AF4C-47C6-BBE1-EF23D981AA44}.Debug|x64.ActiveCfg = Debug|x64 + {C22416C6-AF4C-47C6-BBE1-EF23D981AA44}.Debug|x64.Build.0 = Debug|x64 + {C22416C6-AF4C-47C6-BBE1-EF23D981AA44}.Release|x64.ActiveCfg = Release|x64 + {C22416C6-AF4C-47C6-BBE1-EF23D981AA44}.Release|x64.Build.0 = Release|x64 + {C80B4A96-BAAD-4526-921C-FB5DADBC135E}.Debug|x64.ActiveCfg = Debug|x64 + {C80B4A96-BAAD-4526-921C-FB5DADBC135E}.Debug|x64.Build.0 = Debug|x64 + {C80B4A96-BAAD-4526-921C-FB5DADBC135E}.Release|x64.ActiveCfg = Release|x64 + {C80B4A96-BAAD-4526-921C-FB5DADBC135E}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj index 20145c0..d99c6a8 100644 --- a/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Driver/Org.Apache.REEF.Driver.DotNet.csproj @@ -27,6 +27,7 @@ under the License. <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" /> <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 '$(TargetGramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj index 5f0a653..3ce7afa 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.DotNet.csproj @@ -1,5 +1,5 @@ <Project Sdk="Microsoft.NET.Sdk"> -<!-- + <!-- 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 @@ -18,12 +18,16 @@ under the License. <PropertyGroup> <AssemblyName>Org.Apache.REEF.Evaluator.Tests</AssemblyName> </PropertyGroup> - <Import Project="..\build.DotNetApp.props" /> + <Import Project="..\build.DotNetTest.props" /> <ItemGroup> <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" /> <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" /> + </ItemGroup> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' 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" /> @@ -34,5 +38,4 @@ under the License. <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> </ItemGroup> - <Import Project="..\xunit.DotNet.targets" /> -</Project> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj index c7bc5f9..1b8bcf6 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.DotNet.csproj @@ -26,6 +26,7 @@ under the License. <ItemGroup> <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" /> </ItemGroup> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj new file mode 100644 index 0000000..af780b3 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Examples.AllHandlers/Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj @@ -0,0 +1,48 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <!-- +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.Examples.AllHandlers</AssemblyName> + <Description>All handlers example for REEF.NET</Description> + <PackageTags>REEF Examples</PackageTags> + </PropertyGroup> + <Import Project="..\build.DotNetApp.props" /> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetGramework)' == 'net46'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <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> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj b/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj new file mode 100644 index 0000000..52281c8 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Examples.DriverRestart/Org.Apache.REEF.Examples.DriverRestart.DotNet.csproj @@ -0,0 +1,47 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <!-- +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.Examples.DriverRestart</AssemblyName> + <Description>Driver restart example for REEF.NET</Description> + <PackageTags>REEF Examples</PackageTags> + </PropertyGroup> + <Import Project="..\build.DotNetApp.props" /> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetGramework)' == 'net46'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" /> + </ItemGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj new file mode 100644 index 0000000..b59586b --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj @@ -0,0 +1,46 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <!-- +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.Examples.HelloREEF</AssemblyName> + <Description>Hello World Example for REEF.NET</Description> + <PackageTags>REEF Examples</PackageTags> + </PropertyGroup> + <Import Project="..\build.DotNetApp.props" /> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetGramework)' == 'net46'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> + </ItemGroup> +</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj index 99d3709..be06d00 100644 --- a/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.Examples/Org.Apache.REEF.Examples.DotNet.csproj @@ -27,6 +27,7 @@ under the License. <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> <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'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj b/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj new file mode 100644 index 0000000..1b21aa8 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.FatNuGet/Org.Apache.REEF.FatNuGet.DotNet.csproj @@ -0,0 +1,51 @@ +<Project Sdk="Microsoft.NET.Sdk"> +<!-- +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.FatNuGet</AssemblyName> + <Description>Provide single package which contains all necessary REEF/WAKE/TANG projects./Description> + <PackageTags>Single package which contains all Reef/Wake/Tang projects</PackageTags> + </PropertyGroup> + <Import Project="..\build.DotNetLibrary.props" /> + <ItemGroup> + <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" /> + <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 '$(TargetGramework)' == 'net46'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IMRU\Org.Apache.REEF.IMRU.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IMRU.Examples\Org.Apache.REEF.IMRU.Examples.DotNet.csproj" /> + </ItemGroup> +</Project> + http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj b/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj new file mode 100644 index 0000000..2f9c54f --- /dev/null +++ b/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.DotNet.csproj @@ -0,0 +1,48 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <!-- +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.IMRU.Examples</AssemblyName> + <Description>IMRU Examples for REEF.NET</Description> + <PackageTags>REEF Examples IMRU</PackageTags> + </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'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IMRU\Org.Apache.REEF.IMRU.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> + </ItemGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.IMRU.Examples/Properties/AssemblyInfo.DotNet.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU.Examples/Properties/AssemblyInfo.DotNet.cs b/lang/cs/Org.Apache.REEF.IMRU.Examples/Properties/AssemblyInfo.DotNet.cs new file mode 100644 index 0000000..7f1338f --- /dev/null +++ b/lang/cs/Org.Apache.REEF.IMRU.Examples/Properties/AssemblyInfo.DotNet.cs @@ -0,0 +1,20 @@ +// 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.Tests")] http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.DotNet.csproj new file mode 100644 index 0000000..36e99e8 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.IMRU.Tests/Org.Apache.REEF.IMRU.Tests.DotNet.csproj @@ -0,0 +1,49 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <!-- +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.IMRU.Tests</AssemblyName> + </PropertyGroup> + <Import Project="..\build.DotNetTest.props" /> + <ItemGroup> + <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" /> + </ItemGroup> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <Import Project="..\xunit.DotNet.props" /> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.IMRU\Org.Apache.REEF.IMRU.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IMRU.Examples\Org.Apache.REEF.IMRU.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> + </ItemGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.DotNet.csproj b/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.DotNet.csproj new file mode 100644 index 0000000..9d1c9be --- /dev/null +++ b/lang/cs/Org.Apache.REEF.IMRU/Org.Apache.REEF.IMRU.DotNet.csproj @@ -0,0 +1,53 @@ +<Project Sdk="Microsoft.NET.Sdk"> + <!-- +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.IMRU</AssemblyName> + <Description>IMRU for REEF.NET</Description> + <PackageTags>REEF IMRU</PackageTags> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'"> + <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> + </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'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <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" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + </ItemGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.IMRU/Properties/AssemblyInfo.DotNet.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU/Properties/AssemblyInfo.DotNet.cs b/lang/cs/Org.Apache.REEF.IMRU/Properties/AssemblyInfo.DotNet.cs new file mode 100644 index 0000000..13fab4a --- /dev/null +++ b/lang/cs/Org.Apache.REEF.IMRU/Properties/AssemblyInfo.DotNet.cs @@ -0,0 +1,21 @@ +// 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.IMRU.Tests")] +[assembly: InternalsVisibleToAttribute("Org.Apache.REEF.Tests")] http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.DotNet.csproj b/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.DotNet.csproj new file mode 100644 index 0000000..b64310a --- /dev/null +++ b/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.DotNet.csproj @@ -0,0 +1,49 @@ +<Project Sdk="Microsoft.NET.Sdk" > + <!-- +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.IO.TestClient</AssemblyName> + <Description>REEF IO TestClient</Description> + <PackageTags>REEF IO TestClient</PackageTags> + </PropertyGroup> + <Import Project="..\build.DotNetApp.props" /> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network.Examples\Org.Apache.REEF.Network.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" /> + </ItemGroup> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj index 1ab52b7..3245ec7 100644 --- a/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.IO.Tests/Org.Apache.REEF.IO.Tests.DotNet.csproj @@ -18,11 +18,12 @@ under the License. <PropertyGroup> <AssemblyName>Org.Apache.REEF.IO.Tests</AssemblyName> </PropertyGroup> - <Import Project="..\build.DotNetApp.props" /> + <Import Project="..\build.DotNetTest.props" /> <ItemGroup> <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" /> <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" /> </ItemGroup> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj b/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj index 6e9bd6a..783424e 100644 --- a/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj +++ b/lang/cs/Org.Apache.REEF.IO/Org.Apache.REEF.IO.DotNet.csproj @@ -32,9 +32,11 @@ under the License. <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" /> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> </ItemGroup> + <!-- TODO[JIRA REEF-1888] Remove the conditional, but keep the item group --> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" /> </ItemGroup> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> <Reference Include="Microsoft.CSharp" /> <Reference Include="System" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.DotNet.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.DotNet.csproj b/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.DotNet.csproj new file mode 100644 index 0000000..848c53d --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.DotNet.csproj @@ -0,0 +1,48 @@ +<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.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. +--> + <PropertyGroup> + <AssemblyName>Org.Apache.REEF.Network.Examples.Client</AssemblyName> + <Description>REEF Network Client examples</Description> + <PackageTags>REEF Examples Network Client</PackageTags> + </PropertyGroup> + <Import Project="..\build.DotNetApp.props" /> + <!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. --> + <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'"> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <ProjectReference Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network.Examples\Org.Apache.REEF.Network.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <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> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/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 ae177f5..049d10f 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 @@ -23,6 +23,7 @@ under the License. <PackageTags>REEF Network services examples</PackageTags> </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'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/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 782ab9a..94cb86a 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 @@ -18,11 +18,12 @@ under the License. <PropertyGroup> <AssemblyName>Org.Apache.REEF.Network.Tests</AssemblyName> </PropertyGroup> - <Import Project="..\build.DotNetApp.props" /> + <Import Project="..\build.DotNetTest.props" /> <ItemGroup> <PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" /> <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'"> <Reference Include="System" /> </ItemGroup> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/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 30d1f8f..0a449a3 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 @@ -30,6 +30,7 @@ under the License. <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> <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'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/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 3af5f8c..28b7ba8 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 @@ -23,6 +23,7 @@ under the License. <PackageTags> Apache REEF tang dependency injection examples</PackageTags> </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'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/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 c21b56f..6f04a04 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 @@ -18,13 +18,14 @@ under the License. <PropertyGroup> <AssemblyName>Org.Apache.REEF.Tang.Tests</AssemblyName> </PropertyGroup> - <Import Project="..\build.DotNetApp.props" /> + <Import Project="..\build.DotNetTest.props" /> <ItemGroup> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> <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'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/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 6369476..ebc50ad 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 @@ -28,6 +28,7 @@ under the License. <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" /> <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'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs index 7b06025..6a1f1d7 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs +++ b/lang/cs/Org.Apache.REEF.Tests/Functional/ReefFunctionalTest.cs @@ -311,16 +311,16 @@ namespace Org.Apache.REEF.Tests.Functional CloudStorageAccount storageAccount = CloudStorageAccount.Parse(GetStorageConnectionString()); CloudBlobClient blobClient = storageAccount.CreateCloudBlobClient(); CloudBlobContainer container = blobClient.GetContainerReference(DateTime.Now.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture)); - container.CreateIfNotExists(); + container.CreateIfNotExistsAsync().Wait(); CloudBlockBlob blob = container.GetBlockBlobReference(Path.Combine(TestId, "driverStdOut")); FileStream fs = new FileStream(driverStdout, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); - blob.UploadFromStream(fs); + blob.UploadFromStreamAsync(fs).Wait(); fs.Close(); blob = container.GetBlockBlobReference(Path.Combine(TestId, "driverStdErr")); fs = new FileStream(driverStderr, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); - blob.UploadFromStream(fs); + blob.UploadFromStreamAsync(fs).Wait(); fs.Close(); } http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/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 new file mode 100644 index 0000000..da79ee7 --- /dev/null +++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj @@ -0,0 +1,62 @@ +<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.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. +--> + <PropertyGroup> + <AssemblyName>Org.Apache.REEF.Tests</AssemblyName> + <FileUpgradeFlags> + </FileUpgradeFlags> + <UpgradeBackupLocation> + </UpgradeBackupLocation> + <OldToolsVersion>2.0</OldToolsVersion> + </PropertyGroup> + <Import Project="..\build.DotNetTest.props" /> + <ItemGroup> + <PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="2.0.4" /> + <PackageReference Include="Microsoft.Data.Edm" Version="5.8.2" /> + <PackageReference Include="Microsoft.Data.OData" Version="5.8.2" /> + <PackageReference Include="Microsoft.Data.Services.Client" Version="5.8.2" /> + <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" /> + <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" /> + <PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" /> + <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> + <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'"> + <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" /> + <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Network.Examples\Org.Apache.REEF.Network.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.Examples.AllHandlers\Org.Apache.REEF.Examples.AllHandlers.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IMRU.Examples\Org.Apache.REEF.IMRU.Examples.DotNet.csproj" /> + <ProjectReference Include="..\Org.Apache.REEF.IMRU\Org.Apache.REEF.IMRU.DotNet.csproj" /> + <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> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/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 dc73da0..fdeb129 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 @@ -18,7 +18,7 @@ under the License. <PropertyGroup> <AssemblyName>Org.Apache.REEF.Wake.Tests</AssemblyName> </PropertyGroup> - <Import Project="..\build.DotNetApp.props" /> + <Import Project="..\build.DotNetTest.props" /> <ItemGroup> <PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" /> <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/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 076a90b..1ce1d7d 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 @@ -23,9 +23,10 @@ under the License. <Import Project="..\build.DotNetLibrary.props" /> <ItemGroup> <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" /> - <PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Core" Version="$(TransientFaultHandlingVersion)" NoWarn="NU1603" /> + <PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Core" Version="$(TransientFaultHandlingVersion)" /> <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'"> <Reference Include="System" /> <Reference Include="System.Core" /> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/build.DotNet.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNet.props b/lang/cs/build.DotNet.props index 10e2c17..a202355 100644 --- a/lang/cs/build.DotNet.props +++ b/lang/cs/build.DotNet.props @@ -36,8 +36,9 @@ under the License. <PropertyGroup> <Platforms>x64</Platforms> <PlatformTarget>x64</PlatformTarget> + <NoWarn>NU1701;NU1603</NoWarn> <DefineConstants>DOTNET_BUILD</DefineConstants> - <OutputPath>..\bin\$(AssemblyName)</OutputPath> + <OutputPath>..\bin\.netcore\$(Configruation)\$(AssemblyName)</OutputPath> <AvroVersion>0.1.0</AvroVersion> <NewtonsoftJsonVersion>10.0.3</NewtonsoftJsonVersion> <NSubstituteVersion>1.8.2.0</NSubstituteVersion> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/build.DotNetApp.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetApp.props b/lang/cs/build.DotNetApp.props index 120dfc6..9f6d908 100644 --- a/lang/cs/build.DotNetApp.props +++ b/lang/cs/build.DotNetApp.props @@ -17,8 +17,19 @@ under the License. --> <Import Project="build.DotNet.props"/> -<PropertyGroup> + +<!-- 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>netcoreapp2.0;net46;net451</TargetFrameworks> - <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">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> -</Project> \ No newline at end of file +</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/build.DotNetTest.props ---------------------------------------------------------------------- diff --git a/lang/cs/build.DotNetTest.props b/lang/cs/build.DotNetTest.props new file mode 100644 index 0000000..82e26fd --- /dev/null +++ b/lang/cs/build.DotNetTest.props @@ -0,0 +1,24 @@ +<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>netcoreapp2.0;net46;net451</TargetFrameworks> + <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks> +</PropertyGroup> +</Project> http://git-wip-us.apache.org/repos/asf/reef/blob/23d9b960/lang/cs/nuget.config ---------------------------------------------------------------------- diff --git a/lang/cs/nuget.config b/lang/cs/nuget.config index a8f428a..fb8cf76 100644 --- a/lang/cs/nuget.config +++ b/lang/cs/nuget.config @@ -18,6 +18,13 @@ specific language governing permissions and limitations under the License. --> <configuration> + <config> + <add key="globalPackagesFolder" value="packages"/> + </config> + <packageRestore> + <add key="enabled" value="True"/> + <add key="automatic" value="True"/> + </packageRestore> <packageSources> <add key="nuget.org" value="https://api.nuget.org/v3/index.json"; /> <add key="nuget.org" value="https://www.nuget.org/api/V2"; />
