From 54e823517e453b1448099f1663560bbcce497650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Tue, 7 Jan 2020 11:36:21 -0800 Subject: [PATCH 1/2] Remove conditional attribute (#4600) (cherry picked from commit d0833c8e5e58cfc507ce3c8da364e55931190263) --- src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs index bd150cf1e45..ca335c1f2dc 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs @@ -220,9 +220,7 @@ public override bool Execute() case Lang.VisualBasic: getStringMethod = $@"{memberIndent}Friend Shared Property Culture As Global.System.Globalization.CultureInfo -#If Not NET20 Then {memberIndent} -#End If {memberIndent}Friend Shared Function GetResourceString(ByVal resourceKey As String, Optional ByVal defaultValue As String = Nothing) As String {memberIndent} Return ResourceManager.GetString(resourceKey, Culture) {memberIndent}End Function"; From fc6135d06941eed1c0959c3aac5118f9617982bd Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Thu, 9 Jan 2020 12:25:17 -0800 Subject: [PATCH 2/2] Remove trailing parenthesis from GenerateResxSource (#4611) (cherry picked from commit 96a4497b2c38c6b7e19c39e4cb8fe5adac299fb4) --- src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs index ca335c1f2dc..f14c03158e6 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs +++ b/src/Microsoft.DotNet.Arcade.Sdk/src/GenerateResxSource.cs @@ -139,7 +139,7 @@ public override bool Execute() case Lang.CSharp: if (AsConstants) { - strings.AppendLine($"{memberIndent}internal const string @{identifier} = \"{name}\");"); + strings.AppendLine($"{memberIndent}internal const string @{identifier} = \"{name}\";"); } else {