← Back to branch summary

~ubuntu-branches/ubuntu/saucy/monodevelop/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/make_4.0_default_framework.patch

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2012-06-22 20:35:35 UTC
  • mfrom: (10.3.2)
  • Revision ID: package-import@ubuntu.com-20120622203535-zrozwvcf6kfk6l6i
Tags: 3.0.3.2+dfsg-1
* [3fd89ae] Imported Upstream version 3.0.3.2+dfsg
* [379a680] Remove old patches we haven't used for ages from git.
* [d71161d] Remove correct_paths_in_monodevelop-core-addins.pc.patch.
  Upstream claim to have fixed this by moving assembly install locations.
* [15dbfb9] Fix install location for MonoDevelop.Gettext.dll.config.
* [26eb434] Fix install location for MonoDevelop.SourceEditor2.dll.config.
* [4169974] Upstream commit 53282c9 which finally reconciles the 
  MonoDevelop.Gettext.dll install location with the 
  monodevelop-core-addins.pc location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/make_4.0_default_framework.patch
1
 
Index: monodevelop/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs
2
 
===================================================================
3
 
--- monodevelop.orig/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs    2011-11-08 00:33:54.000000000 +0000
4
 
+++ monodevelop/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs 2011-11-08 00:43:17.000000000 +0000
5
 
@@ -50,9 +50,9 @@
6
 
                
7
 
                //NOTE: default toolsversion should match the default format.
8
 
                // remember to update the builder process' app.config too
9
 
-               public const string DefaultFormat = "MSBuild08";
10
 
-               const string REFERENCED_MSBUILD_TOOLS = "3.5";
11
 
-               const string REFERENCED_MSBUILD_UTILS = "Microsoft.Build.Utilities.v3.5";
12
 
+               public const string DefaultFormat = "MSBuild10";
13
 
+               const string REFERENCED_MSBUILD_TOOLS = "4.0";
14
 
+               const string REFERENCED_MSBUILD_UTILS = "Microsoft.Build.Utilities.v4.0";
15
 
                internal const string DefaultToolsVersion = REFERENCED_MSBUILD_TOOLS;
16
 
                
17
 
                static DataContext dataContext;
18
 
Index: monodevelop/src/core/MonoDevelop.Projects.Formats.MSBuild/app.config
19
 
===================================================================
20
 
--- monodevelop.orig/src/core/MonoDevelop.Projects.Formats.MSBuild/app.config   2011-11-08 00:32:44.000000000 +0000
21
 
+++ monodevelop/src/core/MonoDevelop.Projects.Formats.MSBuild/app.config        2011-11-08 00:43:17.000000000 +0000
22
 
@@ -5,11 +5,11 @@
23
 
                <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
24
 
                        <dependentAssembly>
25
 
                                <assemblyIdentity name="Microsoft.Build.Framework" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
26
 
-                               <bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="3.5.0.0" />
27
 
+                               <bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="4.0.0.0" />
28
 
                        </dependentAssembly>
29
 
                        <dependentAssembly>
30
 
                                <assemblyIdentity name="Microsoft.Build.Engine" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
31
 
-                               <bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="3.5.0.0" />
32
 
+                               <bindingRedirect oldVersion="0.0.0.0-100.0.0.0" newVersion="4.0.0.0" />
33
 
                        </dependentAssembly>
34
 
                </assemblyBinding>
35
 
        </runtime>