Browse Source

enabled CLR2-compatibility mode when launching profiler under CLR4

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4381 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 16 years ago
parent
commit
dd77c3a5ca
  1. 1
      src/AddIns/Misc/Profiler/Controller/Profiler.cs
  2. 5
      src/AddIns/Misc/Profiler/Frontend/AddIn/AddIn.csproj
  3. 4
      src/AddIns/Misc/Profiler/X64Converter/X64Converter.csproj

1
src/AddIns/Misc/Profiler/Controller/Profiler.cs

@ -242,6 +242,7 @@ namespace ICSharpCode.Profiler.Controller @@ -242,6 +242,7 @@ namespace ICSharpCode.Profiler.Controller
this.psi.EnvironmentVariables["AccessEventName"] = AccessEventId; // name for access event of controller
this.psi.EnvironmentVariables["COR_ENABLE_PROFILING"] = "1"; // enable profiling; 0 = disable
this.psi.EnvironmentVariables["COR_PROFILER"] = ProfilerGuid; // GUID for the profiler
this.psi.EnvironmentVariables["COMPLUS_ProfAPI_ProfilerCompatibilitySetting"] = "EnableV2Profiler"; // enable CLR 2.0 for CLR 4.0
file = MemoryMappedFile.CreateSharedMemory(SharedMemoryId, profilerOptions.SharedMemorySize);

5
src/AddIns/Misc/Profiler/Frontend/AddIn/AddIn.csproj

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{D294A12D-4B38-4F25-9AA6-3D4A6CE26E7B}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
<OutputType>Library</OutputType>
<RootNamespace>ICSharpCode.Profiler.AddIn</RootNamespace>
<AssemblyName>ICSharpCode.Profiler.AddIn</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<SourceAnalysisOverrideSettingsFile>C:\Dokumente und Einstellungen\HP\Anwendungsdaten\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
@ -101,7 +101,6 @@ @@ -101,7 +101,6 @@
<DependentUpon>ProfileExecutableForm.xaml</DependentUpon>
</Compile>
<Compile Include="Src\OptionsPanels\General.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Src\OptionsPanels\GeneralOptionsPanel.xaml.cs">
<DependentUpon>GeneralOptionsPanel.xaml</DependentUpon>

4
src/AddIns/Misc/Profiler/X64Converter/X64Converter.csproj

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>X64Converter</RootNamespace>
<AssemblyName>X64Converter</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SourceAnalysisOverrideSettingsFile>C:\Users\Siegfried\AppData\Roaming\ICSharpCode/SharpDevelop3.0\Settings.SourceAnalysis</SourceAnalysisOverrideSettingsFile>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>

Loading…
Cancel
Save