diff --git a/Xceed.Document.NET/AssemblyVersionInfo.cs b/Xceed.Document.NET/AssemblyVersionInfo.cs index 2913e77..09b2e45 100644 --- a/Xceed.Document.NET/AssemblyVersionInfo.cs +++ b/Xceed.Document.NET/AssemblyVersionInfo.cs @@ -13,11 +13,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at *************************************************************************************/ - -#pragma warning disable 0436 -[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )] -#pragma warning restore 0436 - internal static class _XceedVersionInfo { [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )] diff --git a/Xceed.Document.NET/Properties/AssemblyInfo.cs b/Xceed.Document.NET/Properties/AssemblyInfo.cs index 747d502..166d2c9 100644 --- a/Xceed.Document.NET/Properties/AssemblyInfo.cs +++ b/Xceed.Document.NET/Properties/AssemblyInfo.cs @@ -19,23 +19,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle( "Xceed Document for .NET" )] -[assembly: AssemblyDescription( "This assembly implements the classes for Xceed Document for .NET." )] - -[assembly: AssemblyCompany( "Xceed Software Inc." )] -[assembly: AssemblyProduct( "Xceed Document for .NET" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2009-2021" )] -[assembly: AssemblyCulture("")] - - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - // Allow the Xceed.Words.NET to get at internal stuff. [assembly: InternalsVisibleTo( "Xceed.Words.NET" + ",PublicKey=" + @@ -86,18 +69,3 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" + "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" + "f92cbfb5")] - - - - - - - - - -#pragma warning disable 1699 -[assembly: AssemblyDelaySign( false )] -[assembly: AssemblyKeyFile( @"..\..\sn.snk" )] -[assembly: AssemblyKeyName( "" )] -#pragma warning restore 1699 - diff --git a/Xceed.Document.NET/Src/Document.cs b/Xceed.Document.NET/Src/Document.cs index f917c11..2b4d533 100644 --- a/Xceed.Document.NET/Src/Document.cs +++ b/Xceed.Document.NET/Src/Document.cs @@ -28,7 +28,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at using System.Collections.ObjectModel; using System.Net; using System.Diagnostics; -using System.Drawing.Drawing2D; using System.Reflection; using System.ComponentModel; diff --git a/Xceed.Document.NET/Src/HelperFunctions.cs b/Xceed.Document.NET/Src/HelperFunctions.cs index d793444..98c5065 100644 --- a/Xceed.Document.NET/Src/HelperFunctions.cs +++ b/Xceed.Document.NET/Src/HelperFunctions.cs @@ -26,7 +26,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at using System.Globalization; using System.Diagnostics; using System.Drawing; -using System.Drawing.Drawing2D; namespace Xceed.Document.NET { diff --git a/Xceed.Document.NET/Xceed.Document.NET.csproj b/Xceed.Document.NET/Xceed.Document.NET.csproj index 8ecb585..d406f44 100644 --- a/Xceed.Document.NET/Xceed.Document.NET.csproj +++ b/Xceed.Document.NET/Xceed.Document.NET.csproj @@ -1,161 +1,24 @@ - - + - Debug - AnyCPU - 9.0.21022 - 2.0 - {E863D072-AA8B-4108-B5F1-785241B37F67} - Library - Properties - Xceed.Document.NET - Xceed.Document.NET - v4.0 - 512 - - - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - - - true - full - false - bin\Debug\ - TRACE;DEBUG;NETFRAMEWORK - prompt - 4 - - - AllRules.ruleset - CS1591 - - - none - true - bin\Release\ - TRACE;NETFRAMEWORK - prompt - 4 - AllRules.ruleset - - - - - false + net40;netstandard2.0 + + Xceed Document for .NET + This assembly implements the classes for Xceed Document for .NET. + 2.0.0.0 + + Xceed Software Inc. + Xceed Document for .NET + Copyright (C) Xceed Software Inc. 2009-2021 - - + true + false + sn.snk - - - - - 3.5 - - - - - 3.5 - - - 3.5 - - - - 3.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - @@ -164,12 +27,11 @@ - - - + + + + + + + + \ No newline at end of file diff --git a/Xceed.Words.NET.Examples/Program.cs b/Xceed.Words.NET.Examples/Program.cs index b952171..06c9f4b 100644 --- a/Xceed.Words.NET.Examples/Program.cs +++ b/Xceed.Words.NET.Examples/Program.cs @@ -19,11 +19,9 @@ namespace Xceed.Words.NET.Examples { public class Program { -#if NETCORE || NET5 - internal const string SampleDirectory = @"..\..\..\Samples\"; -#else - internal const string SampleDirectory = @"..\..\Samples\"; -#endif + internal static string SampleDirectory = System.IO.Path.Combine( + System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"..\..\..\Samples\" + ); private static void Main( string[] args ) { diff --git a/Xceed.Words.NET.Examples/Properties/AssemblyInfo.cs b/Xceed.Words.NET.Examples/Properties/AssemblyInfo.cs deleted file mode 100644 index 12bab9f..0000000 --- a/Xceed.Words.NET.Examples/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,51 +0,0 @@ -/*************************************************************************************** -Xceed Words for .NET – Xceed.Words.NET.Examples – AssemblyInfo -Copyright (c) 2009-2021 - Xceed Software Inc. - -This application demonstrates how to create docx files when using the API -from the Xceed Words for .NET. - -This file is part of Xceed Words for .NET. The source code in this file -is only intended as a supplement to the documentation, and is provided -"as is", without warranty of any kind, either expressed or implied. -*************************************************************************************/ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle( "Xceed Words for .NET - Examples" )] -[assembly: AssemblyDescription( "This assembly contains the Examples for Xceed Words for .NET." )] - -[assembly: AssemblyCompany( "Xceed Software Inc." )] -[assembly: AssemblyProduct( "Xceed Words for .NET" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2009-2021" )] -[assembly: AssemblyCulture( "" )] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible( false )] - -//In order to begin building localizable applications, set -//CultureYouAreCodingWith in your .csproj file -//inside a . For example, if you are using US english -//in your source files, set the to en-US. Then uncomment -//the NeutralResourceLanguage attribute below. Update the "en-US" in -//the line below to match the UICulture setting in the project file. - -//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion( "2.0.0.0" )] -[assembly: AssemblyFileVersion( "2.0.0.0" )] diff --git a/Xceed.Words.NET.Examples/Samples/Bookmark/BookmarkSample.cs b/Xceed.Words.NET.Examples/Samples/Bookmark/BookmarkSample.cs index c78f266..fb295fb 100644 --- a/Xceed.Words.NET.Examples/Samples/Bookmark/BookmarkSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Bookmark/BookmarkSample.cs @@ -21,8 +21,8 @@ public class BookmarkSample { #region Private Members - private const string BookmarkSampleResourcesDirectory = Program.SampleDirectory + @"Bookmark\Resources\"; - private const string BookmarkSampleOutputDirectory = Program.SampleDirectory + @"Bookmark\Output\"; + private static string BookmarkSampleResourcesDirectory = Program.SampleDirectory + @"Bookmark\Resources\"; + private static string BookmarkSampleOutputDirectory = Program.SampleDirectory + @"Bookmark\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Chart/ChartSample.cs b/Xceed.Words.NET.Examples/Samples/Chart/ChartSample.cs index 430ba8e..461de02 100644 --- a/Xceed.Words.NET.Examples/Samples/Chart/ChartSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Chart/ChartSample.cs @@ -21,8 +21,8 @@ public class ChartSample { #region Private Members - private const string ChartSampleOutputDirectory = Program.SampleDirectory + @"Chart\Output\"; - private const string ChartSampleResourceDirectory = Program.SampleDirectory + @"Chart\Resources\"; + private static string ChartSampleOutputDirectory = Program.SampleDirectory + @"Chart\Output\"; + private static string ChartSampleResourceDirectory = Program.SampleDirectory + @"Chart\Resources\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/CheckBox/CheckBoxSample.cs b/Xceed.Words.NET.Examples/Samples/CheckBox/CheckBoxSample.cs index 4eef625..ac353e4 100644 --- a/Xceed.Words.NET.Examples/Samples/CheckBox/CheckBoxSample.cs +++ b/Xceed.Words.NET.Examples/Samples/CheckBox/CheckBoxSample.cs @@ -20,8 +20,8 @@ public class CheckBoxSample { #region Private Members - private const string CheckBoxSampleResourcesDirectory = Program.SampleDirectory + @"CheckBox\Resources\"; - private const string CheckBoxSampleOutputDirectory = Program.SampleDirectory + @"CheckBox\Output\"; + private static string CheckBoxSampleResourcesDirectory = Program.SampleDirectory + @"CheckBox\Resources\"; + private static string CheckBoxSampleOutputDirectory = Program.SampleDirectory + @"CheckBox\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/DigitalSignature/DigitalSignatureSample.cs b/Xceed.Words.NET.Examples/Samples/DigitalSignature/DigitalSignatureSample.cs index 975179a..074c16a 100644 --- a/Xceed.Words.NET.Examples/Samples/DigitalSignature/DigitalSignatureSample.cs +++ b/Xceed.Words.NET.Examples/Samples/DigitalSignature/DigitalSignatureSample.cs @@ -20,8 +20,8 @@ public class DigitalSignatureSample { #region Private Members - private const string DigitalSignatureSampleOutputDirectory = Program.SampleDirectory + @"DigitalSignature\Output\"; - private const string DigitalSignatureSampleResourcesDirectory = Program.SampleDirectory + @"DigitalSignature\Resources\"; + private static string DigitalSignatureSampleOutputDirectory = Program.SampleDirectory + @"DigitalSignature\Output\"; + private static string DigitalSignatureSampleResourcesDirectory = Program.SampleDirectory + @"DigitalSignature\Resources\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Document/DocumentSample.cs b/Xceed.Words.NET.Examples/Samples/Document/DocumentSample.cs index 7dbe6c7..152a191 100644 --- a/Xceed.Words.NET.Examples/Samples/Document/DocumentSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Document/DocumentSample.cs @@ -30,8 +30,8 @@ public class DocumentSample { "DATE", "October 18 2016" }, }; - private const string DocumentSampleResourcesDirectory = Program.SampleDirectory + @"Document\Resources\"; - private const string DocumentSampleOutputDirectory = Program.SampleDirectory + @"Document\Output\"; + private static string DocumentSampleResourcesDirectory = Program.SampleDirectory + @"Document\Resources\"; + private static string DocumentSampleOutputDirectory = Program.SampleDirectory + @"Document\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Equation/EquationSample.cs b/Xceed.Words.NET.Examples/Samples/Equation/EquationSample.cs index d8edfdc..2fcc5b3 100644 --- a/Xceed.Words.NET.Examples/Samples/Equation/EquationSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Equation/EquationSample.cs @@ -21,7 +21,7 @@ public class EquationSample { #region Private Members - private const string EquationSampleOutputDirectory = Program.SampleDirectory + @"Equation\Output\"; + private static string EquationSampleOutputDirectory = Program.SampleDirectory + @"Equation\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/FootnoteEndnote/FootnoteEndnoteSample.cs b/Xceed.Words.NET.Examples/Samples/FootnoteEndnote/FootnoteEndnoteSample.cs index 8f2067e..b419d45 100644 --- a/Xceed.Words.NET.Examples/Samples/FootnoteEndnote/FootnoteEndnoteSample.cs +++ b/Xceed.Words.NET.Examples/Samples/FootnoteEndnote/FootnoteEndnoteSample.cs @@ -22,8 +22,8 @@ public class FootnoteEndnoteSample { #region Private Members - private const string FootnoteEndnoteSampleResourcesDirectory = Program.SampleDirectory + @"FootnoteEndnote\Resources\"; - private const string FootnoteEndnoteSampleOutputDirectory = Program.SampleDirectory + @"FootnoteEndnote\Output\"; + private static string FootnoteEndnoteSampleResourcesDirectory = Program.SampleDirectory + @"FootnoteEndnote\Resources\"; + private static string FootnoteEndnoteSampleOutputDirectory = Program.SampleDirectory + @"FootnoteEndnote\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/HeaderFooter/HeaderFooterSample.cs b/Xceed.Words.NET.Examples/Samples/HeaderFooter/HeaderFooterSample.cs index 8e9add9..e9a36ad 100644 --- a/Xceed.Words.NET.Examples/Samples/HeaderFooter/HeaderFooterSample.cs +++ b/Xceed.Words.NET.Examples/Samples/HeaderFooter/HeaderFooterSample.cs @@ -20,7 +20,7 @@ public class HeaderFooterSample { #region Private Members - private const string HeaderFooterSampleOutputDirectory = Program.SampleDirectory + @"HeaderFooter\Output\"; + private static string HeaderFooterSampleOutputDirectory = Program.SampleDirectory + @"HeaderFooter\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Hyperlink/HyperlinkSample.cs b/Xceed.Words.NET.Examples/Samples/Hyperlink/HyperlinkSample.cs index 7030385..b4bac4f 100644 --- a/Xceed.Words.NET.Examples/Samples/Hyperlink/HyperlinkSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Hyperlink/HyperlinkSample.cs @@ -21,7 +21,7 @@ public class HyperlinkSample { #region Private Members - private const string HyperlinkSampleOutputDirectory = Program.SampleDirectory + @"Hyperlink\Output\"; + private static string HyperlinkSampleOutputDirectory = Program.SampleDirectory + @"Hyperlink\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Hyphenation/HyphenationSample.cs b/Xceed.Words.NET.Examples/Samples/Hyphenation/HyphenationSample.cs index fae140b..e52af20 100644 --- a/Xceed.Words.NET.Examples/Samples/Hyphenation/HyphenationSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Hyphenation/HyphenationSample.cs @@ -20,8 +20,8 @@ public class HyphenationSample { #region Private Members - private const string HyphenationSampleResourceDirectory = Program.SampleDirectory + @"Hyphenation\Resources\"; - private const string HyphenationSampleOutputDirectory = Program.SampleDirectory + @"Hyphenation\Output\"; + private static string HyphenationSampleResourceDirectory = Program.SampleDirectory + @"Hyphenation\Resources\"; + private static string HyphenationSampleOutputDirectory = Program.SampleDirectory + @"Hyphenation\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Image/ImageSample.cs b/Xceed.Words.NET.Examples/Samples/Image/ImageSample.cs index 28df9a8..71c30f7 100644 --- a/Xceed.Words.NET.Examples/Samples/Image/ImageSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Image/ImageSample.cs @@ -24,8 +24,8 @@ public class ImageSample { #region Private Members - private const string ImageSampleResourcesDirectory = Program.SampleDirectory + @"Image\Resources\"; - private const string ImageSampleOutputDirectory = Program.SampleDirectory + @"Image\Output\"; + private static string ImageSampleResourcesDirectory = Program.SampleDirectory + @"Image\Resources\"; + private static string ImageSampleOutputDirectory = Program.SampleDirectory + @"Image\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Line/LineSample.cs b/Xceed.Words.NET.Examples/Samples/Line/LineSample.cs index 5e2c63d..62aee4f 100644 --- a/Xceed.Words.NET.Examples/Samples/Line/LineSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Line/LineSample.cs @@ -20,7 +20,7 @@ public class LineSample { #region Private Members - private const string LineSampleOutputDirectory = Program.SampleDirectory + @"Line\Output\"; + private static string LineSampleOutputDirectory = Program.SampleDirectory + @"Line\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/List/ListSample.cs b/Xceed.Words.NET.Examples/Samples/List/ListSample.cs index 8b78f98..4022b01 100644 --- a/Xceed.Words.NET.Examples/Samples/List/ListSample.cs +++ b/Xceed.Words.NET.Examples/Samples/List/ListSample.cs @@ -24,8 +24,8 @@ public class ListSample { #region Private Members - private const string ListSampleResourceDirectory = Program.SampleDirectory + @"List\Resources\"; - private const string ListSampleOutputDirectory = Program.SampleDirectory + @"List\Output\"; + private static string ListSampleResourceDirectory = Program.SampleDirectory + @"List\Resources\"; + private static string ListSampleOutputDirectory = Program.SampleDirectory + @"List\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Margin/MarginSample.cs b/Xceed.Words.NET.Examples/Samples/Margin/MarginSample.cs index 86eaac0..fb0c7fd 100644 --- a/Xceed.Words.NET.Examples/Samples/Margin/MarginSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Margin/MarginSample.cs @@ -20,7 +20,7 @@ public class MarginSample { #region Private Members - private const string MarginSampleOutputDirectory = Program.SampleDirectory + @"Margin\Output\"; + private static string MarginSampleOutputDirectory = Program.SampleDirectory + @"Margin\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Miscellaneous/MiscellaneousSample.cs b/Xceed.Words.NET.Examples/Samples/Miscellaneous/MiscellaneousSample.cs index 55a1ab7..3af261c 100644 --- a/Xceed.Words.NET.Examples/Samples/Miscellaneous/MiscellaneousSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Miscellaneous/MiscellaneousSample.cs @@ -24,9 +24,9 @@ public class MiscellaneousSample { #region Private Members - private const string MiscellaneousSampleResourcesDirectory = Program.SampleDirectory + @"Miscellaneous\Resources\"; - private const string MiscellaneousSampleOutputDirectory = Program.SampleDirectory + @"Miscellaneous\Output\"; - private const string MiscellaneousSampleOutputMailMergeDirectory = MiscellaneousSample.MiscellaneousSampleOutputDirectory + @"MailMerge\"; + private static string MiscellaneousSampleResourcesDirectory = Program.SampleDirectory + @"Miscellaneous\Resources\"; + private static string MiscellaneousSampleOutputDirectory = Program.SampleDirectory + @"Miscellaneous\Output\"; + private static string MiscellaneousSampleOutputMailMergeDirectory = MiscellaneousSample.MiscellaneousSampleOutputDirectory + @"MailMerge\"; private static List Canditates = new List() { diff --git a/Xceed.Words.NET.Examples/Samples/Paragraph/ParagraphSample.cs b/Xceed.Words.NET.Examples/Samples/Paragraph/ParagraphSample.cs index fa1f2a6..8d48d2f 100644 --- a/Xceed.Words.NET.Examples/Samples/Paragraph/ParagraphSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Paragraph/ParagraphSample.cs @@ -28,8 +28,8 @@ public class ParagraphSample { "COST", "$13.95" }, }; - private const string ParagraphSampleResourcesDirectory = Program.SampleDirectory + @"Paragraph\Resources\"; - private const string ParagraphSampleOutputDirectory = Program.SampleDirectory + @"Paragraph\Output\"; + private static string ParagraphSampleResourcesDirectory = Program.SampleDirectory + @"Paragraph\Resources\"; + private static string ParagraphSampleOutputDirectory = Program.SampleDirectory + @"Paragraph\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Parallel/ParallelSample.cs b/Xceed.Words.NET.Examples/Samples/Parallel/ParallelSample.cs index afb2dbb..ca35958 100644 --- a/Xceed.Words.NET.Examples/Samples/Parallel/ParallelSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Parallel/ParallelSample.cs @@ -20,8 +20,8 @@ public class ParallelSample { #region Private Members - private const string ParallelSampleResourcesDirectory = Program.SampleDirectory + @"Parallel\Resources\"; - private const string ParallelSampleOutputDirectory = Program.SampleDirectory + @"Parallel\Output\"; + private static string ParallelSampleResourcesDirectory = Program.SampleDirectory + @"Parallel\Resources\"; + private static string ParallelSampleOutputDirectory = Program.SampleDirectory + @"Parallel\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Protection/ProtectionSample.cs b/Xceed.Words.NET.Examples/Samples/Protection/ProtectionSample.cs index c7a583e..5709d3e 100644 --- a/Xceed.Words.NET.Examples/Samples/Protection/ProtectionSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Protection/ProtectionSample.cs @@ -20,8 +20,8 @@ public class ProtectionSample { #region Private Members - private const string ProtectionSampleResourceDirectory = Program.SampleDirectory + @"Protection\Resources\"; - private const string ProtectionSampleOutputDirectory = Program.SampleDirectory + @"Protection\Output\"; + private static string ProtectionSampleResourceDirectory = Program.SampleDirectory + @"Protection\Resources\"; + private static string ProtectionSampleOutputDirectory = Program.SampleDirectory + @"Protection\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Section/SectionSample.cs b/Xceed.Words.NET.Examples/Samples/Section/SectionSample.cs index 394ecf0..3aa72da 100644 --- a/Xceed.Words.NET.Examples/Samples/Section/SectionSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Section/SectionSample.cs @@ -22,7 +22,7 @@ public class SectionSample { #region Private Members - private const string SectionSampleOutputDirectory = Program.SampleDirectory + @"Section\Output\"; + private static string SectionSampleOutputDirectory = Program.SampleDirectory + @"Section\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Shape/ShapeSample.cs b/Xceed.Words.NET.Examples/Samples/Shape/ShapeSample.cs index 15c424c..788d2d8 100644 --- a/Xceed.Words.NET.Examples/Samples/Shape/ShapeSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Shape/ShapeSample.cs @@ -23,7 +23,7 @@ public class ShapeSample { #region Private Members - private const string ShapeSampleOutputDirectory = Program.SampleDirectory + @"Shape\Output\"; + private static string ShapeSampleOutputDirectory = Program.SampleDirectory + @"Shape\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/Table/TableSample.cs b/Xceed.Words.NET.Examples/Samples/Table/TableSample.cs index ab4fb74..661e448 100644 --- a/Xceed.Words.NET.Examples/Samples/Table/TableSample.cs +++ b/Xceed.Words.NET.Examples/Samples/Table/TableSample.cs @@ -24,8 +24,8 @@ public class TableSample private static Random rand = new Random(); - private const string TableSampleResourcesDirectory = Program.SampleDirectory + @"Table\Resources\"; - private const string TableSampleOutputDirectory = Program.SampleDirectory + @"Table\Output\"; + private static string TableSampleResourcesDirectory = Program.SampleDirectory + @"Table\Resources\"; + private static string TableSampleOutputDirectory = Program.SampleDirectory + @"Table\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Samples/TableOfContent/TableOfContentSample.cs b/Xceed.Words.NET.Examples/Samples/TableOfContent/TableOfContentSample.cs index 714cf60..cfc09bc 100644 --- a/Xceed.Words.NET.Examples/Samples/TableOfContent/TableOfContentSample.cs +++ b/Xceed.Words.NET.Examples/Samples/TableOfContent/TableOfContentSample.cs @@ -21,8 +21,8 @@ public class TableOfContentSample { #region Private Members - private const string TableOfContentSampleResourcesDirectory = Program.SampleDirectory + @"TableOfContent\Resources\"; - private const string TableOfContentSampleOutputDirectory = Program.SampleDirectory + @"TableOfContent\Output\"; + private static string TableOfContentSampleResourcesDirectory = Program.SampleDirectory + @"TableOfContent\Resources\"; + private static string TableOfContentSampleOutputDirectory = Program.SampleDirectory + @"TableOfContent\Output\"; #endregion diff --git a/Xceed.Words.NET.Examples/Xceed.Words.NET.Examples.csproj b/Xceed.Words.NET.Examples/Xceed.Words.NET.Examples.csproj index 5f66014..139e897 100644 --- a/Xceed.Words.NET.Examples/Xceed.Words.NET.Examples.csproj +++ b/Xceed.Words.NET.Examples/Xceed.Words.NET.Examples.csproj @@ -1,79 +1,28 @@ - - + - Debug - AnyCPU - 8.0.30703 - 2.0 - {F3022BB7-0E40-4C80-A495-37FEAF3671AB} + net40;netcoreapp3.1;net5.0-windows;net6.0-windows Exe - Properties - Xceed.Words.NET.Examples - Xceed.Words.NET.Examples - v4.0 - - - 512 - - - AnyCPU - true - full - false - bin\Debug\ - TRACE;DEBUG;NETFRAMEWORK - prompt - 4 - - - AnyCPU - none - true - bin\Release\ - TRACE;NETFRAMEWORK - prompt - 4 + + Xceed Words for .NET - Examples + This assembly contains the Examples for Xceed Words for .NET. + 2.0.0.0 + + Xceed Software Inc. + Xceed Words for .NET + Copyright (C) Xceed Software Inc. 2009-2021 - - - - - - - - + + AssemblyVersionInfo.cs + + + AssemblyVersionInfoCommon.cs + - - - - - - - - - - - - - - - - - - - - - - - - - - + - @@ -119,19 +68,6 @@ - - ..\Xceed.Document.NET\bin\Debug\Xceed.Document.NET.dll - - - ..\Xceed.Words.NET\bin\Debug\Xceed.Words.NET.dll - + - - - + \ No newline at end of file diff --git a/Xceed.Words.NET.sln b/Xceed.Words.NET.sln index 948c56d..89c2dd6 100644 --- a/Xceed.Words.NET.sln +++ b/Xceed.Words.NET.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29418.71 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.31911.260 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Words.NET.Examples", "Xceed.Words.NET.Examples\Xceed.Words.NET.Examples.csproj", "{F3022BB7-0E40-4C80-A495-37FEAF3671AB}" ProjectSection(ProjectDependencies) = postProject diff --git a/Xceed.Words.NET/DocX.cs b/Xceed.Words.NET/DocX.cs index 2b336ba..dcdd6c8 100644 --- a/Xceed.Words.NET/DocX.cs +++ b/Xceed.Words.NET/DocX.cs @@ -19,14 +19,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at using System.IO; using System.IO.Packaging; using System.Linq; -#if NETFRAMEWORK -using System.Security.Cryptography.X509Certificates; -using System.Security.Cryptography.Xml; -using Microsoft.Win32; -using System.Drawing; -using System.Drawing.Imaging; -using System.Xml; -#endif using System.Xml.Linq; using Xceed.Document.NET; diff --git a/Xceed.Words.NET/Properties/AssemblyInfo.cs b/Xceed.Words.NET/Properties/AssemblyInfo.cs deleted file mode 100644 index 41eb255..0000000 --- a/Xceed.Words.NET/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,44 +0,0 @@ -/*************************************************************************************** - - DocX – DocX is the community edition of Xceed Words for .NET - - Copyright (C) 2009-2020 Xceed Software Inc. - - This program is provided to you under the terms of the XCEED SOFTWARE, INC. - COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at - https://github.com/xceedsoftware/DocX/blob/master/license.md - - For more features and fast professional support, - pick up Xceed Words for .NET at https://xceed.com/xceed-words-for-net/ - - *************************************************************************************/ - - -using System; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle( "Xceed Words for .NET" )] -[assembly: AssemblyDescription( "This assembly implements the classes for Xceed Words for .NET." )] - -[assembly: AssemblyCompany( "Xceed Software Inc." )] -[assembly: AssemblyProduct( "Xceed Words for .NET" )] -[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2009-2021" )] -[assembly: AssemblyCulture("")] - - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -#pragma warning disable 1699 -[assembly: AssemblyDelaySign( false )] -[assembly: AssemblyKeyFile( @"..\..\sn.snk" )] -[assembly: AssemblyKeyName( "" )] -#pragma warning restore 1699 - diff --git a/Xceed.Words.NET/Xceed.Words.NET.csproj b/Xceed.Words.NET/Xceed.Words.NET.csproj index 8dafac4..a5889f9 100644 --- a/Xceed.Words.NET/Xceed.Words.NET.csproj +++ b/Xceed.Words.NET/Xceed.Words.NET.csproj @@ -1,53 +1,20 @@ - - - + - Debug - AnyCPU - {6A9B96D0-A011-4F33-8EE2-AC31C948CCA9} - Library - Properties - Xceed.Words.NET - Xceed.Words.NET - v4.0 - 512 - - false - false + net40;netstandard2.0 + + Xceed Words for .NET + This assembly implements the classes for Xceed Words for .NET. + 2.0.0.0 + + Xceed Software Inc. + Xceed Words for .NET + Copyright (C) Xceed Software Inc. 2009-2021 - - true - full - false - bin\Debug\ - TRACE;DEBUG;NETFRAMEWORK - prompt - 4 - - - - - pdbonly - true - bin\Release\ - TRACE;NETFRAMEWORK - prompt - 4 - - + + true + false + sn.snk - - - - - - - - - - - - AssemblyVersionInfo.cs @@ -55,21 +22,11 @@ AssemblyVersionInfoCommon.cs - - - - {e863d072-aa8b-4108-b5f1-785241b37f67} - Xceed.Document.NET - + + + + - - - + \ No newline at end of file