From b2429f3add80606e84f5c7069de600d57cc90c2f Mon Sep 17 00:00:00 2001 From: Christian Resma Helle Date: Wed, 23 Oct 2013 21:56:08 +0200 Subject: [PATCH] Creates the ResourceLoader instance using the static method GetForCurrentView() instead of the constructor to resolve the Visual Studio 2013 compiler warning --- .../ReswCodeGen.Tests/CSharpCodeGeneratorTests.cs | 2 +- .../CSharpCodeGeneratorTestsInternal.cs | 2 +- .../VisualBasicCodeGeneratorInternalTests.cs | 2 +- .../VisualBasicCodeGeneratorTests.cs | 2 +- .../VSPackage/CustomTool/CodeDomCodeGenerator.cs | 14 ++++++++++++-- .../VSPackage/Properties/AssemblyInfo.cs | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/RESW File Code Generator/ReswCodeGen.Tests/CSharpCodeGeneratorTests.cs b/RESW File Code Generator/ReswCodeGen.Tests/CSharpCodeGeneratorTests.cs index 5e1c68c..5a87ee6 100644 --- a/RESW File Code Generator/ReswCodeGen.Tests/CSharpCodeGeneratorTests.cs +++ b/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\");")); } } } \ No newline at end of file diff --git a/RESW File Code Generator/ReswCodeGen.Tests/CSharpCodeGeneratorTestsInternal.cs b/RESW File Code Generator/ReswCodeGen.Tests/CSharpCodeGeneratorTestsInternal.cs index 94b52e8..c5c43ac 100644 --- a/RESW File Code Generator/ReswCodeGen.Tests/CSharpCodeGeneratorTestsInternal.cs +++ b/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\");")); } } } \ No newline at end of file diff --git a/RESW File Code Generator/ReswCodeGen.Tests/VisualBasicCodeGeneratorInternalTests.cs b/RESW File Code Generator/ReswCodeGen.Tests/VisualBasicCodeGeneratorInternalTests.cs index feb6135..274977d 100644 --- a/RESW File Code Generator/ReswCodeGen.Tests/VisualBasicCodeGeneratorInternalTests.cs +++ b/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\")")); } } } \ No newline at end of file diff --git a/RESW File Code Generator/ReswCodeGen.Tests/VisualBasicCodeGeneratorTests.cs b/RESW File Code Generator/ReswCodeGen.Tests/VisualBasicCodeGeneratorTests.cs index ebb4d39..9ce6571 100644 --- a/RESW File Code Generator/ReswCodeGen.Tests/VisualBasicCodeGeneratorTests.cs +++ b/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\")")); } } } \ No newline at end of file diff --git a/RESW File Code Generator/VSPackage/CustomTool/CodeDomCodeGenerator.cs b/RESW File Code Generator/VSPackage/CustomTool/CodeDomCodeGenerator.cs index 1a2f437..f77b45d 100644 --- a/RESW File Code Generator/VSPackage/CustomTool/CodeDomCodeGenerator.cs +++ b/RESW File Code Generator/VSPackage/CustomTool/CodeDomCodeGenerator.cs @@ -84,21 +84,31 @@ namespace ChristianHelle.DeveloperTools.CodeGenerators.Resw.VSPackage.CustomTool new CodeVariableReferenceExpression("currentAssemblyName"), new CodeArrayIndexerExpression(new CodeVariableReferenceExpression("currentAssemblySplit"), new CodePrimitiveExpression(1))); + // TODO: Call GetForCurrentView() instead of the constructor method because the constructor will be depracted after future versions of Windows 8.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 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 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); diff --git a/RESW File Code Generator/VSPackage/Properties/AssemblyInfo.cs b/RESW File Code Generator/VSPackage/Properties/AssemblyInfo.cs index 9925d48..e8288c0 100644 --- a/RESW File Code Generator/VSPackage/Properties/AssemblyInfo.cs +++ b/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.2.0.*")] [assembly: InternalsVisibleTo("VSPackage_IntegrationTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010045bd05a5b24c74b83f069df52e138682c2fb8b1ee65cb9d351fd7e8d622308aeb588b2a2975d75da4fe8a392510528baa26a3317809ec064d3cc852f0df94752ad2228d9f2a048ee2858c1e9d505b05f7fb4ede02f34154f75ea50445741c84f5ab1c814358f5fd6a6f08bb3d94284cff0524d5ca9d888c8648bcbc7a1e0a3c8")] [assembly: InternalsVisibleTo("VSPackage_UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010045bd05a5b24c74b83f069df52e138682c2fb8b1ee65cb9d351fd7e8d622308aeb588b2a2975d75da4fe8a392510528baa26a3317809ec064d3cc852f0df94752ad2228d9f2a048ee2858c1e9d505b05f7fb4ede02f34154f75ea50445741c84f5ab1c814358f5fd6a6f08bb3d94284cff0524d5ca9d888c8648bcbc7a1e0a3c8")]