v1.3

RESW File Code Generator/ReswCodeGen.Tests/CSharpCodeGeneratorTests.cs

@@ -62,7 +62,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.CustomTool.Tests
         [TestMethod]
         public void ResourceLoaderInitializedWithClassName()
         {
-            Assert.IsTrue(actual.Contains("new ResourceLoader(currentAssemblyName + \"/Resources\");"));
+            Assert.IsTrue(actual.Contains("ResourceLoader.GetForCurrentView(currentAssemblyName + \"/Resources\");"));
         }
     }
 }

RESW File Code Generator/ReswCodeGen.Tests/CSharpCodeGeneratorTestsInternal.cs

@@ -63,7 +63,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.CustomTool.Tests
         [TestMethod]
         public void ResourceLoaderInitializedWithClassName()
         {
-            Assert.IsTrue(actual.Contains("new ResourceLoader(currentAssemblyName + \"/Resources\");"));
+            Assert.IsTrue(actual.Contains("ResourceLoader.GetForCurrentView(currentAssemblyName + \"/Resources\");"));
         }
     }
 }

RESW File Code Generator/ReswCodeGen.Tests/VisualBasicCodeGeneratorInternalTests.cs

@@ -64,7 +64,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.CustomTool.Tests
         [TestMethod]
         public void ResourceLoaderInitializedWithClassName()
         {
-            Assert.IsTrue(actual.Contains("New ResourceLoader(currentAssemblyName + \"/Resources\")"));
+            Assert.IsTrue(actual.Contains("ResourceLoader.GetForCurrentView(currentAssemblyName + \"/Resources\")"));
         }
     }
 }

RESW File Code Generator/ReswCodeGen.Tests/VisualBasicCodeGeneratorTests.cs

@@ -57,7 +57,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.CustomTool.Tests
         [TestMethod]
         public void ResourceLoaderInitializedWithClassName()
         {
-            Assert.IsTrue(actual.Contains("New ResourceLoader(currentAssemblyName + \"/Resources\")"));
+            Assert.IsTrue(actual.Contains("ResourceLoader.GetForCurrentView(currentAssemblyName + \"/Resources\")"));
         }
     }
 }

RESW File Code Generator/VSPackage/CustomTool/CodeDomCodeGenerator.cs

@@ -10,18 +10,25 @@ using Microsoft.CSharp;
 namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
 {
     public class CodeDomCodeGenerator : CodeGenerator, IDisposable
-    {
-        private readonly string className;
+    {  
         private readonly TypeAttributes? classAccessibility;
+        private readonly VisualStudioVersion visualStudioVersion;
+        private readonly string className;
         private readonly CodeNamespace codeNamespace;
         private readonly CodeCompileUnit compileUnit;
         private readonly CodeDomProvider provider;
 
-        public CodeDomCodeGenerator(IResourceParser resourceParser, string className, string defaultNamespace, CodeDomProvider codeDomProvider = null, TypeAttributes? classAccessibility = null)
+        public CodeDomCodeGenerator(IResourceParser resourceParser,
+                                    string className,
+                                    string defaultNamespace,
+                                    CodeDomProvider codeDomProvider = null,
+                                    TypeAttributes? classAccessibility = null,
+                                    VisualStudioVersion visualStudioVersion = VisualStudioVersion.VS2012)
             : base(resourceParser, defaultNamespace)
         {
             this.className = className;
             this.classAccessibility = classAccessibility;
+            this.visualStudioVersion = visualStudioVersion;
             compileUnit = new CodeCompileUnit();
             provider = codeDomProvider ?? new CSharpCodeProvider();
             codeNamespace = new CodeNamespace(defaultNamespace);
@@ -29,7 +36,8 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
 
         public override string GenerateCode()
         {
-            codeNamespace.Comments.Add(new CodeCommentStatement("--------------------------------------------------------------------------------------------------"));
+            codeNamespace.Comments.Add(
+                new CodeCommentStatement("--------------------------------------------------------------------------------------------------"));
             codeNamespace.Comments.Add(new CodeCommentStatement("<auto-generatedInfo>"));
             codeNamespace.Comments.Add(new CodeCommentStatement("\tThis code was generated by ResW File Code Generator (http://reswcodegen.codeplex.com)"));
             codeNamespace.Comments.Add(new CodeCommentStatement("\tResW File Code Generator was written by Christian Resma Helle"));
@@ -40,66 +48,75 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
             codeNamespace.Comments.Add(new CodeCommentStatement(string.Empty));
             codeNamespace.Comments.Add(new CodeCommentStatement("\tGenerated: " + DateTime.Now.ToString(CultureInfo.InvariantCulture)));
             codeNamespace.Comments.Add(new CodeCommentStatement("</auto-generatedInfo>"));
-            codeNamespace.Comments.Add(new CodeCommentStatement("--------------------------------------------------------------------------------------------------"));
+            codeNamespace.Comments.Add(
+                new CodeCommentStatement("--------------------------------------------------------------------------------------------------"));
 
             codeNamespace.Imports.Add(new CodeNamespaceImport("Windows.ApplicationModel.Resources"));
 
             var targetClass = new CodeTypeDeclaration(className)
-                                  {
-                                      IsClass = true,
-                                      IsPartial = true,
-                                      TypeAttributes = classAccessibility.HasValue ? classAccessibility.Value : TypeAttributes.Public
-                                  };
+            {
+                IsClass = true,
+                IsPartial = true,
+                TypeAttributes = classAccessibility.HasValue ? classAccessibility.Value : TypeAttributes.Public
+            };
 
             const string resourceLoaderType = "ResourceLoader";
             var resourceLoaderField = new CodeMemberField(resourceLoaderType, "resourceLoader")
-                                          {
-                                              Attributes = MemberAttributes.Private | MemberAttributes.Static | MemberAttributes.Final
-                                          };
+            {
+                Attributes = MemberAttributes.Private | MemberAttributes.Static | MemberAttributes.Final
+            };
             targetClass.Members.Add(resourceLoaderField);
 
             var constructor = new CodeTypeConstructor();
 
-            var executingAssemblyVar = new CodeVariableDeclarationStatement(typeof(string), "executingAssemblyName");
-            var executingAssemblyInit = new CodeAssignStatement(
-                new CodeVariableReferenceExpression("executingAssemblyName"),
-                new CodeSnippetExpression("Windows.UI.Xaml.Application.Current.GetType().AssemblyQualifiedName"));
-            var executingAssemblySplit = new CodeVariableDeclarationStatement(typeof(string[]), "executingAssemblySplit");
-            var executingAssemblyInit2 = new CodeAssignStatement(
-                new CodeVariableReferenceExpression("executingAssemblySplit"),
-                new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("executingAssemblyName"), "Split", new CodePrimitiveExpression(',')));
-            var executingAssemblyInit3 = new CodeAssignStatement(
-                new CodeVariableReferenceExpression("executingAssemblyName"),
-                new CodeArrayIndexerExpression(new CodeVariableReferenceExpression("executingAssemblySplit"), new CodePrimitiveExpression(1)));
+            var executingAssemblyVar = new CodeVariableDeclarationStatement(typeof (string), "executingAssemblyName");
+            var executingAssemblyInit = new CodeAssignStatement(new CodeVariableReferenceExpression("executingAssemblyName"),
+                                                                new CodeSnippetExpression("Windows.UI.Xaml.Application.Current.GetType().AssemblyQualifiedName"));
+            var executingAssemblySplit = new CodeVariableDeclarationStatement(typeof (string[]), "executingAssemblySplit");
+            var executingAssemblyInit2 = new CodeAssignStatement(new CodeVariableReferenceExpression("executingAssemblySplit"),
+                                                                 new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("executingAssemblyName"),
+                                                                                                "Split",
+                                                                                                new CodePrimitiveExpression(',')));
+            var executingAssemblyInit3 = new CodeAssignStatement(new CodeVariableReferenceExpression("executingAssemblyName"),
+                                                                 new CodeArrayIndexerExpression(new CodeVariableReferenceExpression("executingAssemblySplit"),
+                                                                                                new CodePrimitiveExpression(1)));
 
-            var currentAssemblyVar = new CodeVariableDeclarationStatement(typeof(string), "currentAssemblyName");
-            var currentAssemblyInit = new CodeAssignStatement(
-                new CodeVariableReferenceExpression("currentAssemblyName"),
-                new CodePropertyReferenceExpression(new CodeTypeOfExpression(className), "AssemblyQualifiedName"));
-            var currentAssemblySplit = new CodeVariableDeclarationStatement(typeof(string[]), "currentAssemblySplit");
-            var currentAssemblyInit2 = new CodeAssignStatement(
-                 new CodeVariableReferenceExpression("currentAssemblySplit"),
-                 new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("currentAssemblyName"), "Split", new CodePrimitiveExpression(',')));
-            var currentAssemblyInit3 = new CodeAssignStatement(
-                new CodeVariableReferenceExpression("currentAssemblyName"),
-                new CodeArrayIndexerExpression(new CodeVariableReferenceExpression("currentAssemblySplit"), new CodePrimitiveExpression(1)));
+            var currentAssemblyVar = new CodeVariableDeclarationStatement(typeof (string), "currentAssemblyName");
+            var currentAssemblyInit = new CodeAssignStatement(new CodeVariableReferenceExpression("currentAssemblyName"),
+                                                              new CodePropertyReferenceExpression(new CodeTypeOfExpression(className), "AssemblyQualifiedName"));
+            var currentAssemblySplit = new CodeVariableDeclarationStatement(typeof (string[]), "currentAssemblySplit");
+            var currentAssemblyInit2 = new CodeAssignStatement(new CodeVariableReferenceExpression("currentAssemblySplit"),
+                                                               new CodeMethodInvokeExpression(new CodeVariableReferenceExpression("currentAssemblyName"),
+                                                                                              "Split",
+                                                                                              new CodePrimitiveExpression(',')));
+            var currentAssemblyInit3 = new CodeAssignStatement(new CodeVariableReferenceExpression("currentAssemblyName"),
+                                                               new CodeArrayIndexerExpression(new CodeVariableReferenceExpression("currentAssemblySplit"),
+                                                                                              new CodePrimitiveExpression(1)));
 
             var createResourceLoader = new CodeConditionStatement(
                 new CodeSnippetExpression("executingAssemblyName.Equals(currentAssemblyName)"),
                 new CodeStatement[] // true
-                    {
-                        new CodeAssignStatement(
-                            new CodeFieldReferenceExpression(null, "resourceLoader"),
-                            new CodeObjectCreateExpression(new CodeTypeReference("ResourceLoader"),
-                                                           new CodeSnippetExpression("\"" + className + "\"")))
-                    },
+                {
+                    visualStudioVersion == VisualStudioVersion.VS2013
+                        ? new CodeAssignStatement(new CodeFieldReferenceExpression(null, "resourceLoader"),
+                                                  new CodeMethodInvokeExpression(new CodeTypeReferenceExpression("ResourceLoader"),
+                                                                                 "GetForCurrentView",
+                                                                                 new CodeSnippetExpression("\"" + className + "\"")))
+                        : new CodeAssignStatement(new CodeFieldReferenceExpression(null, "resourceLoader"),
+                                                  new CodeObjectCreateExpression(new CodeTypeReference("ResourceLoader"),
+                                                                                 new CodeSnippetExpression("\"" + className + "\"")))
+                },
                 new CodeStatement[] // false
-                    {
-                        new CodeAssignStatement(
-                            new CodeFieldReferenceExpression(null, "resourceLoader"),
-                            new CodeObjectCreateExpression(new CodeTypeReference("ResourceLoader"),
-                                                           new CodeSnippetExpression("currentAssemblyName + \"/" + className + "\"")))
-                    });
+                {
+                    visualStudioVersion == VisualStudioVersion.VS2013
+                        ? new CodeAssignStatement(new CodeFieldReferenceExpression(null, "resourceLoader"),
+                                                  new CodeMethodInvokeExpression(new CodeTypeReferenceExpression("ResourceLoader"),
+                                                                                 "GetForCurrentView",
+                                                                                 new CodeSnippetExpression("currentAssemblyName + \"/" + className + "\"")))
+                        : new CodeAssignStatement(new CodeFieldReferenceExpression(null, "resourceLoader"),
+                                                  new CodeObjectCreateExpression(new CodeTypeReference("ResourceLoader"),
+                                                                                 new CodeSnippetExpression("currentAssemblyName + \"/" + className + "\"")))
+                });
 
             constructor.Statements.Add(executingAssemblyVar);
             constructor.Statements.Add(executingAssemblyInit);
@@ -122,12 +139,12 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
                     continue;
 
                 var property = new CodeMemberProperty
-                                   {
-                                       Name = item.Name.Trim(),
-                                       Attributes = MemberAttributes.Public | MemberAttributes.Static,
-                                       HasGet = true,
-                                       Type = new CodeTypeReference(typeof(string))
-                                   };
+                {
+                    Name = item.Name.Trim(),
+                    Attributes = MemberAttributes.Public | MemberAttributes.Static,
+                    HasGet = true,
+                    Type = new CodeTypeReference(typeof (string))
+                };
 
                 property.Comments.Add(new CodeCommentStatement("<summary>", true));
                 property.Comments.Add(new CodeCommentStatement("Localized resource similar to \"" + (item.Value ?? item.Name) + "\"", true));
@@ -135,7 +152,8 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
                 property.GetStatements.Add(
                     new CodeMethodReturnStatement(
                         new CodeMethodInvokeExpression(
-                            new CodeFieldReferenceExpression(null, "resourceLoader"), "GetString",
+                            new CodeFieldReferenceExpression(null, "resourceLoader"),
+                            "GetString",
                             new CodePrimitiveExpression(item.Name))));
 
                 targetClass.Members.Add(property);
@@ -149,7 +167,7 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
 
         private string GenerateCodeFromCompileUnit()
         {
-            var options = new CodeGeneratorOptions { BracingStyle = "C" };
+            var options = new CodeGeneratorOptions {BracingStyle = "C"};
 
             var code = new StringBuilder();
 
@@ -163,16 +181,16 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
 
         private bool disposed;
 
-        ~CodeDomCodeGenerator()
-        {
-            Dispose(false);
-        }
-
         public void Dispose()
         {
             Dispose(true);
         }
 
+        ~CodeDomCodeGenerator()
+        {
+            Dispose(false);
+        }
+
         protected virtual void Dispose(bool dispose)
         {
             if (disposed)

RESW File Code Generator/VSPackage/CustomTool/CodeGeneratorFactory.cs

@@ -1,6 +1,9 @@
-using System.CodeDom;
+using System;
 using System.CodeDom.Compiler;
 using System.Reflection;
+using EnvDTE;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 
 namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
 {
@@ -8,7 +11,23 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
     {
         public ICodeGenerator Create(string className, string defaultNamespace, string inputFileContents, CodeDomProvider codeDomProvider = null, TypeAttributes? classAccessibility = null)
         {
-            return new CodeDomCodeGenerator(new ResourceParser(inputFileContents), className, defaultNamespace, codeDomProvider, classAccessibility);
+            return new CodeDomCodeGenerator(new ResourceParser(inputFileContents), className, defaultNamespace, codeDomProvider, classAccessibility, VisualStudioHelper.GetVersion());
+        }
+    }
+
+    public static class VisualStudioHelper
+    {
+        public static VisualStudioVersion GetVersion()
+        {
+            var dte = Package.GetGlobalService(typeof(SDTE)) as DTE;
+            var vsVersion = VisualStudioVersion.VS2012;
+            if (dte != null)
+            {
+                Version dteVersion;
+                if (Version.TryParse(dte.Version, out dteVersion) && dteVersion >= new Version(12, 0))
+                    vsVersion = VisualStudioVersion.VS2013;
+            }
+            return vsVersion;
         }
     }
 }

RESW File Code Generator/VSPackage/CustomTool/VisualStudioVersion.cs

@@ -0,0 +1,9 @@
+namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool
+{
+    public enum VisualStudioVersion
+    {
+        VS2012,
+        VS2013,
+        Unknown
+    }
+}

RESW File Code Generator/VSPackage/Properties/AssemblyInfo.cs

@@ -29,7 +29,7 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.1.0.*")]
+[assembly: AssemblyVersion("1.3.0.*")]
 
 [assembly: InternalsVisibleTo("VSPackage_IntegrationTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010045bd05a5b24c74b83f069df52e138682c2fb8b1ee65cb9d351fd7e8d622308aeb588b2a2975d75da4fe8a392510528baa26a3317809ec064d3cc852f0df94752ad2228d9f2a048ee2858c1e9d505b05f7fb4ede02f34154f75ea50445741c84f5ab1c814358f5fd6a6f08bb3d94284cff0524d5ca9d888c8648bcbc7a1e0a3c8")]
 [assembly: InternalsVisibleTo("VSPackage_UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010045bd05a5b24c74b83f069df52e138682c2fb8b1ee65cb9d351fd7e8d622308aeb588b2a2975d75da4fe8a392510528baa26a3317809ec064d3cc852f0df94752ad2228d9f2a048ee2858c1e9d505b05f7fb4ede02f34154f75ea50445741c84f5ab1c814358f5fd6a6f08bb3d94284cff0524d5ca9d888c8648bcbc7a1e0a3c8")]

RESW File Code Generator/VSPackage/VSPackage.csproj

@@ -119,6 +119,7 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CustomTool\VisualStudioVersion.cs" />
     <Compile Include="VisualStudio2013Package.cs" />
     <Compile Include="CustomTool\ClassNameExtractor.cs" />
     <Compile Include="CustomTool\CodeDomCodeGenerator.cs" />

RESW File Code Generator/VSPackage/VSPackage.resx

@@ -1,14 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--
-    VS SDK Notes: This resx file contains the resources that will be consumed from your package by Visual Studio.
-    For example, Visual Studio will attempt to load resource '400' from this resource stream when it needs to
-    load your package's icon. Because Visual Studio will always look in the VSPackage.resources stream first for
-    resources it needs, you should put additional resources that Visual Studio will load directly into this resx 
-    file. 
-
-    Resources that you would like to access directly from your package in a strong-typed fashion should be stored 
-    in Resources.resx or another resx file.
--->
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -127,13 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="110" xml:space="preserve">
     <value>ResW File Code Generator</value>
   </data>
   <data name="112" xml:space="preserve">
-    <value>Information about my packageA Visual Studio 2012 Custom Tool for generating a strongly typed helper class for accessing localized resources from a .ResW file.</value>
+    <value>A Visual Studio 2012 and 2013 Custom Tool for generating a strongly typed helper class for accessing localized resources from a .ResW file.</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="400" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>Resources\Package.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

RESW File Code Generator/VSPackage/VSPackage_IntegrationTests/VSPackage_IntegrationTests.csproj

@@ -66,6 +66,7 @@
     <Compile Include="SignOff-Tests\CSharpProjectTests.cs" />
     <Compile Include="SignOff-Tests\SolutionTests.cs" />
     <Compile Include="SignOff-Tests\VBProjectTests.cs" />
+    <Compile Include="VisualStudioVersionHelperTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="Key.snk" />

RESW File Code Generator/VSPackage/VSPackage_IntegrationTests/VisualStudioVersionHelperTests.cs

@@ -0,0 +1,16 @@
+using ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace VSPackage_IntegrationTests
+{
+    [TestClass]
+    public class VisualStudioHelperTests
+    {
+        [TestMethod]
+        public void GetVersionTests()
+        {
+            var actual = VisualStudioHelper.GetVersion();
+            Assert.AreNotEqual(VisualStudioVersion.Unknown, actual);
+        }
+    }
+}

RESW File Code Generator/VSPackage/VisualStudio2012Package.cs

@@ -63,7 +63,6 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage
         {
             Debug.WriteLine (string.Format(CultureInfo.CurrentCulture, "Entering Initialize() of: {0}", this.ToString()));
             base.Initialize();
-
         }
         #endregion
 

RESW File Code Generator/VSPackage/VisualStudio2013Package.cs

@@ -63,7 +63,6 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage
         {
             Debug.WriteLine (string.Format(CultureInfo.CurrentCulture, "Entering Initialize() of: {0}", this.ToString()));
             base.Initialize();
-
         }
         #endregion
 

RESW File Code Generator/VSPackage/source.extension.vsixmanifest

@@ -4,7 +4,7 @@
                  xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
     <Identity Id="6a4c1726-440f-4b2d-a2e5-711277da6099"
-              Version="1.1"
+              Version="1.3"
               Language="en-US"
               Publisher="Christian Resma Helle" />
     <DisplayName>ResW File Code Generator</DisplayName>
@@ -13,8 +13,7 @@
     <License>License.txt</License>
   </Metadata>
   <Installation InstalledByMsi="false">
-    <InstallationTarget Version="[11.0,12.0]"
-                        Id="Microsoft.VisualStudio.Premium" />
+    <InstallationTarget Version="[11.0,12.0]" Id="Microsoft.VisualStudio.IntegratedShell" />
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP"