From a1cb7b24ff9e8a0e41b7a5fa6d2fbc3c32c20bbe Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 10 Jun 2024 16:14:45 +0100 Subject: Update project files --- Mammoth.Cli/Mammoth.Cli.csproj | 41 +++-------- Mammoth.Cli/Properties/AssemblyInfo.cs | 27 ------- Mammoth.Tests/DocumentConverterTests.cs | 8 +- Mammoth.Tests/Mammoth.Tests.csproj | 61 ++++----------- Mammoth.Tests/Properties/AssemblyInfo.cs | 27 ------- Mammoth.Tests/packages.config | 9 --- Mammoth/Mammoth.csproj | 123 +++++-------------------------- Mammoth/Mammoth.nuspec | 16 ---- Mammoth/Properties/AssemblyInfo.cs | 27 ------- makefile | 8 +- 10 files changed, 54 insertions(+), 293 deletions(-) delete mode 100644 Mammoth.Cli/Properties/AssemblyInfo.cs delete mode 100644 Mammoth.Tests/Properties/AssemblyInfo.cs delete mode 100644 Mammoth.Tests/packages.config delete mode 100644 Mammoth/Mammoth.nuspec delete mode 100644 Mammoth/Properties/AssemblyInfo.cs diff --git a/Mammoth.Cli/Mammoth.Cli.csproj b/Mammoth.Cli/Mammoth.Cli.csproj index f7e125e..7aeedc3 100644 --- a/Mammoth.Cli/Mammoth.Cli.csproj +++ b/Mammoth.Cli/Mammoth.Cli.csproj @@ -1,44 +1,23 @@ - - + - Debug - AnyCPU - {20602E78-EEBD-407B-B8C3-EDB6254BD663} Exe - Mammoth.Cli - Mammoth.Cli - v4.5 + net45 + Mammoth.Cli + Michael Williamson + false + 1.0.* + 1.0.* + full + true - true - full - false bin\Debug DEBUG; - prompt - 4 - true - full - true bin\Release - prompt - 4 - true - - - - - - - - - - {51C5CBD6-8809-4D5E-BABE-1787A16F5ED8} - Mammoth - + \ No newline at end of file diff --git a/Mammoth.Cli/Properties/AssemblyInfo.cs b/Mammoth.Cli/Properties/AssemblyInfo.cs deleted file mode 100644 index 1f83366..0000000 --- a/Mammoth.Cli/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle ("Mammoth.Cli")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("Michael Williamson")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion ("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/Mammoth.Tests/DocumentConverterTests.cs b/Mammoth.Tests/DocumentConverterTests.cs index 5469e08..c61ac04 100644 --- a/Mammoth.Tests/DocumentConverterTests.cs +++ b/Mammoth.Tests/DocumentConverterTests.cs @@ -98,7 +98,7 @@ namespace Mammoth.Tests { Directory.Delete(tempDirectory, recursive: true); } } - + [Fact] public void ImageConversionCanBeCustomised() { AssertSuccessfulConversion( @@ -106,7 +106,7 @@ namespace Mammoth.Tests { "

" ); } - + private IDictionary ConvertImage(IImage image) { using (var stream = image.GetStream()) { var base64 = StreamToBase64(stream); @@ -114,7 +114,7 @@ namespace Mammoth.Tests { return new Dictionary { { "src", src } }; } } - + private static string StreamToBase64(System.IO.Stream stream) { var memoryStream = new System.IO.MemoryStream(); stream.CopyTo(memoryStream); @@ -269,7 +269,7 @@ namespace Mammoth.Tests { } private string TestFilePath(string name) { - return Path.Combine("../../TestData", name); + return Path.Combine("../../../TestData", name); } } } diff --git a/Mammoth.Tests/Mammoth.Tests.csproj b/Mammoth.Tests/Mammoth.Tests.csproj index d561dde..3cae293 100644 --- a/Mammoth.Tests/Mammoth.Tests.csproj +++ b/Mammoth.Tests/Mammoth.Tests.csproj @@ -1,55 +1,29 @@ - - + - Debug - AnyCPU - {E9C3EA8B-FF3B-4E3E-8137-1510465200B5} - Library - Mammoth.Tests - Mammoth.Tests - v4.5 + net45 + Mammoth.Tests + Michael Williamson + false + 1.0.* + 1.0.* + full + false - true - full - false bin\Debug DEBUG; - prompt - 4 - false - full - true bin\Release - prompt - 4 - false - - - - ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll - - - ..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll - - - ..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll - - - ..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll - - - - - - - - + + + + + + @@ -69,9 +43,6 @@ - - {51C5CBD6-8809-4D5E-BABE-1787A16F5ED8} - Mammoth - + \ No newline at end of file diff --git a/Mammoth.Tests/Properties/AssemblyInfo.cs b/Mammoth.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 79596a3..0000000 --- a/Mammoth.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle ("Mammoth.Tests")] -[assembly: AssemblyDescription ("")] -[assembly: AssemblyConfiguration ("")] -[assembly: AssemblyCompany ("")] -[assembly: AssemblyProduct ("")] -[assembly: AssemblyCopyright ("Michael Williamson")] -[assembly: AssemblyTrademark ("")] -[assembly: AssemblyCulture ("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion ("1.0.*")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/Mammoth.Tests/packages.config b/Mammoth.Tests/packages.config deleted file mode 100644 index 69a4ec4..0000000 --- a/Mammoth.Tests/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Mammoth/Mammoth.csproj b/Mammoth/Mammoth.csproj index cba1c2f..9a9a58c 100644 --- a/Mammoth/Mammoth.csproj +++ b/Mammoth/Mammoth.csproj @@ -1,118 +1,33 @@ - - + - Debug - AnyCPU - {51C5CBD6-8809-4D5E-BABE-1787A16F5ED8} - Library - Mammoth - Mammoth - v4.5 + net45 + Mammoth + Michael Williamson + Mammoth + Convert Word documents from docx to simple HTML + Copyright 2015 - 2016 Michael Williamson + 1.4.0.0 + 1.4.0.0 + 1.4.0.0 + full + false + Michael Williamson + http://opensource.org/licenses/BSD-2-Clause + https://github.com/mwilliamson/dotnet-mammoth + docx html office word - true - full - false bin\Debug DEBUG; - prompt - 4 - false - full - true bin\Release - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + \ No newline at end of file diff --git a/Mammoth/Mammoth.nuspec b/Mammoth/Mammoth.nuspec deleted file mode 100644 index 943c9c6..0000000 --- a/Mammoth/Mammoth.nuspec +++ /dev/null @@ -1,16 +0,0 @@ - - - - $id$ - $version$ - $title$ - $author$ - $author$ - http://opensource.org/licenses/BSD-2-Clause - https://github.com/mwilliamson/dotnet-mammoth - false - $description$ - Copyright 2015 - 2016 Michael Williamson - docx html office word - - diff --git a/Mammoth/Properties/AssemblyInfo.cs b/Mammoth/Properties/AssemblyInfo.cs deleted file mode 100644 index 8f594e4..0000000 --- a/Mammoth/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("Mammoth")] -[assembly: AssemblyDescription("Convert Word documents from docx to simple HTML")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Michael Williamson")] -[assembly: AssemblyProduct("Mammoth")] -[assembly: AssemblyCopyright("Copyright © Michael Williamson 2015 - 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("1.4.0.0")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/makefile b/makefile index 2020215..deaf585 100644 --- a/makefile +++ b/makefile @@ -1,8 +1,10 @@ -.PHONY: build test +.PHONY: build build: couscous - xbuild Mammoth.sln + dotnet build + +.PHONY: test test: build - mono --debug packages/xunit.runner.console.2.1.0/tools/xunit.console.exe Mammoth.Tests/bin/Debug/Mammoth.Tests.dll -noshadow + mono --debug packages/xunit.runner.console.2.1.0/tools/xunit.console.exe Mammoth.Tests/bin/Debug/net45/Mammoth.Tests.dll -noshadow -- cgit v1.2.3