antonmihaylov · vaceslav · Feb 4, 2025
diff --git a/OpenXMLTemplates/Documents/TemplateDocument.cs b/OpenXMLTemplates/Documents/TemplateDocument.cs
@@ -83,18 +83,12 @@ public void Dispose()
             WordprocessingDocument?.Dispose();
         }
 
-
-        public void Close(bool save = false)
-        {
-            if (save)
-                WordprocessingDocument.Save();
-
-            WordprocessingDocument.Close();
-        }
-
         public OpenXmlPackage SaveAs(string path)
         {
-            return WordprocessingDocument.SaveAs(path);
+            // return WordprocessingDocument.SaveAs(path);
+            var clone = WordprocessingDocument.Clone(path);
+            clone.Save();
+            return clone;
         }
 
         public void RemoveControl(ContentControl contentControl)

diff --git a/OpenXMLTemplates/OpenXMLTemplates.csproj b/OpenXMLTemplates/OpenXMLTemplates.csproj
@@ -22,7 +22,7 @@
         <OldToolsVersion>2.0</OldToolsVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="DocumentFormat.OpenXml" Version="2.9.1"/>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.2"/>
+        <PackageReference Include="DocumentFormat.OpenXml" Version="3.2.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 </Project>
diff --git a/OpenXMLTemplatesTest/ControlRemovalTest/Tests.cs b/OpenXMLTemplatesTest/ControlRemovalTest/Tests.cs
@@ -6,7 +6,7 @@
 using OpenXMLTemplates.Documents;
 using OpenXMLTemplates.Engine;
 using OpenXMLTemplates.Variables;
-namespace OpenXMLTempaltesTest.ControlRemovalTest
+namespace OpenXMLTemplatesTest.ControlRemovalTest
 {
     public class Tests
     {

diff --git a/...MLTemplatesTest/ControlReplacersTests/ConditionalControlReplacerTest/ConditionalsTests.cs b/...MLTemplatesTest/ControlReplacersTests/ConditionalControlReplacerTest/ConditionalsTests.cs
@@ -5,7 +5,7 @@
 using OpenXMLTemplates.Documents;
 using OpenXMLTemplates.Variables;
 
-namespace OpenXMLTempaltesTest.ControlReplacersTests.
+namespace OpenXMLTemplatesTest.ControlReplacersTests.
     ConditionalControlReplacerTest
 {
     public class Tests
@@ -37,8 +37,6 @@ public void ReplacedConditionalDropdownContentControls()
             Assert.IsNull(
                 doc.WordprocessingDocument.FindContentControl(replacer.TagName + "_enabled2_and_enabled3_not"));
             doc.WordprocessingDocument.AssertValid();
-
-            doc.Close();
         }
     }
 }
diff --git a/...DropdownControlReplacersTests/ConditionalDropdownControlReplacerTest/ConditionalsTests.cs b/...DropdownControlReplacersTests/ConditionalDropdownControlReplacerTest/ConditionalsTests.cs
@@ -5,7 +5,7 @@
 using OpenXMLTemplates.Documents;
 using OpenXMLTemplates.Variables;
 
-namespace OpenXMLTempaltesTest.ControlReplacersTests.DropdownControlReplacersTests.
+namespace OpenXMLTemplatesTest.ControlReplacersTests.DropdownControlReplacersTests.
     ConditionalDropdownControlReplacerTest
 {
     public class Tests
@@ -38,8 +38,6 @@ public void ReplacedConditionalDropdownContentControls()
             Assert.AreEqual("THIS IS VALID", c3.GetTextElement().Text);
             doc.WordprocessingDocument.AssertValid();
             doc.SaveAs(this.CurrentFolder() + "result.docx");
-
-            doc.Close();
         }
     }
 }
diff --git a/...sTest/ControlReplacersTests/DropdownControlReplacersTests/SingularsTest/SingularsTests.cs b/...sTest/ControlReplacersTests/DropdownControlReplacersTests/SingularsTest/SingularsTests.cs
@@ -5,7 +5,7 @@
 using OpenXMLTemplates.Documents;
 using OpenXMLTemplates.Variables;
 
-namespace OpenXMLTempaltesTest.ControlReplacersTests.DropdownControlReplacersTests.SingularsTest
+namespace OpenXMLTemplatesTest.ControlReplacersTests.DropdownControlReplacersTests.SingularsTest
 {
     public class Tests
     {
@@ -34,8 +34,6 @@ public void FindsContentControlAndReplacesSingulars()
             Assert.AreEqual("buyer", c2.GetTextElement().Text);
             doc.WordprocessingDocument.AssertValid();
             doc.SaveAs(this.CurrentFolder() + "result.docx");
-
-            doc.Close();
         }
     }
 }
diff --git a/OpenXMLTemplatesTest/ControlReplacersTests/PictureControlReplacerTests/Tests.cs b/OpenXMLTemplatesTest/ControlReplacersTests/PictureControlReplacerTests/Tests.cs
@@ -5,7 +5,7 @@
 using OpenXMLTemplates.Documents;
 using OpenXMLTemplates.Variables;
 
-namespace OpenXMLTempaltesTest.ControlReplacersTests.PictureControlReplacerTests
+namespace OpenXMLTemplatesTest.ControlReplacersTests.PictureControlReplacerTests
 {
     public class Tests
     {

diff --git a/OpenXMLTemplatesTest/ControlReplacersTests/RepeatingControlTests/Tests.cs b/OpenXMLTemplatesTest/ControlReplacersTests/RepeatingControlTests/Tests.cs
@@ -6,7 +6,7 @@
 using OpenXMLTemplates.Documents;
 using OpenXMLTemplates.Variables;
 
-namespace OpenXMLTempaltesTest.ControlReplacersTests.RepeatingControlTests
+namespace OpenXMLTemplatesTest.ControlReplacersTests.RepeatingControlTests
 {
     public class Tests
     {

diff --git a/OpenXMLTemplatesTest/ControlReplacersTests/VariableControlReplacerTests/Tests.cs b/OpenXMLTemplatesTest/ControlReplacersTests/VariableControlReplacerTests/Tests.cs
@@ -7,7 +7,7 @@
 using OpenXMLTemplates.Documents;
 using OpenXMLTemplates.Variables;
 
-namespace OpenXMLTempaltesTest.ControlReplacersTests.VariableControlReplacerTests
+namespace OpenXMLTemplatesTest.ControlReplacersTests.VariableControlReplacerTests
 {
     public class Tests
     {

diff --git a/OpenXMLTemplatesTest/CustomPartAdditionTest/CustomPartAdditionTests.cs b/OpenXMLTemplatesTest/CustomPartAdditionTest/CustomPartAdditionTests.cs
@@ -5,7 +5,7 @@
 using OpenXMLTemplates;
 using OpenXMLTemplates.Utils;
 
-namespace OpenXMLTempaltesTest.CustomPartAdditionTest
+namespace OpenXMLTemplatesTest.CustomPartAdditionTest
 {
     public class CustomPartAdditionTests
     {
@@ -20,8 +20,6 @@ public void AddsCustomXmlPart()
 
             Assert.IsNotNull(doc.GetCustomXmlPart("XmlCustomPart"));
             doc.AssertValid();
-
-            doc.Close();
         }
 
         [Test]
@@ -41,8 +39,6 @@ public void ReplacesCustomPartIfPresent()
             Assert.DoesNotThrow(() => doc.GetCustomXmlParts().Single(e => e.GetNamespace() == "XmlCustomPart"));
 
             doc.AssertValid();
-
-            doc.Close();
         }
 
         private WordprocessingDocument GetDoc()

diff --git a/OpenXMLTemplatesTest/EngineTest/EngineTest.cs b/OpenXMLTemplatesTest/EngineTest/EngineTest.cs
@@ -7,7 +7,7 @@
 using OpenXMLTemplates.Engine;
 using OpenXMLTemplates.Variables;
 
-namespace OpenXMLTempaltesTest.EngineTest
+namespace OpenXMLTemplatesTest.EngineTest
 {
     public class EngineTest
     {
@@ -57,7 +57,6 @@ string GetText(string tagName, int elementIndex)
 
 
             doc.WordprocessingDocument.AssertValid();
-            doc.Close();
         }
 
         [Test]

diff --git a/OpenXMLTemplatesTest/OpenXMLTemplatesTest.csproj b/OpenXMLTemplatesTest/OpenXMLTemplatesTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
     <PropertyGroup>
         <IsPackable>false</IsPackable>
-        <RootNamespace>OpenXMLTempaltesTest</RootNamespace>
+        <RootNamespace>OpenXMLTemplatesTest</RootNamespace>
         <TargetFramework>net6.0</TargetFramework>
         <FileUpgradeFlags>
         </FileUpgradeFlags>

diff --git a/OpenXMLTemplatesTest/TestUtils.cs b/OpenXMLTemplatesTest/TestUtils.cs
@@ -3,7 +3,7 @@
 using DocumentFormat.OpenXml.Validation;
 using NUnit.Framework;
 
-namespace OpenXMLTempaltesTest
+namespace OpenXMLTemplatesTest
 {
     internal static class TestUtils
     {
@@ -12,7 +12,7 @@ internal static class TestUtils
         /// </summary>
         internal static string CurrentFolder(this object testObject)
         {
-            var type = testObject.GetType().Namespace?.Replace("OpenXMLTempaltesTest.", "").Replace(".", "/");
+            var type = testObject.GetType().Namespace?.Replace("OpenXMLTemplatesTest.", "").Replace(".", "/");
             return TestContext.CurrentContext.TestDirectory + $"/{type}/";
         }
 

diff --git a/OpenXMLTemplatesTest/Variables/VariableSourceTests.cs b/OpenXMLTemplatesTest/Variables/VariableSourceTests.cs
@@ -4,7 +4,7 @@
 using OpenXMLTemplates.Variables;
 using OpenXMLTemplates.Variables.Exceptions;
 
-namespace OpenXMLTempaltesTest
+namespace OpenXMLTemplatesTest
 {
     public class DataTests
     {

diff --git a/OpenXMLTemplatesTest/XMLReplacementTest/XmlReplacementTests.cs b/OpenXMLTemplatesTest/XMLReplacementTest/XmlReplacementTests.cs
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using OpenXMLTemplates.Utils;
 
-namespace OpenXMLTempaltesTest.XMLReplacementTest
+namespace OpenXMLTemplatesTest.XMLReplacementTest
 {
     public class XmlReplacementTests
     {
@@ -24,7 +24,6 @@ public void ReplacesXmlUsingJson()
             doc.AssertValid();
 
 //            doc.SaveAs(TestContext.CurrentContext.TestDirectory + "/XMLReplacementTest/result.docx");
-            doc.Close();
         }
 
         [Test]
@@ -37,8 +36,6 @@ public void ReplacesXml()
 
             doc.AddOrReplaceCustomXmlPart(xData);
 
-            doc.Close();
-
 //            Can't be tested directly, because word needs to reevaluate the content controls first         
 //            Assert.AreEqual("NewItem1Value", doc.FindContentControl("item1").GetTextElement().Text);
 //            Assert.AreEqual("NewItem2Value", doc.FindContentControl("item2").GetTextElement().Text);