Skip to content

Commit 8a6cdce

Browse files
Carl-HugoCarl-Hugo
committed
Simplify props and csproj files
1 parent f78f845 commit 8a6cdce

10 files changed

+50
-76
lines changed

Diff for: ‎Dependencies.Build.props

-30
This file was deleted.

Diff for: ‎Directory.Build.props

-10
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
<Project>
2-
<Import Project="Dependencies.Build.props" />
3-
42
<PropertyGroup>
5-
<Product>ForEvolve Framework</Product>
6-
<RepositoryUrl>https://github.com/ForEvolve/ForEvolve-Framework</RepositoryUrl>
7-
<RepositoryType>git</RepositoryType>
83
<LangVersion>latest</LangVersion>
94
</PropertyGroup>
10-
11-
<ItemGroup Condition="'$(TargetFramework)'!='net461'">
12-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
13-
</ItemGroup>
14-
155
</Project>

Diff for: ‎ForEvolve.OperationResults.sln

+17
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForEvolve.OperationResults.
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ForEvolve.OperationResults.AspNetCore.Tests", "test\ForEvolve.OperationResults.AspNetCore.Tests\ForEvolve.OperationResults.AspNetCore.Tests.csproj", "{89FD91BC-13E4-4A7B-9F37-7AB075C2700A}"
1717
EndProject
18+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{CAE60B3D-061E-4B12-BFD3-E966AA7B10E8}"
19+
ProjectSection(SolutionItems) = preProject
20+
Directory.Build.props = Directory.Build.props
21+
EndProjectSection
22+
EndProject
23+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{206A433D-0EEB-4BB5-9C9A-7636AB172D4F}"
24+
ProjectSection(SolutionItems) = preProject
25+
src\Directory.Build.props = src\Directory.Build.props
26+
EndProjectSection
27+
EndProject
28+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{C4D44813-C5C9-45B7-B918-7B078BEBCE9C}"
29+
ProjectSection(SolutionItems) = preProject
30+
test\Directory.Build.props = test\Directory.Build.props
31+
EndProjectSection
32+
EndProject
1833
Global
1934
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2035
Debug|Any CPU = Debug|Any CPU
@@ -82,6 +97,8 @@ Global
8297
{0DEA78FB-065C-4B01-9B66-57E70A3B647F} = {5E6BF7CA-D8BA-40DC-A57F-DC42AE9BAF6E}
8398
{2F188C34-E6F5-4C8F-851A-AF09D8AE2E5C} = {C2A89744-3ADE-4349-B861-243D394CE14E}
8499
{89FD91BC-13E4-4A7B-9F37-7AB075C2700A} = {C2A89744-3ADE-4349-B861-243D394CE14E}
100+
{206A433D-0EEB-4BB5-9C9A-7636AB172D4F} = {CAE60B3D-061E-4B12-BFD3-E966AA7B10E8}
101+
{C4D44813-C5C9-45B7-B918-7B078BEBCE9C} = {CAE60B3D-061E-4B12-BFD3-E966AA7B10E8}
85102
EndGlobalSection
86103
GlobalSection(ExtensibilityGlobals) = postSolution
87104
SolutionGuid = {18F52EC3-580A-4474-8BBE-C7DBF2F0855A}

Diff for: ‎src/Directory.Build.props

+16-17
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
<Project>
2-
<!-- <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" /> -->
32
<Import Project="..\Directory.Build.props" />
43
<PropertyGroup>
5-
<TargetFrameworks>$(ForEvolveTargetFrameworks)</TargetFrameworks>
64
<IsPackable>True</IsPackable>
75
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
86
<Authors>Carl-Hugo Marcotte</Authors>
97
<Company>ForEvolve</Company>
10-
<PackageProjectUrl>https://github.com/ForEvolve/ForEvolve-Framework</PackageProjectUrl>
11-
<PackageLicenseUrl>https://github.com/ForEvolve/ForEvolve-Framework/blob/master/LICENSE</PackageLicenseUrl>
12-
<AssemblyVersion>1.0.0.0</AssemblyVersion>
13-
<FileVersion>1.0.0.0</FileVersion>
14-
<Version>1.0.0</Version>
15-
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
8+
<PackageProjectUrl>https://github.com/ForEvolve/StateR</PackageProjectUrl>
9+
<License>MIT</License>
1610
<Copyright>Carl-Hugo Marcotte</Copyright>
17-
<IncludeSymbols>True</IncludeSymbols>
18-
<IncludeSource>True</IncludeSource>
19-
<DebugType>Full</DebugType>
2011
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2112
<EmbedUntrackedSources>true</EmbedUntrackedSources>
13+
<IncludeSymbols>True</IncludeSymbols>
2214
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
23-
<!--<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>-->
24-
<!--
25-
Removed until documentation is up to date.
26-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
27-
-->
28-
<!-- <GenerateDocumentationFile>true</GenerateDocumentationFile> -->
2915
</PropertyGroup>
16+
17+
<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
18+
<LangVersion>preview</LangVersion>
19+
</PropertyGroup>
20+
<PropertyGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
21+
<LangVersion>latest</LangVersion>
22+
</PropertyGroup>
23+
3024
<ItemGroup>
3125
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
26+
<PackageReference Include="Nerdbank.GitVersioning">
27+
<Version>3.3.37</Version>
28+
<PrivateAssets>all</PrivateAssets>
29+
</PackageReference>
3230
</ItemGroup>
31+
3332
</Project>

Diff for: ‎src/ForEvolve.OperationResults.AspNetCore/ForEvolve.OperationResults.AspNetCore.csproj

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(ForEvolveTargetFrameworks)</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
<Description>This package contains an operation result helpers for Asp.Net Core MVC and MediatR; for example: automatic validation.</Description>
66
<PackageTags>forevolve,aspnetcore,mvc,filters,asp.net,core,aspnet,asp,operation,result,results,message,exception</PackageTags>
77
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
11+
</ItemGroup>
812

913
<ItemGroup>
1014
<PackageReference Include="FluentValidation" Version="8.6.2" />

Diff for: ‎src/ForEvolve.OperationResults/ForEvolve.OperationResults.csproj

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(ForEvolveTargetFrameworks)</TargetFrameworks>
4+
<TargetFrameworks>net5.0</TargetFrameworks>
55
<Description>This package contains an operation result generic implementation that should fits most needs.</Description>
66
<PackageTags>forevolve,aspnetcore,asp.net,core,aspnet,asp,operation,result,results,message,exception</PackageTags>
77
</PropertyGroup>
88

9+
<ItemGroup>
10+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
11+
</ItemGroup>
912
</Project>

Diff for: ‎test/Directory.Build.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0" />
9-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(ForEvolveAspNetCoreTestHostVersion)" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(ForEvolveTestSdkVersion)" />
11-
<PackageReference Include="Moq" Version="$(ForEvolveMoqVersion)" />
12-
<PackageReference Include="xunit" Version="$(ForEvolveXunitVersion)" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="$(ForEvolveXunitVersion)" />
9+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
11+
<PackageReference Include="Moq" Version="4.14.1" />
12+
<PackageReference Include="xunit" Version="2.4.1" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
1414
<DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="ForEvolve.Testing" Version="$(ForEvolveTestingVersion)" />
17+
<PackageReference Include="ForEvolve.Testing" Version="1.0.6" />
1818
</ItemGroup>
1919

2020
</Project>

Diff for: ‎test/ForEvolve.OperationResults.AspNetCore.Tests/ForEvolve.OperationResults.AspNetCore.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
</PropertyGroup>
55

66
<PropertyGroup>
7-
<TargetFramework>$(ForEvolveTestTargetFramework)</TargetFramework>
7+
<TargetFramework>net5.0</TargetFramework>
88
</PropertyGroup>
99

1010
<ItemGroup>

Diff for: ‎test/ForEvolve.OperationResults.Tests/ForEvolve.OperationResults.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>$(ForEvolveTestTargetFramework)</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<RootNamespace>ForEvolve.OperationResults</RootNamespace>
66
</PropertyGroup>
77

Diff for: ‎test/TestServer.Build.props

-9
This file was deleted.

0 commit comments

Comments
 (0)