Skip to content

Commit da12fd3

Browse files
sondrebsondreb
authored
Move properties to the root .props file (#94)
- This commit moves most of the properties from individual project files into a shared props file. - The props files are not inherited, so they are all removed from individual folders which was used to set the IsPackable property. This is added to individual project files instead. - Delete all AssemblyInfo.cs files from properties folder. - Move all version properties into a singular place, making updates easier. - Changes the assembly name of NBitcoin fork to "Blockcore.NBitcoin". - Automatically makes internals visible to .Tests projects based on script in .props file. - Remove some old NETCORE conditional checks.
1 parent dbbc2e1 commit da12fd3

81 files changed

Lines changed: 63 additions & 962 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Bitcoin.Cli/Bitcoin.Cli.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
6-
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
75
</PropertyGroup>
86

97
<ItemGroup>

‎src/Bitcoin/BitcoinD.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
54
<AssemblyName>blockcore.bitcoind</AssemblyName>
65
<OutputType>Exe</OutputType>
76
<PackageId>BitcoinD</PackageId>
8-
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
9-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
10-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
11-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
127
<PreBuildEvent></PreBuildEvent>
138
</PropertyGroup>
149

‎src/Bitcoin/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/Blockcore.Benchmark/Blockcore.Benchmark.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
6-
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
75
</PropertyGroup>
86

97
<ItemGroup>

‎src/Blockcore.Features.Api.Tests/Blockcore.Features.Api.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
54
<AssemblyName>Blockcore.Api.Tests</AssemblyName>
65
<PackageId>Blockcore.Features.Api.Tests</PackageId>
76
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
8-
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
97
</PropertyGroup>
108

119
<ItemGroup>

‎src/Blockcore.Features.Api/Blockcore.Features.Api.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
54
<PreserveCompilationContext>true</PreserveCompilationContext>
65
<AssemblyName>Blockcore.Features.Api</AssemblyName>
76
<OutputType>Library</OutputType>
8-
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
97
<PackageId>Blockcore.Features.Api</PackageId>
10-
<VersionPrefix>1.0.3</VersionPrefix>
118
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
129
<ApplicationIcon />
1310
<OutputTypeEx>library</OutputTypeEx>
1411
<StartupObject />
15-
<Authors>Stratis Group Ltd. and Blockcore Developers</Authors>
16-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
12+
<IsPackable>true</IsPackable>
1713
</PropertyGroup>
1814

1915
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

‎src/Blockcore.Features.Api/Directory.Build.props‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎src/Blockcore.Features.BlockStore.Tests/Blockcore.Features.BlockStore.Tests.csproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
54
<AssemblyName>Blockcore.Features.BlockStore.Tests</AssemblyName>
65
<PackageId>Blockcore.Features.BlockStore.Tests</PackageId>
76
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
8-
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
9-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
10-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
11-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
12-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
13-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
14-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
15-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
16-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
177
</PropertyGroup>
188

199
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

‎src/Blockcore.Features.BlockStore/Blockcore.Features.BlockStore.csproj‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,11 @@
33
<PropertyGroup>
44
<Description>Blockcore Features BlockStore</Description>
55
<AssemblyTitle>Blockcore.Features.BlockStore</AssemblyTitle>
6-
<TargetFramework>netcoreapp3.1</TargetFramework>
7-
<RuntimeFrameworkVersion>3.1.0</RuntimeFrameworkVersion>
86
<AssemblyName>Blockcore.Features.BlockStore</AssemblyName>
97
<PackageId>Blockcore.Features.BlockStore</PackageId>
10-
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
11-
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
12-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
13-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
14-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
15-
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
16-
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
17-
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
18-
<VersionPrefix>1.0.3</VersionPrefix>
198
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
20-
<Authors>Stratis Group Ltd. and Blockcore Developers</Authors>
21-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
9+
<Authors>Blockcore</Authors>
10+
<IsPackable>true</IsPackable>
2211
</PropertyGroup>
2312
<ItemGroup>
2413
<PackageReference Include="DBreeze" Version="1.95.0" />
@@ -37,10 +26,6 @@
3726
<Folder Include="Pruning\" />
3827
</ItemGroup>
3928

40-
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
41-
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
42-
</PropertyGroup>
43-
4429
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
4530
<NoWarn>1701;1702;1705;IDE0008;</NoWarn>
4631
<DocumentationFile></DocumentationFile>

‎src/Blockcore.Features.BlockStore/Directory.Build.props‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)