Skip to content

Commit 69aa642

Browse files
synercodersynercoder
committed
Moved project properties and itemgroups around
1 parent 645eb4f commit 69aa642

File tree

7 files changed

+43
-68
lines changed

7 files changed

+43
-68
lines changed

‎Directory.Build.props

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,38 +6,33 @@
66
<BaseArtifactsPathSuffix>$(SynercodingProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
77
<BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath>
88
<BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath>
9-
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(BaseArtifactsPathSuffix)/$(Configuration)/</PackageOutputPath>
9+
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
1010
</PropertyGroup>
1111

1212
<PropertyGroup>
1313
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1414
<DebugType>portable</DebugType>
1515
<DebugType Condition="'$(codecov)' != ''">full</DebugType>
16-
<Nullable>enable</Nullable>
17-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
1816
<SignAssembly>false</SignAssembly>
1917
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
20-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
21-
<Features>strict</Features>
18+
</PropertyGroup>
19+
20+
<PropertyGroup>
21+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
22+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2223
</PropertyGroup>
2324

2425
<PropertyGroup>
2526
<Authors>Gerard Gunnewijk</Authors>
2627
<Company>Synercoding</Company>
27-
<Product>Synercoding.FileFormats.Pdf</Product>
2828
<Copyright>Copyright © $(Company)</Copyright>
2929
</PropertyGroup>
3030

31-
<PropertyGroup>
32-
<VersionPrefix>0.0.1</VersionPrefix>
33-
<VersionPrefix Condition="'$(packageversion)' != ''">$(PackageVersion)</VersionPrefix>
34-
<VersionSuffix></VersionSuffix>
35-
</PropertyGroup>
36-
3731
<PropertyGroup>
3832
<NeutralLanguage>en</NeutralLanguage>
3933
<OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
4034
<RepositoryType>git</RepositoryType>
35+
<RepositoryUrl>https://github.com/synercoder/FileFormats.Pdf/</RepositoryUrl>
4136
<RestoreSources>
4237
https://api.nuget.org/v3/index.json;
4338
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
@@ -47,6 +42,19 @@
4742

4843
<PropertyGroup>
4944
<LangVersion>8.0</LangVersion>
45+
<Nullable>enable</Nullable>
46+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
47+
<Features>strict</Features>
48+
</PropertyGroup>
49+
50+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
51+
<DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
52+
</PropertyGroup>
53+
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
54+
<DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
55+
</PropertyGroup>
56+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
57+
<DefineConstants>$(DefineConstants);SUPPORTS_HASHCODE</DefineConstants>
5058
</PropertyGroup>
5159

5260
</Project>

‎Directory.Build.targets

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,4 @@
66
<DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
77
</PropertyGroup>
88

9-
<ItemGroup>
10-
<PackageReference Update="Aspose.PDF" Version="20.1.0" />
11-
<PackageReference Update="iTextSharp" Version="5.5.13.1" NoWarn="NU1701" />
12-
<PackageReference Update="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0007" />
13-
<PackageReference Update="xunit.assert" Version="2.4.1" />
14-
</ItemGroup>
15-
169
</Project>

‎src/Directory.Build.props

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Project>
33

44
<PropertyGroup>
5+
<TargetFrameworks>netcoreapp3.1;netcoreapp2.1;netstandard2.1;netstandard2.0;netstandard1.6</TargetFrameworks>
56
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileDirectory)..\Directory.Build.props</MSBuildAllProjects>
67
<SynercodingProjectCategory>src</SynercodingProjectCategory>
78
</PropertyGroup>
@@ -15,9 +16,5 @@
1516
<PropertyGroup>
1617
<WarningsNotAsErrors>CS1591</WarningsNotAsErrors>
1718
</PropertyGroup>
18-
19-
<PropertyGroup>
20-
<TargetFramework>netcoreapp3.1</TargetFramework>
21-
</PropertyGroup>
2219

2320
</Project>

‎src/Directory.Build.targets

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,6 @@
77

88
<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
99

10-
<PropertyGroup>
11-
<GeneratedInternalsVisibleToFile Condition="'$(GeneratedInternalsVisibleToFile)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).InternalsVisibleTo$(DefaultLanguageSourceExtension)</GeneratedInternalsVisibleToFile>
12-
</PropertyGroup>
13-
14-
<ItemDefinitionGroup>
15-
<InternalsVisibleTo>
16-
<Visible>false</Visible>
17-
</InternalsVisibleTo>
18-
</ItemDefinitionGroup>
19-
20-
<Target Name="GenerateInternalsVisibleTo"
21-
BeforeTargets="CoreCompile"
22-
DependsOnTargets="PrepareForBuild;CoreGenerateInternalsVisibleTo"
23-
Condition="'@(InternalsVisibleTo)' != ''" />
24-
25-
<Target Name="CoreGenerateInternalsVisibleTo"
26-
Condition="'$(Language)' == 'VB' or '$(Language)' == 'C#'"
27-
Inputs="$(MSBuildAllProjects)"
28-
Outputs="$(GeneratedInternalsVisibleToFile)">
29-
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity)" Condition="'%(InternalsVisibleTo.PublicKey)' == ''">
30-
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
31-
</CreateItem>
32-
<CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute" AdditionalMetadata="_Parameter1=%(InternalsVisibleTo.Identity), PublicKey=%(InternalsVisibleTo.PublicKey)" Condition="'%(InternalsVisibleTo.PublicKey)' != ''">
33-
<Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
34-
</CreateItem>
35-
36-
<WriteCodeFragment AssemblyAttributes="@(InternalsVisibleToAttribute)" Language="$(Language)" OutputFile="$(GeneratedInternalsVisibleToFile)">
37-
<Output TaskParameter="OutputFile" ItemName="Compile" />
38-
<Output TaskParameter="OutputFile" ItemName="FileWrites" />
39-
</WriteCodeFragment>
40-
</Target>
41-
4210
<!-- Empty target so that `dotnet test` will work on the solution -->
4311
<!-- https://github.com/Microsoft/vstest/issues/411 -->
4412
<Target Name="VSTest" />

‎src/Synercoding.FileFormats.Pdf/PackageDetails.props

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project>
3+
4+
<PropertyGroup>
5+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
</PropertyGroup>
7+
8+
<PropertyGroup>
9+
<PackageTags>PDF</PackageTags>
10+
<Product>Synercoding.FileFormats.Pdf</Product>
11+
<Title>Synercoding.FileFormats.Pdf</Title>
12+
<Description>Contains classes which makes it easy to quickly create a pdf file.</Description>
13+
<PackageReleaseNotes>Started using Synercoding.Primitives &amp; updated SixLabors.ImageSharp.</PackageReleaseNotes>
14+
</PropertyGroup>
15+
16+
</Project>

‎src/Synercoding.FileFormats.Pdf/Synercoding.FileFormats.Pdf.csproj

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>8</LangVersion>
6-
<Version>1.0.0-alpha006</Version>
7-
<Authors>Synercoding</Authors>
8-
<Description>Contains classes which makes it easy to quickly create a pdf file</Description>
9-
<PackageReleaseNotes>Started using Synercoding.Primitives &amp; updated SixLabors.ImageSharp.</PackageReleaseNotes>
10-
<PackageProjectUrl>https://github.com/synercoder/FileFormats.Pdf</PackageProjectUrl>
11-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
12-
<RepositoryUrl>https://github.com/synercoder/FileFormats.Pdf</RepositoryUrl>
13-
</PropertyGroup>
14-
3+
<Import Project="$(MSBuildThisFileDirectory)\PackageDetails.props" />
4+
5+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
6+
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
7+
</ItemGroup>
8+
159
<ItemGroup>
1610
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
1711
<PackageReference Include="Synercoding.Primitives" Version="1.0.0-rc02" />

‎tests/Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
<PropertyGroup>
1717
<TargetFramework>netcoreapp3.1</TargetFramework>
18-
<LangVersion>8.0</LangVersion>
1918
<IsPackable>false</IsPackable>
2019
</PropertyGroup>
2120

0 commit comments

Comments
 (0)