Browse Source

ParserService now supports ProjectReferences.

Go to definition now works for local variables.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@79 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 21 years ago
parent
commit
c9c374372a
  1. 4
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj
  2. 2
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj.user
  3. 1
      src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
  4. 18
      src/Main/Base/Project/Src/Dom/Implementations/DefaultRegion.cs
  5. 8
      src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs
  6. 10
      src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs
  7. 4
      src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs
  8. 1
      src/Main/Base/Project/Src/Services/ParserService/CaseSensitiveProjectContent.cs
  9. 7
      src/Main/Base/Project/Src/Services/ParserService/ParserService.cs
  10. 4
      src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs
  11. 11
      src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs
  12. 4
      src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs
  13. 1
      src/Main/Core/Project/ICSharpCode.Core.csproj
  14. 8
      src/Main/Core/Project/Src/Services/MessageService/MessageService.cs
  15. 82
      src/SharpDevelop.sln

4
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -101,8 +101,6 @@ @@ -101,8 +101,6 @@
<Name>ICSharpCode.Core</Name>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Src\PrettyPrinter\Gui\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

2
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.csproj.user

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>

1
src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DefineConstants>DEBUG</DefineConstants>
<Optimize>False</Optimize>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<OutputPath>..\..\..\..\bin\</OutputPath>

18
src/Main/Base/Project/Src/Dom/Implementations/DefaultRegion.cs

@ -57,16 +57,16 @@ namespace ICSharpCode.SharpDevelop.Dom { @@ -57,16 +57,16 @@ namespace ICSharpCode.SharpDevelop.Dom {
}
}
public DefaultRegion(Point start, Point end) : this(start.Y, start.X, end.Y, end.X)
public DefaultRegion(Point start, Point end)
: this(start.Y, start.X, end.Y, end.X)
{
}
public DefaultRegion(int beginLine, int beginColumn)
public DefaultRegion(Point start)
: this(start.Y, start.X)
{
this.beginLine = beginLine;
this.beginColumn = beginColumn;
}
public DefaultRegion(int beginLine, int beginColumn, int endLine, int endColumn)
{
this.beginLine = beginLine;
@ -74,7 +74,13 @@ namespace ICSharpCode.SharpDevelop.Dom { @@ -74,7 +74,13 @@ namespace ICSharpCode.SharpDevelop.Dom {
this.endLine = endLine;
this.endColumn = endColumn;
}
public DefaultRegion(int beginLine, int beginColumn)
{
this.beginLine = beginLine;
this.beginColumn = beginColumn;
}
/// <remarks>
/// Returns true, if the given coordinates (row, column) are in the region.
/// This method assumes that for an unknown end the end line is == -1

8
src/Main/Base/Project/Src/Dom/NRefactoryResolver/NRefactoryResolver.cs

@ -91,8 +91,8 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver @@ -91,8 +91,8 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
expression = expression.ToLower();
}
this.caretLine = caretLineNumber;
this.caretColumn = caretColumn;
this.caretLine = caretLineNumber;
this.caretColumn = caretColumn;
ParseInformation parseInfo = ParserService.GetParseInformation(fileName);
if (parseInfo == null) {
@ -126,8 +126,10 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver @@ -126,8 +126,10 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
NRefactoryASTConvertVisitor cSharpVisitor = new NRefactoryASTConvertVisitor(parseInfo.MostRecentCompilationUnit != null ? parseInfo.MostRecentCompilationUnit.ProjectContent : null);
cu = (ICompilationUnit)cSharpVisitor.Visit(fileCompilationUnit, null);
if (cu != null) {
callingClass = cu.GetInnermostClass(caretLine, caretColumn);
cu.FileName = fileName;
}
callingMember = GetCurrentMember();
@ -207,7 +209,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver @@ -207,7 +209,7 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
LocalLookupVariable var = SearchVariable(identifier);
if (var != null) {
IReturnType type = GetVariableType(var);
IField field = new LocalVariableField(type, identifier, null, callingClass);
IField field = new LocalVariableField(type, identifier, new DefaultRegion(var.StartPos, var.EndPos), callingClass);
return new LocalResolveResult(callingMember, field, false);
}
IParameter para = SearchMethodParameter(identifier);

10
src/Main/Base/Project/Src/Project/Items/ProjectReferenceProjectItem.cs

@ -14,11 +14,14 @@ namespace ICSharpCode.SharpDevelop.Project @@ -14,11 +14,14 @@ namespace ICSharpCode.SharpDevelop.Project
}
}
IProject referencedProject;
[Browsable(false)]
public IProject ReferencedProject {
public IProject ReferencedProject {
get {
throw new System.NotImplementedException();
// return null;
if (referencedProject == null)
referencedProject = ProjectService.GetProject(this.FileName);
return referencedProject;
}
}
@ -51,6 +54,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -51,6 +54,7 @@ namespace ICSharpCode.SharpDevelop.Project
Include = FileUtility.GetRelativePath(project.Directory, referenceTo.FileName);
ProjectGuid = referenceTo.IdGuid;
ProjectName = referenceTo.Name;
this.referencedProject = referenceTo;
}
public override string ToString()

4
src/Main/Base/Project/Src/Services/Debugger/DebuggerService.cs

@ -568,9 +568,7 @@ namespace ICSharpCode.Core @@ -568,9 +568,7 @@ namespace ICSharpCode.Core
}
}
} catch (Exception e) {
Console.Beep();
Console.WriteLine();
Console.WriteLine(e);
ICSharpCode.Core.MessageService.ShowError(e);
}
}

1
src/Main/Base/Project/Src/Services/ParserService/CaseSensitiveProjectContent.cs

@ -100,6 +100,7 @@ namespace ICSharpCode.Core @@ -100,6 +100,7 @@ namespace ICSharpCode.Core
foreach (ProjectItem item in project.Items.ToArray()) {
switch (item.ItemType) {
case ItemType.Reference:
case ItemType.ProjectReference:
IProjectContent referencedContent = ProjectContentRegistry.GetProjectContentForReference(item as ReferenceProjectItem);
if (referencedContent != null) {
newProjectContent.referencedContents.Add(referencedContent);

7
src/Main/Base/Project/Src/Services/ParserService/ParserService.cs

@ -81,7 +81,8 @@ namespace ICSharpCode.Core @@ -81,7 +81,8 @@ namespace ICSharpCode.Core
projectContents[project] = newContent;
}
} catch (Exception e) {
Console.WriteLine("Error while retrieving project contents from {0} : {1}", project, e);
Console.WriteLine("Error while retrieving project contents from {0}:", project);
ICSharpCode.Core.MessageService.ShowError(e);
}
}
}
@ -150,9 +151,7 @@ namespace ICSharpCode.Core @@ -150,9 +151,7 @@ namespace ICSharpCode.Core
}
}
} catch (Exception e) {
Console.Beep();
Console.WriteLine();
Console.WriteLine(e);
ICSharpCode.Core.MessageService.ShowError(e);
}
Thread.Sleep(2000);
}

4
src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs

@ -37,12 +37,16 @@ namespace ICSharpCode.Core @@ -37,12 +37,16 @@ namespace ICSharpCode.Core
public static IProjectContent GetProjectContentForReference(ReferenceProjectItem item)
{
if (item is ProjectReferenceProjectItem) {
return ParserService.GetProjectContent(((ProjectReferenceProjectItem)item).ReferencedProject);
}
if (contents.ContainsKey(item.FileName)) {
return contents[item.FileName];
}
if (contents.ContainsKey(item.Include)) {
return contents[item.Include];
}
Assembly assembly = null;
try {

11
src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs

@ -28,6 +28,17 @@ namespace ICSharpCode.SharpDevelop.Project @@ -28,6 +28,17 @@ namespace ICSharpCode.SharpDevelop.Project
}
}
public static IProject GetProject(string filename)
{
filename = Path.GetFullPath(filename).ToLower();
foreach (IProject project in OpenSolution.Projects) {
if (project.FileName.ToLower() == filename) {
return project;
}
}
return null;
}
static ProjectService()
{
WorkbenchSingleton.Workbench.ActiveWorkbenchWindowChanged += new EventHandler(ActiveWindowChanged);

4
src/Main/Base/Project/Src/TextEditor/Gui/Editor/SharpDevelopTextAreaControl.cs

@ -385,9 +385,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor @@ -385,9 +385,7 @@ namespace ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor
private void LogException(Exception ex)
{
Console.WriteLine();
Console.WriteLine("EXCEPTION: " + ex);
Console.Beep(); // notify user
ICSharpCode.Core.MessageService.ShowError(ex);
}
public string GetWordBeforeCaret()

1
src/Main/Core/Project/ICSharpCode.Core.csproj

@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DefineConstants>DEBUG</DefineConstants>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<OutputPath>..\..\..\..\bin\</OutputPath>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>

8
src/Main/Core/Project/Src/Services/MessageService/MessageService.cs

@ -51,6 +51,13 @@ namespace ICSharpCode.Core @@ -51,6 +51,13 @@ namespace ICSharpCode.Core
public static void ShowError(Exception ex, string message)
{
#if DEBUG
Console.WriteLine();
if (message != null)
Console.WriteLine(message);
Console.WriteLine(ex);
Console.Beep();
#else
string msg = String.Empty;
if (message != null) {
@ -66,6 +73,7 @@ namespace ICSharpCode.Core @@ -66,6 +73,7 @@ namespace ICSharpCode.Core
}
MessageBox.Show(MessageService.MainForm, StringParser.Parse(msg), StringParser.Parse("${res:Global.ErrorText}"), MessageBoxButtons.OK, MessageBoxIcon.Error);
#endif
}
public static void ShowWarning(string message)

82
src/SharpDevelop.sln

@ -1,34 +1,12 @@ @@ -1,34 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.0.0.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormDesigner", "AddIns\DisplayBindings\FormDesigner\Project\FormDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AddIns", "AddIns", "{14A277EE-7DF1-4529-B639-7D1EF334C1C5}"
ProjectSection(SolutionItems) = postProject
@ -68,13 +46,35 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\St @@ -68,13 +46,35 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartPage", "AddIns\Misc\St
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AddinScout", "AddIns\Misc\AddinScout\Project\AddinScout.csproj", "{4B8F0F98-8BE1-402B-AA8B-C8D548577B38}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Display Bindings", "Display Bindings", "{4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{9421EDF4-9769-4BE9-B5A6-C87DE221D73C}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormDesigner", "AddIns\DisplayBindings\FormDesigner\Project\FormDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.framework.dll", "Tools\NUnit\src\NUnitFramework\framework\nunit.framework.dll.csproj", "{83DD7E12-A705-4DBA-9D71-09C8973D9382}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceEditor", "AddIns\DisplayBindings\ResourceEditor\Project\ResourceEditor.csproj", "{CBC6C247-747B-4908-B09A-4D2E0F640B6B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.core.dll", "Tools\NUnit\src\NUnitFramework\core\nunit.core.dll.csproj", "{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsUI", "Libraries\DockPanel_Src\WinFormsUI\WinFormsUI.csproj", "{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.extensions.dll", "Tools\NUnit\src\NUnitFramework\extensions\nunit.extensions.dll.csproj", "{98B10E98-003C-45A0-9587-119142E39986}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Main", "Main", "{5A3EBEBA-0560-41C1-966B-23F7D03A5486}"
ProjectSection(SolutionItems) = postProject
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Tests", "Main\Base\Test\ICSharpCode.SharpDevelop.Tests.csproj", "{4980B743-B32F-4aba-AABD-45E2CAD3568D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StartUp", "Main\StartUp\Project\StartUp.csproj", "{1152B71B-3C05-4598-B20D-823B5D40559E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Tests", "Main\Core\Test\ICSharpCode.Core.Tests.csproj", "{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -157,17 +157,8 @@ Global @@ -157,17 +157,8 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{CE5B42B7-6E8C-4385-9E97-F4023FC16BF2} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C} = {14A277EE-7DF1-4529-B639-7D1EF334C1C5}
{1F1AC7CD-D154-45BB-8EAF-804CA8055F5A} = {FEB825FA-4AD8-425D-8E4A-B5A18EE1B81C}
@ -182,7 +173,16 @@ Global @@ -182,7 +173,16 @@ Global
{B08385CD-F0CC-488C-B4F4-EEB34B6D2688} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
{1D18D788-F7EE-4585-A23B-34DC8EC63CB8} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
{EC06F96A-AEEC-49D6-B03D-AB87C6EB674C} = {6604365C-C702-4C10-9BA8-637F1E3D4D0D}
{CBC6C247-747B-4908-B09A-4D2E0F640B6B} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} = {4EA396ED-64AD-4AD0-A67A-AB363F3E0C79}
{98B10E98-003C-45A0-9587-119142E39986} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{D3C782BA-178E-4235-A3BA-8C11DEBB6BEE} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{EBD43A7F-AFCA-4281-BB53-5CDD91F966A3} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{83DD7E12-A705-4DBA-9D71-09C8973D9382} = {9421EDF4-9769-4BE9-B5A6-C87DE221D73C}
{AD6FAA08-D6F5-4DBA-AF85-F4DA9F40C3B5} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{1152B71B-3C05-4598-B20D-823B5D40559E} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{2748AD25-9C63-4E12-877B-4DCE96FBED54} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
{4980B743-B32F-4aba-AABD-45E2CAD3568D} = {5A3EBEBA-0560-41C1-966B-23F7D03A5486}
EndGlobalSection
EndGlobal

Loading…
Cancel
Save