diff options
| author | Lluis Sanchez <lluis@novell.com> | 2010-06-14 22:44:34 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2010-06-14 22:44:34 +0400 |
| commit | 0a7b82d8b97f9f7be7dec600be3761fbf567d3f7 (patch) | |
| tree | 929b3ec9736d1374a3e420380e1b5f2997bdd43c /main/src/addins/VBNetBinding | |
| parent | 477b4e9d0cb64b45c2662ebc834d7ac40a351d7f (diff) | |
* VBBindingCompilerServices.cs: Track api changes.
svn path=/trunk/monodevelop/; revision=158896
Diffstat (limited to 'main/src/addins/VBNetBinding')
| -rw-r--r-- | main/src/addins/VBNetBinding/ChangeLog | 4 | ||||
| -rw-r--r-- | main/src/addins/VBNetBinding/VBBindingCompilerServices.cs | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/main/src/addins/VBNetBinding/ChangeLog b/main/src/addins/VBNetBinding/ChangeLog index 75ce293c66..62e8dfe369 100644 --- a/main/src/addins/VBNetBinding/ChangeLog +++ b/main/src/addins/VBNetBinding/ChangeLog @@ -1,3 +1,7 @@ +2010-06-14 Lluis Sanchez Gual <lluis@novell.com> + + * VBBindingCompilerServices.cs: Track api changes. + 2010-06-04 Lluis Sanchez Gual <lluis@novell.com> * templates/VBConsoleApplicationProject.xpt.xml: Set the diff --git a/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs b/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs index fc28c28649..a3120bbca0 100644 --- a/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs +++ b/main/src/addins/VBNetBinding/VBBindingCompilerServices.cs @@ -257,7 +257,7 @@ namespace MonoDevelop.VBNetBinding { workingDir = configuration.ParentItem.BaseDirectory; int exitCode; - Dictionary<string,string> envVars = configuration.TargetRuntime.GetToolsEnvironmentVariables (configuration.TargetFramework); + var envVars = configuration.TargetRuntime.GetToolsExecutionEnvironment (configuration.TargetFramework); monitor.Log.WriteLine (Path.GetFileName (compilerName) + " " + string.Join (" ", File.ReadAllLines (responseFileName))); exitCode = DoCompilation (outstr, tf, workingDir, envVars, ref output); @@ -360,7 +360,7 @@ namespace MonoDevelop.VBNetBinding { return null; } - private int DoCompilation (string outstr, TempFileCollection tf, string working_dir, Dictionary<string,string> envVars, ref string output) + private int DoCompilation (string outstr, TempFileCollection tf, string working_dir, ExecutionEnvironment envVars, ref string output) { StringWriter outwr = new StringWriter (); string[] tokens = outstr.Split (' '); @@ -369,13 +369,7 @@ namespace MonoDevelop.VBNetBinding { ProcessStartInfo pinfo = new ProcessStartInfo (tokens[0], "\"" + outstr + "\""); pinfo.WorkingDirectory = working_dir; - - foreach (KeyValuePair<string,string> ev in envVars) { - if (ev.Value == null) - pinfo.EnvironmentVariables.Remove (ev.Key); - else - pinfo.EnvironmentVariables [ev.Key] = ev.Value; - } + envVars.MergeTo (pinfo); pinfo.UseShellExecute = false; pinfo.RedirectStandardOutput = true; |