mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.0.1.1

Browse Source 
Former-commit-id: ffd3a248ace900b177db27aa87e5c702a9bc7322
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-05-24 10:59:19 +00:00
parent 9cc54951a2
commit 4bdbaf4a88
74 changed files with 63 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mcs/tools/pdb2mdb/Driver.cs
View File

@@ -28,20 +28,21 @@ namespace Pdb2Mdb {
public static void Convert (string filename)
{
var asm = AssemblyDefinition.ReadAssembly (filename);
using (var asm = AssemblyDefinition.ReadAssembly (filename)) {
var pdb = asm.Name.Name + ".pdb";
pdb = Path.Combine (Path.GetDirectoryName (filename), pdb);
var pdb = asm.Name.Name + ".pdb";
pdb = Path.Combine (Path.GetDirectoryName (filename), pdb);
if (!File.Exists (pdb))
throw new FileNotFoundException ("PDB file doesn't exist: " + pdb);
if (!File.Exists (pdb))
throw new FileNotFoundException ("PDB file doesn't exist: " + pdb);
using (var stream = File.OpenRead (pdb)) {
if (IsPortablePdb (stream))
throw new PortablePdbNotSupportedException ();
using (var stream = File.OpenRead (pdb)) {
if (IsPortablePdb (stream))
throw new PortablePdbNotSupportedException ();
var funcs = PdbFile.LoadFunctions (stream, true);
Converter.Convert (asm, funcs, new MonoSymbolWriter (filename));
var funcs = PdbFile.LoadFunctions (stream, true);
Converter.Convert (asm, funcs, new MonoSymbolWriter (filename));
}
}
}

14
mcs/tools/xbuild/Makefile
View File

@@ -93,16 +93,10 @@ install-pcl-targets:
done
install-web-targets:
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v9.0/WebApplications
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v9.0/WebApplications
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v10.0/WebApplications
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v10.0/WebApplications
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v11.0/WebApplications
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v11.0/WebApplications
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v12.0/WebApplications
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v12.0/WebApplications
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/v14.0/WebApplications
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/v14.0/WebApplications
for VERSION in v9.0 v10.0 v11.0 v12.0 v14.0 v15.0; do \
$(MKINSTALLDIRS) $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \
$(INSTALL_DATA) targets/Microsoft.WebApplication.targets $(DESTDIR)$(VS_TARGETS_DIR)/$$VERSION/WebApplications; \
done
NUGET_BUILDTASKS_REPO_DIR=$(topdir)/../external/nuget-buildtasks