Skip to content

Commit fe53f8e

Browse files
steseestesee
authored
Upgraded DocumentFormat.OpenXml (OpenXmlDev#6)
* Fixed some easy fixable warnings * dropped office specific test code dropped mysterious compiler flags * Reverted breaking things and split up huge cs file into classes * Fixed nuget upgrade script * Upgraded DocumentFormat.OpenXml to 2.11.3
1 parent cb7ac2d commit fe53f8e

File tree

36 files changed

+80
-75
lines changed

36 files changed

+80
-75
lines changed

‎.vscode/tasks.json‎

Lines changed: 33 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,34 @@
11
{
2-
"version": "2.0.0",
3-
"tasks": [
4-
{
5-
"label": "build",
6-
"command": "dotnet",
7-
"type": "process",
8-
"args": [
9-
"build",
10-
"${workspaceFolder}/OpenXmlPowerToolsExamples/DocumentAssembler/DocumentAssembler.csproj",
11-
"/property:GenerateFullPaths=true",
12-
"/consoleloggerparameters:NoSummary"
13-
],
14-
"problemMatcher": "$msCompile"
15-
},
16-
{
17-
"label": "publish",
18-
"command": "dotnet",
19-
"type": "process",
20-
"args": [
21-
"publish",
22-
"${workspaceFolder}/OpenXmlPowerToolsExamples/DocumentAssembler/DocumentAssembler.csproj",
23-
"/property:GenerateFullPaths=true",
24-
"/consoleloggerparameters:NoSummary"
25-
],
26-
"problemMatcher": "$msCompile"
27-
},
28-
{
29-
"label": "watch",
30-
"command": "dotnet",
31-
"type": "process",
32-
"args": [
33-
"watch",
34-
"run",
35-
"${workspaceFolder}/OpenXmlPowerToolsExamples/DocumentAssembler/DocumentAssembler.csproj",
36-
"/property:GenerateFullPaths=true",
37-
"/consoleloggerparameters:NoSummary"
38-
],
39-
"problemMatcher": "$msCompile"
40-
}
41-
]
42-
}
2+
// See https://go.microsoft.com/fwlink/?LinkId=733558
3+
// for the documentation about the tasks.json format
4+
"version": "2.0.0",
5+
"tasks": [
6+
{
7+
"label": "build",
8+
"command": "dotnet",
9+
"type": "shell",
10+
"args": [
11+
"build",
12+
// Ask dotnet build to generate full paths for file names.
13+
"/property:GenerateFullPaths=true",
14+
// Do not generate summary otherwise it leads to duplicate errors in Problems panel
15+
"/consoleloggerparameters:NoSummary"
16+
],
17+
"group": "build",
18+
"presentation": {
19+
"reveal": "silent"
20+
},
21+
"problemMatcher": "$msCompile"
22+
},
23+
{
24+
"label": "update nuget",
25+
"command": "./.vscode/updateNuget.sh",
26+
"args": [],
27+
"group": "build",
28+
"presentation": {
29+
"reveal": "always"
30+
},
31+
"problemMatcher": "$msCompile"
32+
}
33+
]
34+
}

‎.vscode/updateNuget.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
regex='PackageReference Include="([^"]*)" Version="([^"]*)"'
3+
find . -name "*.*proj" | while read proj; do
4+
while read line; do
5+
if [[ $line =~ $regex ]]; then
6+
name="${BASH_REMATCH[1]}"
7+
version="${BASH_REMATCH[2]}"
8+
if [[ $version != *-* ]]; then
9+
dotnet add "$proj" package "$name"
10+
fi
11+
fi
12+
done <"$proj"
13+
done

‎OpenXmlPowerTools.Tests/OpenXmlPowerTools.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT' ">netcoreapp3.1</TargetFrameworks>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.10.1" />
8+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />
99
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎OpenXmlPowerTools/OpenXmlPowerTools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ It supports scenarios such as:
4444
</ItemGroup>
4545

4646
<ItemGroup>
47-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.10.1" />
47+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />
4848
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
4949
<PrivateAssets>all</PrivateAssets>
5050
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎OpenXmlPowerToolsExamples/ChartUpdater01/ChartUpdater01.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
10-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.10.1" />
10+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />
1111
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎OpenXmlPowerToolsExamples/DocumentAssembler/DocumentAssembler.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
10-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.10.1" />
10+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />
1111
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎OpenXmlPowerToolsExamples/DocumentAssembler01/DocumentAssembler01.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
10-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.10.1" />
10+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />
1111
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎OpenXmlPowerToolsExamples/DocumentAssembler02/DocumentAssembler02.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
10-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.10.1" />
10+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />
1111
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎OpenXmlPowerToolsExamples/DocumentAssembler03/DocumentAssembler03.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
10-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.10.1" />
10+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />
1111
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

‎OpenXmlPowerToolsExamples/DocumentBuilder01/DocumentBuilder01.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<ItemGroup>
99
<ProjectReference Include="..\..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
10-
<PackageReference Include="DocumentFormat.OpenXml" Version="2.10.1" />
10+
<PackageReference Include="DocumentFormat.OpenXml" Version="2.11.3" />
1111
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
1212
<PrivateAssets>all</PrivateAssets>
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)