Clippit 2.0

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
  "isRoot": true,
  "tools": {
  "paket": {
- "version": "7.2.1",
+ "version": "8.0.0",
  "commands": [
  "paket"
  ]
  },
  "fake-cli": {
- "version": "5.20.4",
+ "version": "6.0.0",
  "commands": [
  "fake"
  ]

.github/workflows/main.yml

@@ -7,6 +7,7 @@ on:
  pull_request:
  branches:
  - master
+ - net6
 
 jobs:
  build:
@@ -15,7 +16,7 @@ jobs:
  fail-fast: false
  matrix:
  os: [ubuntu-latest, windows-latest, macOS-latest]
- dotnet: [5.0.408]
+ dotnet: [6.0.407]
  runs-on: ${{ matrix.os }}
 
  steps:
@@ -25,12 +26,6 @@ jobs:
  uses: actions/setup-dotnet@v1
  with:
  dotnet-version: ${{ matrix.dotnet }}
- - name: Install libgdiplus on macOS
- if: matrix.os == 'macOS-latest'
- run: brew install mono-libgdiplus
- - name: Install libgdiplus on Ubuntu
- if: matrix.os == 'ubuntu-latest'
- run: sudo apt-get update -y && sudo apt-get install -y libgdiplus
  - name: Install local tools
  run: dotnet tool restore
  - name: Paket Restore
@@ -53,7 +48,7 @@ jobs:
  - name: Setup .NET Core
  uses: actions/setup-dotnet@v1
  with:
- dotnet-version: 5.0.408
+ dotnet-version: 6.0.407
  - name: Install local tools
  run: dotnet tool restore
  - name: Paket Restore

OpenXmlPowerTools.Tests/OpenXmlPowerTools.Tests.csproj → Clippit.Tests/Clippit.Tests.csproj

@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>net5.0</TargetFrameworks>
+ <TargetFramework>net6.0</TargetFramework>
+ <RollForward>LatestMajor</RollForward>
  <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <LangVersion>9.0</LangVersion>
+ <LangVersion>latest</LangVersion>
  <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
  <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
  <RootNamespace>Clippit.Tests</RootNamespace>
  <AssemblyName>Clippit.Tests</AssemblyName>
  </PropertyGroup>
  <ItemGroup>
- <ProjectReference Include="..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
+ <ProjectReference Include="..\Clippit\Clippit.csproj" />
  </ItemGroup>
  <ItemGroup>
  <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />

OpenXmlPowerTools.Tests/Common/ChartUpdaterTests.cs → Clippit.Tests/Common/ChartUpdaterTests.cs

@@ -2,7 +2,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
+using System.Globalization;
 using System.IO;
+using Clippit.PowerPoint;
+using Clippit.Word;
 using DocumentFormat.OpenXml.Packaging;
 using Xunit;
 using Xunit.Abstractions;
@@ -229,7 +232,7 @@ public void CU001(string name)
 
  private static string ToExcelInteger(DateTime dateTime)
  {
- return dateTime.ToOADate().ToString();
+ return dateTime.ToOADate().ToString(CultureInfo.CurrentCulture);
  }
  }
 }

OpenXmlPowerTools.Tests/Common/MetricsGetterTests.cs → Clippit.Tests/Common/MetricsGetterTests.cs

@@ -3,6 +3,9 @@
 
 using System.IO;
 using System.Xml.Linq;
+using Clippit.Excel;
+using Clippit.PowerPoint;
+using Clippit.Word;
 using Xunit;
 using Xunit.Abstractions;
 

OpenXmlPowerTools.Tests/Common/OpenXmlRegexTests.cs → Clippit.Tests/Common/OpenXmlRegexTests.cs

@@ -1,7 +1,6 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
@@ -225,165 +224,152 @@ private static string InnerDelText(XContainer e)
  [Fact]
  public void CanReplaceTextWithQuotationMarks()
  {
- XDocument partDocument = XDocument.Parse(QuotationMarksDocumentXmlString);
- XElement p = partDocument.Descendants(W.p).First();
- string innerText = InnerText(p);
+ var partDocument = XDocument.Parse(QuotationMarksDocumentXmlString);
+ var p = partDocument.Descendants(W.p).First();
+ var innerText = InnerText(p);
 
  Assert.Equal(
  "Text can be enclosed in “normal double quotes” and in «double angle quotation marks».",
  innerText);
 
- using (var stream = new MemoryStream())
- using (WordprocessingDocument wordDocument = WordprocessingDocument.Create(stream, DocumentType))
- {
- MainDocumentPart part = wordDocument.AddMainDocumentPart();
- part.PutXDocument(partDocument);
-
- IEnumerable<XElement> content = partDocument.Descendants(W.p);
- var regex = new Regex(string.Format("{0}(?<words>{1}){2}", LeftDoubleQuotationMarks, Words,
- RightDoubleQuotationMarks));
- int count = OpenXmlRegex.Replace(content, regex, "‘changed ${words}’", null);
-
- p = partDocument.Descendants(W.p).First();
- innerText = InnerText(p);
-
- Assert.Equal(2, count);
- Assert.Equal(
- "Text can be enclosed in ‘changed normal double quotes’ and in ‘changed double angle quotation marks’.",
- innerText);
- }
+ using var stream = new MemoryStream();
+ using var wordDocument = WordprocessingDocument.Create(stream, DocumentType);
+ var part = wordDocument.AddMainDocumentPart();
+ part.PutXDocument(partDocument);
+
+ var content = partDocument.Descendants(W.p);
+ var regex = new Regex($"{LeftDoubleQuotationMarks}(?<words>{Words}){RightDoubleQuotationMarks}");
+ var count = OpenXmlRegex.Replace(content, regex, "‘changed ${words}’", null);
+
+ p = partDocument.Descendants(W.p).First();
+ innerText = InnerText(p);
+
+ Assert.Equal(2, count);
+ Assert.Equal(
+ "Text can be enclosed in ‘changed normal double quotes’ and in ‘changed double angle quotation marks’.",
+ innerText);
  }
 
  [Fact]
  public void CanReplaceTextWithQuotationMarksAndAddTrackedChangesWhenReplacing()
  {
- XDocument partDocument = XDocument.Parse(QuotationMarksDocumentXmlString);
- XElement p = partDocument.Descendants(W.p).First();
- string innerText = InnerText(p);
+ var partDocument = XDocument.Parse(QuotationMarksDocumentXmlString);
+ var p = partDocument.Descendants(W.p).First();
+ var innerText = InnerText(p);
 
  Assert.Equal(
  "Text can be enclosed in “normal double quotes” and in «double angle quotation marks».",
  innerText);
 
- using (var stream = new MemoryStream())
- using (WordprocessingDocument wordDocument = WordprocessingDocument.Create(stream, DocumentType))
- {
- MainDocumentPart part = wordDocument.AddMainDocumentPart();
- part.PutXDocument(partDocument);
+ using var stream = new MemoryStream();
+ using var wordDocument = WordprocessingDocument.Create(stream, DocumentType);
+ var part = wordDocument.AddMainDocumentPart();
+ part.PutXDocument(partDocument);
 
- IEnumerable<XElement> content = partDocument.Descendants(W.p);
- var regex = new Regex(string.Format("{0}(?<words>{1}){2}", LeftDoubleQuotationMarks, Words,
- RightDoubleQuotationMarks));
- int count = OpenXmlRegex.Replace(content, regex, "‘changed ${words}’", null, true, "John Doe");
+ var content = partDocument.Descendants(W.p);
+ var regex = new Regex($"{LeftDoubleQuotationMarks}(?<words>{Words}){RightDoubleQuotationMarks}");
+ var count = OpenXmlRegex.Replace(content, regex, "‘changed ${words}’", null, true, "John Doe");
 
-  p = partDocument.Descendants(W.p).First();
-  innerText = InnerText(p);
+ p = partDocument.Descendants(W.p).First();
+ innerText = InnerText(p);
 
-  Assert.Equal(2, count);
-  Assert.Equal(
-  "Text can be enclosed in ‘changed normal double quotes’ and in ‘changed double angle quotation marks’.",
-  innerText);
+ Assert.Equal(2, count);
+ Assert.Equal(
+ "Text can be enclosed in ‘changed normal double quotes’ and in ‘changed double angle quotation marks’.",
+ innerText);
 
-  Assert.Contains(p.Elements(W.ins), e => InnerText(e) == "‘changed normal double quotes’");
-  Assert.Contains(p.Elements(W.ins), e => InnerText(e) == "‘changed double angle quotation marks’");
+ Assert.Contains(p.Elements(W.ins), e => InnerText(e) == "‘changed normal double quotes’");
+ Assert.Contains(p.Elements(W.ins), e => InnerText(e) == "‘changed double angle quotation marks’");
 
- Assert.Contains(p.Elements(W.del), e => InnerDelText(e) == "“normal double quotes”");
- Assert.Contains(p.Elements(W.del), e => InnerDelText(e) == "«double angle quotation marks»");
- }
+ Assert.Contains(p.Elements(W.del), e => InnerDelText(e) == "“normal double quotes”");
+ Assert.Contains(p.Elements(W.del), e => InnerDelText(e) == "«double angle quotation marks»");
  }
 
  [Fact]
  public void CanReplaceTextWithQuotationMarksAndTrackedChanges()
  {
- XDocument partDocument = XDocument.Parse(QuotationMarksAndTrackedChangesDocumentXmlString);
- XElement p = partDocument.Descendants(W.p).First();
- string innerText = InnerText(p);
+ var partDocument = XDocument.Parse(QuotationMarksAndTrackedChangesDocumentXmlString);
+ var p = partDocument.Descendants(W.p).First();
+ var innerText = InnerText(p);
 
  Assert.Equal(
  "Text can be enclosed in “normal double quotes” and in «double angle quotation marks».",
  innerText);
 
- using (var stream = new MemoryStream())
- using (WordprocessingDocument wordDocument = WordprocessingDocument.Create(stream, DocumentType))
- {
- MainDocumentPart part = wordDocument.AddMainDocumentPart();
- part.PutXDocument(partDocument);
+ using var stream = new MemoryStream();
+ using var wordDocument = WordprocessingDocument.Create(stream, DocumentType);
+ var part = wordDocument.AddMainDocumentPart();
+ part.PutXDocument(partDocument);
 
- IEnumerable<XElement> content = partDocument.Descendants(W.p);
- var regex = new Regex(string.Format("{0}(?<words>{1}){2}", LeftDoubleQuotationMarks, Words,
- RightDoubleQuotationMarks));
- int count = OpenXmlRegex.Replace(content, regex, "‘changed ${words}’", null, true, "John Doe");
+ var content = partDocument.Descendants(W.p);
+ var regex = new Regex($"{LeftDoubleQuotationMarks}(?<words>{Words}){RightDoubleQuotationMarks}");
+ var count = OpenXmlRegex.Replace(content, regex, "‘changed ${words}’", null, true, "John Doe");
 
-  p = partDocument.Descendants(W.p).First();
-  innerText = InnerText(p);
+ p = partDocument.Descendants(W.p).First();
+ innerText = InnerText(p);
 
-  Assert.Equal(2, count);
-  Assert.Equal(
-  "Text can be enclosed in ‘changed normal double quotes’ and in ‘changed double angle quotation marks’.",
-  innerText);
+ Assert.Equal(2, count);
+ Assert.Equal(
+ "Text can be enclosed in ‘changed normal double quotes’ and in ‘changed double angle quotation marks’.",
+ innerText);
 
- Assert.Contains(p.Elements(W.ins), e => InnerText(e) == "‘changed normal double quotes’");
- Assert.Contains(p.Elements(W.ins), e => InnerText(e) == "‘changed double angle quotation marks’");
- }
+ Assert.Contains(p.Elements(W.ins), e => InnerText(e) == "‘changed normal double quotes’");
+ Assert.Contains(p.Elements(W.ins), e => InnerText(e) == "‘changed double angle quotation marks’");
  }
 
  [Fact]
  public void CanReplaceTextWithSymbolsAndTrackedChanges()
  {
- XDocument partDocument = XDocument.Parse(SymbolsAndTrackedChangesDocumentXmlString);
- XElement p = partDocument.Descendants(W.p).First();
- string innerText = InnerText(p);
+ var partDocument = XDocument.Parse(SymbolsAndTrackedChangesDocumentXmlString);
+ var p = partDocument.Descendants(W.p).First();
+ var innerText = InnerText(p);
 
  Assert.Equal("We can also use symbols such as \uF021 or \uF028.", innerText);
 
- using (var stream = new MemoryStream())
- using (WordprocessingDocument wordDocument = WordprocessingDocument.Create(stream, DocumentType))
- {
- MainDocumentPart part = wordDocument.AddMainDocumentPart();
- part.PutXDocument(partDocument);
+ using var stream = new MemoryStream();
+ using var wordDocument = WordprocessingDocument.Create(stream, DocumentType);
+ var part = wordDocument.AddMainDocumentPart();
+ part.PutXDocument(partDocument);
 
-  IEnumerable<XElement> content = partDocument.Descendants(W.p);
-  var regex = new Regex(@"[\uF021]");
-  int count = OpenXmlRegex.Replace(content, regex, "\uF028", null, true, "John Doe");
+ var content = partDocument.Descendants(W.p);
+ var regex = new Regex(@"[\uF021]");
+ var count = OpenXmlRegex.Replace(content, regex, "\uF028", null, true, "John Doe");
 
-  p = partDocument.Descendants(W.p).First();
-  innerText = InnerText(p);
+ p = partDocument.Descendants(W.p).First();
+ innerText = InnerText(p);
 
-  Assert.Equal(1, count);
-  Assert.Equal("We can also use symbols such as \uF028 or \uF028.", innerText);
+ Assert.Equal(1, count);
+ Assert.Equal("We can also use symbols such as \uF028 or \uF028.", innerText);
 
- Assert.Contains(p.Descendants(W.ins), ins => ins.Descendants(W.sym).Any(
- sym => sym.Attribute(W.font).Value == "Wingdings" && 
- sym.Attribute(W._char).Value == "F028"));
- }
+ Assert.Contains(p.Descendants(W.ins), ins => ins.Descendants(W.sym).Any(
+ sym => sym.Attribute(W.font).Value == "Wingdings" && 
+ sym.Attribute(W._char).Value == "F028"));
  }
 
  [Fact]
  public void CanReplaceTextWithFields()
  {
- XDocument partDocument = XDocument.Parse(FieldsDocumentXmlString);
- XElement p = partDocument.Descendants(W.p).Last();
- string innerText = InnerText(p);
+ var partDocument = XDocument.Parse(FieldsDocumentXmlString);
+ var p = partDocument.Descendants(W.p).Last();
+ var innerText = InnerText(p);
 
  Assert.Equal("As stated in Article {__1} and this Section {__1.1}, this is described in Schedule C (Performance Framework).",
  innerText);
 
- using (var stream = new MemoryStream())
- using (WordprocessingDocument wordDocument = WordprocessingDocument.Create(stream, DocumentType))
- {
- MainDocumentPart part = wordDocument.AddMainDocumentPart();
- part.PutXDocument(partDocument);
+ using var stream = new MemoryStream();
+ using var wordDocument = WordprocessingDocument.Create(stream, DocumentType);
+ var part = wordDocument.AddMainDocumentPart();
+ part.PutXDocument(partDocument);
 
-  IEnumerable<XElement> content = partDocument.Descendants(W.p);
-  var regex = new Regex(@"Schedule C \(Performance Framework\)");
-  int count = OpenXmlRegex.Replace(content, regex, "Exhibit 4", null, true, "John Doe");
+ var content = partDocument.Descendants(W.p);
+ var regex = new Regex(@"Schedule C \(Performance Framework\)");
+ var count = OpenXmlRegex.Replace(content, regex, "Exhibit 4", null, true, "John Doe");
 
-  p = partDocument.Descendants(W.p).Last();
-  innerText = InnerText(p);
+ p = partDocument.Descendants(W.p).Last();
+ innerText = InnerText(p);
 
- Assert.Equal(1, count);
- Assert.Equal("As stated in Article {__1} and this Section {__1.1}, this is described in Exhibit 4.", innerText);
- }
+ Assert.Equal(1, count);
+ Assert.Equal("As stated in Article {__1} and this Section {__1.1}, this is described in Exhibit 4.", innerText);
  }
  }
 }

OpenXmlPowerTools.Tests/Common/Samples/ChartUpdaterSamples.cs → Clippit.Tests/Common/Samples/ChartUpdaterSamples.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Globalization;
 using System.IO;
+using Clippit.Word;
 using DocumentFormat.OpenXml.Packaging;
 using Xunit;
 using Xunit.Abstractions;
@@ -212,7 +214,7 @@ public void UpdatePowerPoints(string fileName)
 
  private static string ToExcelInteger(DateTime dateTime)
  {
- return dateTime.ToOADate().ToString();
+ return dateTime.ToOADate().ToString(CultureInfo.CurrentCulture);
  }
  }
 }

OpenXmlPowerTools.Tests/Common/Samples/MetricsGetterSamples.cs → Clippit.Tests/Common/Samples/MetricsGetterSamples.cs

@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using Xunit;
 using Xunit.Abstractions;
 

OpenXmlPowerTools.Tests/Common/Samples/TextReplacerSamples.cs → Clippit.Tests/Common/Samples/TextReplacerSamples.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using Clippit.Internal;
 using DocumentFormat.OpenXml.Packaging;
 using Xunit;
 using Xunit.Abstractions;