Skip to content

Commit 2de0dd7

Browse files
committed
Simplify build
1 parent 5e10491 commit 2de0dd7

File tree

5 files changed

+16
-24
lines changed

5 files changed

+16
-24
lines changed

Directory.Build.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project>
2+
<Import Project="netfx.props" />
23

34
<PropertyGroup>
45
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -12,19 +13,18 @@
1213
</PropertyGroup>
1314

1415
<PropertyGroup>
15-
<StringFormatterVersion>1.0.0.12</StringFormatterVersion>
16+
<Version>1.0.0.12</Version>
1617
</PropertyGroup>
1718

1819
<PropertyGroup>
19-
<Version>$(StringFormatterVersion)</Version>
2020
<Authors>Michael Popoloski, Mendel Monteiro-Beckerman</Authors>
2121
<Description>Zero-allocation string formatting for .NET (a fork of https://github.com/MikePopoloski/StringFormatter)</Description>
2222
<Product>StringFormatter</Product>
2323
<PackageProjectUrl>https://github.com/MendelMonteiro/StringFormatter</PackageProjectUrl>
24-
<PackageLicense>https://github.com/MendelMonteiro/StringFormatter/blob/master/LICENSE</PackageLicense>
24+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
2525
<PackageTags>string format zero-alloc</PackageTags>
26-
<Copyright>Copyright © 2015 Michael Popoloski</Copyright>
26+
<Copyright>Copyright © 2015 Michael Popoloski</Copyright>
2727
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2828
</PropertyGroup>
2929

30-
</Project>
30+
</Project>

StringFormatter.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1515
LICENSE = LICENSE
1616
netfx.props = netfx.props
1717
README.md = README.md
18-
SharedVersionInfo.cs = SharedVersionInfo.cs
19-
version.yml = version.yml
2018
EndProjectSection
2119
EndProject
2220
Global

StringFormatter/StringFormatter.csproj

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\netfx.props" />
32
<PropertyGroup>
4-
<OutputType>Library</OutputType>
5-
<Version>$(StringFormatterVersion)</Version>
63
<TargetFrameworks>net461;netstandard2.0;netcoreapp2.1</TargetFrameworks>
7-
<PackageId>StringFormatter</PackageId>
84
<IsPackable>true</IsPackable>
9-
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
5+
<PackageId>StringFormatter</PackageId>
106
</PropertyGroup>
117

128
<ItemGroup>
@@ -31,4 +27,5 @@
3127
<DependentUpon>Arg.tt</DependentUpon>
3228
</Compile>
3329
</ItemGroup>
34-
</Project>
30+
31+
</Project>
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\netfx.props" />
32
<PropertyGroup>
3+
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
44
<OutputType>exe</OutputType>
55
<OutputTypeEx>exe</OutputTypeEx>
6-
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
7-
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
86
</PropertyGroup>
97

108
<ItemGroup>
11-
<PackageReference Include="BenchmarkDotNet" Version="0.11.3" />
9+
<ProjectReference Include="..\StringFormatter\StringFormatter.csproj" />
1210
</ItemGroup>
1311

1412
<ItemGroup>
15-
<ProjectReference Include="..\StringFormatter\StringFormatter.csproj" />
13+
<PackageReference Include="BenchmarkDotNet" Version="0.11.3" />
1614
</ItemGroup>
15+
1716
</Project>

Test/Test.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="..\netfx.props" />
32
<PropertyGroup>
4-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
53
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
6-
<LangVersion>latest</LangVersion>
74
</PropertyGroup>
85

6+
<ItemGroup>
7+
<ProjectReference Include="..\StringFormatter\StringFormatter.csproj" />
8+
</ItemGroup>
9+
910
<ItemGroup>
1011
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
1112
<PackageReference Include="AutoFixture" Version="4.6.0" />
@@ -15,7 +16,4 @@
1516
<PackageReference Include="NUnit3TestAdapter" Version="3.11.2" />
1617
</ItemGroup>
1718

18-
<ItemGroup>
19-
<ProjectReference Include="..\StringFormatter\StringFormatter.csproj" />
20-
</ItemGroup>
2119
</Project>

0 commit comments

Comments
 (0)