Skip to content

Commit f9e2a2e

Browse files
steseestesee
authored
Merge pull request OpenXmlDev#31 from Codeuctivity/Example-changes
Enabled system.drawing.common compatible in tests
2 parents 1bbc34f + 7591245 commit f9e2a2e

41 files changed

Lines changed: 66 additions & 57 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.vscode/launch.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
"version": "0.2.0",
66
"configurations": [
77
{
8-
"name": ".NET Core Launch (console)",
8+
"name": ".NET Launch (console)",
99
"type": "coreclr",
1010
"request": "launch",
1111
"preLaunchTask": "build",
1212
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceFolder}/OpenXmlPowerToolsExamples/DocumentAssembler/bin/Debug/net5.0/DocumentAssembler.dll",
13+
"program": "${workspaceFolder}/OpenXmlPowerToolsExamples/DocumentAssembler/bin/Debug/net6.0/DocumentAssembler.dll",
1414
"args": [],
1515
"cwd": "${workspaceFolder}/OpenXmlPowerToolsExamples/DocumentAssembler",
1616
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
1717
"console": "internalConsole",
1818
"stopAtEntry": false
1919
},
2020
{
21-
"name": ".NET Core Attach",
21+
"name": ".NET Attach",
2222
"type": "coreclr",
2323
"request": "attach",
2424
"processId": "${command:pickProcess}"

‎OpenXmlPowerTools.Tests/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverterHandlerTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public void ShouldTranslateWithWordprocessingTextDummyHandler()
3535
[InlineData("jpeg", minimalJpg)]
3636
public void ShouldTranslateWithDefaultImageHandler(string imageType, string minimalImage)
3737
{
38+
AppContext.SetSwitch("System.Drawing.EnableUnixSupport", true);
3839
var expectedStart = $"<img src=\"data:image/{imageType};base64,";
3940
var expectedEnd = "\" xmlns=\"http://www.w3.org/1999/xhtml\" />";
4041
var binaryBitmap = Convert.FromBase64String(minimalImage);

‎OpenXmlPowerTools.Tests/OpenXmlPowerTools.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net472;net6.0;netcoreapp3.1</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0;netcoreapp3.1</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
66
<LangVersion>8.0</LangVersion>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>

‎OpenXmlPowerTools.Tests/PresentationBuilderTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void PB005_Formatting()
9393
PresentationBuilder.BuildPresentation(sources, processedDestPptx.FullName);
9494
}
9595

96-
#if NET5_0
96+
#if NET6_0
9797
[Fact(Skip="Bug since netcore 2.0 : https://github.com/OfficeDev/Open-Xml-PowerTools/pull/238#issuecomment-412375570")]
9898
#elif NETCOREAPP3_1
9999
[Fact(Skip="Bug since netcore 2.0 : https://github.com/OfficeDev/Open-Xml-PowerTools/pull/238#issuecomment-412375570")]

‎OpenXmlPowerTools.Tests/runtimeconfig.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"runtimeOptions": {
3+
"configProperties": {
4+
"System.Drawing.EnableUnixSupport": true
5+
}
6+
}
7+
}

‎OpenXmlPowerTools/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverter.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3210,8 +3210,7 @@ private static object ConvertContentThatCanContainFields(WordprocessingDocument
32103210
"image/png", "image/gif", "image/tiff", "image/jpeg"
32113211
};
32123212

3213-
internal static XElement ProcessImage(WordprocessingDocument wordDoc,
3214-
XElement element, IImageHandler imageHandler)
3213+
internal static XElement ProcessImage(WordprocessingDocument wordDoc, XElement element, IImageHandler imageHandler)
32153214
{
32163215
if (imageHandler == null)
32173216
{
@@ -3228,8 +3227,7 @@ internal static XElement ProcessImage(WordprocessingDocument wordDoc,
32283227
return null;
32293228
}
32303229

3231-
private static XElement ProcessDrawing(WordprocessingDocument wordDoc,
3232-
XElement element, IImageHandler imageHandler)
3230+
private static XElement ProcessDrawing(WordprocessingDocument wordDoc, XElement element, IImageHandler imageHandler)
32333231
{
32343232
var containerElement = element.Elements()
32353233
.FirstOrDefault(e => e.Name == WP.inline || e.Name == WP.anchor);

‎OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net472;net6.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
66
<LangVersion>8.0</LangVersion>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>

‎OpenXmlPowerToolsExamples/DocumentAssembler/DocumentAssembler.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net472;net6.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
66
<LangVersion>8.0</LangVersion>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>

‎OpenXmlPowerToolsExamples/DocumentAssembler01/DocumentAssembler01.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net472;net6.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
66
<LangVersion>8.0</LangVersion>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>

‎OpenXmlPowerToolsExamples/DocumentAssembler02/DocumentAssembler02.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net472;net6.0</TargetFrameworks>
4+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT' ">net48;net6.0</TargetFrameworks>
55
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">net6.0</TargetFrameworks>
66
<LangVersion>8.0</LangVersion>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>

0 commit comments

Comments
 (0)