Skip to content

Commit 4d1d8fb

Browse files
Encode our test baselines as text rather than byte[] in the .resx
1 parent 90a8b36 commit 4d1d8fb

File tree

4 files changed

+172
-62
lines changed

4 files changed

+172
-62
lines changed

src/Microsoft.NuGet.Build.Tasks.Tests/AnalyzerResolutionTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System.Linq;
55
using Xunit;
6-
using static System.Text.Encoding;
76

87
namespace Microsoft.NuGet.Build.Tasks.Tests
98
{
@@ -13,7 +12,7 @@ public class AnalyzerResolutionTests
1312
public static void TestAnalyzerResolutionCSharp()
1413
{
1514
var result = NuGetTestHelpers.ResolvePackagesWithJsonFileContents(
16-
Default.GetString(Json.Json.analyzers),
15+
Json.Json.analyzers,
1716
targetMoniker: ".NETCore,Version=v5.0",
1817
runtimeIdentifier: "",
1918
projectLanguage: "C#");
@@ -25,7 +24,7 @@ public static void TestAnalyzerResolutionCSharp()
2524
public static void TestAnalyzerResolutionVisualBasic()
2625
{
2726
var result = NuGetTestHelpers.ResolvePackagesWithJsonFileContents(
28-
Default.GetString(Json.Json.analyzers),
27+
Json.Json.analyzers,
2928
targetMoniker: ".NETCore,Version=v5.0",
3029
runtimeIdentifier: "",
3130
projectLanguage: "vb");

src/Microsoft.NuGet.Build.Tasks.Tests/Json/Json.Designer.cs

Lines changed: 140 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Microsoft.NuGet.Build.Tasks.Tests/Json/Json.resx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,24 +119,24 @@
119119
</resheader>
120120
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="analyzers" type="System.Resources.ResXFileRef, System.Windows.Forms">
122-
<value>analyzers.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
122+
<value>analyzers.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
123123
</data>
124124
<data name="Win10" type="System.Resources.ResXFileRef, System.Windows.Forms">
125-
<value>Win10.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
125+
<value>Win10.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
126126
</data>
127127
<data name="FluentAssertions" type="System.Resources.ResXFileRef, System.Windows.Forms">
128-
<value>FluentAssertions.lock.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
128+
<value>FluentAssertions.lock.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
129129
</data>
130130
<data name="FluentAssertionsAndWin10" type="System.Resources.ResXFileRef, System.Windows.Forms">
131-
<value>FluentAssertionsAndWin10.lock.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
131+
<value>FluentAssertionsAndWin10.lock.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
132132
</data>
133133
<data name="Win10_Edm" type="System.Resources.ResXFileRef, System.Windows.Forms">
134-
<value>Win10.Edm.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
134+
<value>Win10.Edm.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
135135
</data>
136136
<data name="Win10_xunit" type="System.Resources.ResXFileRef, System.Windows.Forms">
137-
<value>Win10.xunit.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
137+
<value>Win10.xunit.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
138138
</data>
139139
<data name="nativeWinMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
140-
<value>nativeWinMD.json;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
140+
<value>nativeWinMD.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
141141
</data>
142142
</root>

0 commit comments

Comments
 (0)