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

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
mcs/class/System.Web/System.Web.Compilation/AppResourcesAssemblyBuilder.cs
View File

@ -47,8 +47,6 @@ namespace System.Web.Compilation
{
class AppResourcesAssemblyBuilder
{
static string framework_version = "4.5";
static string profile_path = "net_4_x";
CompilationSection config;
CompilerInfo ci;
CodeDomProvider _provider;
@ -233,36 +231,14 @@ namespace System.Web.Compilation
string SetAlPath (ProcessStartInfo info)
{
if (RuntimeHelpers.RunningOnWindows) {
string alPath;
string monoPath;
PropertyInfo gac = typeof (Environment).GetProperty ("GacPath", BindingFlags.Static|BindingFlags.NonPublic);
MethodInfo get_gac = gac.GetGetMethod (true);
string p = Path.GetDirectoryName ((string) get_gac.Invoke (null, null));
monoPath = Path.Combine (Path.GetDirectoryName (Path.GetDirectoryName (p)), "bin\\mono.bat");
if (!File.Exists (monoPath)) {
monoPath = Path.Combine (Path.GetDirectoryName (Path.GetDirectoryName (p)), "bin\\mono.exe");
if (!File.Exists (monoPath)) {
monoPath = Path.Combine (Path.GetDirectoryName (Path.GetDirectoryName (Path.GetDirectoryName (p))), "mono\\mono\\mini\\mono.exe");
if (!File.Exists (monoPath))
throw new FileNotFoundException ("Windows mono path not found: " + monoPath);
}
}
alPath = Path.Combine (p, framework_version + "\\al.exe");
if (!File.Exists (alPath)) {
alPath = Path.Combine (Path.GetDirectoryName (p), "lib\\" + profile_path + "\\al.exe");
if (!File.Exists (alPath))
throw new FileNotFoundException ("Windows al path not found: " + alPath);
}
info.FileName = monoPath;
return alPath + " ";
info.FileName = MonoToolsLocator.Mono;
return MonoToolsLocator.AssemblyLinker + " ";
} else {
info.FileName = "al";
info.FileName = MonoToolsLocator.AssemblyLinker;
return String.Empty;
}
}
string BuildAssemblyPath (string cultureName)
{
string baseDir = Path.Combine (baseAssemblyDirectory, cultureName);