Repository: reef Updated Branches: refs/heads/master e0c0d6a49 -> f74a7e8b1
[REEF-1307] Adding app.config for .NET projects which have executables This change adds app.config for the following projects: * Evaluator * IMRU.Examples * IO.TestClient * Network.Examples.Client It also modifies projects which already use it to unify placement of app.config file. JIRA: [REEF-1307](https://issues.apache.org/jira/browse/REEF-1307) Pull request: This closes #918 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/f74a7e8b Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/f74a7e8b Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/f74a7e8b Branch: refs/heads/master Commit: f74a7e8b13db83babe65ca5e52501e6baed65204 Parents: e0c0d6a Author: Julia Wang <[email protected]> Authored: Fri Apr 1 14:45:29 2016 -0700 Committer: Mariia Mykhailova <[email protected]> Committed: Tue Apr 5 16:53:18 2016 -0700 ---------------------------------------------------------------------- lang/cs/App.config | 32 ++++++++++++++++++++ .../Org.Apache.REEF.Evaluator.Tests.csproj | 3 ++ .../Org.Apache.REEF.Evaluator.csproj | 5 ++- .../App.config | 32 -------------------- .../Org.Apache.REEF.Examples.HelloREEF.csproj | 4 ++- .../Org.Apache.REEF.IMRU.Examples.csproj | 5 ++- .../Org.Apache.REEF.IO.TestClient.csproj | 7 ++++- ...g.Apache.REEF.Network.Examples.Client.csproj | 6 +++- .../Org.Apache.REEF.Tang.Tests.csproj | 8 ++--- .../Org.Apache.REEF.Tests.csproj | 7 ++--- lang/cs/Org.Apache.REEF.Tests/app.config | 29 ------------------ 11 files changed, 64 insertions(+), 74 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/App.config ---------------------------------------------------------------------- diff --git a/lang/cs/App.config b/lang/cs/App.config new file mode 100644 index 0000000..72dbca3 --- /dev/null +++ b/lang/cs/App.config @@ -0,0 +1,32 @@ +<?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> + <runtime> + <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> + <dependentAssembly> + <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> + <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> + </dependentAssembly> + </assemblyBinding> + </runtime> +</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj index ae6aa98..673fea1 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Evaluator.Tests/Org.Apache.REEF.Evaluator.Tests.csproj @@ -90,6 +90,9 @@ under the License. </ProjectReference> </ItemGroup> <ItemGroup> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> <None Include="packages.config" /> </ItemGroup> <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" /> http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj index ba0541b..e36f7cc 100644 --- a/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj +++ b/lang/cs/Org.Apache.REEF.Evaluator/Org.Apache.REEF.Evaluator.csproj @@ -62,6 +62,9 @@ under the License. </Content> </ItemGroup> <ItemGroup> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> <None Include="Org.Apache.REEF.Evaluator.nuspec" /> <None Include="packages.config" /> </ItemGroup> @@ -90,4 +93,4 @@ under the License. <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> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config deleted file mode 100644 index 72dbca3..0000000 --- a/lang/cs/Org.Apache.REEF.Examples.HelloREEF/App.config +++ /dev/null @@ -1,32 +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> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.csproj b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.csproj index 8e9c250..c6fc4ae 100644 --- a/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.csproj +++ b/lang/cs/Org.Apache.REEF.Examples.HelloREEF/Org.Apache.REEF.Examples.HelloREEF.csproj @@ -33,7 +33,9 @@ <Compile Include="Properties\AssemblyInfo.cs" /> </ItemGroup> <ItemGroup> - <None Include="App.config" /> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> <None Include="packages.config" /> <None Include="Readme.md" /> </ItemGroup> http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/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 3501e3a..a125811 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 @@ -100,6 +100,9 @@ under the License. </ProjectReference> </ItemGroup> <ItemGroup> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> <None Include="packages.config" /> </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> @@ -111,4 +114,4 @@ under the License. </PropertyGroup> <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" /> </Target> -</Project> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.csproj b/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.csproj index 33bcfa6..35bde03 100644 --- a/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.csproj +++ b/lang/cs/Org.Apache.REEF.IO.TestClient/Org.Apache.REEF.IO.TestClient.csproj @@ -95,6 +95,11 @@ under the License. <Name>Org.Apache.REEF.IO</Name> </ProjectReference> </ItemGroup> + <ItemGroup> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets" Condition="Exists('$(PackagesDir)\StyleCop.MSBuild.$(StyleCopVersion)\build\StyleCop.MSBuild.Targets')" /> -</Project> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj b/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj index 0b3fe42..60600fc 100644 --- a/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj +++ b/lang/cs/Org.Apache.REEF.Network.Examples.Client/Org.Apache.REEF.Network.Examples.Client.csproj @@ -52,6 +52,10 @@ under the License. <None Include="$(SolutionDir)\Org.Apache.REEF.Client\run.cmd"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> + <None Include="packages.config" /> </ItemGroup> <ItemGroup> <ProjectReference Include="$(SolutionDir)\Org.Apache.REEF.Bridge\Org.Apache.REEF.Bridge.vcxproj"> @@ -98,4 +102,4 @@ under the License. <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> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj index 6ca1207..51b5eb0 100644 --- a/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Tang.Tests/Org.Apache.REEF.Tang.Tests.csproj @@ -113,6 +113,9 @@ under the License. <Compile Include="Utilities\Utilities.cs" /> </ItemGroup> <ItemGroup> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> <None Include="packages.config"> <SubType>Designer</SubType> </None> @@ -148,7 +151,4 @@ under the License. <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="AfterBuild"> - <Copy SourceFiles="$(SolutionDir)\Org.Apache.REEF.Tests\app.config" DestinationFiles="$(OutputPath)\$(AssemblyName).dll.config" /> - </Target> -</Project> +</Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj index 94c6e23..5a36bb1 100644 --- a/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj +++ b/lang/cs/Org.Apache.REEF.Tests/Org.Apache.REEF.Tests.csproj @@ -105,7 +105,9 @@ under the License. <None Include="$(SolutionDir)\Org.Apache.REEF.Client\run.cmd"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> - <None Include="app.config" /> + <None Include="..\App.config"> + <Link>App.config</Link> + </None> <None Include="packages.config" /> </ItemGroup> <ItemGroup> @@ -160,7 +162,4 @@ under the License. <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="AfterBuild"> - <Copy SourceFiles="$(SolutionDir)\Org.Apache.REEF.Tests\app.config" DestinationFiles="$(OutputPath)\$(AssemblyName).dll.config" /> - </Target> </Project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/reef/blob/f74a7e8b/lang/cs/Org.Apache.REEF.Tests/app.config ---------------------------------------------------------------------- diff --git a/lang/cs/Org.Apache.REEF.Tests/app.config b/lang/cs/Org.Apache.REEF.Tests/app.config deleted file mode 100644 index 39d3857..0000000 --- a/lang/cs/Org.Apache.REEF.Tests/app.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. ---> -<configuration> - <runtime> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> \ No newline at end of file
