Repository: incubator-reef Updated Branches: refs/heads/master 1afe37a83 -> 56427ca4b
[REEF-622] Solve the wrong merge done in REEF-609 This addressed the issue by * pushing correct changes in IMRU.Examples.csproj files * removing App.Config JIRA: [REEF-622](https://issues.apache.org/jira/browse/REEF-622) This Closes #397 Author: Dhruv <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/56427ca4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/56427ca4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/56427ca4 Branch: refs/heads/master Commit: 56427ca4bc9c10ca67d82b85c63ac64a3e433ba3 Parents: 1afe37a Author: Dhruv <[email protected]> Authored: Thu Aug 20 18:07:51 2015 -0700 Committer: Julia Wang <[email protected]> Committed: Thu Aug 20 18:17:21 2015 -0700 ---------------------------------------------------------------------- .../cs/Org.Apache.REEF.IMRU.Examples/App.config | 24 ---------- .../Org.Apache.REEF.IMRU.Examples.csproj | 50 -------------------- 2 files changed, 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/56427ca4/lang/cs/Org.Apache.REEF.IMRU.Examples/App.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU.Examples/App.config b/lang/cs/Org.Apache.REEF.IMRU.Examples/App.config deleted file mode 100644 index e429816..0000000 --- a/lang/cs/Org.Apache.REEF.IMRU.Examples/App.config +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<configuration> - <startup> - <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /> - </startup> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/56427ca4/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.csproj b/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.csproj index 94a1d3d..cb335c7 100644 --- a/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.csproj +++ b/lang/cs/Org.Apache.REEF.IMRU.Examples/Org.Apache.REEF.IMRU.Examples.csproj @@ -26,32 +26,11 @@ under the License. <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..</SolutionDir> - <PublishUrl>publish\</PublishUrl> - <Install>true</Install> - <InstallFrom>Disk</InstallFrom> - <UpdateEnabled>false</UpdateEnabled> - <UpdateMode>Foreground</UpdateMode> - <UpdateInterval>7</UpdateInterval> - <UpdateIntervalUnits>Days</UpdateIntervalUnits> - <UpdatePeriodically>false</UpdatePeriodically> - <UpdateRequired>false</UpdateRequired> - <MapFileExtensions>true</MapFileExtensions> - <ApplicationRevision>0</ApplicationRevision> - <ApplicationVersion>1.0.0.%2a</ApplicationVersion> - <IsWebBootstrapper>false</IsWebBootstrapper> - <UseApplicationTrust>false</UseApplicationTrust> - <BootstrapperEnabled>true</BootstrapperEnabled> </PropertyGroup> <PropertyGroup> <BuildPackage>false</BuildPackage> <UseVSHostingProcess>false</UseVSHostingProcess> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> - <OutputPath>..\bin\x64\Debug\Org.Apache.REEF.IMRU.Examples\</OutputPath> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> - <OutputPath>..\bin\x64\Release\Org.Apache.REEF.IMRU.Examples\</OutputPath> - </PropertyGroup> <Import Project="$(SolutionDir)\build.props" /> <ItemGroup> <Reference Include="System" /> @@ -67,9 +46,6 @@ under the License. <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <None Include="App.config" /> - </ItemGroup> - <ItemGroup> <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> @@ -111,31 +87,5 @@ under the License. <Name>Org.Apache.REEF.Network</Name> </ProjectReference> </ItemGroup> - <ItemGroup> - <BootstrapperPackage Include=".NETFramework,Version=v4.5"> - <Visible>False</Visible> - <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName> - <Install>true</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Client.3.5"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName> - <Install>false</Install> - </BootstrapperPackage> - <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1"> - <Visible>False</Visible> - <ProductName>.NET Framework 3.5 SP1</ProductName> - <Install>false</Install> - </BootstrapperPackage> - </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> - <!--begin jar reference--> - <PropertyGroup> - <AfterBuildDependsOn> - $(AfterBuildDependsOn); - CopyJarFiles; - </AfterBuildDependsOn> - </PropertyGroup> - <Target Name="AfterBuild" DependsOnTargets="$(AfterBuildDependsOn);" /> - <!--end jar reference--> </Project> \ No newline at end of file
