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 2015/07/22 19:27:41 UTC
incubator-reef git commit: [REEF-473] Change Org.Apache.REEF.Client
to DLL
Repository: incubator-reef
Updated Branches:
refs/heads/master 7824be835 -> 25735bfa5
[REEF-473] Change Org.Apache.REEF.Client to DLL
* changed the Client project from console app to assembly
* removed CLRBridgeClient.cs
* updated nuget specification for client
JIRA:
[REEF-473](https://issues.apache.org/jira/browse/REEF-473)
Pull Request:
This closes #308
Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/25735bfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/25735bfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/25735bfa
Branch: refs/heads/master
Commit: 25735bfa540af27651e293aae99fd6052bed36db
Parents: 7824be8
Author: Julia Wang <ju...@microsoft.com>
Authored: Tue Jul 21 23:03:41 2015 -0700
Committer: Markus Weimer <we...@apache.org>
Committed: Wed Jul 22 10:25:50 2015 -0700
----------------------------------------------------------------------
.../Org.Apache.REEF.Client/CLRBridgeClient.cs | 31 --------------------
lang/cs/Org.Apache.REEF.Client/NugetExeFix.txt | 19 ------------
.../Org.Apache.REEF.Client.csproj | 14 +++------
.../Org.Apache.REEF.Client.nuspec | 4 +--
4 files changed, 6 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/25735bfa/lang/cs/Org.Apache.REEF.Client/CLRBridgeClient.cs
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/CLRBridgeClient.cs b/lang/cs/Org.Apache.REEF.Client/CLRBridgeClient.cs
deleted file mode 100644
index 0c2cc80..0000000
--- a/lang/cs/Org.Apache.REEF.Client/CLRBridgeClient.cs
+++ /dev/null
@@ -1,31 +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;
-
-namespace Org.Apache.REEF.Client
-{
- public class CLRBridgeClient
- {
- public static void Main(string[] args)
- {
- Console.WriteLine("This is a skeleton for the console application. It will be removed after the project is converted to assembly.");
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/25735bfa/lang/cs/Org.Apache.REEF.Client/NugetExeFix.txt
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Client/NugetExeFix.txt b/lang/cs/Org.Apache.REEF.Client/NugetExeFix.txt
deleted file mode 100644
index 3f3e205..0000000
--- a/lang/cs/Org.Apache.REEF.Client/NugetExeFix.txt
+++ /dev/null
@@ -1,19 +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.
-
-
-Nuget hack, don't delete this
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/25735bfa/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 0deb829..2dff64f 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
@@ -19,7 +19,7 @@ under the License.
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<ProjectGuid>{5094C35B-4FDB-4322-AC05-45D684501CBF}</ProjectGuid>
- <OutputType>Exe</OutputType>
+ <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Org.Apache.REEF.Client</RootNamespace>
<AssemblyName>Org.Apache.REEF.Client</AssemblyName>
@@ -28,6 +28,9 @@ under the License.
<RestorePackages>true</RestorePackages>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..</SolutionDir>
</PropertyGroup>
+ <PropertyGroup>
+ <StartupObject />
+ </PropertyGroup>
<Import Project="$(SolutionDir)\build.props" />
<PropertyGroup>
<UseVSHostingProcess>false</UseVSHostingProcess>
@@ -48,7 +51,6 @@ under the License.
<Compile Include="API\JobSubmission.cs" />
<Compile Include="API\JobSubmissionBuilder.cs" />
<Compile Include="API\JobSubmissionBuilderFactory.cs" />
- <Compile Include="CLRBridgeClient.cs" />
<Compile Include="Common\ClientConstants.cs" />
<Compile Include="Common\ClrClient2JavaClientCuratedParameters.cs" />
<Compile Include="Common\DriverFolderPreparationHelper.cs" />
@@ -65,16 +67,8 @@ under the License.
<Compile Include="YARN\YarnCommandLineEnvironment.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="NugetExeFix.txt">
- <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
- </Content>
- </ItemGroup>
- <ItemGroup>
<None Include="packages.config" />
<None Include="Org.Apache.REEF.Client.nuspec" />
- <None Include="run.cmd">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Utilities\Org.Apache.REEF.Utilities.csproj">
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/25735bfa/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
index 44b7fb5..efdffe1 100644
--- a/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec
+++ b/lang/cs/Org.Apache.REEF.Client/Org.Apache.REEF.Client.nuspec
@@ -41,8 +41,8 @@ under the License.
</dependencies>
</metadata>
<files>
- <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Client\Org.Apache.REEF.Client.exe" target="tools" />
- <file src="..\bin\$Platform$\$Configuration$\Org.Apache.REEF.Client\NugetExeFix.txt" target="lib\net45" />
+ <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>