Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into 2019
Browse files Browse the repository at this point in the history
  • Loading branch information
twsouthwick committed Feb 28, 2020
2 parents 61f81a5 + d27a1fa commit c7d02dc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
10 changes: 7 additions & 3 deletions CHANGELOG.md
Expand Up @@ -4,10 +4,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## Version 2.10.1 - 2020-02-28
## Version 2.11.0 - Unreleased
### Added
- Added `FileFormatVersions.2019` enum (#695)
- Added `OpenXmlElementFunctionalExtensions.With` extension methods, which offer flexible means for constructing `OpenXmlElement` instances in the context of pure functional transformations.

## Version 2.10.1 - 2020-02-28
### Fixed
- Ensures attributes are available when `OpenXmlElement` is initialized with outer XML (#684, #692)
- Ensured attributes are available when `OpenXmlElement` is initialized with outer XML (#684, #692)
- Some documentation errors (#681)
- Removed state that made it non-thread safe to validate elements under certain conditions (#686)
- Correctly inserts strongly-typed elements before known elements that are not strongly-typed (#690)
Expand All @@ -16,7 +20,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Added
- Added initial Office 2016 support, including `FileFormatVersion.Office2016`, `ExtendedChartPart` and other new schema elements (#586)
- Added .NET Standard 2.0 target (#587)
- Include symbols support for debugging (#650)
- Included symbols support for debugging (#650)
- Exposed `IXmlNamespaceResolver` from `XmlPath` instead of formatted list of strings to expose namespace/prefix mapping (#536)
- Implemented `IComparable<T>` and `IEquatable<T>` on `OpenXmlComparableSimpleValue` to allow comparisons without boxing (#550)
- Added `OpenXmlPackage.RootPart` to easily access the root part on any package (#661)
Expand Down
1 change: 0 additions & 1 deletion src/DocumentFormat.OpenXml/DocumentFormat.OpenXml.csproj
Expand Up @@ -15,7 +15,6 @@
<!-- Remove all files under System as they need to be specifically opted into. They are
helper files to fill the gaps of the various platforms that are targeted -->
<Compile Remove="System\**\*.cs" />
<Compile Remove="OpenXmlElementFunctionalExtensions.cs" />
<Compile Include="System\UriHelper.cs" />
</ItemGroup>

Expand Down
Expand Up @@ -5,10 +5,6 @@
<IsTestProject>true</IsTestProject>
</PropertyGroup>

<ItemGroup>
<Compile Remove="OpenXmlElementFunctionalExtensionsTests.cs" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\DocumentFormat.OpenXml\DocumentFormat.OpenXml.csproj" />
<ProjectReference Include="..\DocumentFormat.OpenXml.Tests.Assets\DocumentFormat.OpenXml.Tests.Assets.csproj" />
Expand Down

0 comments on commit c7d02dc

Please sign in to comment.