Repository: incubator-reef Updated Branches: refs/heads/master 867449090 -> 9e3e09051
[REEF-296] clean up bridge.jar.csproj This is to fix/clean up "Copy the client JAR session" in `bridge.jar.csproj` file JIRA: [REEF-296](https://issues.apache.org/jira/browse/REEF-296) Pull request: This closes #169 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/9e3e0905 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/9e3e0905 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/9e3e0905 Branch: refs/heads/master Commit: 9e3e09051829cd592ce04274ea9d1c1d72f8e068 Parents: 8674490 Author: Julia Wang <[email protected]> Authored: Thu Apr 30 16:37:28 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Fri May 1 09:00:36 2015 -0700 ---------------------------------------------------------------------- .../Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/9e3e0905/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj index 21637e7..81e1a57 100644 --- a/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj +++ b/lang/cs/Org.Apache.REEF.Bridge.JAR/Org.Apache.REEF.Bridge.JAR.csproj @@ -95,7 +95,6 @@ under the License. <PropertyGroup> <BuildCommand>$(NuGetCommand) pack "$(FinalizedNuspecFile)" -BasePath $(NugetProjectPath) -Properties "Configuration=$(Configuration);Platform=$(Platform);REEF_Version=$(REEF_Version);Version=$(REEF_NugetVersion)" $(NonInteractiveSwitch) -OutputDirectory "$(PackageOutputDir)" </BuildCommand> - <ReefVer>$([System.String]::Copy('$(REEF_NugetVersion)').Replace('-SNAPSHOT-',''))</ReefVer> </PropertyGroup> <ItemGroup> @@ -104,8 +103,8 @@ under the License. <Line Include="line03"><Text>$copyToOutput1 = $file1.Properties.Item("CopyToOutputDirectory")</Text></Line> <Line Include="line04"><Text>$copyToOutput1.Value = 2</Text></Line> <!--Copy the client JAR--> - <Line Include="line05"><Text>$file2 = $project.ProjectItems.Item("reef-bridge-client-$(ReefVer)-incubating-SNAPSHOT-shaded.jar")</Text></Line> <Line Include="line05"><Text>$file2 = $project.ProjectItems.Item("reef-bridge-client-$(REEF_Version)-shaded.jar")</Text></Line> + <Line Include="line05"><Text>$copyToOutput2 = $file2.Properties.Item("CopyToOutputDirectory")</Text></Line> <Line Include="line07"><Text>$copyToOutput2.Value = 2</Text></Line> <LineText Include="%(Line.Text)" /> </ItemGroup>
