diff --git a/CHANGES b/CHANGES index f66293a8..9cc1b2a3 100644 --- a/CHANGES +++ b/CHANGES @@ -1110,3 +1110,9 @@ Version history - fixed stack overflows with static foreach - fixed infinite loop for cyclic base classes - fixed more crashes during semantic highlighting + +2019-04-28 Version 0.49.2 + * VS2013/VS2015: VC projects broken in 0.49.1 due to unsupported msbuild variable + * visualdproj: fixed additional options not passed to single file compilation + * VS2015: workaround VS not correctly updating extension caches after uninstallation + * bugzilla 19826: visualdproj projects created for LDC still use DMD diff --git a/VERSION b/VERSION index 41c8a32b..75bb2860 100644 --- a/VERSION +++ b/VERSION @@ -1,5 +1,5 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 49 -#define VERSION_REVISION 1 +#define VERSION_REVISION 2 #define VERSION_BETA #define VERSION_BUILD 0 diff --git a/doc/StartPage.dd b/doc/StartPage.dd index a27eb510..16668d0c 100644 --- a/doc/StartPage.dd +++ b/doc/StartPage.dd @@ -54,6 +54,12 @@ $(H2 News) $(P $(LINK2 VersionHistory.html, Full version history and complete details...) ) +2019-04-28 Version 0.49.2 +$(UL + $(LI VS2013/VS2015: VC projects broken in 0.49.1 due to unsupported msbuild variable) + $(LI VS2015: workaround VS not correctly updating extension caches after uninstallation) +) + 2019-04-21 Version 0.49.1 $(UL $(LI fixed reading settings from VC projects in VS2017) diff --git a/doc/VersionHistory.dd b/doc/VersionHistory.dd index 6c7d8f66..ac189dbc 100644 --- a/doc/VersionHistory.dd +++ b/doc/VersionHistory.dd @@ -1,5 +1,13 @@ Ddoc +$(H2 2019-04-28 Version 0.49.2) + $(UL + $(LI VS2013/VS2015: VC projects broken in 0.49.1 due to unsupported msbuild variable) + $(LI visualdproj: fixed additional options not passed to single file compilation) + $(LI VS2015: workaround VS not correctly updating extension caches after uninstallation) + $(LI bugzilla 19826: visualdproj projects created for LDC still use DMD) + ) + $(H2 2019-04-21 Version 0.49.1) $(UL $(LI fixed reading settings from VC projects in VS2017) diff --git a/doc/visuald.ddoc b/doc/visuald.ddoc index e0f41de4..545f98e9 100644 --- a/doc/visuald.ddoc +++ b/doc/visuald.ddoc @@ -1,4 +1,4 @@ -VERSION = 0.49.0 +VERSION = 0.49.2 ROOT_DIR = http://www.dlang.org/ ROOT = http://www.dlang.org BODYCLASS = visuald diff --git a/msbuild/ImportBefore/Default/d.props b/msbuild/ImportBefore/Default/d.props index 7da03963..3ef961cd 100644 --- a/msbuild/ImportBefore/Default/d.props +++ b/msbuild/ImportBefore/Default/d.props @@ -4,16 +4,22 @@ $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\VisualD@msbuild) $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\VisualD@msbuild) + + $([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[0]) $([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[1]) $([System.String]::Copy('$(MSBuildVersion)').Split(['.'])[2]) - $(MSBuildVersion_Major).0 + $(MSBuildVersion_Major).$(MSBuildVersion_Minor) 16.0 16.1 + + $(MsBuildToolsVersion) + + diff --git a/msbuild/dbuild/dbuild.csproj b/msbuild/dbuild/dbuild.csproj index 6e42609d..22159b0c 100644 --- a/msbuild/dbuild/dbuild.csproj +++ b/msbuild/dbuild/dbuild.csproj @@ -133,6 +133,7 @@ Properties dbuild v4.6 + v4.5 v4.7.2 false false @@ -254,16 +255,16 @@ False - C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\PublicAssemblies\Microsoft.VisualStudio.VCProject.dll + assemblies\v14\Microsoft.VisualStudio.VCProject.dll False False - c:\Windows\assembly\GAC\Microsoft.VisualStudio.VCProjectEngine\14.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.VCProjectEngine.dll + assemblies\v14\Microsoft.VisualStudio.VCProjectEngine.dll False - c:\Windows\Microsoft.NET\assembly\GAC_MSIL\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine\v4.0_14.0.0.0__b03f5f7f11d50a3a\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll + assemblies\v14\Microsoft.VisualStudio.Project.VisualC.VCProjectEngine.dll diff --git a/nsis/visuald.nsi b/nsis/visuald.nsi index 349dc770..a8db3304 100644 --- a/nsis/visuald.nsi +++ b/nsis/visuald.nsi @@ -406,6 +406,9 @@ ${MementoSection} "Install in VS 2013" SecVS2013 ${SetOutPath} "$1\PublicAssemblies" ${File} "..\bin\Release\VisualDWizard\obj\" VisualDWizard.dll + push $1 + Call VSConfigurationChanged + ${MementoSectionEnd} ;-------------------------------- @@ -439,6 +442,14 @@ ${MementoSection} "Install in VS 2015" SecVS2015 ${SetOutPath} "$1\PublicAssemblies" ${File} "..\bin\Release\VisualDWizard\obj\" VisualDWizard.dll + push $1 + Call VSConfigurationChanged + + ; Workaround for extension cache not properly updated + SetShellVarContext current + Delete $LocalAppData\Microsoft\VisualStudio\14.0\Extensions\*.cache + SetShellVarContext all + ${MementoSectionEnd} ;-------------------------------- @@ -905,12 +916,25 @@ Section "Uninstall" ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2015_REGISTRY_KEY}" InstallDir IfErrors NoVS2015pkgdef + IfFileExists '$1${EXTENSION_DIR_APP}' +1 NoVS2015ExtensionDir + Push $1 + Call un.VSConfigurationChanged + + ; Workaround for extension cache not properly updated + SetShellVarContext current + Delete $LocalAppData\Microsoft\VisualStudio\14.0\Extensions\*.cache + SetShellVarContext all + NoVS2015ExtensionDir: RMDir /r '$1${EXTENSION_DIR_APP}' RMDir '$1${EXTENSION_DIR_ROOT}' NoVS2015pkgdef: ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2013_REGISTRY_KEY}" InstallDir IfErrors NoVS2013pkgdef + IfFileExists '$1${EXTENSION_DIR_APP}' +1 NoVS2013ExtensionDir + Push $1 + Call un.VSConfigurationChanged + NoVS2013ExtensionDir: RMDir /r '$1${EXTENSION_DIR_APP}' RMDir '$1${EXTENSION_DIR_ROOT}' NoVS2013pkgdef: @@ -1432,7 +1456,7 @@ Function VSConfigurationChanged IfErrors NoVS2017 FileClose $R1 ; empty file good enough NoVS2017: - + Pop $1 FunctionEnd Function un.VSConfigurationChanged diff --git a/vdc/parser.visualdproj b/vdc/parser.visualdproj index c54a991b..fce31c07 100644 --- a/vdc/parser.visualdproj +++ b/vdc/parser.visualdproj @@ -1,6 +1,6 @@ {FE3A959D-6CFA-43BF-8637-62125B571770} - + 0 0 1 @@ -49,6 +49,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -108,7 +122,7 @@ *.obj - + 0 0 1 @@ -157,6 +171,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -216,7 +244,7 @@ *.obj - + 0 0 1 @@ -265,6 +293,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -324,7 +366,7 @@ *.obj - + 0 0 1 @@ -373,6 +415,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -432,7 +488,7 @@ *.obj - + 0 0 1 @@ -481,6 +537,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -540,7 +610,7 @@ *.obj - + 0 0 0 @@ -589,6 +659,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -648,7 +732,7 @@ *.obj - + 0 0 1 @@ -697,6 +781,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 1 0 $(CC) -c @@ -756,7 +854,7 @@ *.obj - + 0 0 1 @@ -805,6 +903,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 1 0 $(CC) -c @@ -864,7 +976,7 @@ *.obj - + 0 0 1 @@ -913,6 +1025,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 2 0 $(CC) -c @@ -972,7 +1098,7 @@ *.obj - + 0 0 1 @@ -1021,6 +1147,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 2 0 $(CC) -c @@ -1080,7 +1220,7 @@ *.obj - + 0 0 1 @@ -1129,6 +1269,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -1188,7 +1342,7 @@ *.obj - + 0 0 1 @@ -1237,6 +1391,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 1 $(CC) -c @@ -1296,7 +1464,7 @@ *.obj - + 0 0 1 @@ -1345,6 +1513,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 2 0 $(CC) -c @@ -1404,7 +1586,7 @@ *.obj - + 0 0 1 @@ -1453,6 +1635,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 2 0 $(CC) -c @@ -1512,7 +1708,8 @@ *.obj - + + 0 0 0 1 @@ -1547,7 +1744,7 @@ 0 0 0 - 1 + 0 1 1 0 @@ -1561,6 +1758,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -1620,7 +1831,7 @@ *.obj - + 0 0 1 @@ -1669,6 +1880,20 @@ 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 1 $(CC) -c diff --git a/vdwizard/VDProjectWizard.cs b/vdwizard/VDProjectWizard.cs index f311eadb..39849048 100644 --- a/vdwizard/VDProjectWizard.cs +++ b/vdwizard/VDProjectWizard.cs @@ -107,9 +107,9 @@ when the Type attribute of the VSTemplate element is ProjectGroup */ if (dlg.compilerDMD.Checked) AddConfigReplacements(replacementsDictionary, ++numCompiler, 0, " DMD"); if (dlg.compilerLDC.Checked) - AddConfigReplacements(replacementsDictionary, ++numCompiler, 0, " LDC"); + AddConfigReplacements(replacementsDictionary, ++numCompiler, 2, " LDC"); if (dlg.compilerGDC.Checked) - AddConfigReplacements(replacementsDictionary, ++numCompiler, 0, " GDC"); + AddConfigReplacements(replacementsDictionary, ++numCompiler, 1, " GDC"); } while (numCompiler++ <= 3) diff --git a/visuald/completion.d b/visuald/completion.d index 5d336a49..26a46751 100644 --- a/visuald/completion.d +++ b/visuald/completion.d @@ -34,7 +34,6 @@ import visuald.dpackage; import visuald.dproject; import visuald.dlangsvc; import visuald.dimagelist; -import visuald.dllmain; import visuald.config; import visuald.intellisense; diff --git a/visuald/config.d b/visuald/config.d index 5f516d9a..821bd602 100644 --- a/visuald/config.d +++ b/visuald/config.d @@ -3121,6 +3121,8 @@ class Config : DisposingComObject, cmd ~= " -c -o-"; else cmd ~= " -c " ~ mProjectOptions.getOutputFileOption(outfile); + if(mProjectOptions.additionalOptions.length) + cmd ~= " " ~ mProjectOptions.additionalOptions.replace("\n", " "); cmd ~= " " ~ quoteFilename(file.GetFilename()); foreach(ddoc; getDDocFileList()) cmd ~= " " ~ ddoc; diff --git a/visuald/dllmain.d b/visuald/dllmain.d index 452209a8..1cae8bc0 100644 --- a/visuald/dllmain.d +++ b/visuald/dllmain.d @@ -27,8 +27,6 @@ import threadaux = core.sys.windows.threadaux; import std.conv; import std.array; -__gshared HINSTANCE g_hInst; - // enable precise scanning of the DATA/TLS sections (dmd 2.075+) and GC (dmd 2.085+) pragma(msg, "DMD VERSION = ", __VERSION__); static if (__VERSION__ >= 2085) diff --git a/visuald/dpackage.d b/visuald/dpackage.d index 23837d80..e084d88e 100644 --- a/visuald/dpackage.d +++ b/visuald/dpackage.d @@ -52,7 +52,6 @@ import visuald.profiler; import visuald.library; import visuald.pkgutil; import visuald.colorizer; -import visuald.dllmain; import visuald.taskprovider; import visuald.vdserverclient; import xml = visuald.xmlwrap; @@ -166,6 +165,8 @@ void global_exit() } /////////////////////////////////////////////////////////////////////// +__gshared HINSTANCE g_hInst; + __gshared int g_dllRefCount; extern(Windows) diff --git a/visuald/dproject.d b/visuald/dproject.d index c89e7af3..e45df0d6 100644 --- a/visuald/dproject.d +++ b/visuald/dproject.d @@ -51,8 +51,6 @@ import visuald.oledatasource; import visuald.pkgutil; import visuald.dimagelist; -import visuald.dllmain : g_hInst; - /////////////////////////////////////////////////////////////// class ProjectFactory : DComObject, IVsProjectFactory diff --git a/visuald/hierarchy.d b/visuald/hierarchy.d index 4cd13f1e..76c3a8f1 100644 --- a/visuald/hierarchy.d +++ b/visuald/hierarchy.d @@ -46,7 +46,6 @@ import visuald.pkgutil; import visuald.dproject; import visuald.dpackage; -import visuald.dllmain; /////////////////////////////////////////////////////////////////////////////// class CFileNode : CHierNode, diff --git a/visuald/pkgutil.d b/visuald/pkgutil.d index fbff7246..a9bc0cd7 100644 --- a/visuald/pkgutil.d +++ b/visuald/pkgutil.d @@ -541,7 +541,6 @@ bool RemoveHardwareBreakpoint(HANDLE hBrk) //import pkgutil; import sdk.port.base; -import visuald.dllmain; void setHWBreakpopints() { diff --git a/visuald/propertypage.d b/visuald/propertypage.d index d2cf5bf4..843e71d3 100644 --- a/visuald/propertypage.d +++ b/visuald/propertypage.d @@ -19,7 +19,6 @@ import visuald.comutil; import visuald.logutil; import visuald.dpackage; import visuald.dproject; -import visuald.dllmain; import visuald.config; import visuald.winctrl; import visuald.hierarchy; diff --git a/visuald/register.d b/visuald/register.d index 23aba962..7999534b 100644 --- a/visuald/register.d +++ b/visuald/register.d @@ -23,7 +23,6 @@ import stdext.string; import stdext.registry; import visuald.dpackage; -import visuald.dllmain; import visuald.propertypage; import visuald.config; import visuald.comutil; @@ -381,7 +380,7 @@ void fixVS2012Shellx64Debugger(HKEY keyRoot, wstring registrationRoot) { float ver = guessVSVersion(registrationRoot); //MessageBoxA(null, text("version: ", ver, "\nregkey: ", to!string(registrationRoot)).ptr, to!string(registrationRoot).ptr, MB_OK); - if(ver >= 11) + if(ver >= 11 && ver < 14) { scope RegKey keyDebugger = new RegKey(keyRoot, registrationRoot ~ "\\Debugger"w); keyDebugger.Set("msvsmon-pseudo_remote"w, r"$ShellFolder$\Common7\Packages\Debugger\X64\msvsmon.exe"w, false); @@ -426,43 +425,47 @@ HRESULT VSDllUnregisterServerInternal(in wchar* pszRegRoot, in bool useRanu) HKEY keyRoot = useRanu ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE; wstring registrationRoot = GetRegistrationRoot(pszRegRoot, useRanu); - wstring packageGuid = GUID2wstring(g_packageCLSID); - wstring languageGuid = GUID2wstring(g_languageCLSID); - wstring wizardGuid = GUID2wstring(g_ProjectItemWizardCLSID); - wstring vdhelperGuid = GUID2wstring(g_VisualDHelperCLSID); - wstring vchelperGuid = GUID2wstring(g_VisualCHelperCLSID); - HRESULT hr = S_OK; - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\Packages\\"w ~ packageGuid); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ languageGuid); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ wizardGuid); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ vdhelperGuid); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ vchelperGuid); + float ver = guessVSVersion(registrationRoot); + if (ver < 14) + { + wstring packageGuid = GUID2wstring(g_packageCLSID); + wstring languageGuid = GUID2wstring(g_languageCLSID); + wstring wizardGuid = GUID2wstring(g_ProjectItemWizardCLSID); + wstring vdhelperGuid = GUID2wstring(g_VisualDHelperCLSID); + wstring vchelperGuid = GUID2wstring(g_VisualCHelperCLSID); + + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\Packages\\"w ~ packageGuid); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ languageGuid); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ wizardGuid); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ vdhelperGuid); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ vchelperGuid); - foreach (wstring fileExt; g_languageFileExtensions) - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathFileExts ~ "\\"w ~ fileExt); + foreach (wstring fileExt; g_languageFileExtensions) + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathFileExts ~ "\\"w ~ fileExt); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\Services\\"w ~ languageGuid); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\InstalledProducts\\"w ~ g_packageName); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\Services\\"w ~ languageGuid); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\InstalledProducts\\"w ~ g_packageName); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathLServices ~ "\\"w ~ g_languageName); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathCodeExpansions ~ "\\"w ~ g_languageName); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathLServices ~ "\\"w ~ g_languageName); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathCodeExpansions ~ "\\"w ~ g_languageName); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathPrjTemplates ~ "\\"w ~ packageGuid); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathProjects ~ "\\"w ~ GUID2wstring(g_projectFactoryCLSID)); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regMiscFiles ~ "\\AddItemTemplates\\TemplateDirs\\"w ~ packageGuid); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathPrjTemplates ~ "\\"w ~ packageGuid); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathProjects ~ "\\"w ~ GUID2wstring(g_projectFactoryCLSID)); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regMiscFiles ~ "\\AddItemTemplates\\TemplateDirs\\"w ~ packageGuid); - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathToolsOptions); + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ regPathToolsOptions); - foreach(guid; guids_propertyPages) - hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ GUID2wstring(*guid)); + foreach(guid; guids_propertyPages) + hr |= RegDeleteRecursive(keyRoot, registrationRoot ~ "\\CLSID\\"w ~ GUID2wstring(*guid)); - hr |= RegDeleteRecursive(HKEY_CLASSES_ROOT, "CLSID\\"w ~ GUID2wstring(g_unmarshalEnumOutCLSID)); - static if(is(typeof(g_unmarshalTargetInfoCLSID))) - hr |= RegDeleteRecursive(HKEY_CLASSES_ROOT, "CLSID\\"w ~ GUID2wstring(g_unmarshalTargetInfoCLSID)); + hr |= RegDeleteRecursive(HKEY_CLASSES_ROOT, "CLSID\\"w ~ GUID2wstring(g_unmarshalEnumOutCLSID)); + static if(is(typeof(g_unmarshalTargetInfoCLSID))) + hr |= RegDeleteRecursive(HKEY_CLASSES_ROOT, "CLSID\\"w ~ GUID2wstring(g_unmarshalTargetInfoCLSID)); - scope RegKey keyToolMenu = new RegKey(keyRoot, registrationRoot ~ "\\Menus"w); - keyToolMenu.Delete(packageGuid); + scope RegKey keyToolMenu = new RegKey(keyRoot, registrationRoot ~ "\\Menus"w); + keyToolMenu.Delete(packageGuid); + } updateConfigurationChanged(keyRoot, registrationRoot); return hr; diff --git a/visuald/visuald.visualdproj b/visuald/visuald.visualdproj index 5f7514d8..96d9b59f 100644 --- a/visuald/visuald.visualdproj +++ b/visuald/visuald.visualdproj @@ -32,7 +32,7 @@ 0 0 0 - 0 + 0 0 0 0 @@ -45,10 +45,22 @@ 0 0 0 - 2 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -86,10 +98,11 @@ 1 $(VisualDInstallDir)\cv2pdb\cv2pdb.exe - 0 0 0 -s. + 0 + $(IntDir)\$(SafeProjectName).mixin uuid.lib advapi32.lib comdlg32.lib ole32.lib ..\sdk\lib\oleaut32.lib ..\sdk\lib\comctl32.lib shell32.lib gdi32.lib winmm.lib @@ -140,7 +153,7 @@ 0 0 0 - 0 + 0 0 0 1 @@ -153,10 +166,22 @@ 0 0 0 - 2 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -194,10 +219,11 @@ 2 $(VisualDInstallDir)\cv2pdb\cv2pdb.exe - 0 0 0 + 0 + $(IntDir)\$(SafeProjectName).mixin uuid.lib advapi32.lib comdlg32.lib ole32.lib ..\sdk\lib\oleaut32.lib ..\sdk\lib\comctl32.lib shell32.lib gdi32.lib winmm.lib @@ -248,7 +274,7 @@ 0 0 0 - 0 + 0 0 1 0 @@ -261,10 +287,22 @@ 0 0 0 - 2 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -302,10 +340,11 @@ 1 $(VisualDInstallDir)\cv2pdb\cv2pdb.exe - 0 0 0 + 0 + $(IntDir)\$(SafeProjectName).mixin user32.lib kernel32.lib advapi32.lib comdlg32.lib ole32.lib oleaut32.lib comctl32.lib shell32.lib gdi32.lib winmm.lib @@ -356,7 +395,7 @@ 0 0 0 - 0 + 0 0 0 0 @@ -369,10 +408,22 @@ 0 0 0 - 2 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 2 0 $(CC) -c @@ -410,10 +461,11 @@ 0 $(VisualDInstallDir)\cv2pdb\cv2pdb.exe - 0 0 0 + 0 + $(IntDir)\$(SafeProjectName).mixin uuid.lib advapi32.lib comdlg32.lib ole32.lib oleaut32.lib comctl32.lib shell32.lib gdi32.lib winmm.lib @@ -464,7 +516,7 @@ 0 0 0 - 0 + 0 0 0 0 @@ -477,10 +529,22 @@ 0 0 0 - 2 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -518,10 +582,11 @@ 0 $(VisualDInstallDir)\cv2pdb\cv2pdb.exe - 0 0 0 + 0 + $(IntDir)\$(SafeProjectName).mixin uuid.lib advapi32.lib comdlg32.lib ole32.lib oleaut32.lib comctl32.lib shell32.lib gdi32.lib winmm.lib @@ -572,7 +637,7 @@ 0 0 0 - 1 + 3 0 0 1 @@ -585,10 +650,22 @@ 0 0 0 - 2 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 2 0 $(CC) -c @@ -626,10 +703,11 @@ 0 $(VisualDInstallDir)\cv2pdb\cv2pdb.exe - 0 0 0 + 0 + $(IntDir)\$(SafeProjectName).mixin uuid.lib advapi32.lib comdlg32.lib ole32.lib oleaut32.lib comctl32.lib shell32.lib gdi32.lib winmm.lib @@ -680,7 +758,7 @@ 0 0 0 - 0 + 0 0 0 1 @@ -693,10 +771,22 @@ 0 0 0 - 2 0 0 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 0 0 $(CC) -c @@ -734,10 +824,11 @@ 0 $(VisualDInstallDir)\cv2pdb\cv2pdb.exe - 0 0 0 + 0 + $(IntDir)\$(SafeProjectName).mixin uuid.lib advapi32.lib comdlg32.lib ole32.lib oleaut32.lib comctl32.lib shell32.lib gdi32.lib winmm.lib @@ -838,87 +929,6 @@ if errorlevel 1 goto reportError rc /fo"$(OutDir)\visuald.res" /I "$(IntDir)" $(InputPath)" dependencies=""$(IntDir)\pkgcmd.cto";resources\daboutlogo.ico;..\version;resources\dimagelist.bmp;resources\completionset.bmp" outfile="$(OutDir)\visuald.res" path="visuald.rc" linkoutput="true" tool="Custom" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/visuald_vs10.sln b/visuald_vs10.sln index c1e6d2c5..2e97ea53 100644 --- a/visuald_vs10.sln +++ b/visuald_vs10.sln @@ -129,6 +129,171 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", nsis\Extensions\visuald.pkgdef = nsis\Extensions\visuald.pkgdef EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{AC054091-8D8F-4393-B3C5-AB67980B80EE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projects_vs9", "Projects_vs9", "{068889f6-165e-494b-95d6-9c4695ee9d45}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\Projects_vs9\VDTemplates.vsdir = visuald\Templates\Projects_vs9\VDTemplates.vsdir + visuald\Templates\Projects_vs9\VDTemplates.VSTDIR = visuald\Templates\Projects_vs9\VDTemplates.VSTDIR + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DUB", "DUB", "{600531c5-7627-446a-8d27-89e3035edcb8}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\Projects\DUB\DUBTemplates.vsdir = visuald\Templates\Projects\DUB\DUBTemplates.vsdir + visuald\Templates\Projects\DUB\DUBTemplates.VSTDIR = visuald\Templates\Projects\DUB\DUBTemplates.VSTDIR + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vibe", "vibe", "{9c02ac6a-14bd-4ccd-ba76-359e5c453992}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems\DUB\vibe\app.d = visuald\Templates\ProjectItems\DUB\vibe\app.d + visuald\Templates\ProjectItems\DUB\vibe\dub.json = visuald\Templates\ProjectItems\DUB\vibe\dub.json + visuald\Templates\ProjectItems\DUB\vibe\dub_vibe_d.vstemplate = visuald\Templates\ProjectItems\DUB\vibe\dub_vibe_d.vstemplate + visuald\Templates\ProjectItems\DUB\vibe\ServerApp.visualdproj = visuald\Templates\ProjectItems\DUB\vibe\ServerApp.visualdproj + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "vibe", "vibe", "{4dd1b584-c5f5-4f56-80c1-f787b781bc47}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems_vs9\DUB\vibe\app.d = visuald\Templates\ProjectItems_vs9\DUB\vibe\app.d + visuald\Templates\ProjectItems_vs9\DUB\vibe\dub.json = visuald\Templates\ProjectItems_vs9\DUB\vibe\dub.json + visuald\Templates\ProjectItems_vs9\DUB\vibe\dub_vibe_d.vstemplate = visuald\Templates\ProjectItems_vs9\DUB\vibe\dub_vibe_d.vstemplate + visuald\Templates\ProjectItems_vs9\DUB\vibe\ServerApp.visualdproj = visuald\Templates\ProjectItems_vs9\DUB\vibe\ServerApp.visualdproj + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "minimal", "minimal", "{e6961bd5-09b1-4148-a99d-8239cd28af3d}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems\DUB\minimal\app.d = visuald\Templates\ProjectItems\DUB\minimal\app.d + visuald\Templates\ProjectItems\DUB\minimal\ConsoleApp.visualdproj = visuald\Templates\ProjectItems\DUB\minimal\ConsoleApp.visualdproj + visuald\Templates\ProjectItems\DUB\minimal\dub.sdl = visuald\Templates\ProjectItems\DUB\minimal\dub.sdl + visuald\Templates\ProjectItems\DUB\minimal\minimal.vstemplate = visuald\Templates\ProjectItems\DUB\minimal\minimal.vstemplate + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConsoleApp", "ConsoleApp", "{931771d1-7ca4-42c7-8bb0-5742b914ff27}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems_vs9\ConsoleApp\ConsoleApp.visualdproj = visuald\Templates\ProjectItems_vs9\ConsoleApp\ConsoleApp.visualdproj + visuald\Templates\ProjectItems_vs9\ConsoleApp\ConsoleApp.vstemplate = visuald\Templates\ProjectItems_vs9\ConsoleApp\ConsoleApp.vstemplate + visuald\Templates\ProjectItems_vs9\ConsoleApp\main.d = visuald\Templates\ProjectItems_vs9\ConsoleApp\main.d + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConsoleDMDGDC", "ConsoleDMDGDC", "{44dd3ffb-474a-4291-a854-b880166de1e8}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems_vs9\ConsoleDMDGDC\ConsoleApp.visualdproj = visuald\Templates\ProjectItems_vs9\ConsoleDMDGDC\ConsoleApp.visualdproj + visuald\Templates\ProjectItems_vs9\ConsoleDMDGDC\ConsoleApp.vstemplate = visuald\Templates\ProjectItems_vs9\ConsoleDMDGDC\ConsoleApp.vstemplate + visuald\Templates\ProjectItems_vs9\ConsoleDMDGDC\main.d = visuald\Templates\ProjectItems_vs9\ConsoleDMDGDC\main.d + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConsoleDLG", "ConsoleDLG", "{3624e57e-5e42-499f-a5f4-a709a1f39679}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems_vs9\ConsoleDLG\ConsoleApp.visualdproj = visuald\Templates\ProjectItems_vs9\ConsoleDLG\ConsoleApp.visualdproj + visuald\Templates\ProjectItems_vs9\ConsoleDLG\ConsoleApp.vstemplate = visuald\Templates\ProjectItems_vs9\ConsoleDLG\ConsoleApp.vstemplate + visuald\Templates\ProjectItems_vs9\ConsoleDLG\main.d = visuald\Templates\ProjectItems_vs9\ConsoleDLG\main.d + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VCProject", "VCProject", "{b21f226c-eed0-4fe1-acd7-4c8ade029690}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems\VCProject\main.cpp = visuald\Templates\ProjectItems\VCProject\main.cpp + visuald\Templates\ProjectItems\VCProject\main.d = visuald\Templates\ProjectItems\VCProject\main.d + visuald\Templates\ProjectItems\VCProject\stdafx.cpp = visuald\Templates\ProjectItems\VCProject\stdafx.cpp + visuald\Templates\ProjectItems\VCProject\stdafx.h = visuald\Templates\ProjectItems\VCProject\stdafx.h + visuald\Templates\ProjectItems\VCProject\VCProject.vstemplate = visuald\Templates\ProjectItems\VCProject\VCProject.vstemplate + visuald\Templates\ProjectItems\VCProject\WindowsApp.vcxproj = visuald\Templates\ProjectItems\VCProject\WindowsApp.vcxproj + visuald\Templates\ProjectItems\VCProject\WindowsApp.vcxproj.filters = visuald\Templates\ProjectItems\VCProject\WindowsApp.vcxproj.filters + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wizards", "Wizards", "{244b9b41-b45f-4617-847c-06af16b81587}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\Wizards\package.vsz = visuald\Templates\Wizards\package.vsz + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DUB", "DUB", "{9d445645-f988-4712-b7da-ee20993217cf}") + ProjectSection(SolutionItems) = preProject + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicLib", "DynamicLib", "{b12b215a-1e8c-49a7-8506-638d5f77b8cd}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems_vs9\DynamicLib\dll.def = visuald\Templates\ProjectItems_vs9\DynamicLib\dll.def + visuald\Templates\ProjectItems_vs9\DynamicLib\dllmain.d = visuald\Templates\ProjectItems_vs9\DynamicLib\dllmain.d + visuald\Templates\ProjectItems_vs9\DynamicLib\DynamicLib.visualdproj = visuald\Templates\ProjectItems_vs9\DynamicLib\DynamicLib.visualdproj + visuald\Templates\ProjectItems_vs9\DynamicLib\DynamicLib.vstemplate = visuald\Templates\ProjectItems_vs9\DynamicLib\DynamicLib.vstemplate + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticLib", "StaticLib", "{79b19844-890f-4723-acfd-398e20ec888a}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems_vs9\StaticLib\lib.d = visuald\Templates\ProjectItems_vs9\StaticLib\lib.d + visuald\Templates\ProjectItems_vs9\StaticLib\StaticLib.visualdproj = visuald\Templates\ProjectItems_vs9\StaticLib\StaticLib.visualdproj + visuald\Templates\ProjectItems_vs9\StaticLib\StaticLib.vstemplate = visuald\Templates\ProjectItems_vs9\StaticLib\StaticLib.vstemplate + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeSnippets", "CodeSnippets", "{1f473a70-b5e1-4d56-a9f3-e87d69886621}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\CodeSnippets\SnippetsIndex.xml = visuald\Templates\CodeSnippets\SnippetsIndex.xml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDProject", "VDProject", "{64e623a0-2378-4dda-979e-9e0c2e20eb41}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems\VDProject\main.d = visuald\Templates\ProjectItems\VDProject\main.d + visuald\Templates\ProjectItems\VDProject\VDProject.vstemplate = visuald\Templates\ProjectItems\VDProject\VDProject.vstemplate + visuald\Templates\ProjectItems\VDProject\WindowsApp.visualdproj = visuald\Templates\ProjectItems\VDProject\WindowsApp.visualdproj + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsApp", "WindowsApp", "{141cc6e2-473a-4bf8-a0d5-68df367ecbc3}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems_vs9\WindowsApp\WindowsApp.visualdproj = visuald\Templates\ProjectItems_vs9\WindowsApp\WindowsApp.visualdproj + visuald\Templates\ProjectItems_vs9\WindowsApp\WindowsApp.vstemplate = visuald\Templates\ProjectItems_vs9\WindowsApp\WindowsApp.vstemplate + visuald\Templates\ProjectItems_vs9\WindowsApp\winmain.d = visuald\Templates\ProjectItems_vs9\WindowsApp\winmain.d + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DUB", "DUB", "{17f86ff0-1b24-43b7-957f-b0066a98fd13}") + ProjectSection(SolutionItems) = preProject + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "minimal", "minimal", "{179dd4f8-c93e-4617-b5cf-a25dbea13f85}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems_vs9\DUB\minimal\app.d = visuald\Templates\ProjectItems_vs9\DUB\minimal\app.d + visuald\Templates\ProjectItems_vs9\DUB\minimal\ConsoleApp.visualdproj = visuald\Templates\ProjectItems_vs9\DUB\minimal\ConsoleApp.visualdproj + visuald\Templates\ProjectItems_vs9\DUB\minimal\dub.sdl = visuald\Templates\ProjectItems_vs9\DUB\minimal\dub.sdl + visuald\Templates\ProjectItems_vs9\DUB\minimal\minimal.vstemplate = visuald\Templates\ProjectItems_vs9\DUB\minimal\minimal.vstemplate + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Items", "Items", "{ec52c2ea-80d0-4688-ba51-81578c88c17c}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\Items\empty.d = visuald\Templates\Items\empty.d + visuald\Templates\Items\hello.d = visuald\Templates\Items\hello.d + visuald\Templates\Items\items.vsdir = visuald\Templates\Items\items.vsdir + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectItems_vs9", "ProjectItems_vs9", "{48291a62-1094-4bec-9b13-8fd8e8358022}") + ProjectSection(SolutionItems) = preProject + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ConsoleDMDLDC", "ConsoleDMDLDC", "{e09c1baf-1b29-48c3-9796-c55517d240cf}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\ProjectItems_vs9\ConsoleDMDLDC\ConsoleApp.visualdproj = visuald\Templates\ProjectItems_vs9\ConsoleDMDLDC\ConsoleApp.visualdproj + visuald\Templates\ProjectItems_vs9\ConsoleDMDLDC\ConsoleApp.vstemplate = visuald\Templates\ProjectItems_vs9\ConsoleDMDLDC\ConsoleApp.vstemplate + visuald\Templates\ProjectItems_vs9\ConsoleDMDLDC\main.d = visuald\Templates\ProjectItems_vs9\ConsoleDMDLDC\main.d + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectItems", "ProjectItems", "{c7f6cf4c-db41-492c-9ad2-aa1001a389b0}") + ProjectSection(SolutionItems) = preProject + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Snippets", "Snippets", "{6de93aa1-4ebb-40df-8c3d-6b060f2f045a}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\CodeSnippets\Snippets\blockcomment.snippet = visuald\Templates\CodeSnippets\Snippets\blockcomment.snippet + visuald\Templates\CodeSnippets\Snippets\class.snippet = visuald\Templates\CodeSnippets\Snippets\class.snippet + visuald\Templates\CodeSnippets\Snippets\ctor.snippet = visuald\Templates\CodeSnippets\Snippets\ctor.snippet + visuald\Templates\CodeSnippets\Snippets\else.snippet = visuald\Templates\CodeSnippets\Snippets\else.snippet + visuald\Templates\CodeSnippets\Snippets\for.snippet = visuald\Templates\CodeSnippets\Snippets\for.snippet + visuald\Templates\CodeSnippets\Snippets\if.snippet = visuald\Templates\CodeSnippets\Snippets\if.snippet + visuald\Templates\CodeSnippets\Snippets\version.snippet = visuald\Templates\CodeSnippets\Snippets\version.snippet + visuald\Templates\CodeSnippets\Snippets\while.snippet = visuald\Templates\CodeSnippets\Snippets\while.snippet + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Projects", "Projects", "{6fdf165b-4643-4059-8b50-70b6e4a2d99c}") + ProjectSection(SolutionItems) = preProject + visuald\Templates\Projects\DTemplates.vsdir = visuald\Templates\Projects\DTemplates.vsdir + visuald\Templates\Projects\DubTemplates.vsdir = visuald\Templates\Projects\DubTemplates.vsdir + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug COFF32|Win32 = Debug COFF32|Win32 @@ -458,6 +623,31 @@ Global {6C5387E8-CF11-443A-88BD-CA6DCA80E755} = {38FEE953-9826-4DDB-8BE3-6DAB8E71AC66} {AB498803-493D-4FB4-9FB1-9CEF0E628CE9} = {6C5387E8-CF11-443A-88BD-CA6DCA80E755} {7F391DE3-9620-4A98-B05D-4181924A9D15} = {342DCC0D-9F76-4AFE-B2BF-4FEFEB438D17} + {AC054091-8D8F-4393-B3C5-AB67980B80EE} = {832B817E-DCF9-46DC-8440-6418B93E62B6} + {068889f6-165e-494b-95d6-9c4695ee9d45} = {AC054091-8D8F-4393-B3C5-AB67980B80EE} + {6fdf165b-4643-4059-8b50-70b6e4a2d99c} = {AC054091-8D8F-4393-B3C5-AB67980B80EE} + {9c02ac6a-14bd-4ccd-ba76-359e5c453992} = {17f86ff0-1b24-43b7-957f-b0066a98fd13} + {4dd1b584-c5f5-4f56-80c1-f787b781bc47} = {9d445645-f988-4712-b7da-ee20993217cf} + {e6961bd5-09b1-4148-a99d-8239cd28af3d} = {17f86ff0-1b24-43b7-957f-b0066a98fd13} + {931771d1-7ca4-42c7-8bb0-5742b914ff27} = {48291a62-1094-4bec-9b13-8fd8e8358022} + {44dd3ffb-474a-4291-a854-b880166de1e8} = {48291a62-1094-4bec-9b13-8fd8e8358022} + {3624e57e-5e42-499f-a5f4-a709a1f39679} = {48291a62-1094-4bec-9b13-8fd8e8358022} + {b21f226c-eed0-4fe1-acd7-4c8ade029690} = {c7f6cf4c-db41-492c-9ad2-aa1001a389b0} + {244b9b41-b45f-4617-847c-06af16b81587} = {AC054091-8D8F-4393-B3C5-AB67980B80EE} + {9d445645-f988-4712-b7da-ee20993217cf} = {48291a62-1094-4bec-9b13-8fd8e8358022} + {b12b215a-1e8c-49a7-8506-638d5f77b8cd} = {48291a62-1094-4bec-9b13-8fd8e8358022} + {79b19844-890f-4723-acfd-398e20ec888a} = {48291a62-1094-4bec-9b13-8fd8e8358022} + {1f473a70-b5e1-4d56-a9f3-e87d69886621} = {AC054091-8D8F-4393-B3C5-AB67980B80EE} + {64e623a0-2378-4dda-979e-9e0c2e20eb41} = {c7f6cf4c-db41-492c-9ad2-aa1001a389b0} + {141cc6e2-473a-4bf8-a0d5-68df367ecbc3} = {48291a62-1094-4bec-9b13-8fd8e8358022} + {17f86ff0-1b24-43b7-957f-b0066a98fd13} = {c7f6cf4c-db41-492c-9ad2-aa1001a389b0} + {179dd4f8-c93e-4617-b5cf-a25dbea13f85} = {9d445645-f988-4712-b7da-ee20993217cf} + {ec52c2ea-80d0-4688-ba51-81578c88c17c} = {AC054091-8D8F-4393-B3C5-AB67980B80EE} + {48291a62-1094-4bec-9b13-8fd8e8358022} = {AC054091-8D8F-4393-B3C5-AB67980B80EE} + {e09c1baf-1b29-48c3-9796-c55517d240cf} = {48291a62-1094-4bec-9b13-8fd8e8358022} + {c7f6cf4c-db41-492c-9ad2-aa1001a389b0} = {AC054091-8D8F-4393-B3C5-AB67980B80EE} + {6de93aa1-4ebb-40df-8c3d-6b060f2f045a} = {1f473a70-b5e1-4d56-a9f3-e87d69886621} + {600531c5-7627-446a-8d27-89e3035edcb8} = {6fdf165b-4643-4059-8b50-70b6e4a2d99c} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BAF35E81-511D-4170-B7D0-594E5DE3886A}