diff options
author | Michael Hutchinson <mhutch@xamarin.com> | 2014-01-17 12:36:52 +0400 |
---|---|---|
committer | Michael Hutchinson <mhutch@xamarin.com> | 2014-01-17 12:39:51 +0400 |
commit | f0563f335fae3d27e3ac76e07388b68a63f9aed0 (patch) | |
tree | 461982722ae90b05351fdcea321953f4edfa7d88 /main/src/core/MonoDevelop.Projects.Formats.MSBuild | |
parent | 6de1a605c305550c03635c2bef8808da87a90a11 (diff) |
[MSBuild] Reorganize the builders' assembly redirects
Diffstat (limited to 'main/src/core/MonoDevelop.Projects.Formats.MSBuild')
8 files changed, 7 insertions, 20 deletions
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj index 468804904d..d98aa2ef75 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.csproj @@ -59,7 +59,7 @@ <Folder Include="MonoDevelop.Projects.Formats.MSBuild\" /> </ItemGroup> <ItemGroup> - <None Include="MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.exe.config"> + <None Include="app.v4.0.config"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>MonoDevelop.Projects.Formats.MSBuild.exe.config</Link> </None> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v2.0.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v2.0.csproj index c9b3cfcd75..5358a0d859 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v2.0.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v2.0.csproj @@ -59,7 +59,7 @@ <Folder Include="MonoDevelop.Projects.Formats.MSBuild\" /> </ItemGroup> <ItemGroup> - <None Include="MonoDevelop.Projects.Formats.MSBuild.v2.0.exe.config"> + <None Include="app.v2.0.config"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>MonoDevelop.Projects.Formats.MSBuild.exe.config</Link> </None> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v3.5.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v3.5.csproj index 37da33a83d..f7aa997731 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v3.5.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v3.5.csproj @@ -60,7 +60,7 @@ <Folder Include="MonoDevelop.Projects.Formats.MSBuild\" /> </ItemGroup> <ItemGroup> - <None Include="MonoDevelop.Projects.Formats.MSBuild.v3.5.exe.config"> + <None Include="app.v3.5.config"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <Link>MonoDevelop.Projects.Formats.MSBuild.exe.config</Link> </None> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj index 4fc4183e24..3d3389f81e 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v4.0.csproj @@ -57,6 +57,9 @@ <Folder Include="MonoDevelop.Projects.Formats.MSBuild\" /> </ItemGroup> <ItemGroup> - <None Include="app.config" /> + <None Include="app.v4.0.config"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + <Link>MonoDevelop.Projects.Formats.MSBuild.exe.config</Link> + </None> </ItemGroup> </Project> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/app.config b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/app.config deleted file mode 100644 index 30df74844c..0000000000 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/app.config +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<configuration> - <runtime> - <generatePublisherEvidence enabled="false" /> - <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> - <dependentAssembly> - <assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="4.0.0.0" /> - </dependentAssembly> - <dependentAssembly> - <assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> - <bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="4.0.0.0" /> - </dependentAssembly> - </assemblyBinding> - </runtime> -</configuration> diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v2.0.exe.config b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/app.v2.0.config index 4e4303ebdf..4e4303ebdf 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v2.0.exe.config +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/app.v2.0.config diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v3.5.exe.config b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/app.v3.5.config index 8309829ba3..8309829ba3 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.v3.5.exe.config +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/app.v3.5.config diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.exe.config b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/app.v4.0.config index 30df74844c..30df74844c 100644 --- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild.dotnet.v4.0.exe.config +++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/app.v4.0.config |