From a00b2b2b3e313fa63da4f8d21cd149eae412db57 Mon Sep 17 00:00:00 2001
From: MrJul <julien@gammajul.net>
Date: Sat, 17 Aug 2013 01:09:22 +0200
Subject: [PATCH] Fixed a problem with some unresolved references of references

---
 .../GammaJul.ReSharper.ForTea.Setup.aip           |  6 +++---
 .../GammaJul.ReSharper.ForTea.Setup.aiproj        |  2 +-
 .../GammaJul.ReSharper.ForTea.v8.csproj           |  4 +++-
 .../GammaJul.ReSharper.ForTea.v8.nuspec           |  2 +-
 .../Properties/AssemblyInfo.cs                    |  2 +-
 GammaJul.ReSharper.ForTea/Psi/T4PsiModule.cs      | 15 +++++++++++----
 GammaJul.ReSharper.ForTea/Psi/T4PsiModule.v8.cs   |  2 +-
 README.md                                         |  6 +++---
 8 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/GammaJul.ReSharper.ForTea.Setup/GammaJul.ReSharper.ForTea.Setup.aip b/GammaJul.ReSharper.ForTea.Setup/GammaJul.ReSharper.ForTea.Setup.aip
index e28734e..ef14a10 100644
--- a/GammaJul.ReSharper.ForTea.Setup/GammaJul.ReSharper.ForTea.Setup.aip
+++ b/GammaJul.ReSharper.ForTea.Setup/GammaJul.ReSharper.ForTea.Setup.aip
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<DOCUMENT Type="Advanced Installer" CreateVersion="8.2" version="10.1" Modules="professional" RootPath="." Language="en" Id="{380AE56C-C72F-4A9D-8574-952686B32D88}">
+<DOCUMENT Type="Advanced Installer" CreateVersion="8.2" version="10.3" Modules="professional" RootPath="." Language="en" Id="{380AE56C-C72F-4A9D-8574-952686B32D88}">
   <COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
     <ROW Name="HiddenItems" Value="DigCertStoreComponent;UpdaterComponent;SerValComponent;PreReqComponent;MsiExtComponent;MsiAssemblyComponent;MsiServInstComponent;MsiOrgComponent;ActSyncAppComponent;MsiThemeComponent;BackgroundImagesComponent;DictionaryComponent;CPLAppletComponent;MsiClassComponent;WebApplicationsComponent;MsiOdbcDataSrcComponent;MsiInstExSeqComponent"/>
   </COMPONENT>
@@ -16,10 +16,10 @@
     <ROW Property="ARPURLINFOABOUT" Value="https://github.com/MrJul/ForTea"/>
     <ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:3"/>
     <ROW Property="Manufacturer" Value="Julien Lebosquain" ValueLocId="*"/>
-    <ROW Property="ProductCode" Value="1033:{8053CC8B-0829-4CF2-B791-405FC6FCF1DF} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{225E394A-ECAA-40D2-B06F-AF4429E63752} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="ForTea for ReSharper 7.1" ValueLocId="*"/>
-    <ROW Property="ProductVersion" Value="1.1.1" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.1.2" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
     <ROW Property="UpgradeCode" Value="{501ADDDA-F122-4414-B633-0150564B03F7}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
diff --git a/GammaJul.ReSharper.ForTea.Setup/GammaJul.ReSharper.ForTea.Setup.aiproj b/GammaJul.ReSharper.ForTea.Setup/GammaJul.ReSharper.ForTea.Setup.aiproj
index 4a886dd..b94c8b5 100644
--- a/GammaJul.ReSharper.ForTea.Setup/GammaJul.ReSharper.ForTea.Setup.aiproj
+++ b/GammaJul.ReSharper.ForTea.Setup/GammaJul.ReSharper.ForTea.Setup.aiproj
@@ -14,7 +14,7 @@
     <AssemblyName>GammaJul.ReSharper.ForTea.Setup</AssemblyName>
     <Name>GammaJul.ReSharper.ForTea.Setup</Name>
     <RootNamespace>GammaJul.ReSharper.ForTea.Setup</RootNamespace>
-    <AdvinstCmdLine>-buildslist DefaultBuild</AdvinstCmdLine>
+    <AdvinstCmdLine>-buildslist All</AdvinstCmdLine>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'All' ">
     <DebugSymbols>false</DebugSymbols>
diff --git a/GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.v8.csproj b/GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.v8.csproj
index 9776cb4..abb30d0 100644
--- a/GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.v8.csproj
+++ b/GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.v8.csproj
@@ -225,7 +225,9 @@
     <Compile Include="Parsing\T4TreeBuilder.DirectiveBuilder.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="GammaJul.ReSharper.ForTea.v8.nuspec" />
+    <None Include="GammaJul.ReSharper.ForTea.v8.nuspec">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <PropertyGroup>
     <ReSharperSdkTargets Condition=" '$(ReSharperSdkTargets)' == '' ">$(MSBuildExtensionsPath)\JetBrains\ReSharper.SDK\v$(ReSharperSdkVersion)</ReSharperSdkTargets>
diff --git a/GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.v8.nuspec b/GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.v8.nuspec
index 7f4f37f..e3c18a9 100644
--- a/GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.v8.nuspec
+++ b/GammaJul.ReSharper.ForTea/GammaJul.ReSharper.ForTea.v8.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
 	<metadata>
 		<id>ForTea</id>
-		<version>1.1.1.0</version>
+		<version>1.1.2</version>
 		<title>ForTea</title>
 		<authors>Julien Lebosquain</authors>
 		<description>Adds support for editing T4 text templating files (.tt)</description>
diff --git a/GammaJul.ReSharper.ForTea/Properties/AssemblyInfo.cs b/GammaJul.ReSharper.ForTea/Properties/AssemblyInfo.cs
index 4513122..57676f1 100644
--- a/GammaJul.ReSharper.ForTea/Properties/AssemblyInfo.cs
+++ b/GammaJul.ReSharper.ForTea/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
 [assembly: AssemblyCopyright("Copyright © Julien Lebosquain, 2012-2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.1.1.0")]
+[assembly: AssemblyVersion("1.1.2.0")]
 
 // The following information is displayed by ReSharper in the Plugins dialog
 [assembly: PluginTitle("ForTea")]
diff --git a/GammaJul.ReSharper.ForTea/Psi/T4PsiModule.cs b/GammaJul.ReSharper.ForTea/Psi/T4PsiModule.cs
index 0b25f81..cf28875 100644
--- a/GammaJul.ReSharper.ForTea/Psi/T4PsiModule.cs
+++ b/GammaJul.ReSharper.ForTea/Psi/T4PsiModule.cs
@@ -362,10 +362,17 @@ object IChangeProvider.Execute(IChangeMap changeMap) {
 		/// <remarks>Does not implement <see cref="IDisposable"/>, is called when the lifetime is terminated.</remarks>
 		private void Dispose() {
 			_isValid = false;
-			
-			foreach (IAssemblyCookie assemblyCookie in _assemblyReferences.Values)
-				assemblyCookie.Dispose();
-			_assemblyReferences.Clear();
+
+			// Removes the references.
+			IAssemblyCookie[] assemblyCookies = _assemblyReferences.Values.ToArray();
+			if (assemblyCookies.Length > 0) {
+				_shellLocks.ExecuteWithWriteLock(() => {
+					foreach (IAssemblyCookie assemblyCookie in assemblyCookies)
+						assemblyCookie.Dispose();
+				});
+				_assemblyReferences.Clear();
+			}
+
 			_resolveProject.Dispose();
 		}
 
diff --git a/GammaJul.ReSharper.ForTea/Psi/T4PsiModule.v8.cs b/GammaJul.ReSharper.ForTea/Psi/T4PsiModule.v8.cs
index e32c24e..43de602 100644
--- a/GammaJul.ReSharper.ForTea/Psi/T4PsiModule.v8.cs
+++ b/GammaJul.ReSharper.ForTea/Psi/T4PsiModule.v8.cs
@@ -51,7 +51,7 @@ private PsiProjectFile CreateSourceFile([NotNull] IProjectFile projectFile, [Not
 				(pf, sf) => new T4PsiProjectFileProperties(pf, sf, true), 
 				JetFunc<IProjectFile, IPsiSourceFile>.True,
 				documentManager,
-				projectFile.GetProject().GetResolveContext());
+				UniversalModuleReferenceContext.Instance);
 		}
 
 
diff --git a/README.md b/README.md
index 3238f5a..adcacd6 100644
--- a/README.md
+++ b/README.md
@@ -5,15 +5,15 @@ What's ForTea?
 --------------
 ForTea is a a plugin for [JetBrains ReSharper](http://www.jetbrains.com/resharper/) 7.1 and 8.0 that adds support for editing T4 (.tt) files.  
 This project corresponds to the issue [RSRP-191807](http://youtrack.jetbrains.com/issue/RSRP-191807) in JetBrains bug tracker.  
-Latest version is 1.1.1 (2013-07-19), please see the [Release Notes](https://github.com/MrJul/ForTea/wiki/Release-Notes).  
+Latest version is 1.1.2 (2013-08-17), please see the [Release Notes](https://github.com/MrJul/ForTea/wiki/Release-Notes).  
 Don't hesitate to [open an issue](https://github.com/MrJul/ForTea/issues) if you encounter any problem.
 
 Installation
 ------------
 Visual Studio 2010 or Visual Studio 2012 is required.  
 ReSharper 7.1.x or 8.0 must be installed.  
-To install ForTea 1.1.1 in various ReSharper versions:
- - For ReSharper 7.1.x, install ForTea using the MSI installer available [here](http://download.flynware.com/ForTea/ForTea-1.1.1.msi).  
+To install ForTea 1.1.2 in various ReSharper versions:
+ - For ReSharper 7.1.x, install ForTea using the MSI installer available [here](http://download.flynware.com/ForTea/ForTea-1.1.2.msi).  
  - For ReSharper 8.0, install ForTea using the built-in Extension Manager from the ReSharper menu.