Browse Source

Update submodule and remove build copy.

pull/1574/head
James Jackson-South 6 years ago
parent
commit
74de9bc174
  1. 2
      shared-infrastructure
  2. 13
      src/Directory.Build.targets
  3. 1154
      src/ImageSharp/Common/Helpers/Guard.Numeric.cs
  4. 16
      src/ImageSharp/ImageSharp.csproj

2
shared-infrastructure

@ -1 +1 @@
Subproject commit 8dfef29f1838da76be9596f1a2f1be6d93e453d3
Subproject commit ea561c249ba86352fe3b69e612b8072f3652eacb

13
src/Directory.Build.targets

@ -55,14 +55,6 @@
<ItemGroup>
<!--Shared config files that have to exist at root level.-->
<ConfigFilesToCopy Include="..\..\shared-infrastructure\.editorconfig;..\..\shared-infrastructure\.gitattributes" />
<!--
Copy submodule files generated via T4 templates.
We cannot include the generated files in the submodule as any solution wide T4 regeneration
could potentially cause the module to be marked dirty which is a headache.
This, instead, combined with using 'Compile Update' over 'Include' allows us to copy the file
across from the submodule and place it directly in the src folder for compilation.
-->
<SubmoduleSourceFilesToCopy Include="..\..\shared-infrastructure\src\SharedInfrastructure\Guard.Numeric.cs" />
</ItemGroup>
<!--Ensures our config files are up to date.-->
@ -70,11 +62,6 @@
<Copy SourceFiles="@(ConfigFilesToCopy)"
SkipUnchangedFiles = "true"
DestinationFolder="..\..\" />
<Copy SourceFiles="@(SubmoduleSourceFilesToCopy)"
DestinationFolder="..\..\src\ImageSharp\Common\Helpers"
SkipUnchangedFiles="true"
ContinueOnError="true" />
</Target>
<!-- Allows regenerating T4-generated files at build time using MsBuild -->

1154
src/ImageSharp/Common/Helpers/Guard.Numeric.cs

File diff suppressed because it is too large

16
src/ImageSharp/ImageSharp.csproj

@ -36,17 +36,7 @@
<PackageReference Include="System.ValueTuple" />
</ItemGroup>
<ItemGroup>
<!--
Note: Generating all templates via Visual Studio causes a duplicate entry that requires deleting
post operation. MSBuild target leaves the csproj file intact.
-->
<Compile Update="..\..\shared-infrastructure\src\SharedInfrastructure\Guard.Numeric.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Guard.Numeric.tt</DependentUpon>
</Compile>
<ItemGroup>
<Compile Update="Formats\Jpeg\Components\Block8x8F.Generated.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
@ -212,10 +202,6 @@
<LastGenOutput>DefaultPixelBlenders.Generated.cs</LastGenOutput>
<Generator>TextTemplatingFileGenerator</Generator>
</None>
<None Update="..\..\shared-infrastructure\src\SharedInfrastructure\Guard.Numeric.tt">
<LastGenOutput>Guard.Numeric.cs</LastGenOutput>
<Generator>TextTemplatingFileGenerator</Generator>
</None>
</ItemGroup>
<ItemGroup>

Loading…
Cancel
Save