[REEF-1987] Visual Studio 2017 Project Conversion
The goal of these changes is to migrate over to the new DotNet projects.
Part of this effort is to be able to execute the build and tests via the
build system. Therefore with this change, the DotNet projects now build
.net452 by default and target the bridge. The build and tests can now
run using msbuild -- almost identical to the commands that are in the
appveyor.yml:
-msbuild lang\cs\Org.Apache.REEF.DotNet.sln /t:Restore
-msbuild lang\cs\Org.Apache.REEF.DotNet.sln
-msbuild lang\cs\TestRunner.DotNet.proj
If there is a need to continue to use .net core builds, the
EnableDotNetBuild variable can be set to make this happen.
This completes the following sub-tasks:
[REEF-1986] DotNet project needs to support different build projects
- Added EnableDotNetBuild parameter in build.Common.DotNet.props.
When active, the projects will build .net452 and .netcore but will
target the Bridge.CLR project. If false, will target .net452 and
existing bridge project. Defaults to false.
[REEF-1985] Update DotNet projects to target .net 452
- Updated all *DotNet projects to target .net 452
[REEF-1984] Port test-runner project to the DotNet project
- Added a DotNet test runner project, works like the old test runner
but supports the new projects. This project can be ran using
msbuild.
[REEF-1983] DotNet client project supports embedding jar files as resource
- Client project has changed to run the Custom code task that will
embed the bridge exe and java jar files as resources into the file.
[REEF-1982] DotNet port of Bridge and BridgeJAR projects
- This add DotNet versions of the Bridge and BridgeJar projects. The
DotNet build will now build the java project and copy jar files
over. Bridge project builds as a .net452 exe.
JIRA:
[REEF-1986](https://issues.apache.org/jira/browse/REEF-1986)
[REEF-1985](https://issues.apache.org/jira/browse/REEF-1985)
[REEF-1984](https://issues.apache.org/jira/browse/REEF-1984)
[REEF-1983](https://issues.apache.org/jira/browse/REEF-1983)
[REEF-1982](https://issues.apache.org/jira/browse/REEF-1982)
Pull Request:
This closes #1435
diff --git a/lang/cs/App.config b/lang/cs/App.config
index 735f2b3..ccdbecf 100644
--- a/lang/cs/App.config
+++ b/lang/cs/App.config
@@ -29,4 +29,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
-</configuration>
\ No newline at end of file
+</configuration>
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
index 1e745a8..2260546 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -36,7 +36,7 @@
<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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetGramework)' == 'net46'">
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -59,4 +59,5 @@
<!-- 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>
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
new file mode 100644
index 0000000..8525900
--- /dev/null
+++ b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.DotNet.csproj
@@ -0,0 +1,84 @@
+<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>net452</TargetFramework>
+ </PropertyGroup>
+ <Import Project="..\build.DotNet.props" />
+ <PropertyGroup>
+ <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>
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
new file mode 100644
index 0000000..7227a7a
--- /dev/null
+++ b/lang/cs/Org.Apache.REEF.Bridge/Org.Apache.REEF.Bridge.DotNet.vcxproj
@@ -0,0 +1,205 @@
+<?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>
+ </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.5.2</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\net452</AdditionalUsingDirectories>
+ </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>
+ <AdditionalUsingDirectories>$(BinDir)$(Configuration)\Org.Apache.REEF.Driver\net452</AdditionalUsingDirectories>
+ </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>
+</Project>
\ No newline at end of file
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
index 5995b51..182dbb0 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -32,12 +32,11 @@
<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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' 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" />
@@ -46,4 +45,5 @@
<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>
diff --git a/lang/cs/Org.Apache.REEF.Client/Common/JobSubmissionResult.cs b/lang/cs/Org.Apache.REEF.Client/Common/JobSubmissionResult.cs
index e1967e2..3fc8ff4 100644
--- a/lang/cs/Org.Apache.REEF.Client/Common/JobSubmissionResult.cs
+++ b/lang/cs/Org.Apache.REEF.Client/Common/JobSubmissionResult.cs
@@ -23,7 +23,7 @@
using System.Net.Http.Headers;
using System.Threading;
using System.Threading.Tasks;
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
using Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling;
#else
using Microsoft.Practices.TransientFaultHandling;
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
index 0d47ef3..f425468 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -21,15 +21,29 @@
<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) == ''">Resources.DotNet.resx</TempResxFile>
+ </PropertyGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="$(TempResxFile)">
+ <Generator>ResXFileCodeGenerator</Generator>
+ </EmbeddedResource>
+ </ItemGroup>
<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] Remove the conditional, but keep the item group -->
+ <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+ <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
+ </ItemGroup>
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetGramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -42,15 +56,116 @@
<Reference Include="System.Runtime.Serialization" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Condition="'$(EnableBuildDotNet)' == 'false'" Include="..\Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.DotNet.vcxproj" />
+ <ProjectReference Condition="'$(EnableBuildDotNet)' == 'true'" Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.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" />
<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
+ <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", "net452");
+ 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="AfterBuild">
+ <Delete Files="$(TempResxFile)" />
+ <RemoveDir Directories="$(BaseIntermediateOutputPath)" />
+ </Target>
+ <Target Name="BeforeBuild" DependsOnTargets="RewriteClientResources">
+ </Target>
+ -->
+</Project>
diff --git a/lang/cs/Org.Apache.REEF.Client/Properties/Resources.DotNet.xml b/lang/cs/Org.Apache.REEF.Client/Properties/Resources.DotNet.xml
new file mode 100644
index 0000000..8bab319
--- /dev/null
+++ b/lang/cs/Org.Apache.REEF.Client/Properties/Resources.DotNet.xml
@@ -0,0 +1,101 @@
+<?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.
+-->
+<!--
+This file is used to embed JAR files to client dll
+-->
+<root>
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <data name="ClientJarFullName" xml:space="preserve">
+ <value>reef-bridge-client-0.17.0-SNAPSHOT-shaded.jar</value>
+ </data>
+ <data name="DriverJarFullName" xml:space="preserve">
+ <value>reef-bridge-java-0.17.0-SNAPSHOT-shaded.jar</value>
+ </data>
+ <data name="ClrDriverFullName" xml:space="preserve">
+ <value>Org.Apache.REEF.ClrDriver.exe</value>
+ </data>
+ <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+ <data name="reef_bridge_client" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>E:\src\reef\lang\cs\bin\x64\Debug\Org.Apache.REEF.Bridge.JAR\reef-bridge-client-0.17.0-SNAPSHOT-shaded.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="reef_bridge_driver" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>E:\src\reef\lang\cs\bin\x64\Debug\Org.Apache.REEF.Bridge.JAR\reef-bridge-java-0.17.0-SNAPSHOT-shaded.jar;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+ <data name="reef_clrdriver" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>E:\src\reef\lang\cs\bin\x64\Debug\Org.Apache.REEF.ClrDriver\Org.Apache.REEF.ClrDriver.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </data>
+</root>
\ No newline at end of file
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 da4eaa8..3170042 100644
--- a/lang/cs/Org.Apache.REEF.Client/YARN/RESTClient/HttpClientRetryHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Client/YARN/RESTClient/HttpClientRetryHandler.cs
@@ -20,7 +20,7 @@
using System.Threading;
using System.Threading.Tasks;
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
using Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling;
#else
using Microsoft.Practices.TransientFaultHandling;
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
index 4f131c0..b7cce9d 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,7 +24,7 @@
<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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -33,10 +33,10 @@
<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>
+ <Import Project="$(SolutionDir)\build.DotNetTest.targets" />
</Project>
\ No newline at end of file
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 aef690a..1fd5366 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -31,7 +31,7 @@
<PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" />
</ItemGroup>
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
@@ -42,5 +42,6 @@
<ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets" />
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Common/Runtime/MachineStatus.cs b/lang/cs/Org.Apache.REEF.Common/Runtime/MachineStatus.cs
index 6c78477..5a6d24d 100644
--- a/lang/cs/Org.Apache.REEF.Common/Runtime/MachineStatus.cs
+++ b/lang/cs/Org.Apache.REEF.Common/Runtime/MachineStatus.cs
@@ -24,7 +24,7 @@
{
public class MachineStatus
{
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
private const string NotSupportedValue = "<UNSUPPORTED>";
private const string NotSupportedMessage = "Machine Status is not supported on this OS";
#else
@@ -70,7 +70,7 @@
{
get
{
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
return NotSupportedValue + "%";
#else
return CpuCounter.NextValue() + "%";
@@ -82,7 +82,7 @@
{
get
{
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
return NotSupportedValue + "MB";
#else
return RamCounter.NextValue() + "MB";
@@ -94,7 +94,7 @@
{
get
{
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
return NotSupportedValue + "MB";
#else
return ((float)Process.WorkingSet64 / 1000000.0).ToString(CultureInfo.InvariantCulture) + "MB";
@@ -106,7 +106,7 @@
{
get
{
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
return NotSupportedValue + "MB";
#else
return ((float)Process.PeakWorkingSet64 / 1000000.0).ToString(CultureInfo.InvariantCulture) + "MB";
@@ -119,7 +119,7 @@
{
get
{
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
return NotSupportedValue + "MB";
#else
return ((float)ProcessCpuCounter.RawValue / 1000000.0) + "%";
@@ -129,7 +129,7 @@
public override string ToString()
{
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
return NotSupportedMessage;
#else
string info = "No machine status information retrieved. Could be due to lack of admin right to get the info.";
diff --git a/lang/cs/Org.Apache.REEF.DotNet.sln b/lang/cs/Org.Apache.REEF.DotNet.sln
index bd77b58..e47b869 100644
--- a/lang/cs/Org.Apache.REEF.DotNet.sln
+++ b/lang/cs/Org.Apache.REEF.DotNet.sln
@@ -1,8 +1,15 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26730.12
+VisualStudioVersion = 15.0.27130.2027
MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Org.Apache.REEF.Bridge.DotNet", "Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.DotNet.vcxproj", "{6C7325D1-EBB6-4642-B34F-B66F46152230}"
+ ProjectSection(ProjectDependencies) = postProject
+ {448A0D5F-A8DE-4CAA-8224-0A9A63A9392E} = {448A0D5F-A8DE-4CAA-8224-0A9A63A9392E}
+ EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Bridge.JAR.DotNet", "Org.Apache.REEF.Bridge.JAR\Org.Apache.REEF.Bridge.JAR.DotNet.csproj", "{448A0D5F-A8DE-4CAA-8224-0A9A63A9392E}"
+EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Utilities.DotNet", "Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj", "{FE4CEA75-2F26-4C97-B256-375AA698B4A9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Org.Apache.REEF.Tang.DotNet", "Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj", "{16E1218C-9A3C-49E2-A939-C29944BBB72E}"
@@ -35,9 +42,10 @@
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}"
+ ProjectSection(ProjectDependencies) = postProject
+ {6C7325D1-EBB6-4642-B34F-B66F46152230} = {6C7325D1-EBB6-4642-B34F-B66F46152230}
+ EndProjectSection
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
@@ -69,6 +77,14 @@
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {6C7325D1-EBB6-4642-B34F-B66F46152230}.Debug|x64.ActiveCfg = Debug|x64
+ {6C7325D1-EBB6-4642-B34F-B66F46152230}.Debug|x64.Build.0 = Debug|x64
+ {6C7325D1-EBB6-4642-B34F-B66F46152230}.Release|x64.ActiveCfg = Release|x64
+ {6C7325D1-EBB6-4642-B34F-B66F46152230}.Release|x64.Build.0 = Release|x64
+ {448A0D5F-A8DE-4CAA-8224-0A9A63A9392E}.Debug|x64.ActiveCfg = Debug|x64
+ {448A0D5F-A8DE-4CAA-8224-0A9A63A9392E}.Debug|x64.Build.0 = Debug|x64
+ {448A0D5F-A8DE-4CAA-8224-0A9A63A9392E}.Release|x64.ActiveCfg = Release|x64
+ {448A0D5F-A8DE-4CAA-8224-0A9A63A9392E}.Release|x64.Build.0 = Release|x64
{FE4CEA75-2F26-4C97-B256-375AA698B4A9}.Debug|x64.ActiveCfg = Debug|x64
{FE4CEA75-2F26-4C97-B256-375AA698B4A9}.Debug|x64.Build.0 = Debug|x64
{FE4CEA75-2F26-4C97-B256-375AA698B4A9}.Release|x64.ActiveCfg = Release|x64
@@ -133,10 +149,6 @@
{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
@@ -193,4 +205,7 @@
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {7BAAE3F9-A5D6-4949-9357-849CAA006F96}
+ EndGlobalSection
EndGlobal
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 d99c6a8..8be3f62 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetGramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
@@ -39,5 +39,6 @@
<ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
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 3ce7afa..07f6136 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,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,10 +24,9 @@
<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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
</ItemGroup>
- <Import Project="..\xunit.DotNet.props" />
<ItemGroup>
<ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" />
@@ -38,4 +37,5 @@
<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="..\build.DotNetTest.targets" />
</Project>
\ No newline at end of file
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 1b8bcf6..7de529f 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -22,12 +22,12 @@
<Description>Evaluator for REEF.NET</Description>
<PackageTags>REEF Evaluator</PackageTags>
</PropertyGroup>
- <Import Project="..\build.DotNetLibrary.props" />
+ <Import Project="..\build.DotNetApp.props" />
<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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Configuration" />
@@ -39,5 +39,6 @@
<ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets" />
</Project>
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
index af780b3..3f6c259 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,7 +24,7 @@
</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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetGramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -34,7 +34,6 @@
<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" />
@@ -45,4 +44,5 @@
<ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
\ No newline at end of file
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
index 52281c8..c35c031 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,7 +24,7 @@
</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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetGramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -34,7 +34,6 @@
<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" />
@@ -44,4 +43,5 @@
<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>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
\ No newline at end of file
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
index b59586b..49628fe 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,7 +24,7 @@
</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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetGramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -43,4 +43,5 @@
<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>
+ <Import Project="..\build.DotNet.targets" />
</Project>
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 be06d00..8772120 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
</ItemGroup>
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
@@ -41,5 +41,6 @@
<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="..\build.DotNet.targets"/>
</Project>
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
index 1b21aa8..0040d03 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,7 +28,7 @@
<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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetGramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
@@ -44,8 +44,8 @@
<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>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
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
index 2f9c54f..4f55a6c 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,7 +24,7 @@
</PropertyGroup>
<Import Project="..\build.DotNetLibrary.props" />
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -37,7 +37,6 @@
<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" />
@@ -45,4 +44,5 @@
<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>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
\ No newline at end of file
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
index 36e99e8..d8c435a 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -25,7 +25,7 @@
<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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -34,7 +34,6 @@
<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" />
@@ -46,4 +45,5 @@
<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>
+ <Import Project="..\build.DotNetTest.targets" />
</Project>
\ No newline at end of file
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
index 9d1c9be..b002a72 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -22,15 +22,9 @@
<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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -42,7 +36,6 @@
<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" />
@@ -50,4 +43,5 @@
<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>
+ <Import Project="..\build.DotNet.targets" />
</Project>
\ No newline at end of file
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
index b64310a..e02e7ba 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" >
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,7 +24,7 @@
</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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -34,7 +34,6 @@
<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" />
@@ -46,4 +45,6 @@
<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>
+
+ <Import Project="..\build.DotNet.targets"/>
</Project>
\ No newline at end of file
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 3245ec7..bc5c3f9 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -20,11 +20,17 @@
</PropertyGroup>
<Import Project="..\build.DotNetTest.props" />
<ItemGroup>
+ <PackageReference Include="Microsoft.Azure.DataLake.Store" Version="$(MicrosoftDataLakeStoreVersion)" />
<PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
<PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" />
</ItemGroup>
+ <!-- TODO[JIRA REEF-1888] Remove the conditional, but keep the item group -->
+ <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+ <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
+ <PackageReference Include="System.Net.Sockets" Version="4.3.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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -33,7 +39,6 @@
<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.IO\Org.Apache.REEF.IO.DotNet.csproj" />
@@ -41,4 +46,5 @@
<ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNetTest.targets" />
</Project>
diff --git a/lang/cs/Org.Apache.REEF.IO/FileSystem/AzureBlob/AzureCloudBlockBlob.cs b/lang/cs/Org.Apache.REEF.IO/FileSystem/AzureBlob/AzureCloudBlockBlob.cs
index b2289b6..3305094 100644
--- a/lang/cs/Org.Apache.REEF.IO/FileSystem/AzureBlob/AzureCloudBlockBlob.cs
+++ b/lang/cs/Org.Apache.REEF.IO/FileSystem/AzureBlob/AzureCloudBlockBlob.cs
@@ -61,12 +61,24 @@
public Stream Open()
{
- return _blob.OpenRead();
+ #if REEF_DOTNET_BUILD
+ var task = _blob.OpenReadAsync();
+ task.Wait();
+ return task.Result;
+ #else
+ return _blob.OpenRead();
+ #endif
}
public Stream Create()
{
- return _blob.OpenWrite();
+ #if REEF_DOTNET_BUILD
+ var task = _blob.OpenWriteAsync();
+ task.Wait();
+ return task.Result;
+ #else
+ return _blob.OpenWrite();
+ #endif
}
public bool Exists()
@@ -100,7 +112,7 @@
public void UploadFromFile(string path, FileMode mode)
{
- #if DOTNET_BUILD
+ #if REEF_DOTNET_BUILD
_blob.UploadFromFileAsync(path).Wait();
#else
_blob.UploadFromFileAsync(path, mode).Wait();
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 783424e..d9f1801 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -21,13 +21,19 @@
<AssemblyName>Org.Apache.REEF.IO</AssemblyName>
<Description>I/O library for Apache REEF</Description>
<PackageTags> Apache REEF IO</PackageTags>
+ <DefineConstants>REEF_DOTNET_BUILD</DefineConstants>
</PropertyGroup>
<Import Project="..\build.DotNetLibrary.props" />
<ItemGroup>
+ <PackageReference Include="Microsoft.Azure.DataLake.Store" Version="$(MicrosoftDataLakeStoreVersion)" />
<PackageReference Include="Microsoft.Azure.KeyVault.Core" Version="2.0.4" />
+ <PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.2.1" />
<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="Microsoft.Rest.ClientRuntime" Version="2.3.10" />
+ <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure" Version="3.3.7" />
+ <PackageReference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication" Version="2.3.1" />
<PackageReference Include="System.Spatial" Version="5.8.2" />
<PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
@@ -35,9 +41,11 @@
<!-- 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" />
+ <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
+ <PackageReference Include="System.Net.Sockets" Version="4.3.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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -51,4 +59,5 @@
<ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets" />
</Project>
diff --git a/lang/cs/Org.Apache.REEF.IO/packages.config b/lang/cs/Org.Apache.REEF.IO/packages.config
index b401637..f53a362 100644
--- a/lang/cs/Org.Apache.REEF.IO/packages.config
+++ b/lang/cs/Org.Apache.REEF.IO/packages.config
@@ -27,10 +27,10 @@
<package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net452" />
<package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.7" targetFramework="net452" />
- <package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.2" targetFramework="net452" />
+ <package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.3.1" targetFramework="net452" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
<package id="NLog" version="4.4.12" targetFramework="net452" />
<package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45" developmentDependency="true" />
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
+</packages>
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
index 848c53d..c8cffbe 100644
--- 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
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,7 +24,7 @@
</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'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -34,7 +34,6 @@
<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" />
@@ -45,4 +44,5 @@
<ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
\ No newline at end of file
diff --git a/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj b/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj
index 049d10f..9dffe68 100644
--- a/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Network.Examples/Org.Apache.REEF.Network.Examples.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,7 +24,7 @@
</PropertyGroup>
<Import Project="..\build.DotNetLibrary.props" />
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@@ -41,5 +41,6 @@
<ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj
index 94cb86a..5b286e9 100644
--- a/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Network.Tests/Org.Apache.REEF.Network.Tests.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,10 +24,9 @@
<PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" />
</ItemGroup>
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
</ItemGroup>
- <Import Project="..\xunit.DotNet.props" />
<ItemGroup>
<ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" />
@@ -36,4 +35,5 @@
<ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNetTest.targets" />
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj
index 0a449a3..230cf8c 100644
--- a/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Network/Org.Apache.REEF.Network.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -31,7 +31,7 @@
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="1.1.2" />
</ItemGroup>
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
@@ -44,5 +44,6 @@
<ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj
index 28b7ba8..6160d31 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang.Examples/Org.Apache.REEF.Tang.Examples.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,7 +24,7 @@
</PropertyGroup>
<Import Project="..\build.DotNetLibrary.props" />
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
@@ -32,4 +32,5 @@
<ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj
index 6f04a04..b3b5d68 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,9 +24,8 @@
<PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" />
<PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
</ItemGroup>
- <Import Project="..\xunit.DotNet.props" />
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>
@@ -42,4 +41,5 @@
<ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNetTest.targets" />
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.DotNet.csproj
index 4b95544..2cb2f8d 100644
--- a/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang.Tools/Org.Apache.REEF.Tang.Tools.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,7 +19,6 @@
<AssemblyName>Org.Apache.REEF.Tang.Tools</AssemblyName>
<Description>Tools for Tang</Description>
<PackageTags>Apache REEF Tang dependency injection</PackageTags>
- <OutputType>Exe</OutputType>
</PropertyGroup>
<Import Project="..\build.DotNetApp.props" />
<ItemGroup>
@@ -27,5 +26,6 @@
<ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj
index ebc50ad..1d40e8e 100644
--- a/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Tang/Org.Apache.REEF.Tang.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -29,7 +29,7 @@
<PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
</ItemGroup>
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" />
@@ -38,4 +38,5 @@
<ItemGroup>
<ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj
index da79ee7..f03a11f 100644
--- a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -17,11 +17,6 @@
-->
<PropertyGroup>
<AssemblyName>Org.Apache.REEF.Tests</AssemblyName>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<Import Project="..\build.DotNetTest.props" />
<ItemGroup>
@@ -36,12 +31,11 @@
<PackageReference Include="System.Spatial" Version="5.8.2" />
</ItemGroup>
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
</ItemGroup>
- <Import Project="..\xunit.DotNet.props" />
<ItemGroup>
<ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.DotNet.csproj" />
@@ -59,4 +53,5 @@
<ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Examples.HelloREEF\Org.Apache.REEF.Examples.HelloREEF.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNetTest.targets" />
</Project>
\ No newline at end of file
diff --git a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.REEF.Utilities.DotNet.csproj b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.REEF.Utilities.DotNet.csproj
index ae531e4..d2a944f 100644
--- a/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.REEF.Utilities.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Utilities/Org.Apache.REEF.Utilities.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -24,4 +24,5 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets"/>
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.DotNet.csproj
index fdeb129..929de58 100644
--- a/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Wake.Tests/Org.Apache.REEF.Wake.Tests.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -23,9 +23,9 @@
<PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" />
<PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" />
</ItemGroup>
- <Import Project="..\xunit.DotNet.props" />
<ItemGroup>
<ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNetTest.targets" />
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj
index 1ce1d7d..34ad138 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj
+++ b/lang/cs/Org.Apache.REEF.Wake/Org.Apache.REEF.Wake.DotNet.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,6 +19,7 @@
<AssemblyName>Org.Apache.REEF.Wake</AssemblyName>
<Description>Wake is an event-driven framework</Description>
<PackageTags>wake event-driven</PackageTags>
+ <DefineConstants>REEF_DOTNET_BUILD</DefineConstants>
</PropertyGroup>
<Import Project="..\build.DotNetLibrary.props" />
<ItemGroup>
@@ -27,7 +28,7 @@
<PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" />
</ItemGroup>
<!-- TODO[JIRA REEF-1888] This item group will not be needed when only .netcore is targeted. -->
- <ItemGroup Condition="'$(TargetFramework)' == 'net451' Or '$(TargetFramework)' == 'net46'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452' Or '$(TargetFramework)' == 'net46'">
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
@@ -36,4 +37,5 @@
<ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
<ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" />
</ItemGroup>
+ <Import Project="..\build.DotNet.targets" />
</Project>
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/IConnectionRetryHandler.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/IConnectionRetryHandler.cs
index 80be721..7e01f6d 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/IConnectionRetryHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/IConnectionRetryHandler.cs
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
using Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling;
#else
using Microsoft.Practices.TransientFaultHandling;
diff --git a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteConnectionRetryHandler.cs b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteConnectionRetryHandler.cs
index 802e0d7..860c341 100644
--- a/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteConnectionRetryHandler.cs
+++ b/lang/cs/Org.Apache.REEF.Wake/Remote/Impl/RemoteConnectionRetryHandler.cs
@@ -16,7 +16,7 @@
// under the License.
using System;
-#if DOTNET_BUILD
+#if REEF_DOTNET_BUILD
using Microsoft.Practices.EnterpriseLibrary.TransientFaultHandling;
#else
using Microsoft.Practices.TransientFaultHandling;
diff --git a/lang/cs/TestRunner.DotNet.proj b/lang/cs/TestRunner.DotNet.proj
new file mode 100644
index 0000000..c141813
--- /dev/null
+++ b/lang/cs/TestRunner.DotNet.proj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<Project DefaultTargets="Test" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project=".\build.DotNet.props" />
+ <ItemGroup>
+ <ProjectReferences Include="*\*.Tests.DotNet.csproj" />
+ </ItemGroup>
+ <PropertyGroup Condition=" '$(Configuration)' == '' ">
+ <Configuration>Debug</Configuration>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Platform)' == '' ">
+ <Platform>x64</Platform>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(TargetFramework)' == '' ">
+ <TargetFramework>net452</TargetFramework>
+ </PropertyGroup>
+ <Target Name="Test">
+ <MSBuild Projects="@(ProjectReferences)"
+ Targets="Test" Properties="Configuration=$(Configuration);Platform=$(Platform);TargetFramework=$(TargetFramework)" StopOnFirstFailure="false" />
+ </Target>
+</Project>
diff --git a/lang/cs/build.Common.DotNet.props b/lang/cs/build.Common.DotNet.props
new file mode 100644
index 0000000..e713cbe
--- /dev/null
+++ b/lang/cs/build.Common.DotNet.props
@@ -0,0 +1,67 @@
+<Project>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+ <PropertyGroup>
+ <Version>0.17.0</Version>
+ <Authors>Apache Software Foundation</Authors>
+ <Owners>The Apache REEF project</Owners>
+ <Product>Apache REEF</Product>
+ <ProductId>$(AssemblyName)</ProductId>
+ <AssemblyVersion>$(Version)</AssemblyVersion>
+ <FileVersion>$(Version)</FileVersion>
+ <NeutralLanguage>en</NeutralLanguage>
+ <Copyright>The Apache Software Foundation</Copyright>
+ <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+ <PackageProjectUrl>https://reef.apache.org</PackageProjectUrl>
+ <PackageIconUrl>https://reef.apache.org/ApacheREEF_logo_no_margin_small.png</PackageIconUrl>
+ <RepositoryUrl>https://github.com/apache/reef.git</RepositoryUrl>
+ <PackageReleaseNotes>Contact the Apache REEF development alias dev@reef.apache.org for questions or issues.</PackageReleaseNotes>
+ <DefaultItemExcludes>$(DefaultItemExcludes);**/AssemblyInfo.cs;**/Resources.xml;packages.config;*.nuspec</DefaultItemExcludes>
+ <IsSnapshot>true</IsSnapshot>
+ <SnapshotNumber>01</SnapshotNumber>
+ </PropertyGroup>
+
+ <PropertyGroup>
+ <Platforms>x64</Platforms>
+ <PlatformTarget>x64</PlatformTarget>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildThisFileDirectory)\</SolutionDir>
+ <BinDir Condition="$(BinDir) == '' Or $(BinDir) == '*Undefined*'">$(SolutionDir)bin\.netcore\</BinDir>
+ <PackagesDir Condition="$(PackagesDir) == '' Or $(PackagesDir) == '*Undefined*'">$(SolutionDir)\packages\</PackagesDir>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <DefineConstants>$(DefineConstants);REEF_DOTNET_BUILD</DefineConstants>
+ <NoWarn>NU1701;NU1603</NoWarn>
+ <OutputPath>$(BinDir)$(Configuration)\$(AssemblyName)\</OutputPath>
+ </PropertyGroup>
+
+ <!-- For linux builds, always enable the dot net build -->
+ <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
+ <EnableDotNetBuild>true</EnableDotNetBuild>
+ </PropertyGroup>
+
+ <!-- For window builds, we are defaulting the dot net build to false until dot net core is fully supported -->
+ <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+ <EnableDotNetBuild>false</EnableDotNetBuild>
+ </PropertyGroup>
+
+ <!-- Locations -->
+ <PropertyGroup>
+ <!--The root directory of the REEF source tree. -->
+ <REEF_Source_Folder>$([System.IO.Path]::GetFullPath($(MSBuildProjectDirectory)\..\..\..))</REEF_Source_Folder>
+ </PropertyGroup>
+
+</Project>
diff --git a/lang/cs/build.DotNet.props b/lang/cs/build.DotNet.props
index 6e37cef..ed01b8d 100644
--- a/lang/cs/build.DotNet.props
+++ b/lang/cs/build.DotNet.props
@@ -15,36 +15,17 @@
specific language governing permissions and limitations
under the License.
-->
- <PropertyGroup>
- <Version>0.17.0</Version>
- <Authors>Apache Software Foundation</Authors>
- <Owners>The Apache REEF project</Owners>
- <Product>Apache REEF</Product>
- <ProductId>$(AssemblyName)</ProductId>
- <AssemblyVersion>$(Version)</AssemblyVersion>
- <FileVersion>$(Version)</FileVersion>
- <NeutralLanguage>en</NeutralLanguage>
- <Copyright>The Apache Software Foundation</Copyright>
- <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
- <PackageProjectUrl>https://reef.apache.org</PackageProjectUrl>
- <PackageIconUrl>https://reef.apache.org/ApacheREEF_logo_no_margin_small.png</PackageIconUrl>
- <RepositoryUrl>https://github.com/apache/reef.git</RepositoryUrl>
- <PackageReleaseNotes>Contact the Apache REEF development alias dev@reef.apache.org for questions or issues.</PackageReleaseNotes>
- <DefaultItemExcludes>$(DefaultItemExcludes);**/AssemblyInfo.cs;packages.config;*.nuspec</DefaultItemExcludes>
- </PropertyGroup>
+ <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+ <Import Project="build.Common.DotNet.props" />
<!-- Allow for C# 7.2 language constructs -->
<PropertyGroup>
<LangVersion>7.2</LangVersion>
</PropertyGroup>
-
+
<PropertyGroup>
- <Platforms>x64</Platforms>
- <PlatformTarget>x64</PlatformTarget>
- <NoWarn>NU1701;NU1603</NoWarn>
- <DefineConstants>DOTNET_BUILD</DefineConstants>
- <OutputPath>..\bin\.netcore\$(Configruation)\$(AssemblyName)</OutputPath>
<AvroVersion>0.1.0</AvroVersion>
+ <MicrosoftDataLakeStoreVersion>1.1.3</MicrosoftDataLakeStoreVersion>
<NewtonsoftJsonVersion>10.0.3</NewtonsoftJsonVersion>
<NSubstituteVersion>1.8.2.0</NSubstituteVersion>
<ProtobufVersion>2.1.0</ProtobufVersion>
@@ -54,5 +35,4 @@
<NSubstituteVersion>2.0.3</NSubstituteVersion>
<WindowsAzureStorageVersion>8.1.3</WindowsAzureStorageVersion>
</PropertyGroup>
-
</Project>
diff --git a/lang/cs/build.DotNet.targets b/lang/cs/build.DotNet.targets
new file mode 100644
index 0000000..4332f6e
--- /dev/null
+++ b/lang/cs/build.DotNet.targets
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<Project>
+ <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>
+
diff --git a/lang/cs/build.DotNetApp.props b/lang/cs/build.DotNetApp.props
index 9f6d908..aa1a6fc 100644
--- a/lang/cs/build.DotNetApp.props
+++ b/lang/cs/build.DotNetApp.props
@@ -27,9 +27,18 @@
<!-- Settings for Windows platforms -->
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
- <TargetFrameworks>netcoreapp2.0;net46;net451</TargetFrameworks>
+ <TargetFrameworks>net452</TargetFrameworks>
+ <!-- If EnableDotNetBuild is true, override the target frameworks to include dot net core -->
+ <TargetFrameworks Condition="'$(EnableDotNetBuild)' == 'true'">net452;netcoreapp2.0</TargetFrameworks>
<OutputType>Exe</OutputType>
<!-- REEF-1888: win7-x64 is needed for .net46 and .net451. Target a newer version of windows once net46 and 451 are removed" -->
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
</PropertyGroup>
+
+<ItemGroup>
+ <None Include="$(SolutionDir)App.config">
+ <Link>App.config</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+</ItemGroup>
</Project>
diff --git a/lang/cs/build.DotNetLibrary.props b/lang/cs/build.DotNetLibrary.props
index 8df151e..1bee8c7 100644
--- a/lang/cs/build.DotNetLibrary.props
+++ b/lang/cs/build.DotNetLibrary.props
@@ -17,8 +17,17 @@
-->
<Import Project="build.DotNet.props"/>
-<PropertyGroup>
- <TargetFrameworks>netstandard2.0;net46;net451</TargetFrameworks>
- <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
+
+<!-- Settings for Linux platform -->
+<PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
+ <TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>
+
+<!-- Settings for Windows platform -->
+<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+ <TargetFrameworks>net452</TargetFrameworks>
+ <!-- If EnableDotNetBuild is true, override the target frameworks to include dot net core -->
+ <TargetFrameworks Condition="'$(EnableDotNetBuild)' == 'true'">net452;netstandard2.0</TargetFrameworks>
+</PropertyGroup>
+
</Project>
\ No newline at end of file
diff --git a/lang/cs/build.DotNetTest.props b/lang/cs/build.DotNetTest.props
index 82e26fd..d7c58b6 100644
--- a/lang/cs/build.DotNetTest.props
+++ b/lang/cs/build.DotNetTest.props
@@ -17,8 +17,9 @@
-->
<Import Project="build.DotNet.props"/>
+<Import Project="xunit.DotNet.props"/>
<PropertyGroup>
- <TargetFrameworks>netcoreapp2.0;net46;net451</TargetFrameworks>
+ <TargetFrameworks>net452</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp2.0</TargetFrameworks>
</PropertyGroup>
</Project>
diff --git a/lang/cs/build.DotNetTest.targets b/lang/cs/build.DotNetTest.targets
new file mode 100644
index 0000000..3787bbc
--- /dev/null
+++ b/lang/cs/build.DotNetTest.targets
@@ -0,0 +1,25 @@
+<Project>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<Import Project="build.DotNet.targets"/>
+<Target Name="Test">
+ <Exec Command="$(PackagesDir)\xunit.runner.console\2.1.0\tools\xunit.console.exe $(OutputPath)\$(AssemblyName).dll -notrait Environment=Yarn -html $(OutputPath)\xunit_report.html"
+ IgnoreStandardErrorWarningFormat="true"/>
+</Target>
+
+</Project>
diff --git a/lang/cs/pomversion.DotNet.targets b/lang/cs/pomversion.DotNet.targets
new file mode 100644
index 0000000..6a35e6c
--- /dev/null
+++ b/lang/cs/pomversion.DotNet.targets
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<Project InitialTargets="ExtractPOMVersion" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <!--
+ ########################################################################
+ Extract the REEF Version from the POM file
+ ########################################################################
+ -->
+ <!--A Task that extracts the version from the pom in a given folder.-->
+ <UsingTask
+ TaskName="GetMavenProjectVersion"
+ TaskFactory="CodeTaskFactory"
+ AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" >
+ <ParameterGroup>
+ <SnapshotNumber/>
+ <ProjectFolder Required="true"/>
+ <Version Output="true"/>
+ <NugetVersion Output="true"/>
+ </ParameterGroup>
+ <Task>
+ <Reference Include="System.Xml"/>
+ <Reference Include="System.Xml.Linq"/>
+ <Using Namespace="System"/>
+ <Using Namespace="System.IO"/>
+ <Using Namespace="System.Linq"/>
+ <Using Namespace="System.Xml.Linq"/>
+ <Code Type="Fragment" Language="cs">
+ <![CDATA[
+ Version = XDocument.Load(Path.Combine(ProjectFolder, "pom.xml")).Descendants()
+ .Where(x => x.Name.ToString().Contains("version"))
+ .FirstOrDefault().Value;
+ var snapshotNumberAsString = ($(SnapshotNumber) >= 0 && $(SnapshotNumber) <=9) ? "0" + $(SnapshotNumber) : $(SnapshotNumber).ToString();
+ NugetVersion = $(IsSnapshot) ? Version + "-" + snapshotNumberAsString : Version.Replace("-SNAPSHOT","");
+ ]]>
+ </Code>
+ </Task>
+ </UsingTask>
+ <!--
+ A Target that extract the REEF version from the pom and makes it available as REEF_Version
+ -->
+ <Target Name="ExtractPOMVersion">
+ <Message Text="MSBuildProjectName is $(MSBuildProjectName)" />
+ <Message Text="MSBuildProjectDirectory is $(MSBuildProjectDirectory)" />
+ <Message Text="SnapshotNumber is $(SnapshotNumber)" />
+ <Message Text="The root directory of the source tree is $(REEF_Source_Folder)" />
+ <GetMavenProjectVersion SnapshotNumber="$(SnapshotNumber)" ProjectFolder="$(REEF_Source_Folder)">
+ <Output PropertyName="REEF_Version" TaskParameter="Version"/>
+ <Output PropertyName="REEF_NugetVersion" TaskParameter="NugetVersion"/>
+ </GetMavenProjectVersion>
+ <Message Text="Extracted the following version from the POM: $(REEF_Version)"/>
+ </Target>
+ <PropertyGroup>
+ <BuildDotTargetsIsImported>true</BuildDotTargetsIsImported>
+ </PropertyGroup>
+</Project>
+
+
diff --git a/lang/cs/xunit.DotNet.props b/lang/cs/xunit.DotNet.props
index a08dd54..2fb4fab 100644
--- a/lang/cs/xunit.DotNet.props
+++ b/lang/cs/xunit.DotNet.props
@@ -24,11 +24,13 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" NoWarn="NU1701"/>
<PackageReference Include="xunit" Version="2.2.0" NoWarn="NU1701"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" NoWarn="NU1701"/>
+ <PackageReference Include="xunit.runner.console" Version="2.2.0" NoWarn="NU1701"/>
</ItemGroup>
- <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
+ <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" NoWarn="NU1701"/>
<PackageReference Include="xunit" Version="2.1.0" NoWarn="NU1701"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.1.0" NoWarn="NU1701"/>
+ <PackageReference Include="xunit.runner.console" Version="2.1.0" NoWarn="NU1701"/>
</ItemGroup>
</Project>
