Skip to content

Commit e941beb

Browse files
committed
Move the workaround to the test project
1 parent be590e4 commit e941beb

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

src/Microsoft.Data.Analysis.Interactive/Microsoft.Data.Analysis.Interactive.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
<ItemGroup>
99
<PackageReference Include="Microsoft.DotNet.Interactive" Version="$(MicrosoftDotNetInteractiveVersion)" />
1010
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="$(MicrosoftDotNetInteractiveFormattingVersion)" />
11-
12-
<!-- work around https://github.com/dotnet/runtime/issues/45560 until System.Text.Json is fixed and Microsoft.DotNet.Interactive updates to the new version -->
13-
<PackageReference Include=" System.Text.Encodings.Web" Version="5.0.1" />
1411
</ItemGroup>
1512

1613
<ItemGroup>

test/Microsoft.Data.Analysis.Interactive.Tests/DataFrameInteractiveTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
namespace Microsoft.Data.Analysis.Interactive.Tests
1010
{
11-
public partial class DataFrameInteractiveTests
11+
public class DataFrameInteractiveTests
1212
{
13-
private const string BUTTON_HTML_PART = "button onclick";
14-
private const string TABLE_HTML_PART = "<table";
13+
private const string ButtonHtmlPart = "button onclick";
14+
private const string TableHtmlPart = "<table";
1515

1616
public static DataFrame MakeDataFrameWithTwoColumns(int length, bool withNulls = true)
1717
{
@@ -35,8 +35,8 @@ public void LessThanOnePageDataFrameTest()
3535
DataFrameKernelExtension.RegisterDataFrame();
3636
var html = dataFrame.ToDisplayString("text/html");
3737

38-
Assert.Contains(TABLE_HTML_PART, html);
39-
Assert.DoesNotContain(BUTTON_HTML_PART, html);
38+
Assert.Contains(TableHtmlPart, html);
39+
Assert.DoesNotContain(ButtonHtmlPart, html);
4040
}
4141

4242
[Fact]
@@ -46,8 +46,8 @@ public void MoreThanOnePageDataFrameTest()
4646
DataFrameKernelExtension.RegisterDataFrame();
4747
var html = dataFrame.ToDisplayString("text/html");
4848

49-
Assert.Contains(TABLE_HTML_PART, html);
50-
Assert.Contains(BUTTON_HTML_PART, html);
49+
Assert.Contains(TableHtmlPart, html);
50+
Assert.Contains(ButtonHtmlPart, html);
5151
}
5252

5353
[Fact]
@@ -57,8 +57,8 @@ public void DataFrameInfoTest()
5757
DataFrameKernelExtension.RegisterDataFrame();
5858
var html = dataFrame.Info().ToDisplayString("text/html");
5959

60-
Assert.Contains(TABLE_HTML_PART, html);
61-
Assert.DoesNotContain(BUTTON_HTML_PART, html);
60+
Assert.Contains(TableHtmlPart, html);
61+
Assert.DoesNotContain(ButtonHtmlPart, html);
6262
}
6363
}
6464
}
Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<PropertyGroup>
3-
<TargetFramework>netcoreapp3.1</TargetFramework>
4-
<NoWarn>$(NoWarn);MSML_PrivateFieldName;MSML_ExtendBaseTestClass</NoWarn>
5-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<NoWarn>$(NoWarn);MSML_ExtendBaseTestClass</NoWarn>
5+
</PropertyGroup>
66

7-
<ItemGroup>
8-
<ProjectReference Include="..\..\src\Microsoft.Data.Analysis.Interactive\Microsoft.Data.Analysis.Interactive.csproj" />
9-
</ItemGroup>
7+
<ItemGroup>
8+
<ProjectReference Include="..\..\src\Microsoft.Data.Analysis.Interactive\Microsoft.Data.Analysis.Interactive.csproj" />
109

11-
<!-- register for test discovery in Visual Studio -->
12-
<ItemGroup>
13-
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
14-
</ItemGroup>
10+
<!-- work around https://github.com/dotnet/runtime/issues/45560 until System.Text.Json is fixed and Microsoft.DotNet.Interactive updates to the new version -->
11+
<PackageReference Include=" System.Text.Encodings.Web" Version="5.0.1" />
12+
</ItemGroup>
13+
14+
<!-- register for test discovery in Visual Studio -->
15+
<ItemGroup>
16+
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
17+
</ItemGroup>
1518
</Project>

0 commit comments

Comments
 (0)