Skip to content

Commit 8910ae5

Browse files
twsouthwicktwsouthwick
authored
Merge pull request #343 from OfficeDev/vNext
2 parents 4f4212a + 2bc1663 commit 8910ae5

File tree

1,322 files changed

+22839
-106986
lines changed

Some content is hidden

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

1,322 files changed

+22839
-106986
lines changed

‎BinaryFormatConverter/BinaryFormatConverter.csproj‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎BinaryFormatConverter/Program.cs‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎Directory.Build.props‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
6+
<!-- Because of the size of the project, to facilitate quick development, by default only single
7+
frameworks will be build. This is customizable with the following possible values:
8+
9+
- DevFramework: will only build for .NET 4.6
10+
- DevCore: Will only build for .NET Core
11+
- All: Will build for all platforms -->
12+
<ProjectLoadStyle Condition=" '$(ProjectLoadStyle)' == '' ">DevCore</ProjectLoadStyle>
13+
</PropertyGroup>
14+
15+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
16+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
17+
</PropertyGroup>
18+
19+
<PropertyGroup>
20+
<LangVersion>latest</LangVersion>
21+
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\rules.ruleset</CodeAnalysisRuleSet>
22+
23+
<!-- Signing -->
24+
<SignAssembly>true</SignAssembly>
25+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)DocumentFormat.OpenXml.snk</AssemblyOriginatorKeyFile>
26+
</PropertyGroup>
27+
28+
<PropertyGroup>
29+
<OutputFullPath>$(MSBuildThisFileDirectory)</OutputFullPath>
30+
<OutputDrop Condition=" '$(OutputDrop)' == '' ">$(OutputFullPath)bin\$(Configuration)\</OutputDrop>
31+
<OutputPath>$(OutputDrop)\$(MSBuildProjectName)\</OutputPath>
32+
<BaseIntermediateOutputPath>$(OutputFullPath)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
33+
</PropertyGroup>
34+
35+
<PropertyGroup>
36+
<IsTestProject Condition=" '$(IsTestProject)' == '' ">false</IsTestProject>
37+
<EnableCodeCoverage Condition=" '$(EnableCodeCoverage)' == '' ">false</EnableCodeCoverage>
38+
<DebugType Condition="$(EnableCodeCoverage)">Full</DebugType>
39+
</PropertyGroup>
40+
</Project>

‎Directory.Build.targets‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
<ItemGroup>
4+
5+
<AdditionalFiles Include="$(MSBuildThisFileDirectory)\stylecop.json" />
6+
7+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
8+
<PrivateAssets>All</PrivateAssets>
9+
</PackageReference>
10+
11+
<!-- GitVersionTask is not compiled against .NET Core, so importing the targets will
12+
result in a failure because it will try to resolve Microsoft.Build.Utilities v4.0 -->
13+
<PackageReference Include="GitVersionTask" Version="4.0.0-beta0012" Condition=" '$(MSBuildRuntimeType)' != 'Core' ">
14+
<PrivateAssets>All</PrivateAssets>
15+
</PackageReference>
16+
17+
</ItemGroup>
18+
19+
<Import Project="$(MSBuildThisFileDirectory)\Tests.targets" />
20+
21+
</Project>

dir.props renamed to DocumentFormat.OpenXml.Package.props

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,31 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
33
<PropertyGroup>
4-
<Version></Version>
5-
<AssemblyInformationalVersion></AssemblyInformationalVersion>
64
<Authors>Microsoft</Authors>
7-
<Description><![CDATA[The Open XML SDK provides open-source libraries for working with Open XML Documents (DOCX, XLSX, and PPTX). It supports scenarios such as:
5+
<Summary>The Open XML SDK provides tools for working with Office Word, Excel, and PowerPoint documents</Summary>
6+
<Description><![CDATA[The Open XML SDK provides tools for working with Office Word, Excel, and PowerPoint documents. It supports scenarios such as:
87
98
- High-performance generation of word-processing documents, spreadsheets, and presentations.
10-
- Populating content in DOCX files from an XML data source.
11-
- Splitting up (shredding) a DOCX or PPTX file into multiple files, and combining multiple DOCX / PPTX files into a single file.
12-
- High fidelity conversion of DOCX => HTML/CSS and HTML/CSS => DOCX.
13-
- Extraction of data from XLSX.
14-
- Searching and replacing content in DOCX / PPTX using regular expressions.
15-
- Updating cached data and embedded spreadsheets for charts in DOCX / PPTX.
9+
- Populating content in Word files from an XML data source.
10+
- Splitting up (shredding) a Word or PowerPoint file into multiple files, and combining multiple Word/PowerPoint files into a single file.
11+
- Extraction of data from Excel documents.
12+
- Searching and replacing content in Word/PowerPoint using regular expressions.
13+
- Updating cached data and embedded spreadsheets for charts in Word/PowerPoint.
1614
- Document modification, such as removing tracked revisions or removing unacceptable content from documents.]]></Description>
1715
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
1816
<Copyright>Copyright 2017 (c) Microsoft Corporation. All rights reserved.</Copyright>
1917
<PackageTags>openxml office</PackageTags>
20-
<PackageReleaseNotes><![CDATA[2.7.1 : January 31, 2017
21-
-Fixed crash when validation is invoked on .NET Framework with strong-naming enforced
18+
<PackageReleaseNotes><![CDATA[
19+
Version 2.7.3 : *In development*
20+
- Manual saving was fixed when autosave is false
21+
- Fixed issue on Mono platforms using System.IO.Packaging NuGet package (Xamarin, etc) when creating a document
22+
23+
Version 2.7.2 : June 7, 2017
24+
- Fixed assembly version information for strong naming.
25+
- Added support for .NET 3.5 and .NET 4.0
26+
27+
Version 2.7.1 : January 31, 2017
28+
- Fixed crash when validation is invoked on .NET Framework with strong-naming enforced
2229
2330
Version 2.7.0 : January 24, 2017
2431
- Added support for .NET Standard 1.3
@@ -31,11 +38,7 @@ Version 2.6.1 : January 15, 2016
3138
Version 2.6.0 : June 29, 2015
3239
- The big feature in 2.6 is the inclusion of a replacement for System.IO.Packaging, which has a serious bug that causes it (albeit rarely and in specific circumstances) to throw exceptions (ObjectDisposedException and NullReferenceException). You can find out more about this bug and whether it affects you in [the blog post that announces the release of the new System.IO.Packaging] (http://openxmldeveloper.org/blog/b/openxmldeveloper/archive/2015/06/29/announcing-the-release-of-a-new-system-io-packaging-implementation.aspx).
3340
]]></PackageReleaseNotes>
34-
35-
<DebugType>portable</DebugType>
36-
37-
<!-- Signing -->
38-
<SignAssembly>true</SignAssembly>
39-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)DocumentFormat.OpenXml.snk</AssemblyOriginatorKeyFile>
41+
<PackageProjectUrl>https://github.com/OfficeDev/Open-XML-SDK</PackageProjectUrl>
42+
<PackageLicenseUrl>https://github.com/OfficeDev/Open-XML-SDK/blob/master/LICENSE.txt</PackageLicenseUrl>
4043
</PropertyGroup>
41-
</Project>
44+
</Project>

0 commit comments

Comments
 (0)