Skip to content

Commit 6fbfac1

Browse files
committed
尝试修复构建
1 parent 7f1ba3d commit 6fbfac1

7 files changed

Lines changed: 15 additions & 11 deletions

File tree

Directory.Build.props

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
2+
23
<Import Project="build\Version.props" />
4+
35
<PropertyGroup>
46
<LangVersion>latest</LangVersion>
57
<PackageOutputPath>$(MSBuildThisFileDirectory)bin\$(Configuration)</PackageOutputPath>
@@ -14,4 +16,9 @@
1416
<Copyright>Copyright © 2020-$([System.DateTime]::Now.ToString(`yyyy`)) dotnet campus, All Rights Reserved.</Copyright>
1517
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1618
</PropertyGroup>
19+
20+
<ItemGroup>
21+
<SourceRoot Include="$(MSBuildThisFileDirectory)"/>
22+
</ItemGroup>
23+
1724
</Project>

src/MediaConverters/MediaConverters.Lib/Imaging/Optimizations/EnhancedGraphicsMetafileOptimization.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
using System.IO;
77
using System.Runtime.InteropServices;
88
using System.Runtime.Versioning;
9+
910
using DotNetCampus.MediaConverter.SkiaWmfRenderer;
10-
using SkiaWmfRenderer;
1111

1212
namespace DotNetCampus.MediaConverters.Imaging.Optimizations;
1313

@@ -194,7 +194,7 @@ private static ImageFileOptimizationResult ConvertWithLibWmf(ImageFileOptimizati
194194
}
195195
catch (Exception e)
196196
{
197-
context.LogMessage($"File.SetUnixFileMode +x Fail. wmf2svgFile='{wmf2svgFile}'. Exception: {e}");
197+
context.LogMessage($"File.SetUnixFileMode +x Fail. wmf2svgFile='{wmf2svgFile}'. Exception: {e}");
198198
}
199199

200200
// ./wmf2svg -o 1.svg image.wmf
@@ -264,7 +264,7 @@ private static ImageFileOptimizationResult ConvertWithInkscape(ImageFileOptimiza
264264
var svgFile = Path.Join(workingFolder.FullName, $"{Path.GetFileNameWithoutExtension(file.Name)}_{Path.GetRandomFileName()}.svg");
265265

266266
context.LogMessage($"Start convert emf or wmf to png by Inkscape. File:'{file}'");
267-
267+
268268
var processStartInfo = new ProcessStartInfo("inkscape")
269269
{
270270
ArgumentList =
@@ -305,7 +305,7 @@ private static ImageFileOptimizationResult ConvertWithInkscape(ImageFileOptimiza
305305
{
306306
context.LogMessage($"Convert emf or wmf to svg by Inkscape failed. We will continue use libwmf to convert the image. File:'{file}' Exception: {e}");
307307
}
308-
308+
309309
return ImageFileOptimizationResult.FailException(e);
310310
}
311311

src/MediaConverters/MediaConverters.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaConverters.Tests", "Me
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{208BA388-4CEE-2CBF-559C-5607C099C1F8}"
1313
ProjectSection(SolutionItems) = preProject
14-
..\..\.github\workflows\MediaConverters.yml = ..\..\.github\workflows\MediaConverters.yml
15-
..\..\.github\workflows\NuGet-tag-publish-MediaConverters.yml = ..\..\.github\workflows\NuGet-tag-publish-MediaConverters.yml
1614
README.md = README.md
1715
README.zh-cn.md = README.zh-cn.md
1816
EndProjectSection

src/MediaConverters/SkiaWmfRenderer/samples/sample/Program.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
using SkiaSharp;
88

9-
using SkiaWmfRenderer;
10-
119
using System.Diagnostics;
1210
using System.Drawing;
1311
using System.Drawing.Imaging;

src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/SkiaWmfRenderHelper.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using DotNetCampus.MediaConverter.SkiaWmfRenderer.Rendering;
44
using Oxage.Wmf;
55
using SkiaSharp;
6-
using SkiaWmfRenderer;
76

87
namespace DotNetCampus.MediaConverter.SkiaWmfRenderer;
98

src/MediaConverters/SkiaWmfRenderer/src/SkiaWmfRenderer/SkiaWmfRenderer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<!--以下为 NuGet 包的属性-->
1414
<PropertyGroup>
1515
<PackageReadmeFile>README.md</PackageReadmeFile>
16+
<Description>The dotnet tools to assist in editing or reading the Office document files</Description>
1617
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1718
<EmbedAllSources Condition="'$(Configuration)' != 'Debug'">true</EmbedAllSources>
1819
<!-- 输出 pdb 文件 NuGet 包 -->

src/MediaConverters/SkiaWmfRenderer/src/wieslawsoltes-wmf/src/library/Enums/Layout.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ public enum Layout
1616
/// Sets the default layout to vertical.
1717
/// </summary>
1818
LAYOUT_VBH = 0x00000004,
19+
/// <summary>
1920
/// Disables any reflection (META_BITBLT and META_STRETCHBLT operations)
20-
/// </summary>
21-
LAYOUT_BITMAPORIENTATIONPRESERVED = 0x00000008
21+
/// </summary>
22+
LAYOUT_BITMAPORIENTATIONPRESERVED = 0x00000008
2223
}
2324
}

0 commit comments

Comments
 (0)