Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@@ -67,33 +67,34 @@ namespace Mono.CodeContracts.Rewrite {
if (options.Debug && options.WritePdbFile)
readerParameters.ReadSymbols = true;
var assembly = this.options.Assembly.IsFilename ?
using (var assembly = this.options.Assembly.IsFilename ?
AssemblyDefinition.ReadAssembly (options.Assembly.Filename, readerParameters) :
AssemblyDefinition.ReadAssembly (options.Assembly.Streams.Assembly, readerParameters);
AssemblyDefinition.ReadAssembly (options.Assembly.Streams.Assembly, readerParameters)) {
if (this.options.ForceAssemblyRename != null) {
assembly.Name.Name = this.options.ForceAssemblyRename;
} else if (this.options.OutputFile.IsSet && this.options.OutputFile.IsFilename) {
assembly.Name.Name = Path.GetFileNameWithoutExtension(this.options.OutputFile.Filename);
}
if (this.options.ForceAssemblyRename != null) {
assembly.Name.Name = this.options.ForceAssemblyRename;
} else if (this.options.OutputFile.IsSet && this.options.OutputFile.IsFilename) {
assembly.Name.Name = Path.GetFileNameWithoutExtension(this.options.OutputFile.Filename);
}
var output = this.options.OutputFile.IsSet ? this.options.OutputFile : this.options.Assembly;
var writerParameters = new WriterParameters ();
if (options.WritePdbFile) {
if (!options.Debug) {
return RewriterResults.Error ("Must specify -debug if using -writePDBFile.");
var output = this.options.OutputFile.IsSet ? this.options.OutputFile : this.options.Assembly;
var writerParameters = new WriterParameters ();
if (options.WritePdbFile) {
if (!options.Debug) {
return RewriterResults.Error ("Must specify -debug if using -writePDBFile.");
}
writerParameters.WriteSymbols = true;
}
writerParameters.WriteSymbols = true;
}
PerformRewrite rewriter = new PerformRewrite (this.options);
rewriter.Rewrite (assembly);
PerformRewrite rewriter = new PerformRewrite (this.options);
rewriter.Rewrite (assembly);
if (output.IsFilename) {
assembly.Write (output.Filename, writerParameters);
} else {
assembly.Write (output.Streams.Assembly, writerParameters);
if (output.IsFilename) {
assembly.Write (output.Filename, writerParameters);
} else {
assembly.Write (output.Streams.Assembly, writerParameters);
}
}
return new RewriterResults (warnings, errors);