make code generated compatible with windows components

DotNetPlus · Jun 6, 2020 · 499cafe · 499cafe
1 parent e5a5eef
commit 499cafe
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/src/Sample/Strings/en-US/Resources.generated.cs b/src/Sample/Strings/en-US/Resources.generated.cs
@@ -6,10 +6,10 @@
 using Windows.UI.Xaml.Data;
 
 namespace ReswPlusSample.Strings{
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("DotNetPlus.ReswPlus", "2.1.1")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("DotNetPlus.ReswPlus", "2.1.2")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources {
+    public static class Resources {
         private static ResourceLoader _resourceLoader;
         static Resources()
         {
@@ -342,7 +342,7 @@ public static string YourAgeAndName(double paramDouble1, string paramString2)
         #endregion
     }
 
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("DotNetPlus.ReswPlus", "2.1.1")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("DotNetPlus.ReswPlus", "2.1.2")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     [MarkupExtensionReturnType(ReturnType = typeof(string))]

diff --git a/src/VSExtension/ReswPlus.Core/CodeGenerators/CsharpCodeGenerator.cs b/src/VSExtension/ReswPlus.Core/CodeGenerators/CsharpCodeGenerator.cs
@@ -76,7 +76,7 @@ protected override void OpenStronglyTypedClass(CodeStringBuilder builder, string
             builder.AppendLine($"[global::System.CodeDom.Compiler.GeneratedCodeAttribute(\"{Constants.ReswPlusName}\", \"{Constants.ReswPlusExtensionVersion}\")]");
             builder.AppendLine("[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]");
             builder.AppendLine("[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]");
-            builder.AppendLine($"public class {className} {{");
+            builder.AppendLine($"public static class {className} {{");
             builder.AddLevel();
             builder.AppendLine("private static ResourceLoader _resourceLoader;");
             builder.AppendLine($"static {className}()");

diff --git a/src/VSExtension/ReswPlus.Core/Constants.cs b/src/VSExtension/ReswPlus.Core/Constants.cs
@@ -9,7 +9,7 @@ namespace ReswPlus.Core
     public sealed class Constants
     {
         public const string ReswPlusName = "DotNetPlus.ReswPlus";
-        public const string ReswPlusExtensionVersion = "2.1.1";
+        public const string ReswPlusExtensionVersion = "2.1.2";
         public static Version ReswPlusLibMinVersion = new Version(1, 0, 0);
     }
 }
diff --git a/src/VSExtension/ReswPlusVSIX/Utils/ProjectExtension.cs b/src/VSExtension/ReswPlusVSIX/Utils/ProjectExtension.cs
@@ -131,7 +131,7 @@ public static bool IsLibrary(this Project project)
         {
             try
             {
-                return Convert.ToInt32(project.Properties.Item("OutputTypeEx").Value) == 2;
+                return Convert.ToInt32(project.Properties.Item("OutputType").Value) == 2;
             }
             catch
             {

diff --git a/src/VSExtension/ReswPlusVSIX/source.extension.vsixmanifest b/src/VSExtension/ReswPlusVSIX/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="ReswPlus.08b03f0c-a947-485c-a7a5-e351c75fad1a" Version="2.1.1" Language="en-US" Publisher="rudyhuyn" />
+        <Identity Id="ReswPlus.08b03f0c-a947-485c-a7a5-e351c75fad1a" Version="2.1.2" Language="en-US" Publisher="rudyhuyn" />
         <DisplayName>ReswPlus -  Advanced Code Generator for .Resw</DisplayName>
         <Description xml:space="preserve">Advanced Resw File Code Generator for UWP apps.
-Original file line number
+Diff line change
@@ Expand Up / @@ -131,7 +131,7 @@ public static bool IsLibrary(this Project project) @@
             {
                 try
                 {
-                    return Convert.ToInt32(project.Properties.Item("OutputTypeEx").Value) == 2;
+                    return Convert.ToInt32(project.Properties.Item("OutputType").Value) == 2;
                 }
                 catch
                 {
@@ Expand Down @@