You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@reef.apache.org by we...@apache.org on 2018/05/30 14:18:36 UTC
[7/8] reef git commit: [REEF-1991] Delete old project,
rename DotNet projects to old project names.
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj
index 90c365e..b94fccb 100644
--- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj
+++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.csproj
@@ -1,13 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<Project>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
+to you under the Apache License, Version 2.0 (thee
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,325 +17,50 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
- <ProjectGuid>{5094C35B-4FDB-4322-AC05-45D684501CBF}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Org.Apache.REEF.Client</RootNamespace>
<AssemblyName>Org.Apache.REEF.Client</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <RestorePackages>true</RestorePackages>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..</SolutionDir>
+ <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.Library.props" />
<PropertyGroup>
- <StartupObject />
- </PropertyGroup>
- <Import Project="$(SolutionDir)\build.props" />
- <PropertyGroup>
- <TempResxFile Condition="$(TempResxFile) == ''">$(SolutionDir)bin\$(PlatformTarget)\$(Configuration)\$(AssemblyName)\Resources.resx</TempResxFile>
- <UseVSHostingProcess>false</UseVSHostingProcess>
+ <TempResxFile Condition="$(TempResxFile) == ''">$(OutputPath)\$(TargetFramework)\Resources.resx</TempResxFile>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Microsoft.Azure.Batch, Version=8.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Azure.Batch.8.0.1\lib\net452\Microsoft.Azure.Batch.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.Azure.KeyVault.Core.1.0.0\lib\net40\Microsoft.Azure.KeyVault.Core.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.Data.Edm.5.8.2\lib\net40\Microsoft.Data.Edm.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Microsoft.Data.OData, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.Data.OData.5.8.2\lib\net40\Microsoft.Data.OData.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Microsoft.Data.Services.Client, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.Data.Services.Client.5.8.2\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Microsoft.Practices.TransientFaultHandling.Core, Version=5.1.1209.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>$(PackagesDir)\TransientFaultHandling.Core.5.1.1209.1\lib\NET4\Microsoft.Practices.TransientFaultHandling.Core.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.Rest.ClientRuntime.2.3.10\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.10\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.WindowsAzure.Storage, Version=8.1.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\WindowsAzure.Storage.8.1.3\lib\net45\Microsoft.WindowsAzure.Storage.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="Microsoft.Hadoop.Avro">
- <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Data" />
- <Reference Include="System.IO.Compression" />
- <Reference Include="System.IO.Compression.FileSystem" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Net.Http.WebRequest" />
- <Reference Include="System.Spatial, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <HintPath>..\packages\System.Spatial.5.8.2\lib\net40\System.Spatial.dll</HintPath>
- <Private>True</Private>
- </Reference>
- <Reference Include="System.Xml" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Runtime.Serialization" />
+ <EmbeddedResource Include="$(TempResxFile)">
+ <Generator>ResXFileCodeGenerator</Generator>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <Compile Include="$(SolutionDir)\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="API\AppParameters.cs" />
- <Compile Include="API\AppParametersBuilder.cs" />
- <Compile Include="API\ClientFactory.cs" />
- <Compile Include="API\DriverStatus.cs" />
- <Compile Include="API\Exceptions\ClasspathException.cs" />
- <Compile Include="API\Exceptions\JavaNotFoundException.cs" />
- <Compile Include="API\IREEFClient.cs" />
- <Compile Include="API\Testing\AbstractAssert.cs" />
- <Compile Include="API\Testing\IAssert.cs" />
- <Compile Include="API\Testing\AssertResult.cs" />
- <Compile Include="API\Testing\ITestResult.cs" />
- <Compile Include="API\Testing\ITestRunner.cs" />
- <Compile Include="API\JobParameters.cs" />
- <Compile Include="API\JobParametersBuilder.cs" />
- <Compile Include="API\JobRequest.cs" />
- <Compile Include="API\JobRequestBuilder.cs" />
- <Compile Include="API\JobRequestBuilderFactory.cs" />
- <Compile Include="API\Parameters.cs" />
- <Compile Include="API\TcpPortConfigurationModule.cs" />
- <Compile Include="Avro\AvroAppSubmissionParameters.cs" />
- <Compile Include="Avro\AvroJobSubmissionParameters.cs" />
- <Compile Include="Avro\AzureBatch\AvroAzureBatchJobSubmissionParameters.cs" />
- <Compile Include="Avro\Local\AvroLocalAppSubmissionParameters.cs" />
- <Compile Include="Avro\Local\AvroLocalJobSubmissionParameters.cs" />
- <Compile Include="Avro\YARN\AvroYarnAppSubmissionParameters.cs" />
- <Compile Include="Avro\YARN\AvroYarnJobSubmissionParameters.cs" />
- <Compile Include="Avro\YARN\AvroYarnClusterJobSubmissionParameters.cs" />
- <Compile Include="AzureBatch\AzureBatchRuntimeClientConfiguration.cs" />
- <Compile Include="AzureBatch\Util\AzureBatchCommandProviderConfiguration.cs" />
- <Compile Include="AzureBatch\AzureBatchDotNetClient.cs" />
- <Compile Include="AzureBatch\Storage\AzureStorageClient.cs" />
- <Compile Include="AzureBatch\Service\AzureBatchService.cs" />
- <Compile Include="AzureBatch\Util\AzureBatchFileNames.cs" />
- <Compile Include="AzureBatch\Util\ICommandBuilder.cs" />
- <Compile Include="AzureBatch\Parameters\AzureBatchAccountKey.cs" />
- <Compile Include="AzureBatch\Parameters\AzureBatchAccountName.cs" />
- <Compile Include="AzureBatch\Parameters\AzureBatchAccountUri.cs" />
- <Compile Include="AzureBatch\Parameters\AzureBatchPoolId.cs" />
- <Compile Include="AzureBatch\Parameters\AzureStorageAccountKey.cs" />
- <Compile Include="AzureBatch\Parameters\AzureStorageAccountName.cs" />
- <Compile Include="AzureBatch\Parameters\AzureStorageContainerName.cs" />
- <Compile Include="AzureBatch\Parameters\DriverStderrFilePath.cs" />
- <Compile Include="AzureBatch\Parameters\DriverStdoutFilePath.cs" />
- <Compile Include="AzureBatch\Parameters\EnableDebugLogging.cs" />
- <Compile Include="AzureBatch\Parameters\IsWindows.cs" />
- <Compile Include="AzureBatch\Util\AbstractCommandBuilder.cs" />
- <Compile Include="AzureBatch\Util\JobJarMaker.cs" />
- <Compile Include="AzureBatch\Util\LinuxCommandBuilder.cs" />
- <Compile Include="AzureBatch\Util\WindowsCommandBuilder.cs" />
- <Compile Include="Common\DotNetFile.cs" />
- <Compile Include="Common\ClientConstants.cs" />
- <Compile Include="Common\DriverFolderPreparationHelper.cs" />
- <Compile Include="Common\EnvironmentDriverConfigurationProviders.cs" />
- <Compile Include="Common\IFile.cs" />
- <Compile Include="Common\IResourceArchiveFileGenerator.cs" />
- <Compile Include="Common\FileSets.cs" />
- <Compile Include="Common\IJavaClientLauncher.cs" />
- <Compile Include="Common\IJobSubmissionResult.cs" />
- <Compile Include="Common\JobSubmissionResult.cs" />
- <Compile Include="Common\JavaClientLauncher.cs" />
- <Compile Include="Common\ResourceArchiveFileGenerator.cs" />
- <Compile Include="Local\LocalClient.cs" />
- <Compile Include="Local\LocalDriverConfigurationProvider.cs" />
- <Compile Include="Local\LocalJobSubmissionResult.cs" />
- <Compile Include="Local\LocalRuntimeClientConfiguration.cs" />
- <Compile Include="Local\Parameters\LocalRuntimeDirectory.cs" />
- <Compile Include="Local\Parameters\NumberOfEvaluators.cs" />
- <Compile Include="Local\TestRunner\FileWritingAssert\FileWritingAssert.cs" />
- <Compile Include="Local\TestRunner\FileWritingAssert\FileWritingAssertConfiguration.cs" />
- <Compile Include="Local\TestRunner\FileWritingAssert\Parameters.cs" />
- <Compile Include="Local\TestRunner\FileWritingAssert\TestResult.cs" />
- <Compile Include="Local\TestRunner\LocalTestRunner.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="API\Testing\TestRunnerFactory.cs" />
- <Compile Include="YARN\ApplicationReport.cs" />
- <Compile Include="YARN\Environment.cs" />
- <Compile Include="YARN\HDI\HDInsightClientConfiguration.cs" />
- <Compile Include="YARN\HDI\HDInsightCommandLineEnvironment.cs" />
- <Compile Include="YARN\HDI\HDInsightCredential.cs" />
- <Compile Include="YARN\HDI\HDInsightResourceFileRemoteUrlToClusterUrlConverter.cs" />
- <Compile Include="YARN\HDI\HDInsightUrlProvider.cs" />
- <Compile Include="YARN\HDI\NamedParameters.cs" />
- <Compile Include="YARN\IApplicationReport.cs" />
- <Compile Include="YARN\IdentityResourceFileRemoteUrlToClusterUrlConverter.cs" />
- <Compile Include="YARN\IResourceFileRemoteUrlToClusterUrlConverter.cs" />
- <Compile Include="YARN\IYarnCommandLineEnvironment.cs" />
- <Compile Include="YARN\IYarnJobCommandProvider.cs" />
- <Compile Include="YARN\IJobResourceUploader.cs" />
- <Compile Include="YARN\IJobSubmissionDirectoryProvider.cs" />
- <Compile Include="YARN\IYarnREEFClient.cs" />
- <Compile Include="YARN\Parameters\DriverMaxMemoryAllicationPoolSizeMB.cs" />
- <Compile Include="YARN\Parameters\DriverMaxPermSizeMB.cs" />
- <Compile Include="YARN\Parameters\DriverStderrFilePath.cs" />
- <Compile Include="YARN\Parameters\DriverStdoutFilePath.cs" />
- <Compile Include="YARN\Parameters\FileSystemUrl.cs" />
- <Compile Include="YARN\Parameters\SecurityTokenStrings.cs" />
- <Compile Include="YARN\RestClient\DataModel\KillApplication.cs" />
- <Compile Include="YARN\RestClient\HttpClient.cs" />
- <Compile Include="YARN\RestClient\IDeserializer.cs" />
- <Compile Include="YARN\RestClient\IHttpClient.cs" />
- <Compile Include="YARN\RestClient\IRequestFactory.cs" />
- <Compile Include="YARN\RestClient\IRestClient.cs" />
- <Compile Include="YARN\RestClient\ISerializer.cs" />
- <Compile Include="YARN\RestClient\IYarnRestClientCredential.cs" />
- <Compile Include="YARN\RestClient\Method.cs" />
- <Compile Include="YARN\RestClient\NullYarnRestClientCredential.cs" />
- <Compile Include="YARN\RestClient\RequestFactory.cs" />
- <Compile Include="YARN\RestClient\RestClient.cs" />
- <Compile Include="YARN\RestClient\RestJsonDeserializer.cs" />
- <Compile Include="YARN\RestClient\RestJsonSerializer.cs" />
- <Compile Include="YARN\RestClient\RestRequest.cs" />
- <Compile Include="YARN\RestClient\RestResponse.cs" />
- <Compile Include="YARN\RestClient\HttpClientRetryHandler.cs" />
- <Compile Include="Avro\YARN\SecurityToken.cs" />
- <Compile Include="YARN\SecurityTokenWriter.cs" />
- <Compile Include="YARN\WindowsYarnJobCommandProvider.cs" />
- <Compile Include="YARN\JobResource.cs" />
- <Compile Include="YARN\JobSubmissionDirectoryProvider.cs" />
- <Compile Include="YARN\LegacyJobResourceUploader.cs" />
- <Compile Include="YARN\Parameters\EnableDebugLogging.cs" />
- <Compile Include="YARN\Parameters\JobSubmissionDirectoryPrefixParameter.cs" />
- <Compile Include="YARN\Parameters\SecurityTokenParameters.cs" />
- <Compile Include="YARN\RestClient\DataModel\Acls.cs" />
- <Compile Include="YARN\RestClient\DataModel\AmContainerSpec.cs" />
- <Compile Include="YARN\RestClient\DataModel\ApplicationFinalState.cs" />
- <Compile Include="YARN\RestClient\DataModel\ApplicationTag.cs" />
- <Compile Include="YARN\RestClient\DataModel\ClusterHaState.cs" />
- <Compile Include="YARN\RestClient\DataModel\ClusterState.cs" />
- <Compile Include="YARN\RestClient\DataModel\Commands.cs" />
- <Compile Include="YARN\RestClient\DataModel\Credentials.cs" />
- <Compile Include="YARN\RestClient\DataModel\Environment.cs" />
- <Compile Include="YARN\RestClient\DataModel\KeyValuePair.cs" />
- <Compile Include="YARN\RestClient\DataModel\LocalResources.cs" />
- <Compile Include="YARN\RestClient\DataModel\Secrets.cs" />
- <Compile Include="YARN\RestClient\DataModel\ServiceData.cs" />
- <Compile Include="YARN\RestClient\DataModel\SubmitApplication.cs" />
- <Compile Include="YARN\RestClient\DataModel\Tokens.cs" />
- <Compile Include="YARN\RestClient\IRestRequestExecutor.cs" />
- <Compile Include="YARN\RestClient\IUrlProvider.cs" />
- <Compile Include="YARN\RestClient\FileSystemJobResourceUploader.cs" />
- <Compile Include="YARN\RestClient\MultipleRMUrlProvider.cs" />
- <Compile Include="YARN\YarnCommandProviderConfiguration.cs" />
- <Compile Include="YARN\YarnJobSubmissionResult.cs" />
- <Compile Include="YARN\YARNREEFClient.cs" />
- <Compile Include="YARN\RestClient\RestRequestExecutor.cs" />
- <Compile Include="YARN\RestClient\IYarnRMClient.cs" />
- <Compile Include="YARN\RestClient\DataModel\Application.cs" />
- <Compile Include="YARN\RestClient\DataModel\Applications.cs" />
- <Compile Include="YARN\RestClient\DataModel\ApplicationState.cs" />
- <Compile Include="YARN\RestClient\DataModel\ClusterInfo.cs" />
- <Compile Include="YARN\RestClient\DataModel\ClusterMetrics.cs" />
- <Compile Include="YARN\RestClient\DataModel\Error.cs" />
- <Compile Include="YARN\RestClient\DataModel\Resouce.cs" />
- <Compile Include="YARN\RestClient\DataModel\NewApplication.cs" />
- <Compile Include="YARN\RestClient\YarnClient.cs" />
- <Compile Include="YARN\RestClient\YarnClientNoCancellationToken.cs" />
- <Compile Include="YARN\RestClient\YarnConfigurationUrlProvider.cs" />
- <Compile Include="YARN\RestClient\YarnRestAPIException.cs" />
- <Compile Include="YARN\YARNClientConfiguration.cs" />
- <Compile Include="YARN\YarnCommandLineEnvironment.cs" />
- <Compile Include="YARN\YarnREEFDotNetClient.cs" />
- <Compile Include="YARN\YarnREEFDotNetParamSerializer.cs" />
- <Compile Include="YARN\YarnREEFParamSerializer.cs" />
+ <PackageReference Include="Azure.Batch" Version="8.0.0" />
+ <PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
+ <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" />
+ <PackageReference Include="EnterpriseLibrary.TransientFaultHandling.Core" Version="$(TransientFaultHandlingVersion)" />
+ <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
+ <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.3.0" />
</ItemGroup>
- <ItemGroup>
- <None Include="Avro\README.md" />
- <None Include="Org.Apache.REEF.Client.nuspec" />
- <None Include="packages.config" />
+
+ <!-- Project Reference conditionals allow for targeting specific projects based upon the target framework. -->
+ <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
+ <ProjectReference Include="..\Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.vcxproj" PrivateAssets="All" />
</ItemGroup>
- <ItemGroup>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
- <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project>
- <Name>Org.Apache.REEF.Utilities</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj">
- <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project>
- <Name>Org.Apache.REEF.Tang</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj">
- <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project>
- <Name>Org.Apache.REEF.Common</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.csproj">
- <Project>{a6baa2a7-f52f-4329-884e-1bcf711d6805}</Project>
- <Name>Org.Apache.REEF.Driver</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Network\Org.Apache.REEF.Network.csproj">
- <Project>{883ce800-6a6a-4e0a-b7fe-c054f4f2c1dc}</Project>
- <Name>Org.Apache.REEF.Network</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj">
- <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project>
- <Name>Org.Apache.REEF.Wake</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.vcxproj">
- <Project>{4e69d40a-26d6-4d4a-b96d-729946c07fe1}</Project>
- <Name>Org.Apache.REEF.Bridge</Name>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
- <LinkLibraryDependencies>false</LinkLibraryDependencies>
- <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Evaluator\Org.Apache.REEF.Evaluator.csproj">
- <Project>{1b983182-9c30-464c-948d-f87eb93a8240}</Project>
- <Name>Org.Apache.REEF.Evaluator</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.csproj">
- <Project>{75503f90-7b82-4762-9997-94b5c68f15db}</Project>
- <Name>Org.Apache.REEF.Examples</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.IO\Org.Apache.REEF.IO.csproj">
- <Project>{DEC0F0A8-DBEF-4EBF-B69C-E2369C15ABF1}</Project>
- <Name>Org.Apache.REEF.IO</Name>
- </ProjectReference>
+ <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+ <ProjectReference Include="..\Org.Apache.REEF.Bridge.CLR\Org.Apache.REEF.Bridge.CLR.csproj" PrivateAssets="All" />
</ItemGroup>
+
<ItemGroup>
- <EmbeddedResource Include="$(TempResxFile)">
- <Generator>ResXFileCodeGenerator</Generator>
- <Visible>false</Visible>
- </EmbeddedResource>
+ <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Driver\Org.Apache.REEF.Driver.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Network\Org.Apache.REEF.Network.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Examples\Org.Apache.REEF.Examples.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.IO\Org.Apache.REEF.IO.csproj" />
</ItemGroup>
- <ItemGroup />
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
- </PropertyGroup>
- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
- </Target>
- <!--begin jar reference-->
- <PropertyGroup>
- <BeforeBuildDependsOn>
- $(BeforeBuildDependsOn);
- RewriteClientResources;
- </BeforeBuildDependsOn>
- </PropertyGroup>
+ <Import Project="..\build.targets" />
<!--
########################################################################
ReWrite client resx to point to correct version of jars
@@ -355,7 +82,8 @@ under the License.
<Using Namespace="System.Xml" />
<Using Namespace="System.Linq" />
<Using Namespace="System.Xml.Linq" />
- <Code Type="Fragment" Language="cs"><![CDATA[
+ <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;
@@ -363,9 +91,9 @@ under the License.
var reefVersion = Version;
var srcDir = @"lang\cs\Org.Apache.REEF.Client\Properties";
- var binDir = @"lang\cs\bin\x64";
+ var binDir = @"lang\cs\bin\.netcore";
var resxInputPath = Path.Combine(ProjectFolder, srcDir, "Resources.xml");
- var resourceDir = Path.Combine(ProjectFolder, binDir, DebugOrRelease, "Org.Apache.REEF.Bridge.JAR");
+ var resourceDir = Path.Combine(ProjectFolder, binDir, DebugOrRelease, "Org.Apache.REEF.Bridge.JAR", "net461");
var clrDriverDir = Path.Combine(ProjectFolder, binDir, DebugOrRelease, "Org.Apache.REEF.Bridge");
var byteArrayType = ";System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089";
var jarRest = reefVersion + "-shaded.jar" + byteArrayType;
@@ -406,27 +134,27 @@ under the License.
{
root.WriteTo(wr);
}
- ]]></Code>
+ ]]>
+ </Code>
</Task>
</UsingTask>
<!--
A Target that reWrites client resx to point to correct version of jars
-->
- <Target Name="CopyJarFiles">
+ <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)\**\Org.Apache.REEF.Bridge.JAR\*.jar" />
+ <MySourceFiles Include="$(BinDir)$(Configuration)\Org.Apache.REEF.Bridge.JAR\$(TargetFramework)\*.jar" />
</ItemGroup>
<Copy SourceFiles="@(MySourceFiles)" DestinationFiles="@(MySourceFiles->'$(TargetDir)%(Filename)%(Extension)')" />
</Target>
- <Target Name="RewriteClientResources" DependsOnTargets="CopyJarFiles">
- <UpdateClientResources ProjectFolder="$(REEF_Source_Folder)" DebugOrRelease="$(Configuration)" resxOutputPath="$(TempResxFile)">
- </UpdateClientResources>
- </Target>
- <Target Name="AfterBuild">
+ <Target Name="RemovingTempResx" AfterTargets="AfterBuild">
+ <Message Text="Removing temporary resx file" Importance="high"/>
<Delete Files="$(TempResxFile)" />
- <RemoveDir Directories="$(BaseIntermediateOutputPath)" />
- </Target>
- <Target Name="BeforeBuild" DependsOnTargets="$(BeforeBuildDependsOn);RewriteClientResources">
</Target>
-</Project>
\ No newline at end of file
+</Project>
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec
deleted file mode 100644
index 34d6847..0000000
--- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<package >
- <metadata>
- <id>Org.Apache.REEF.Client</id>
- <version>$version$</version>
- <title>Org.Apache.REEF.Client</title>
- <authors>The Apache REEF project</authors>
- <owners>The Apache REEF project</owners>
- <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
- <projectUrl>http://reef.apache.org/</projectUrl>
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
- <description>Client for REEF.NET</description>
- <copyright>The Apache Software Foundation</copyright>
- <dependencies>
- <dependency id="Org.Apache.REEF.Utilities" version="$version$" />
- <dependency id="Org.Apache.REEF.Tang" version="$version$" />
- <dependency id="Org.Apache.REEF.Wake" version="$version$" />
- <dependency id="Org.Apache.REEF.Common" version="$version$" />
- <dependency id="Org.Apache.REEF.Network" version="$version$" />
- <dependency id="Org.Apache.REEF.Driver" version="$version$" />
- <dependency id="Org.Apache.REEF.Evaluator" version="$version$" />
- <dependency id="Org.Apache.REEF.Examples" version="$version$" />
- <dependency id="Rx-Core" version="2.2.5" />
- <dependency id="protobuf-net" version="2.1.0" />
- <dependency id="TransientFaultHandling.Core" version="5.1.1209.1" />
- </dependencies>
- </metadata>
- <files>
- <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Client\Org.Apache.REEF.Client.dll" target="lib\net45" />
- <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Client\Org.Apache.REEF.Client.pdb" target="lib\net45" />
- </files>
-</package>
-
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.DotNet.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.DotNet.cs b/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.DotNet.cs
deleted file mode 100644
index 3c33105..0000000
--- a/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.DotNet.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-using System.Runtime.CompilerServices;
-
-// Allow the tests access to `internal` APIs
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Tests")]
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Client.Tests")]
-
-// Allow NSubstitute to create proxy implementations
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
-
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.cs
index e7150cb..3c33105 100644
--- a/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Client/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Licensed to the Apache Software Foundation (ASF) under one
+// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
@@ -15,36 +15,12 @@
// specific language governing permissions and limitations
// under the License.
-using System.Reflection;
using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Org.Apache.REEF.Client")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyProduct("Org.Apache.REEF.Client")]
+// Allow the tests access to `internal` APIs
+[assembly: InternalsVisibleTo("Org.Apache.REEF.Tests")]
+[assembly: InternalsVisibleTo("Org.Apache.REEF.Client.Tests")]
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8717944c-5e99-4f95-a916-5ca3c3f8e697")]
+// Allow NSubstitute to create proxy implementations
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Tests, publickey=" +
- "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" +
- "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" +
- "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" +
- "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")]
- [assembly: InternalsVisibleTo("Org.Apache.REEF.Client.Tests, publickey=" +
- "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" +
- "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" +
- "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" +
- "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")]
-
-// Make internals visible to NSubstitute assembly for mocking in unit tests
- [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=00240000048000009" +
- "40000000602000000240000525341310004000001000100c547cac37a" +
- "bd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc07" +
- "34aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f71724" +
- "1550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15" +
- "605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3" +
- "113e92484cf7045cc7")]
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Client/Properties/Resources.DotNet.xml
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/Properties/Resources.DotNet.xml b/lang/cs/Org.Apache.REEF.Client/Properties/Resources.DotNet.xml
deleted file mode 100644
index 8bab319..0000000
--- a/lang/cs/Org.Apache.REEF.Client/Properties/Resources.DotNet.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<!--
-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
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Client/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/packages.config b/lang/cs/Org.Apache.REEF.Client/packages.config
deleted file mode 100644
index 094733d..0000000
--- a/lang/cs/Org.Apache.REEF.Client/packages.config
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<packages>
- <package id="Azure.Batch" version="8.0.1" targetFramework="net452" />
- <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net452" />
- <package id="Microsoft.Data.Edm" version="5.8.2" targetFramework="net452" />
- <package id="Microsoft.Data.OData" version="5.8.2" targetFramework="net452" />
- <package id="Microsoft.Data.Services.Client" version="5.8.2" targetFramework="net452" />
- <package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net452" />
- <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.10" targetFramework="net452" />
- <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
- <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45" developmentDependency="true" />
- <package id="System.ComponentModel.EventBasedAsync" version="4.0.11" targetFramework="net452" />
- <package id="System.Dynamic.Runtime" version="4.0.0" targetFramework="net452" />
- <package id="System.Linq.Queryable" version="4.0.0" targetFramework="net452" />
- <package id="System.Net.Requests" version="4.0.11" targetFramework="net452" />
- <package id="System.Spatial" version="5.8.2" targetFramework="net452" />
- <package id="TransientFaultHandling.Core" version="5.1.1209.1" targetFramework="net45" />
- <package id="WindowsAzure.Storage" version="8.1.3" targetFramework="net452" />
-</packages>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj
deleted file mode 100644
index bd2b3f9..0000000
--- a/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.DotNet.csproj
+++ /dev/null
@@ -1,32 +0,0 @@
-<Project>
- <!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
- <PropertyGroup>
- <AssemblyName>Org.Apache.REEF.Common.Tests</AssemblyName>
- </PropertyGroup>
- <Import Project="..\build.DotNetTest.props" />
- <ItemGroup>
- <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
- <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" />
- </ItemGroup>
- <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
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj
index a59282b..a4c2164 100644
--- a/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj
+++ b/lang/cs/Org.Apache.REEF.Common.Tests/Org.Apache.REEF.Common.Tests.csproj
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<Project>
+ <!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
@@ -15,70 +15,18 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
- <ProjectGuid>{F1A3495C-2CBD-4F3B-AEDC-9C1A43D9F238}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Org.Apache.REEF.Common.Tests</RootNamespace>
<AssemblyName>Org.Apache.REEF.Common.Tests</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..</SolutionDir>
- <RestorePackages>true</RestorePackages>
</PropertyGroup>
- <Import Project="$(SolutionDir)\build.props" />
- <Import Project="$(SolutionDir)\xunit.targets" />
- <PropertyGroup>
- <BuildPackage>false</BuildPackage>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="$(SolutionDir)\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="Metrics\DefaultMetricSourceTests.cs" />
- <Compile Include="Metrics\ImmutableMetricImplTests.cs" />
- <Compile Include="Metrics\ImmutableMetricTest.cs" />
- <Compile Include="Metrics\MetricsCollectorTests.cs" />
- <Compile Include="Metrics\MetricTestUtils.cs" />
- <Compile Include="Metrics\MutableMetricTest.cs" />
- <Compile Include="Metrics\SnapshotRequestTest.cs" />
- <Compile Include="Metrics\TestMetricsTag.cs" />
- <Compile Include="Telemetry\CounterTests.cs" />
- <Compile Include="TestHttpSerialization.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj">
- <Project>{545a0582-4105-44ce-b99c-b1379514a630}</Project>
- <Name>Org.Apache.REEF.Common</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
- <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project>
- <Name>Org.Apache.REEF.Utilities</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj">
- <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project>
- <Name>Org.Apache.REEF.Tang</Name>
- </ProjectReference>
- </ItemGroup>
+ <Import Project="..\build.Test.props" />
<ItemGroup>
- <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+ <PackageReference Include="NSubstitute" Version="$(NSubstituteVersion)" />
+ <PackageReference Include="WindowsAzure.Storage" Version="$(WindowsAzureStorageVersion)" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
+ <ProjectReference Include="..\Org.Apache.REEF.Common\Org.Apache.REEF.Common.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj" />
</ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" />
+ <Import Project="$(SolutionDir)\build.Test.targets" />
</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common.Tests/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Common.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 06bc60f..0000000
--- a/lang/cs/Org.Apache.REEF.Common.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Org.Apache.REEF.Common.Tests")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyProduct("Org.Apache.REEF.Common.Tests")]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("56634b2e-ff34-4c06-99f4-3c1388093e59")]
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common.Tests/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common.Tests/packages.config b/lang/cs/Org.Apache.REEF.Common.Tests/packages.config
deleted file mode 100644
index 3b963f3..0000000
--- a/lang/cs/Org.Apache.REEF.Common.Tests/packages.config
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<packages>
- <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45" developmentDependency="true" />
- <package id="xunit" version="2.1.0" targetFramework="net45" />
- <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
- <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
- <package id="xunit.core" version="2.1.0" targetFramework="net45" />
- <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
- <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
- <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj
deleted file mode 100644
index 8f13175..0000000
--- a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.DotNet.csproj
+++ /dev/null
@@ -1,40 +0,0 @@
-<Project>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
- <PropertyGroup>
- <AssemblyName>Org.Apache.REEF.Common</AssemblyName>
- <Description>REEF Common Infrastructure</Description>
- <PackageTags>REEF Common Infrastructure</PackageTags>
- </PropertyGroup>
- <Import Project="..\build.DotNetLibrary.props" />
- <ItemGroup>
- <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
- <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" />
- <PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
- <PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" />
- <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.DotNet.csproj" />
- <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.DotNet.csproj" />
- <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.DotNet.csproj" />
- </ItemGroup>
- <Import Project="..\build.DotNet.targets" />
-</Project>
-
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj
index 633bb33..c95548c 100644
--- a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj
+++ b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<Project>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -7,7 +7,9 @@ regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -15,283 +17,24 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
- <ProjectGuid>{545A0582-4105-44CE-B99C-B1379514A630}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>Org.Apache.REEF.Common</RootNamespace>
<AssemblyName>Org.Apache.REEF.Common</AssemblyName>
- <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
- <RestorePackages>true</RestorePackages>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..</SolutionDir>
+ <Description>REEF Common Infrastructure</Description>
+ <PackageTags>REEF Common Infrastructure</PackageTags>
</PropertyGroup>
- <Import Project="$(SolutionDir)\build.props" />
+ <Import Project="..\build.Library.props" />
<ItemGroup>
- <Reference Include="Microsoft.Hadoop.Avro">
- <HintPath>$(PackagesDir)\Microsoft.Hadoop.Avro.$(AvroVersion)\lib\net45\Microsoft.Hadoop.Avro.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json">
- <HintPath>$(PackagesDir)\Newtonsoft.Json.$(NewtonsoftJsonVersion)\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="protobuf-net">
- <HintPath>$(PackagesDir)\protobuf-net.$(ProtobufVersion)\lib\net451\protobuf-net.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Reactive.Core">
- <HintPath>$(PackagesDir)\System.Reactive.Core.$(SystemReactiveVersion)\lib\net45\System.Reactive.Core.dll</HintPath>
- </Reference>
- <Reference Include="System.Reactive.Interfaces">
- <HintPath>$(PackagesDir)\System.Reactive.Interfaces.$(SystemReactiveVersion)\lib\net45\System.Reactive.Interfaces.dll</HintPath>
- </Reference>
- <Reference Include="System.Runtime.Serialization" />
- <Reference Include="System.Xml" />
+ <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
+ <PackageReference Include="protobuf-net" Version="$(ProtobufVersion)" />
+ <PackageReference Include="Microsoft.Avro.Core" Version="$(AvroVersion)" />
+ <PackageReference Include="System.Reactive.Core" Version="$(SystemReactiveVersion)" />
+ <PackageReference Include="System.Reactive.Interfaces" Version="$(SystemReactiveVersion)" />
</ItemGroup>
<ItemGroup>
- <Compile Include="$(SolutionDir)\SharedAssemblyInfo.cs">
- <Link>Properties\SharedAssemblyInfo.cs</Link>
- </Compile>
- <Compile Include="Api\AbstractFailure.cs" />
- <Compile Include="Api\IAbstractFailure.cs" />
- <Compile Include="Api\IFailure.cs" />
- <Compile Include="Avro\AvroDriverInfo.cs">
- <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
- </Compile>
- <Compile Include="Avro\AvroFailedTask.cs" />
- <Compile Include="Avro\AvroHttpRequest.cs">
- <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
- </Compile>
- <Compile Include="Avro\AvroHttpSerializer.cs" />
- <Compile Include="Avro\AvroJsonSerializer.cs" />
- <Compile Include="Avro\AvroReefServiceInfo.cs">
- <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
- </Compile>
- <Compile Include="Avro\HeaderEntry.cs">
- <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
- </Compile>
- <Compile Include="Catalog\Capabilities\CPU.cs" />
- <Compile Include="Catalog\Capabilities\ICapability.cs" />
- <Compile Include="Catalog\Capabilities\RAM.cs" />
- <Compile Include="Catalog\INodeDescriptor.cs" />
- <Compile Include="Catalog\IRackDescriptor.cs" />
- <Compile Include="Catalog\IResourceCatalog.cs" />
- <Compile Include="Catalog\NodeDescriptorImpl.cs" />
- <Compile Include="Catalog\RackDescriptorImpl.cs" />
- <Compile Include="Catalog\ResourceCatalogImpl.cs" />
- <Compile Include="Constants.cs" />
- <Compile Include="Context\ContextConfiguration.cs" />
- <Compile Include="Context\ContextConfigurationOptions.cs" />
- <Compile Include="Context\ContextMessage.cs" />
- <Compile Include="Context\Defaults\DefaultContextMessageSource.cs" />
- <Compile Include="Context\Defaults\DefaultContextStartHandler.cs" />
- <Compile Include="Context\Defaults\DefaultContextStopHandler.cs" />
- <Compile Include="Context\IContextMessage.cs" />
- <Compile Include="Context\IContextMessageHandler.cs" />
- <Compile Include="Context\IContextMessageSource.cs" />
- <Compile Include="Evaluator\DriverConnectionConfigurationProviders\DefaultDriverReconnConfigProvider.cs" />
- <Compile Include="Evaluator\DefaultLocalHttpDriverConnection.cs" />
- <Compile Include="Evaluator\DefaultYarnClusterHttpDriverConnection.cs" />
- <Compile Include="Evaluator\DefaultYarnOneBoxHttpDriverConnection.cs" />
- <Compile Include="Evaluator\DriverConnectionConfigurationProviders\LocalHttpDriverReconnConfigProvider.cs" />
- <Compile Include="Evaluator\DriverConnectionConfigurationProviders\YarnOneBoxHttpDriverReconnConfigProvider.cs" />
- <Compile Include="Evaluator\DriverInformation.cs" />
- <Compile Include="Evaluator\EvaluatorOperationState.cs" />
- <Compile Include="Evaluator\EvaluatorRuntimeState.cs" />
- <Compile Include="Evaluator\EvaluatorType.cs" />
- <Compile Include="Evaluator\IDriverConnection.cs" />
- <Compile Include="Evaluator\DriverConnectionConfigurationProviders\IDriverReconnConfigProvider.cs" />
- <Compile Include="Evaluator\MissingDriverConnection.cs" />
- <Compile Include="Evaluator\Parameters\EvaluatorConfigurationProviders.cs" />
- <Compile Include="Evaluator\DriverConnectionConfigurationProviders\YarnClusterHttpDriverReconnConfigProvider.cs" />
- <Compile Include="Events\IContextStart.cs" />
- <Compile Include="Events\IContextStop.cs" />
- <Compile Include="Exceptions\JobException.cs" />
- <Compile Include="Exceptions\RecoverableNetworkException.cs" />
- <Compile Include="Exceptions\NonSerializableEvaluatorException.cs" />
- <Compile Include="Exceptions\NonSerializableTaskException.cs" />
- <Compile Include="Files\PathUtilities.cs" />
- <Compile Include="IContextAndTaskSubmittable.cs" />
- <Compile Include="IContextSubmittable.cs" />
- <Compile Include="Io\INameClient.cs" />
- <Compile Include="Io\NameAssignment.cs" />
- <Compile Include="Io\NamingConfiguration.cs" />
- <Compile Include="Io\NamingConfigurationOptions.cs" />
- <Compile Include="Io\TcpPortConfigurationProvider.cs" />
- <Compile Include="Jar\ResourceHelper.cs" />
- <Compile Include="ITaskSubmittable.cs" />
- <Compile Include="Client\Parameters\DriverConfigurationProviders.cs" />
- <Compile Include="Metrics\Api\ImmutableMetricImpl.cs" />
- <Compile Include="Metrics\Api\IImmutableMetric.cs" />
- <Compile Include="Metrics\Api\IMetricsCollector.cs" />
- <Compile Include="Metrics\Api\IMetricsFilter.cs" />
- <Compile Include="Metrics\Api\IMetricsInfo.cs" />
- <Compile Include="Metrics\Api\IMetricsRecord.cs" />
- <Compile Include="Metrics\Api\IMetricsRecordBuilder.cs" />
- <Compile Include="Metrics\Api\IMetricsSource.cs" />
- <Compile Include="Metrics\Api\IMetricsSystem.cs" />
- <Compile Include="Metrics\Api\IMetricsVisitor.cs" />
- <Compile Include="Metrics\Api\MetricsInfoImpl.cs" />
- <Compile Include="Metrics\Api\MetricsException.cs" />
- <Compile Include="Metrics\Api\MetricsTag.cs" />
- <Compile Include="Metrics\Api\MetricType.cs" />
- <Compile Include="Metrics\Api\SnapshotRequest.cs" />
- <Compile Include="Metrics\MetricsSystem\DefaultMetricsFilter.cs" />
- <Compile Include="Metrics\MetricsSystem\IMetricsCollectorMutable.cs" />
- <Compile Include="Metrics\MetricsSystem\ImmutableCounter.cs" />
- <Compile Include="Metrics\MetricsSystem\ImmutableDoubleGauge.cs" />
- <Compile Include="Metrics\MetricsSystem\ImmutableLongGauge.cs" />
- <Compile Include="Metrics\MetricsSystem\MetricsCollectorMutable.cs" />
- <Compile Include="Metrics\MetricsSystem\MetricsRecord.cs" />
- <Compile Include="Metrics\MetricsSystem\MetricsRecordBuilder.cs" />
- <Compile Include="Metrics\MetricsSystem\MetricsSystemConstants.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\DefaultMetricsFactoryImpl.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\DefaultMetricsSourceConfiguration.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\DefaultMetricsSourceImpl.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\ICounter.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\IDoubleGauge.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\IExtendedMutableMetric.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\ILongGauge.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\IMetricsFactory.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\IMutableMetric.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\IRate.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\IStat.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\MutableCounter.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\MutableDoubleGauge.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\MutableLongGauge.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\MutableMetricBase.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\IMetricContainer.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\MutableMetricContainer.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\MutableRate.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\MutableStat.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\DefaultMetricsSourceParameters.cs" />
- <Compile Include="Metrics\MutableMetricsLayer\StatsHelperClass.cs" />
- <Compile Include="Poison\PoisonedEventHandler.cs" />
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Protobuf\ReefProtocol\ClientRuntime.pb.cs">
- <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
- </Compile>
- <Compile Include="Protobuf\ReefProtocol\DriverRuntime.pb.cs">
- <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
- </Compile>
- <Compile Include="Protobuf\ReefProtocol\EvaluatorHeartbeatProtoCodec.cs" />
- <Compile Include="Protobuf\ReefProtocol\EvaluatorRunTime.pb.cs">
- <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
- </Compile>
- <Compile Include="Protobuf\ReefProtocol\REEFMessageCodec.cs" />
- <Compile Include="Protobuf\ReefProtocol\ReefProtocol.pb.cs">
- <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
- </Compile>
- <Compile Include="Protobuf\ReefProtocol\ReefService.pb.cs">
- <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
- </Compile>
- <Compile Include="Protobuf\ReefProtocol\Serializer.cs" />
- <Compile Include="Files\REEFFileNames.cs" />
- <Compile Include="Runtime\Evaluator\Constants.cs" />
- <Compile Include="Runtime\Evaluator\Context\ContextClientCodeException.cs" />
- <Compile Include="Runtime\Evaluator\Context\ContextException.cs" />
- <Compile Include="Runtime\Evaluator\Context\ContextLifeCycle.cs" />
- <Compile Include="Runtime\Evaluator\Context\ContextManager.cs" />
- <Compile Include="Runtime\Evaluator\Context\ContextRuntime.cs" />
- <Compile Include="Runtime\Evaluator\Context\ContextStartHandlerException.cs" />
- <Compile Include="Runtime\Evaluator\Context\ContextStartImpl.cs" />
- <Compile Include="Runtime\Evaluator\Context\ContextStopHandlerException.cs" />
- <Compile Include="Runtime\Evaluator\Context\ContextStopImpl.cs" />
- <Compile Include="Runtime\Evaluator\Context\RootContextLauncher.cs" />
- <Compile Include="Runtime\Evaluator\EvaluatorExitLogger.cs" />
- <Compile Include="Runtime\Evaluator\EvaluatorRuntime.cs" />
- <Compile Include="Runtime\Evaluator\EvaluatorSettings.cs" />
- <Compile Include="Runtime\Evaluator\HeartBeatManager.cs" />
- <Compile Include="Runtime\Evaluator\IHeartBeatManager.cs" />
- <Compile Include="Runtime\Evaluator\Parameters\EvaluatorHeartbeatPeriodInMs.cs" />
- <Compile Include="Runtime\Evaluator\Parameters\HeartbeatMaxRetryForNonRecoveryMode.cs" />
- <Compile Include="Runtime\Evaluator\Parameters\HeartbeatMaxRetry.cs" />
- <Compile Include="Runtime\Evaluator\PIDStoreHandler.cs" />
- <Compile Include="Runtime\Evaluator\ReefMessageProtoObserver.cs" />
- <Compile Include="Runtime\Evaluator\Task\CloseEventImpl.cs" />
- <Compile Include="Runtime\Evaluator\Task\DriverMessageImpl.cs" />
- <Compile Include="Runtime\Evaluator\Task\SuspendEventImpl.cs" />
- <Compile Include="Runtime\Evaluator\Task\TaskClientCodeException.cs" />
- <Compile Include="Runtime\Evaluator\Task\TaskLifeCycle.cs" />
- <Compile Include="Runtime\Evaluator\Task\TaskRuntime.cs" />
- <Compile Include="Runtime\Evaluator\Task\TaskStartHandlerException.cs" />
- <Compile Include="Runtime\Evaluator\Task\TaskStartImpl.cs" />
- <Compile Include="Runtime\Evaluator\Task\TaskState.cs" />
- <Compile Include="Runtime\Evaluator\Task\TaskStatus.cs" />
- <Compile Include="Runtime\Evaluator\Task\TaskStopHandlerException.cs" />
- <Compile Include="Runtime\Evaluator\Task\TaskStopImpl.cs" />
- <Compile Include="Runtime\Evaluator\Utils\NamedparameterAlias.cs" />
- <Compile Include="runtime\MachineStatus.cs" />
- <Compile Include="Runtime\RuntimeName.cs" />
- <Compile Include="Services\ServiceConfiguration.cs" />
- <Compile Include="Tasks\Defaults\DefaultTaskCloseHandler.cs" />
- <Compile Include="Tasks\Defaults\DefaultDriverConnectionMessageHandler.cs" />
- <Compile Include="Tasks\Defaults\DefaultDriverMessageHandler.cs" />
- <Compile Include="Tasks\Defaults\DefaultSuspendHandler.cs" />
- <Compile Include="Tasks\Defaults\DefaultTaskMessageSource.cs" />
- <Compile Include="Tasks\DriverConnectionState.cs" />
- <Compile Include="Tasks\DriverConnectionMessageImpl.cs" />
- <Compile Include="Tasks\Events\ICloseEvent.cs" />
- <Compile Include="Tasks\Events\IDriverMessage.cs" />
- <Compile Include="Tasks\Events\ISuspendEvent.cs" />
- <Compile Include="Tasks\Events\ITaskStart.cs" />
- <Compile Include="Tasks\Events\ITaskStop.cs" />
- <Compile Include="Tasks\Exceptions\TaskCloseHandlerNotBoundException.cs" />
- <Compile Include="Tasks\IDriverConnectionMessageHandler.cs" />
- <Compile Include="Tasks\IDriverMessageHandler.cs" />
- <Compile Include="Tasks\IDriverConnectionMessage.cs" />
- <Compile Include="Tasks\ITask.cs" />
- <Compile Include="Tasks\ITaskMessageSource.cs" />
- <Compile Include="Tasks\TaskConfiguration.cs" />
- <Compile Include="Tasks\TaskConfigurationOptions.cs" />
- <Compile Include="Tasks\TaskMessage.cs" />
- <Compile Include="Telemetry\Counter.cs" />
- <Compile Include="Telemetry\CounterData.cs" />
- <Compile Include="Telemetry\CountersData.cs" />
- <Compile Include="Telemetry\Counters.cs" />
- <Compile Include="Telemetry\CounterSinkThreshold.cs" />
- <Compile Include="Telemetry\DefaultMetricsSink.cs" />
- <Compile Include="Telemetry\DriverMetrics.cs" />
- <Compile Include="Telemetry\DriverMetricsObserverConfigurationModule.cs" />
- <Compile Include="Telemetry\DriverMetricsObservers.cs" />
- <Compile Include="Telemetry\EvaluatorMetrics.cs" />
- <Compile Include="Telemetry\ICounter.cs" />
- <Compile Include="Telemetry\ICounters.cs" />
- <Compile Include="Telemetry\IDriverMetrics.cs" />
- <Compile Include="Telemetry\IEvaluatorMetrics.cs" />
- <Compile Include="Telemetry\IMetricsSink.cs" />
- <Compile Include="Telemetry\MessageSenderConfigurationModule.cs" />
- <Compile Include="Telemetry\MetricSinks.cs" />
- <Compile Include="Telemetry\MetricsMessageSender.cs" />
- <Compile Include="Telemetry\MetricsService.cs" />
+ <ProjectReference Include="..\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj" />
+ <ProjectReference Include="..\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj" />
</ItemGroup>
- <ItemGroup>
- <None Include="Avro\README.md" />
- <None Include="Org.Apache.REEF.Common.nuspec" />
- <None Include="packages.config" />
- <None Include="Protobuf\Proto\client_runtime.proto" />
- <None Include="Protobuf\Proto\driver_runtime.proto" />
- <None Include="Protobuf\Proto\evaluator_runtime.proto" />
- <None Include="Protobuf\Proto\reef_protocol.proto" />
- <None Include="Protobuf\Proto\reef_service_protos.proto" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Tang\Org.Apache.REEF.Tang.csproj">
- <Project>{97dbb573-3994-417a-9f69-ffa25f00d2a6}</Project>
- <Name>Org.Apache.REEF.Tang</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
- <Project>{79e7f89a-1dfb-45e1-8d43-d71a954aeb98}</Project>
- <Name>Org.Apache.REEF.Utilities</Name>
- </ProjectReference>
- <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Wake\Org.Apache.REEF.Wake.csproj">
- <Project>{cdfb3464-4041-42b1-9271-83af24cd5008}</Project>
- <Name>Org.Apache.REEF.Wake</Name>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
- <Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" />
-</Project>
\ No newline at end of file
+ <Import Project="..\build.targets" />
+</Project>
+
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec b/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec
deleted file mode 100644
index f792633..0000000
--- a/lang/cs/Org.Apache.REEF.Common/Org.Apache.REEF.Common.nuspec
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<package >
- <metadata>
- <id>Org.Apache.REEF.Common</id>
- <version>$version$</version>
- <title>Org.Apache.REEF.Common</title>
- <authors>The Apache REEF project</authors>
- <owners>The Apache REEF project</owners>
- <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0</licenseUrl>
- <projectUrl>http://reef.apache.org/</projectUrl>
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
- <description>Reef Common Infrastructure</description>
- <copyright>The Apache Software Foundation</copyright>
- <tags>Reef Common Infrastructure</tags>
- <dependencies>
- <dependency id="Microsoft.Hadoop.Avro" version="1.5.6" />
- <dependency id="protobuf-net" version="2.1.0" />
- <dependency id="Rx-Core" version="2.2.5" />
- <dependency id="Org.Apache.REEF.Utilities" version="$version$" />
- <dependency id="Org.Apache.REEF.Tang" version="$version$" />
- <dependency id="Org.Apache.REEF.Wake" version="$version$" />
- </dependencies>
- </metadata>
- <files>
- <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Common\Org.Apache.REEF.Common.dll" target="lib\net45" />
- <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Common\Org.Apache.REEF.Common.pdb" target="lib\net45" />
- </files>
-</package>
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.DotNet.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.DotNet.cs b/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.DotNet.cs
deleted file mode 100644
index bf01667..0000000
--- a/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.DotNet.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License. You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied. See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-using System.Runtime.CompilerServices;
-
-
-// Common and Evaluator share APIs that should not be exposed to the user
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator")]
-
-// Common and Driver share APIs that should not be exposed to the user
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Driver")]
-
-// Common and IO share APIs that should not be exposed to the user
-[assembly: InternalsVisibleTo("Org.Apache.REEF.IO")]
-
-// Allow the tests access to `internal` APIs
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Common.Tests")]
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Tests")]
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator.Tests")]
-
-// Allow NSubstitute to create proxy implementations
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
-
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs b/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs
index d126a7e..bf01667 100644
--- a/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs
+++ b/lang/cs/Org.Apache.REEF.Common/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-// Licensed to the Apache Software Foundation (ASF) under one
+// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
@@ -15,62 +15,23 @@
// specific language governing permissions and limitations
// under the License.
-using System.Reflection;
using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Org.Apache.REEF.Common")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyProduct("Org.Apache.REEF.Common")]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("a810ee4a-fe13-4536-9e9c-5275b16e0842")]
// Common and Evaluator share APIs that should not be exposed to the user
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator, publickey=" +
- "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" +
- "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" +
- "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" +
- "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")]
+[assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator")]
// Common and Driver share APIs that should not be exposed to the user
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Driver, publickey=" +
- "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" +
- "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" +
- "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" +
- "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")]
+[assembly: InternalsVisibleTo("Org.Apache.REEF.Driver")]
// Common and IO share APIs that should not be exposed to the user
-[assembly: InternalsVisibleTo("Org.Apache.REEF.IO, publickey=" +
- "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" +
- "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" +
- "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" +
- "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")]
+[assembly: InternalsVisibleTo("Org.Apache.REEF.IO")]
// Allow the tests access to `internal` APIs
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Common.Tests, publickey=" +
- "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" +
- "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" +
- "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" +
- "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")]
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator.Tests, publickey=" +
- "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" +
- "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" +
- "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" +
- "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")]
-
-[assembly: InternalsVisibleTo("Org.Apache.REEF.Tests, publickey=" +
- "00240000048000009400000006020000002400005253413100040000010001005df3e621d886a9" +
- "9c03469d0f93a9f5d45aa2c883f50cd158759e93673f759ec4657fd84cc79d2db38ef1a2d914cc" +
- "b7c717846a897e11dd22eb260a7ce2da2dccf0263ea63e2b3f7dac24f28882aa568ef544341d17" +
- "618392a1095f4049ad079d4f4f0b429bb535699155fd6a7652ec7d6c1f1ba2b560f11ef3a86b5945d288cf")]
+[assembly: InternalsVisibleTo("Org.Apache.REEF.Common.Tests")]
+[assembly: InternalsVisibleTo("Org.Apache.REEF.Tests")]
+[assembly: InternalsVisibleTo("Org.Apache.REEF.Evaluator.Tests")]
// Allow NSubstitute to create proxy implementations
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=002400000480000" +
- "0940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a36" +
- "02f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0ba" +
- "c1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924c" +
- "ceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
+
http://git-wip-us.apache.org/repos/asf/reef/blob/fafc236b/lang/cs/Org.Apache.REEF.Common/packages.config
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Common/packages.config b/lang/cs/Org.Apache.REEF.Common/packages.config
deleted file mode 100644
index c0664c3..0000000
--- a/lang/cs/Org.Apache.REEF.Common/packages.config
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<packages>
- <package id="Microsoft.Hadoop.Avro" version="1.5.6" targetFramework="net45" />
- <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" />
- <package id="protobuf-net" version="2.1.0" targetFramework="net45" />
- <package id="StyleCop.MSBuild" version="5.0.0" targetFramework="net45" developmentDependency="true" />
- <package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
- <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" />
-</packages>