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

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/PartialClassGenerationTask.cs
View File

@@ -198,8 +198,11 @@ namespace Microsoft.Build.Tasks.Xaml
}
else
{
AppDomain.Unload(inProcessAppDomain);
inProcessAppDomain = null;
if (inProcessAppDomain != null)
{
AppDomain.Unload(inProcessAppDomain);
inProcessAppDomain = null;
}
return GetAppDomainAndExecute();
}
}

6
mcs/class/referencesource/XamlBuildTask/Microsoft/Build/Tasks/Xaml/XamlBuildTaskServices.cs
View File

@@ -215,6 +215,12 @@ namespace Microsoft.Build.Tasks.Xaml
appDomainSetup.ApplicationBase = buildTaskPath;
appDomainSetup.LoaderOptimization = LoaderOptimization.MultiDomainHost;
// Set the AppDomainManager class name and assembly name to the empty string. We don't want the AppDomain to try to load the
// Microsoft.VisualStudio.Platform.AppDomainManager.dll because it is no longer in the GAC, so it won't be found
// by the AppDomain that is created for the in-process build to support Intellisense in Visual Studio.
appDomainSetup.AppDomainManagerType = "";
appDomainSetup.AppDomainManagerAssembly = "";
// Create appdomain with fulltrust.
return AppDomain.CreateDomain(
friendlyName,