Skip to content

Commit

Permalink
Fix <CompilerGeneratedFilesOutputPath> in Svg.Custom. (#1153)
Browse files Browse the repository at this point in the history
 - change to generate `Generated` directory under the project
  • Loading branch information
H1Gdev authored Apr 7, 2024
1 parent 18ab544 commit 3bfa22a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
5 changes: 5 additions & 0 deletions Docs/articles/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# SVG.NET Release Notes
The release versions are NuGet releases.

## Unreleased

### Fixes
* Fixed: `<CompilerGeneratedFilesOutputPath>` in `Svg.Custom` to generate `Generated` directory under project. (see [PR #1153](https://github.com/svg-net/SVG/pull/1153))

## [Version 3.4.7](https://www.nuget.org/packages/Svg/3.4.7) (2024-02-22)

### Changes
Expand Down
19 changes: 8 additions & 11 deletions Tests/Svg.Custom/Svg.Custom.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
<IsPackable>True</IsPackable>
<Nullable>disable</Nullable>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<CompilerGeneratedFilesOutputPath>$(SvgSourcesBasePath)\Generated</CompilerGeneratedFilesOutputPath>
<SvgRootPath>..\..</SvgRootPath>
<CompilerGeneratedFilesOutputPath>$(SvgRootPath)\Source\Generated</CompilerGeneratedFilesOutputPath>
<DefineConstants>$(DefineConstants);NO_SDC</DefineConstants>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
Expand All @@ -23,28 +24,24 @@
<PackageTags>svg;vector graphics;rendering;2d;graphics;geometry;shapes</PackageTags>
</PropertyGroup>

<PropertyGroup>
<SvgSourcesBasePath>..\..</SvgSourcesBasePath>
</PropertyGroup>

<ItemGroup>
<!-- https://github.com/vvvv/SVG/blob/master/Source/SvgDtdResolver.cs#L32 -->
<EmbeddedResource Include="$(SvgSourcesBasePath)\Source\Resources\svg11.dtd">
<EmbeddedResource Include="$(SvgRootPath)\Source\Resources\svg11.dtd">
<Link>Resources\svg11.dtd</Link>
<LogicalName>Svg.Resources.svg11.dtd</LogicalName>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<Compile Include="**\*.cs" Exclude="bin\**;obj\**" />
<Compile Include="$(SvgSourcesBasePath)\Source\**\*.cs" Exclude="$(SvgSourcesBasePath)\Source\obj\**" />
<Compile Remove="$(SvgSourcesBasePath)\Source\Properties\AssemblyInfo.cs" />
<Compile Remove="$(SvgSourcesBasePath)\Source\Resources\svg11.dtd" />
<Compile Include="$(SvgRootPath)\Source\**\*.cs" Exclude="$(SvgRootPath)\Source\obj\**" />
<Compile Remove="$(SvgRootPath)\Source\Properties\AssemblyInfo.cs" />
<Compile Remove="$(SvgRootPath)\Source\Resources\svg11.dtd" />
</ItemGroup>

<ItemGroup>
<Compile Remove="$(CompilerGeneratedFilesOutputPath)/**/*.cs" />
<Compile Remove="$(SvgSourcesBasePath)\Source\Generated\**\*.cs" />
<Compile Remove="$(SvgRootPath)\Source\Generated\**\*.cs" />
</ItemGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
Expand All @@ -68,7 +65,7 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="$(SvgSourcesBasePath)\Generators\Svg.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
<ProjectReference Include="$(SvgRootPath)\Generators\Svg.Generators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
</ItemGroup>

</Project>

0 comments on commit 3bfa22a

Please sign in to comment.