[REEF-1991] Delete old project, rename DotNet projects to old project names.
This change removes all the old projects and renames the new projects to
the old project names (effectively removing the "DotNet" name). Changes
include the following:
- Deletes old projects
- Renames all *.DotNet.csproj to *.csproj
- Renames all AssemblyInfo.DotNet.cs to AssemblyInfo.cs. If the
project only had an AssemblyInfo.cs, this was deleted since its
specified now in the csproj file.
- Removed all packages.config
- Removed all *.nuspec.
- Updates to appveyor.xml for building.
JIRA:
[REEF-1991](https://issues.apache.org/jira/browse/REEF-1991)
Pull Request:
This closes #1459
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/fafc236b
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/fafc236b
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/fafc236b
Branch: refs/heads/master
Commit: fafc236bc6cb0ea2732e43ad36e6cef34fb49044
Parents: 5ed56eb
Author: Scott Inglis <[email protected]>
Authored: Fri May 11 13:53:10 2018 -0700
Committer: Markus Weimer <[email protected]>
Committed: Wed May 30 07:16:12 2018 -0700
----------------------------------------------------------------------
appveyor.yml | 6 +-
.../Org.Apache.REEF.Bridge.CLR.DotNet.csproj | 49 ---
.../Org.Apache.REEF.Bridge.CLR.csproj | 94 ++---
.../Org.Apache.REEF.Bridge.CLR.nuspec | 44 ---
.../Org.Apache.REEF.Bridge.CLR/packages.config | 24 --
.../Org.Apache.REEF.Bridge.JAR.DotNet.csproj | 85 -----
.../Org.Apache.REEF.Bridge.JAR.csproj | 50 ++-
.../Org.Apache.REEF.Bridge.DotNet.vcxproj | 216 -----------
.../Org.Apache.REEF.Bridge.vcxproj | 42 ++-
.../Org.Apache.REEF.Client.Tests.DotNet.csproj | 40 --
.../Org.Apache.REEF.Client.Tests.csproj | 104 +----
.../Properties/AssemblyInfo.cs | 29 --
.../packages.config | 31 --
.../Org.Apache.REEF.Client.DotNet.csproj | 160 --------
.../Org.Apache.REEF.Client.csproj | 376 +++----------------
.../Org.Apache.REEF.Client.nuspec | 49 ---
.../Properties/AssemblyInfo.DotNet.cs | 26 --
.../Properties/AssemblyInfo.cs | 36 +-
.../Properties/Resources.DotNet.xml | 101 -----
lang/cs/Org.Apache.REEF.Client/packages.config | 37 --
.../Org.Apache.REEF.Common.Tests.DotNet.csproj | 32 --
.../Org.Apache.REEF.Common.Tests.csproj | 70 +---
.../Properties/AssemblyInfo.cs | 29 --
.../packages.config | 29 --
.../Org.Apache.REEF.Common.DotNet.csproj | 40 --
.../Org.Apache.REEF.Common.csproj | 291 +-------------
.../Org.Apache.REEF.Common.nuspec | 44 ---
.../Properties/AssemblyInfo.DotNet.cs | 37 --
.../Properties/AssemblyInfo.cs | 57 +--
lang/cs/Org.Apache.REEF.Common/packages.config | 27 --
lang/cs/Org.Apache.REEF.DotNet.sln | 224 -----------
.../Org.Apache.REEF.Driver.DotNet.csproj | 38 --
.../Org.Apache.REEF.Driver.csproj | 177 +--------
.../Org.Apache.REEF.Driver.nuspec | 44 ---
.../Properties/AssemblyInfo.DotNet.cs | 22 --
.../Properties/AssemblyInfo.cs | 21 +-
lang/cs/Org.Apache.REEF.Driver/packages.config | 25 --
...rg.Apache.REEF.Evaluator.Tests.DotNet.csproj | 37 --
.../Org.Apache.REEF.Evaluator.Tests.csproj | 106 +-----
.../Properties/AssemblyInfo.cs | 29 --
.../packages.config | 31 --
.../Org.Apache.REEF.Evaluator.DotNet.csproj | 38 --
.../Org.Apache.REEF.Evaluator.csproj | 92 +----
.../Org.Apache.REEF.Evaluator.nuspec | 47 ---
.../Properties/AssemblyInfo.DotNet.cs | 22 --
.../Properties/AssemblyInfo.cs | 22 +-
.../Org.Apache.REEF.Evaluator/packages.config | 23 --
...ache.REEF.Examples.AllHandlers.DotNet.csproj | 38 --
.../Org.Apache.REEF.Examples.AllHandlers.csproj | 124 +-----
.../Properties/AssemblyInfo.cs | 29 --
.../packages.config | 22 --
...he.REEF.Examples.DriverRestart.DotNet.csproj | 37 --
...rg.Apache.REEF.Examples.DriverRestart.csproj | 115 ++----
.../Properties/AssemblyInfo.cs | 29 --
.../packages.config | 22 --
...Apache.REEF.Examples.HelloREEF.DotNet.csproj | 37 --
.../Org.Apache.REEF.Examples.HelloREEF.csproj | 122 ++----
.../Properties/AssemblyInfo.cs | 29 --
.../packages.config | 23 --
.../Org.Apache.REEF.Examples.DotNet.csproj | 40 --
.../Org.Apache.REEF.Examples.csproj | 105 +-----
.../Org.Apache.REEF.Examples.nuspec | 46 ---
.../Properties/AssemblyInfo.cs | 29 --
.../cs/Org.Apache.REEF.Examples/packages.config | 24 --
.../Org.Apache.REEF.FatNuGet.DotNet.csproj | 62 ---
.../Org.Apache.REEF.FatNuGet.csproj | 112 ++----
.../Org.Apache.REEF.FatNuGet.nuspec | 66 ----
.../Properties/AssemblyInfo.cs | 29 --
.../Org.Apache.REEF.IMRU.Examples.DotNet.csproj | 38 --
.../Org.Apache.REEF.IMRU.Examples.csproj | 123 +-----
.../Org.Apache.REEF.IMRU.Examples.nuspec | 47 ---
.../Properties/AssemblyInfo.DotNet.cs | 20 -
.../Properties/AssemblyInfo.cs | 21 +-
.../packages.config | 22 --
.../Org.Apache.REEF.IMRU.Tests.DotNet.csproj | 39 --
.../Org.Apache.REEF.IMRU.Tests.csproj | 110 +-----
.../Properties/AssemblyInfo.cs | 25 --
.../Org.Apache.REEF.IMRU.Tests/packages.config | 30 --
.../Org.Apache.REEF.IMRU.DotNet.csproj | 37 --
.../Org.Apache.REEF.IMRU.csproj | 177 +--------
.../Org.Apache.REEF.IMRU.nuspec | 47 ---
.../Properties/AssemblyInfo.DotNet.cs | 21 --
.../Properties/AssemblyInfo.cs | 25 +-
lang/cs/Org.Apache.REEF.IMRU/packages.config | 22 --
.../Org.Apache.REEF.IO.TestClient.DotNet.csproj | 40 --
.../Org.Apache.REEF.IO.TestClient.csproj | 106 +-----
.../Properties/AssemblyInfo.cs | 29 --
.../Org.Apache.REEF.IO.Tests.DotNet.csproj | 37 --
.../Org.Apache.REEF.IO.Tests.csproj | 138 +------
.../Properties/AssemblyInfo.cs | 25 --
.../cs/Org.Apache.REEF.IO.Tests/packages.config | 46 ---
.../Org.Apache.REEF.IO.DotNet.csproj | 50 ---
.../Org.Apache.REEF.IO.csproj | 202 ++--------
.../Org.Apache.REEF.IO.nuspec | 36 --
.../Properties/AssemblyInfo.DotNet.cs | 25 --
.../Properties/AssemblyInfo.cs | 44 +--
lang/cs/Org.Apache.REEF.IO/packages.config | 40 --
...e.REEF.Network.Examples.Client.DotNet.csproj | 38 --
...g.Apache.REEF.Network.Examples.Client.csproj | 104 +----
.../Properties/AssemblyInfo.cs | 25 --
.../packages.config | 22 --
...g.Apache.REEF.Network.Examples.DotNet.csproj | 36 --
.../Org.Apache.REEF.Network.Examples.csproj | 87 +----
.../Properties/AssemblyInfo.cs | 29 --
.../packages.config | 22 --
.../Org.Apache.REEF.Network.Tests.DotNet.csproj | 35 --
.../Org.Apache.REEF.Network.Tests.csproj | 87 +----
.../Properties/AssemblyInfo.cs | 29 --
.../packages.config | 31 --
.../Org.Apache.REEF.Network.DotNet.csproj | 42 ---
.../Org.Apache.REEF.Network.csproj | 223 +----------
.../Org.Apache.REEF.Network.nuspec | 45 ---
.../Properties/AssemblyInfo.DotNet.cs | 22 --
.../Properties/AssemblyInfo.cs | 21 +-
lang/cs/Org.Apache.REEF.Network/packages.config | 66 ----
.../Org.Apache.REEF.Tang.Examples.DotNet.csproj | 31 --
.../Org.Apache.REEF.Tang.Examples.csproj | 66 +---
.../Properties/AssemblyInfo.cs | 29 --
.../packages.config | 22 --
.../Org.Apache.REEF.Tang.Tests.DotNet.csproj | 40 --
.../Org.Apache.REEF.Tang.Tests.csproj | 142 +------
.../Properties/AssemblyInfo.cs | 29 --
.../Org.Apache.REEF.Tang.Tests/packages.config | 32 --
.../Org.Apache.REEF.Tang.Tools.DotNet.csproj | 31 --
.../Org.Apache.REEF.Tang.Tools.csproj | 63 +---
.../Properties/AssemblyInfo.cs | 29 --
.../Org.Apache.REEF.Tang.Tools/packages.config | 22 --
.../Org.Apache.REEF.Tang.DotNet.csproj | 35 --
.../Org.Apache.REEF.Tang.csproj | 165 +-------
.../Org.Apache.REEF.Tang.nuspec | 41 --
.../Properties/AssemblyInfo.DotNet.cs | 21 --
.../Properties/AssemblyInfo.cs | 20 +-
lang/cs/Org.Apache.REEF.Tang/packages.config | 25 --
.../Org.Apache.REEF.Tests.DotNet.csproj | 51 ---
.../Org.Apache.REEF.Tests.csproj | 263 ++-----------
.../Properties/AssemblyInfo.cs | 29 --
lang/cs/Org.Apache.REEF.Tests/packages.config | 43 ---
.../Org.Apache.REEF.Utilities.DotNet.csproj | 28 --
.../Org.Apache.REEF.Utilities.csproj | 28 ++
.../Org.Apache.Reef.Utilities.csproj | 83 ----
.../Org.Apache.Reef.Utilities.nuspec | 40 --
.../Properties/AssemblyInfo.DotNet.cs | 21 --
.../Properties/AssemblyInfo.cs | 28 +-
.../Org.Apache.REEF.Utilities/packages.config | 23 --
.../Org.Apache.REEF.Wake.Tests.DotNet.csproj | 31 --
.../Org.Apache.REEF.Wake.Tests.csproj | 71 +---
.../Properties/AssemblyInfo.cs | 29 --
.../Org.Apache.REEF.Wake.Tests/packages.config | 32 --
.../Org.Apache.REEF.Wake.DotNet.csproj | 35 --
.../Org.Apache.REEF.Wake.csproj | 212 +----------
.../Org.Apache.REEF.Wake.nuspec | 43 ---
.../Properties/AssemblyInfo.DotNet.cs | 20 -
.../Properties/AssemblyInfo.cs | 21 +-
lang/cs/Org.Apache.REEF.Wake/packages.config | 30 --
lang/cs/Org.Apache.REEF.sln | Bin 37230 -> 17559 bytes
lang/cs/TestRunner.DotNet.proj | 36 --
lang/cs/TestRunner.proj | 6 +-
lang/cs/build.App.props | 47 +++
lang/cs/build.Common.DotNet.props | 69 ----
lang/cs/build.Common.props | 69 ++++
lang/cs/build.DotNet.props | 37 --
lang/cs/build.DotNet.targets | 21 --
lang/cs/build.DotNetApp.props | 47 ---
lang/cs/build.DotNetLibrary.props | 23 --
lang/cs/build.DotNetTest.props | 36 --
lang/cs/build.DotNetTest.targets | 25 --
lang/cs/build.Library.props | 23 ++
lang/cs/build.Test.props | 36 ++
lang/cs/build.Test.targets | 25 ++
lang/cs/build.props | 67 +---
lang/cs/build.targets | 55 +--
lang/cs/pomversion.DotNet.targets | 72 ----
lang/cs/pomversion.targets | 72 ++++
lang/cs/xunit.DotNet.props | 25 --
lang/cs/xunit.props | 25 ++
lang/cs/xunit.targets | 56 ---
176 files changed, 990 insertions(+), 8865 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/appveyor.yml
----------------------------------------------------------------------
diff --git a/appveyor.yml b/appveyor.yml
index a9c7d7d..600b581 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -32,11 +32,11 @@ install:
- ps: .\dev\appveyor-install-dependencies.ps1
build_script:
- - cmd: msbuild .\lang\cs\Org.Apache.REEF.DotNet.sln
/p:Configuration="Release" /p:Platform="x64" /t:Restore
- - cmd: msbuild .\lang\cs\Org.Apache.REEF.DotNet.sln
/p:Configuration="Release" /p:Platform="x64" /m
+ - cmd: msbuild .\lang\cs\Org.Apache.REEF.sln /p:Configuration="Release"
/p:Platform="x64" /t:Restore
+ - cmd: msbuild .\lang\cs\Org.Apache.REEF.sln /p:Configuration="Release"
/p:Platform="x64" /m
test_script:
- - cmd: msbuild .\lang\cs\TestRunner.DotNet.proj /p:Configuration="Release"
/p:Platform="x64"
+ - cmd: msbuild .\lang\cs\TestRunner.proj /p:Configuration="Release"
/p:Platform="x64"
after_build:
- ps: .\bin\AnalyzeClrCompatibility.ps1
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/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
deleted file mode 100644
index 8648713..0000000
---
a/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.DotNet.csproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
- <PropertyGroup>
- <AssemblyName>Org.Apache.REEF.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>
- <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')" />
- -->
- <Import Project="..\build.DotNet.targets" />
-</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.csproj
b/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.csproj
index 6cd2bb8..1105f9d 100644
--- a/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.csproj
+++ b/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -7,7 +7,9 @@ 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
@@ -15,81 +17,33 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<Project ToolsVersion="12.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"
/>
<PropertyGroup>
- <ProjectGuid>{E19FF4F8-AB45-4631-8017-E18D94D882DD}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Org.Apache.REEF.Bridge.CLR</RootNamespace>
- <AssemblyName>Org.Apache.REEF.Bridge.CLR</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) ==
'*Undefined*'">..</SolutionDir>
- <RestorePackages>true</RestorePackages>
+ <AssemblyName>Org.Apache.REEF.Bridge</AssemblyName>
+ <Description>Avro bridge for REEF.NET</Description>
+ <PackageTags>REEF Bridge</PackageTags>
+ </PropertyGroup>
+ <Import Project="..\build.Library.props" />
+ <PropertyGroup>
<AvroBinaryDirectory>..\packages\AvroBin</AvroBinaryDirectory>
<AvroSchemaDirectory>..\..\common\bridge\avro</AvroSchemaDirectory>
-
<AvroTools>..\packages\Microsoft.Avro.Tools.0.1.0\lib\net451\Microsoft.Avro.Tools.exe</AvroTools>
-
<AvroLibrary>..\packages\Microsoft.Avro.Core.0.1.0\lib\net451\Microsoft.Avro.Core.dll</AvroLibrary>
-
<NewtonsoftLibrary>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</NewtonsoftLibrary>
+
<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>
- <Import Project="$(SolutionDir)\build.props" />
- <ItemGroup>
- <Reference Include="Microsoft.Hadoop.Avro">
-
<HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath>
- </Reference>
- <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>
- <Compile Include="$(SolutionDir)\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="LocalObserver.cs" />
- <Compile Include="Message\Acknowledgement.cs" />
- <Compile Include="Message\BridgeProtocol.cs" />
- <Compile Include="Message\SetupBridge.cs" />
- <Compile Include="Message\SystemOnStart.cs" />
- <Compile Include="NetworkTransport.cs" />
- </ItemGroup>
<ItemGroup>
- <None Include="Message\README.md" />
- <None Include="Org.Apache.REEF.Bridge.CLR.nuspec" />
- <None Include="packages.config" />
+ <PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
+ <PackageReference Include="Microsoft.Avro.Tools" Version="$(AvroVersion)"
/>
+ <PackageReference Include="Newtonsoft.Json"
Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>
<ItemGroup>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj">
- <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project>
- <Name>ReefCommon</Name>
- </ProjectReference>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj">
- <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project>
- <Name>Org.Apache.REEF.Tang</Name>
- </ProjectReference>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
- <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project>
- <Name>Org.Apache.REEF.Utilities</Name>
- </ProjectReference>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj">
- <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project>
- <Name>Org.Apache.REEF.Wake</Name>
- </ProjectReference>
- <ProjectReference
Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.csproj">
- <Project>{dec0f0a8-dbef-4ebf-b69c-e2369c15abf1}</Project>
- <Name>Org.Apache.REEF.IO</Name>
- </ProjectReference>
+ <ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj" />
+ <ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj" />
+ <ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj" />
+ <ProjectReference
Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj" />
+ <ProjectReference
Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.csproj" />
</ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\AvroCodeGeneration.Targets"
Condition="Exists('$(SolutionDir)\AvroCodeGeneration.Targets')" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets"
Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Import
Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets"
Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')"
/>
+ <!-- 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')" />
+ -->
+ <Import Project="..\build.targets" />
</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.nuspec
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.nuspec
b/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.nuspec
deleted file mode 100644
index 1a710c7..0000000
--- a/lang/cs/Org.Apache.REEF.Bridge.CLR/Org.Apache.REEF.Bridge.CLR.nuspec
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<package >
- <metadata>
- <id>Org.Apache.REEF.Bridge.CLR</id>
- <version>$version$</version>
- <title>Org.Apache.REEF.Bridge.CLR</title>
- <authors>The Apache REEF project</authors>
- <owners>The Apache REEF project</owners>
- <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
- <projectUrl>http://reef.apache.org/</projectUrl>
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
- <description>Avro bridge for REEF.NET</description>
- <copyright>The Apache Software Foundation</copyright>
- <dependencies>
- <dependency id="Microsoft.Hadoop.Avro" version="1.5.6" />
- <dependency id="Org.Apache.REEF.Common" version="$version$" />
- <dependency id="Org.Apache.REEF.IO" version="$version$" />
- <dependency id="Org.Apache.REEF.Tang" version="$version$" />
- <dependency id="Org.Apache.REEF.Utilities" version="$version$" />
- <dependency id="Org.Apache.REEF.Wake" version="$version$" />
- </dependencies>
- </metadata>
-
- <files>
- <file
src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.dll"
target="lib\net45" />
- <file
src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.pdb"
target="lib\net45" />
- </files>
-</package>
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Bridge.CLR/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge.CLR/packages.config
b/lang/cs/Org.Apache.REEF.Bridge.CLR/packages.config
deleted file mode 100644
index 7e886bd..0000000
--- a/lang/cs/Org.Apache.REEF.Bridge.CLR/packages.config
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<packages>
- <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45"
/>
- <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
- <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45"
developmentDependency="true" />
-</packages>
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
deleted file mode 100644
index 0c700bd..0000000
---
a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<Project>
- <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
- <PropertyGroup>
- <AssemblyName>Org.Apache.REEF.Bridge.JAR</AssemblyName>
- <Description>Helper project that builds the Bridge JAR </Description>
- <TargetFramework>net461</TargetFramework>
- </PropertyGroup>
- <Import Project="..\build.DotNet.props" />
- <PropertyGroup>
- <IsPackable>false</IsPackable>
-
<OutputPath>$(BinDir)$(Configuration)\Org.Apache.REEF.Bridge.JAR\</OutputPath>
- </PropertyGroup>
- <Import Project="..\build.DotNet.targets" />
- <Import Project="..\pomversion.DotNet.targets" />
-
- <!--
- Check that maven is installed
- -->
- <Target Name="CheckMavenInstall">
- <Error Condition=" '$(M2_HOME)' == '' " Text="$M2_HOME is not set. Please
make sure that Maven is installed and configured. See
https://cwiki.apache.org/confluence/display/REEF/Compiling+REEF for details." />
- <Error Condition=" '$(JAVA_HOME)' == '' " Text="$JAVA_HOME is not set.
Please make sure that Java is installed and configured. See
https://cwiki.apache.org/confluence/display/REEF/Compiling+REEF for details." />
- <Message Text="Using the maven installation found in $(M2_HOME)"
Importance="high" />
- </Target>
- <Target Name="CheckJavaInstall">
- <Error Condition=" '$(JAVA_HOME)' == '' " Text="$JAVA_HOME is not set.
Please make sure that Java is installed and configured. See
https://cwiki.apache.org/confluence/display/REEF/Compiling+REEF for details." />
- <Message Text="Using the java installation found in $(JAVA_HOME)"
Importance="high" />
- </Target>
- <Target Name="CheckProtocInstall">
- <Exec ContinueOnError="True" IgnoreExitCode="true" Command=""cmd /c
where protoc.exe"">
- <Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
- </Exec>
- <Message Text="The exit code is $(ErrorCode)" Importance="high" />
- <Error Text="protoc.exe not found. Please make sure that protoc.exe is on
the path. See https://cwiki.apache.org/confluence/display/REEF/Compiling+REEF
for details." Condition="'$(ErrorCode)' > '0'" />
- </Target>
- <!--
- Executes 'mvn install', if the JAR does not exist.
- -->
- <Target Name="Build"
DependsOnTargets="CheckMavenInstall;CheckJavaInstall;CheckProtocInstall"
Outputs="$(OutputPath)">
- <PropertyGroup>
- <!--The shaded jar of the bridge (driver side) -->
-
<Bridge_JAR_Name>reef-bridge-java-$(REEF_Version)-shaded.jar</Bridge_JAR_Name>
-
<Bridge_JAR>$(REEF_Source_Folder)\lang\java\reef-bridge-java\target\$(Bridge_JAR_Name)</Bridge_JAR>
- <!--The shaded jar of the bridge (client side) -->
-
<Client_JAR_Name>reef-bridge-client-$(REEF_Version)-shaded.jar</Client_JAR_Name>
-
<Client_JAR>$(REEF_Source_Folder)\lang\java\reef-bridge-client\target\$(Client_JAR_Name)</Client_JAR>
- </PropertyGroup>
- <Exec Command="call "$(M2_HOME)\bin\mvn.cmd" --projects
lang/java/reef-bridge-java,lang/java/reef-bridge-client --also-make -TC1
-DskipTests -P!code-quality install" Condition="!Exists('$(Bridge_JAR)')"
WorkingDirectory="$(REEF_Source_Folder)" />
- <Message Text="Copying jar files to $(OutputPath)" Importance="high" />
- <Copy DestinationFolder="$(OutputPath)" SourceFiles="$(Bridge_JAR)" />
- <Copy DestinationFolder="$(OutputPath)" SourceFiles="$(Client_JAR)" />
- </Target>
- <!--
- Executes 'mvn clean', if the JAR exists.
- -->
- <Target Name="Clean"
DependsOnTargets="CheckMavenInstall;CheckJavaInstall;CheckProtocInstall">
- <PropertyGroup>
- <!--The shaded jar of the bridge (driver side) -->
-
<Bridge_JAR_Name>reef-bridge-java-$(REEF_Version)-shaded.jar</Bridge_JAR_Name>
-
<Bridge_JAR>$(REEF_Source_Folder)\lang\java\reef-bridge-java\target\$(Bridge_JAR_Name)</Bridge_JAR>
- <!--The shaded jar of the bridge (client side) -->
-
<Client_JAR_Name>reef-bridge-client-$(REEF_Version)-shaded.jar</Client_JAR_Name>
-
<Client_JAR>$(REEF_Source_Folder)\lang\java\reef-bridge-client\target\$(Client_JAR_Name)</Client_JAR>
- </PropertyGroup>
- <Exec Command="call "$(M2_HOME)\bin\mvn.cmd" -TC1 -DskipTests -q
clean" Condition="Exists('$(Bridge_JAR)')"
WorkingDirectory="$(REEF_Source_Folder)" />
- <Delete Files="$(OutputPath)\$(Bridge_JAR_Name)" />
- <Delete Files="$(OutputPath)\$(Client_JAR_Name)" />
- </Target>
- <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
- <Target Name="CheckPrerequisites" DependsOnTargets="Build" />
-</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj
b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj
index 918955a..1ac6e73 100644
--- a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj
+++ b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<Project>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -15,47 +15,42 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003"; ToolsVersion="12.0">
- <Import
Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"
Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"
/>
<PropertyGroup>
- <!--Set configuration parameters usually set in the Solution. This is
needed for build.props to work.-->
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) ==
'*Undefined*'">..</SolutionDir>
- <RootNamespace>Org.Apache.REEF.Bridge.JAR</RootNamespace>
- <ProjectGuid>{62905C7C-1A7E-4923-B78D-1BF42D7FAD40}</ProjectGuid>
<AssemblyName>Org.Apache.REEF.Bridge.JAR</AssemblyName>
- <RestorePackages>true</RestorePackages>
- <BuildPackage>false</BuildPackage>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+ <Description>Helper project that builds the Bridge JAR </Description>
+ <TargetFramework>net461</TargetFramework>
+ </PropertyGroup>
+ <Import Project="..\build.props" />
+ <PropertyGroup>
+ <IsPackable>false</IsPackable>
+
<OutputPath>$(BinDir)$(Configuration)\Org.Apache.REEF.Bridge.JAR\</OutputPath>
</PropertyGroup>
- <Import Project="$(SolutionDir)\build.props" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets"
Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Import Project="$(MSBuildBinPath)\Microsoft.Common.targets" />
+ <Import Project="..\build.targets" />
+ <Import Project="..\pomversion.targets" />
+
<!--
Check that maven is installed
-->
<Target Name="CheckMavenInstall">
<Error Condition=" '$(M2_HOME)' == '' " Text="$M2_HOME is not set. Please
make sure that Maven is installed and configured. See
https://cwiki.apache.org/confluence/display/REEF/Compiling+REEF for details." />
<Error Condition=" '$(JAVA_HOME)' == '' " Text="$JAVA_HOME is not set.
Please make sure that Java is installed and configured. See
https://cwiki.apache.org/confluence/display/REEF/Compiling+REEF for details." />
- <Message Text="Using the maven installation found in $(M2_HOME)" />
+ <Message Text="Using the maven installation found in $(M2_HOME)"
Importance="high" />
</Target>
<Target Name="CheckJavaInstall">
<Error Condition=" '$(JAVA_HOME)' == '' " Text="$JAVA_HOME is not set.
Please make sure that Java is installed and configured. See
https://cwiki.apache.org/confluence/display/REEF/Compiling+REEF for details." />
- <Message Text="Using the java installation found in $(JAVA_HOME)" />
+ <Message Text="Using the java installation found in $(JAVA_HOME)"
Importance="high" />
</Target>
<Target Name="CheckProtocInstall">
<Exec ContinueOnError="True" IgnoreExitCode="true" Command=""cmd /c
where protoc.exe"">
<Output TaskParameter="ExitCode" PropertyName="ErrorCode" />
</Exec>
- <Message Text="The exit code is $(ErrorCode)" />
- <Message Text="BuildPackage is $(BuildPackage)" />
+ <Message Text="The exit code is $(ErrorCode)" Importance="high" />
<Error Text="protoc.exe not found. Please make sure that protoc.exe is on
the path. See https://cwiki.apache.org/confluence/display/REEF/Compiling+REEF
for details." Condition="'$(ErrorCode)' > '0'" />
</Target>
<!--
Executes 'mvn install', if the JAR does not exist.
-->
- <Target Name="Build"
-
DependsOnTargets="CheckMavenInstall;CheckJavaInstall;CheckProtocInstall"
- Outputs="$(OutputPath)">
+ <Target Name="Build"
DependsOnTargets="CheckMavenInstall;CheckJavaInstall;CheckProtocInstall"
Outputs="$(OutputPath)">
<PropertyGroup>
<!--The shaded jar of the bridge (driver side) -->
<Bridge_JAR_Name>reef-bridge-java-$(REEF_Version)-shaded.jar</Bridge_JAR_Name>
@@ -64,7 +59,8 @@ under the License.
<Client_JAR_Name>reef-bridge-client-$(REEF_Version)-shaded.jar</Client_JAR_Name>
<Client_JAR>$(REEF_Source_Folder)\lang\java\reef-bridge-client\target\$(Client_JAR_Name)</Client_JAR>
</PropertyGroup>
- <Exec Command='call "$(M2_HOME)\bin\mvn.cmd" --projects
lang/java/reef-bridge-java,lang/java/reef-bridge-client --also-make -TC1
-DskipTests -P!code-quality -q install' Condition="!Exists('$(Bridge_JAR)')"
WorkingDirectory="$(REEF_Source_Folder)" />
+ <Exec Command="call "$(M2_HOME)\bin\mvn.cmd" --projects
lang/java/reef-bridge-java,lang/java/reef-bridge-client --also-make -TC1
-DskipTests -P!code-quality install" Condition="!Exists('$(Bridge_JAR)')"
WorkingDirectory="$(REEF_Source_Folder)" />
+ <Message Text="Copying jar files to $(OutputPath)" Importance="high" />
<Copy DestinationFolder="$(OutputPath)" SourceFiles="$(Bridge_JAR)" />
<Copy DestinationFolder="$(OutputPath)" SourceFiles="$(Client_JAR)" />
</Target>
@@ -80,14 +76,10 @@ under the License.
<Client_JAR_Name>reef-bridge-client-$(REEF_Version)-shaded.jar</Client_JAR_Name>
<Client_JAR>$(REEF_Source_Folder)\lang\java\reef-bridge-client\target\$(Client_JAR_Name)</Client_JAR>
</PropertyGroup>
- <Exec Command='call "$(M2_HOME)\bin\mvn.cmd" -TC1 -DskipTests -q clean'
Condition="Exists('$(Bridge_JAR)')" WorkingDirectory="$(REEF_Source_Folder)" />
+ <Exec Command="call "$(M2_HOME)\bin\mvn.cmd" -TC1 -DskipTests -q
clean" Condition="Exists('$(Bridge_JAR)')"
WorkingDirectory="$(REEF_Source_Folder)" />
<Delete Files="$(OutputPath)\$(Bridge_JAR_Name)" />
<Delete Files="$(OutputPath)\$(Client_JAR_Name)" />
-
</Target>
- <!--
- Standard Rebuild target: Clean, then build
- -->
- <Target Name="Rebuild" DependsOnTargets="Clean;Build"/>
- <Target Name="CheckPrerequisites" DependsOnTargets="Build"/>
+ <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
+ <Target Name="CheckPrerequisites" DependsOnTargets="Build" />
</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
deleted file mode 100644
index d713437..0000000
--- a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<Project DefaultTargets="Build" ToolsVersion="12.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <PropertyGroup>
- <TargetName>Org.Apache.REEF.Bridge</TargetName>
- <BuildInParallel>false</BuildInParallel>
- <Configuration Condition="'$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition="'$(Platform)' == ''">x64</Platform>
- <SolutionDir Condition="'$(SolutionDir)' == ''">..</SolutionDir>
- <ConfigurationType>Application</ConfigurationType>
- <!-- Added for when the .net core build is enabled. This prevents
assemblies for the bridge
- to be copied to the bin folder. -->
-
<ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades>
- </PropertyGroup>
- <Import Project="..\build.Common.DotNet.props" />
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{6C7325D1-EBB6-4642-B34F-B66F46152230}</ProjectGuid>
- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
- <Keyword>ManagedCProj</Keyword>
- <RootNamespace>Org.Apache.REEF.Bridge</RootNamespace>
- <WindowsTargetPlatformVersion Condition="'$(MSBuildAssemblyVersion)' >=
'15.0'">10.0.15063.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <!--
- Switch the PlatformToolset based on the Visual Studio Version
- -->
- <PropertyGroup>
- <!-- Assume Visual Studio 2015 / 14.0 as the default -->
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' ==
''">14.0</VisualStudioVersion>
- </PropertyGroup>
- <!-- Visual Studio 2013 (12.0) -->
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '12.0'">
- <PlatformToolset>v120</PlatformToolset>
- </PropertyGroup>
- <!-- Visual Studio 2015 (14.0) -->
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '14.0'">
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
- <!-- Visual Studio 2017 (15.0) -->
- <PropertyGroup Condition="'$(VisualStudioVersion)' == '15.0'">
- <PlatformToolset>v141</PlatformToolset>
- </PropertyGroup>
- <!--
- End of: Switch the PlatformToolset based on the Visual Studio Version
- -->
- <PropertyGroup>
- <!-- Auto generate binding redirects to make sure the latest Newtonsoft
JSON is picked up -->
- <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="Configuration">
- <UseDebugLibraries>true</UseDebugLibraries>
- <CLRSupport>true</CLRSupport>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="Configuration">
- <UseDebugLibraries>false</UseDebugLibraries>
- <CLRSupport>true</CLRSupport>
- <CharacterSet>Unicode</CharacterSet>
- <RestorePackages>true</RestorePackages>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"
Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"
Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"
Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')"
Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <LinkIncremental>true</LinkIncremental>
-
<ReferencePath>$(BinDir)Org.Apache.REEF.Driver;$(ReferencePath)</ReferencePath>
- <OutDir>$(BinDir)$(Configuration)\Org.Apache.REEF.Bridge\</OutDir>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <LinkIncremental>false</LinkIncremental>
-
<ReferencePath>$(BindDir)Org.Apache.REEF.Driver;$(ReferencePath)</ReferencePath>
- <OutDir>$(BinDir)$(Configuration)\Org.Apache.REEF.Bridge\</OutDir>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
- <Optimization>Disabled</Optimization>
-
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
-
<AdditionalIncludeDirectories>..\..\java\reef-bridge-java\target\classes;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-
<AdditionalUsingDirectories>$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\netstandard2.0;C:\Program
Files\dotnet\sdk\2.1.4\Microsoft\Microsoft.NET.Build.Extensions\net461\lib;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
- <!-- Disable C4691 about missing references. This is benign as the
warning reports using a default implementation. -->
-
<DisableSpecificWarnings>4691;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>
- </AdditionalDependencies>
- <AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <WarningLevel>Level3</WarningLevel>
-
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
-
<AdditionalIncludeDirectories>..\..\java\reef-bridge-java\target\classes;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-
<AdditionalUsingDirectories>$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\netstandard2.0;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
- <!-- Disable C4691 about missing references. This is benign as the
warning reports using a default implementation. -->
-
<DisableSpecificWarnings>4691;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <Link>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalDependencies>
- </AdditionalDependencies>
- <AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="BinaryUtil.h" />
- <ClInclude Include="Clr2JavaImpl.h" />
- <ClInclude Include="InteropAssemblies.h" />
- <ClInclude Include="InteropLogger.h" />
- <ClInclude Include="InteropUtil.h" />
- <ClInclude Include="JavaClrBridge.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="Stdafx.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="ActiveContextClr2Java.cpp" />
- <ClCompile Include="AllocatedEvaluatorClr2Java.cpp" />
- <ClCompile Include="AssemblyInfo.cpp" />
- <ClCompile Include="AssemblyUtil.cpp" />
- <ClCompile Include="BinaryUtil.cpp" />
- <ClCompile Include="ClosedContextClr2Java.cpp" />
- <ClCompile Include="CommonUtilities.cpp" />
- <ClCompile Include="CompletedEvaluatorClr2Java.cpp" />
- <ClCompile Include="CompletedTaskClr2Java.cpp" />
- <ClCompile Include="ContextMessageClr2Java.cpp" />
- <ClCompile Include="DriverLauncher.cpp" />
- <ClCompile Include="DriverRestartedClr2Java.cpp" />
- <ClCompile Include="DriverRestartCompletedClr2Java.cpp" />
- <ClCompile Include="EvaluatorRequestorClr2Java.cpp" />
- <ClCompile Include="FailedContextClr2Java.cpp" />
- <ClCompile Include="FailedEvaluatorClr2Java.cpp" />
- <ClCompile Include="FailedTaskClr2Java.cpp" />
- <ClCompile Include="HttpServerClr2Java.cpp" />
- <ClCompile Include="InteropLogger.cpp" />
- <ClCompile Include="InteropUtil.cpp" />
- <ClCompile Include="JavaClrBridge.cpp" />
- <ClCompile Include="RunningTaskClr2Java.cpp" />
- <ClCompile Include="Stdafx.cpp">
- <PrecompiledHeader
Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
- <PrecompiledHeader
Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
- </ClCompile>
- <ClCompile Include="SuspendedTaskClr2Java.cpp" />
- <ClCompile Include="TaskMessageClr2Java.cpp" />
- </ItemGroup>
- <ItemGroup>
- <Text Include="ReadMe.txt" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="app.rc" />
- </ItemGroup>
- <ItemGroup>
- <Image Include="app.ico" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Bridge.JAR\Org.Apache.REEF.Bridge.JAR.DotNet.csproj">
- <!-- <Project>{62905c7c-1a7e-4923-b78d-1bf42d7fad40}</Project> -->
- <Private>false</Private>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference
Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj">
- <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
- <!-- Adds an empty pack target so that this project is skipped when packing.
-->
- <Target Name="Pack">
- </Target>
-</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
index ef98904..50e533c 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
+++ b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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
@@ -17,15 +17,17 @@ under the License.
-->
<Project DefaultTargets="Build" ToolsVersion="12.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup>
+ <TargetName>Org.Apache.REEF.Bridge</TargetName>
<BuildInParallel>false</BuildInParallel>
<Configuration Condition="'$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition="'$(Platform)' == ''">x64</Platform>
<SolutionDir Condition="'$(SolutionDir)' == ''">..</SolutionDir>
- <RestorePackages>true</RestorePackages>
<ConfigurationType>Application</ConfigurationType>
+ <!-- Added for when the .net core build is enabled. This prevents
assemblies for the bridge
+ to be copied to the bin folder. -->
+
<ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades>
</PropertyGroup>
- <Import Project="$(SolutionDir)\build.props" />
- <Import Project="$(SolutionDir)\build.targets" />
+ <Import Project="..\build.Common.props" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
@@ -37,11 +39,11 @@ under the License.
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectGuid>{4E69D40A-26D6-4D4A-B96D-729946C07FE1}</ProjectGuid>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <ProjectGuid>{6C7325D1-EBB6-4642-B34F-B66F46152230}</ProjectGuid>
+ <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<Keyword>ManagedCProj</Keyword>
<RootNamespace>Org.Apache.REEF.Bridge</RootNamespace>
- <WindowsTargetPlatformVersion Condition="'$(MSBuildAssemblyVersion)' >=
'15.0'">10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion Condition="'$(MSBuildAssemblyVersion)' >=
'15.0'">10.0.15063.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<!--
@@ -93,13 +95,13 @@ under the License.
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
-
<ReferencePath>..\bin\$(Platform)\$(Configuration)\Org.Apache.REEF.Driver;..\bin\x64\Release\Org.Apache.REEF.Driver;$(ReferencePath)</ReferencePath>
-
<OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+
<ReferencePath>$(BinDir)Org.Apache.REEF.Driver;$(ReferencePath)</ReferencePath>
+ <OutDir>$(BinDir)$(Configuration)\Org.Apache.REEF.Bridge\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
-
<ReferencePath>..\bin\$(Platform)\$(Configuration)\Org.Apache.REEF.Driver;..\bin\x64\Release\Org.Apache.REEF.Driver;$(ReferencePath)</ReferencePath>
-
<OutDir>$(SolutionDir)bin\$(Platform)\$(Configuration)\$(ProjectName)\</OutDir>
+
<ReferencePath>$(BindDir)Org.Apache.REEF.Driver;$(ReferencePath)</ReferencePath>
+ <OutDir>$(BinDir)$(Configuration)\Org.Apache.REEF.Bridge\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
@@ -109,12 +111,14 @@ under the License.
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>..\..\java\reef-bridge-java\target\classes;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+
<AdditionalUsingDirectories>$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\netstandard2.0;C:\Program
Files\dotnet\sdk\2.1.4\Microsoft\Microsoft.NET.Build.Extensions\net461\lib;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+ <!-- Disable C4691 about missing references. This is benign as the
warning reports using a default implementation. -->
+
<DisableSpecificWarnings>4691;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>
</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\bin\$(Platform)\$(Configuration)\Org.Apache.REEF.Driver;..\bin\x64\$(Configuration)\Org.Apache.REEF.Driver;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
@@ -124,12 +128,15 @@ under the License.
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>..\..\java\reef-bridge-java\target\classes;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+
<AdditionalUsingDirectories>$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\netstandard2.0;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+ <!-- Disable C4691 about missing references. This is benign as the
warning reports using a default implementation. -->
+
<DisableSpecificWarnings>4691;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>
</AdditionalDependencies>
-
<AdditionalLibraryDirectories>..\bin\$(Platform)\$(Configuration)\Org.Apache.REEF.Driver;..\bin\x64\$(Configuration)\Org.Apache.REEF.Driver;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalOptions>/ignore:4248 %(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
@@ -188,8 +195,8 @@ under the License.
<Image Include="app.ico" />
</ItemGroup>
<ItemGroup>
- <ProjectReference
Include="..\Org.Apache.REEF.Bridge.JAR\Org.Apache.REEF.Bridge.JAR.csproj">
- <Project>{62905c7c-1a7e-4923-b78d-1bf42d7fad40}</Project>
+ <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Bridge.JAR\Org.Apache.REEF.Bridge.JAR.csproj">
+ <!-- <Project>{62905c7c-1a7e-4923-b78d-1bf42d7fad40}</Project> -->
<Private>false</Private>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
@@ -203,4 +210,7 @@ under the License.
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+ <!-- Adds an empty pack target so that this project is skipped when packing.
-->
+ <Target Name="Pack">
+ </Target>
+</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/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
deleted file mode 100644
index 7803aa3..0000000
---
a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.DotNet.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project>
- <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
- <PropertyGroup>
- <AssemblyName>Org.Apache.REEF.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)" />
- <PackageReference Include="System.ServiceProcess.ServiceController"
Version="4.4.0" />
- </ItemGroup>
- <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>
- <Import Project="..\build.DotNetTest.targets" />
-</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj
----------------------------------------------------------------------
diff --git
a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj
b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj
index 0602f70..0aecb3d 100644
--- a/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj
+++ b/lang/cs/Org.Apache.REEF.Client.Tests/Org.Apache.REEF.Client.Tests.csproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<Project>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -7,7 +7,9 @@ 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
@@ -15,94 +17,24 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<Project ToolsVersion="12.0" DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup>
- <ProjectGuid>{BB41D9A3-0FA4-4CBA-AEF2-4D5BF18B482C}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Org.Apache.REEF.Client.Tests</RootNamespace>
<AssemblyName>Org.Apache.REEF.Client.Tests</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <TestProjectType>UnitTest</TestProjectType>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) ==
'*Undefined*'">..</SolutionDir>
- <RestorePackages>true</RestorePackages>
+ <Description>REEF Client Tests</Description>
+ <PackageTags>REEF Client</PackageTags>
</PropertyGroup>
- <Import Project="$(SolutionDir)\build.props" />
- <Import Project="$(SolutionDir)\xunit.targets" />
- <PropertyGroup>
- <BuildPackage>false</BuildPackage>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="Newtonsoft.Json">
-
<HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="NSubstitute, Version=$(NSubstituteVersion),
Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-
<HintPath>$(PackagesDir)\NSubstitute.$(NSubstituteVersion)\lib\net45\NSubstitute.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.ServiceProcess" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="$(SolutionDir)\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="AzureBatchCommandBuilderTests.cs" />
- <Compile Include="HDInsightYarnClientTests.cs" />
- <Compile Include="JobRequestBuilderTests.cs" />
- <Compile Include="JobResourceUploaderTests.cs" />
- <Compile Include="LegacyJobResourceUploaderTests.cs" />
- <Compile Include="MultipleRMUrlProviderTests.cs" />
- <Compile Include="RestClientTests.cs" />
- <Compile Include="TestFileWritingAssert.cs" />
- <Compile Include="WindowsHadoopEmulatorYarnClientTests.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="YarnClientTests.cs" />
- <Compile Include="YarnConfigurationUrlProviderTests.cs" />
- <Compile Include="WindowsYarnJobCommandProviderTests.cs" />
- <Compile Include="YarnREEFParamSerializerTests.cs" />
- </ItemGroup>
+ <Import Project="..\build.Test.props" />
<ItemGroup>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Client\Org.Apache.REEF.Client.csproj">
- <Project>{5094c35b-4fdb-4322-ac05-45d684501cbf}</Project>
- <Name>Org.Apache.REEF.Client</Name>
- </ProjectReference>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.IO\Org.Apache.REEF.IO.csproj">
- <Project>{DEC0F0A8-DBEF-4EBF-B69C-E2369C15ABF1}</Project>
- <Name>Org.Apache.REEF.IO</Name>
- </ProjectReference>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj">
- <Project>{97DBB573-3994-417A-9F69-FFA25F00D2A6}</Project>
- <Name>Org.Apache.REEF.Tang</Name>
- </ProjectReference>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
- <Project>{79E7F89A-1DFB-45E1-8D43-D71A954AEB98}</Project>
- <Name>Org.Apache.REEF.Utilities</Name>
- </ProjectReference>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.csproj">
- <Project>{A6BAA2A7-F52F-4329-884E-1BCF711D6805}</Project>
- <Name>Org.Apache.REEF.Driver</Name>
- </ProjectReference>
- <ProjectReference
Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj">
- <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project>
- <Name>Org.Apache.REEF.Wake</Name>
- </ProjectReference>
- <ProjectReference
Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj">
- <Project>{545A0582-4105-44CE-B99C-B1379514A630}</Project>
- <Name>Org.Apache.REEF.Common</Name>
- </ProjectReference>
+ <PackageReference Include="Newtonsoft.Json"
Version="$(NewtonsoftJsonVersion)" />
+ <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
+ <PackageReference Include="System.ServiceProcess.ServiceController"
Version="4.4.0" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
+ <ProjectReference
Include="..\Org.Apache.REEF.Client\Org.Apache.REEF.Client.csproj" />
+ <ProjectReference
Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.csproj" />
+ <ProjectReference
Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj" />
+ <ProjectReference
Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj" />
+ <ProjectReference
Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.csproj" />
+ <ProjectReference
Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj" />
</ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets"
Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Import
Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets"
Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')"
/>
- <Target Name="EnsureNuGetPackageBuildImports"
BeforeTargets="PrepareForBuild">
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')"
Text="$([System.String]::Format('$(NuGetError)',
'$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
-</Project>
\ No newline at end of file
+ <Import Project="..\build.Test.targets" />
+</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Client.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client.Tests/Properties/AssemblyInfo.cs
b/lang/cs/Org.Apache.REEF.Client.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index fe261bb..0000000
--- a/lang/cs/Org.Apache.REEF.Client.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Org.Apache.REEF.Client.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyProduct("Org.Apache.REEF.Client.Tests")]
-
-// The following GUID is for the ID of the typelib if this project is exposed
to COM
-[assembly: Guid("0f573fbb-22d7-45e4-a7e4-2b29029f3148")]
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Client.Tests/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client.Tests/packages.config
b/lang/cs/Org.Apache.REEF.Client.Tests/packages.config
deleted file mode 100644
index 347c9f0..0000000
--- a/lang/cs/Org.Apache.REEF.Client.Tests/packages.config
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<packages>
- <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
- <package id="NSubstitute" version="1.8.2.0" targetFramework="net45" />
- <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45"
developmentDependency="true" />
- <package id="xunit" version="2.1.0" targetFramework="net45" />
- <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
- <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
- <package id="xunit.core" version="2.1.0" targetFramework="net45" />
- <package id="xunit.extensibility.core" version="2.1.0"
targetFramework="net45" />
- <package id="xunit.extensibility.execution" version="2.1.0"
targetFramework="net45" />
- <package id="xunit.runner.visualstudio" version="2.1.0"
targetFramework="net45" />
-</packages>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/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
deleted file mode 100644
index ea13564..0000000
--- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.DotNet.csproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<Project>
- <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (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>
- <!-- Disable default embedded resources as we override this in the project
-->
-
<EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
- </PropertyGroup>
- <Import Project="..\build.DotNetLibrary.props" />
- <PropertyGroup>
- <TempResxFile Condition="$(TempResxFile) ==
''">$(OutputPath)\$(TargetFramework)\Resources.DotNet.resx</TempResxFile>
- </PropertyGroup>
- <ItemGroup>
- <EmbeddedResource Include="$(TempResxFile)">
- <Generator>ResXFileCodeGenerator</Generator>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="Azure.Batch" Version="8.0.0" />
- <PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
- <PackageReference Include="System.Reactive.Interfaces"
Version="$(SystemReactiveVersion)" />
- <PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Core"
Version="$(TransientFaultHandlingVersion)" />
- <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
- <PackageReference Include="System.Diagnostics.DiagnosticSource"
Version="4.3.0" />
- </ItemGroup>
-
- <!-- Project Reference conditionals allow for targeting specific projects
based upon the target framework. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
- <ProjectReference
Include="..\Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.DotNet.vcxproj"
PrivateAssets="All" />
- </ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <ProjectReference
Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.DotNet.csproj"
PrivateAssets="All" />
- </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.Examples\Org.Apache.REEF.Examples.DotNet.csproj" />
- <ProjectReference
Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" />
- </ItemGroup>
- <Import Project="..\build.DotNet.targets" />
- <!--
- ########################################################################
- ReWrite client resx to point to correct version of jars
-
########################################################################
- -->
- <!--A Task that extracts the version from the pom in a given folder.-->
- <UsingTask TaskName="UpdateClientResources" TaskFactory="CodeTaskFactory"
AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
- <ParameterGroup>
- <SnapshotNumber />
- <ProjectFolder Required="true" />
- <DebugOrRelease Required="true" />
- <resxOutputPath Required="true" />
- </ParameterGroup>
- <Task>
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- <Using Namespace="System" />
- <Using Namespace="System.IO" />
- <Using Namespace="System.Xml" />
- <Using Namespace="System.Linq" />
- <Using Namespace="System.Xml.Linq" />
- <Code Type="Fragment" Language="cs">
- <![CDATA[
- var Version = XDocument.Load(Path.Combine(ProjectFolder,
"pom.xml")).Descendants()
- .Where(x => x.Name.ToString().Contains("version"))
- .FirstOrDefault().Value;
- var snapshortNumberAsString = ($(SnapshotNumber) >= 0 &&
$(SnapshotNumber) <=9) ? "0" + $(SnapshotNumber) : $(SnapshotNumber).ToString();
- var reefVersion = Version;
-
- var srcDir = @"lang\cs\Org.Apache.REEF.Client\Properties";
- var binDir = @"lang\cs\bin\.netcore";
- var resxInputPath = Path.Combine(ProjectFolder, srcDir,
"Resources.DotNet.xml");
- var resourceDir = Path.Combine(ProjectFolder, binDir, DebugOrRelease,
"Org.Apache.REEF.Bridge.JAR", "net461");
- var clrDriverDir = Path.Combine(ProjectFolder, binDir, DebugOrRelease,
"Org.Apache.REEF.Bridge");
- var byteArrayType = ";System.Byte[], mscorlib, Version=4.0.0.0,
Culture=neutral, PublicKeyToken=b77a5c561934e089";
- var jarRest = reefVersion + "-shaded.jar" + byteArrayType;
-
- var dllResources = new Dictionary<string,string>();
- dllResources.Add("reef_bridge_client", resourceDir +
@"\reef-bridge-client-" + jarRest);
- dllResources.Add("reef_bridge_driver", resourceDir +
@"\reef-bridge-java-" + jarRest);
- dllResources.Add("evaluator", resourceDir +
"Org.Apache.REEF.Evaluator.exe" + byteArrayType);
- dllResources.Add("reef_clrdriver", clrDriverDir +
@"\Org.Apache.REEF.Bridge.exe" + byteArrayType);
- dllResources.Add("ClientJarFullName", "reef-bridge-client-" +
reefVersion + "-shaded.jar");
- dllResources.Add("DriverJarFullName", "reef-bridge-java-" + reefVersion
+ "-shaded.jar");
- dllResources.Add("ClrDriverFullName", "Org.Apache.REEF.Bridge.exe");
-
- XElement root = XElement.Load(resxInputPath);
- var resources = root.Descendants().Where(x => x.Name.LocalName ==
"data").ToList();
- foreach (var resource in resources)
- {
- var resourceName = resource.Attribute("name").Value;
- string replaceValue;
- if (dllResources.TryGetValue(resourceName, out replaceValue))
- {
- var resourceValue = resource.Descendants().Where(x =>
x.Name.LocalName == "value").FirstOrDefault();
- if (resourceValue != null)
- {
- resourceValue.Value = replaceValue;
- }
- }
- }
- var settings = new XmlWriterSettings
- {
- Indent = true,
- IndentChars = " ",
- NewLineChars = "\r\n",
- NewLineHandling = NewLineHandling.Replace
- };
- (new FileInfo(resxOutputPath)).Directory.Create();
- using (var wr = XmlWriter.Create(resxOutputPath, settings))
- {
- root.WriteTo(wr);
- }
- ]]>
- </Code>
- </Task>
- </UsingTask>
- <!--
- A Target that reWrites client resx to point to correct version of jars
- -->
- <Target Name="RewriteClientResources" BeforeTargets="BeforeBuild">
- <Message Text="Generating temporary resx file" Importance="high" />
- <UpdateClientResources ProjectFolder="$(REEF_Source_Folder)"
DebugOrRelease="$(Configuration)" resxOutputPath="$(TempResxFile)">
- </UpdateClientResources>
- </Target>
- <Target Name="CopyJarFiles" BeforeTargets="RewriteClientResources">
- <MSBuild Targets="Build" BuildInParallel="$(BuildInParallel)"
Properties="Chip=$(Chip);Lang=$(Lang)" Projects="@(ProjectFile)" />
- <ItemGroup>
- <MySourceFiles
Include="$(BinDir)$(Configuration)\Org.Apache.REEF.Bridge.JAR\$(TargetFramework)\*.jar"
/>
- </ItemGroup>
- <Copy SourceFiles="@(MySourceFiles)"
DestinationFiles="@(MySourceFiles->'$(TargetDir)%(Filename)%(Extension)')" />
- </Target>
- <Target Name="RemovingTempResx" AfterTargets="AfterBuild">
- <Message Text="Removing temporary resx file" Importance="high"/>
- <Delete Files="$(TempResxFile)" />
- </Target>
-</Project>
