Skip to content

Commit c403ec5

Browse files
thomas-mullalythomas-mullaly
authored
Added Directory Build and Packages.props (#128)
* Added Directory.Packages.props * Added multiple Directoy.build.props to consolidate some project configuration
1 parent 6384038 commit c403ec5

File tree

16 files changed

+92
-95
lines changed

16 files changed

+92
-95
lines changed

‎.gitignore‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ ClientBin/
221221
*.publishsettings
222222
orleans.codegen.cs
223223

224-
# Including strong name files can present a security risk
224+
# Including strong name files can present a security risk
225225
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
226226
#*.snk
227227

@@ -317,7 +317,7 @@ __pycache__/
317317
# OpenCover UI analysis results
318318
OpenCover/
319319

320-
# Azure Stream Analytics local run output
320+
# Azure Stream Analytics local run output
321321
ASALocalRun/
322322

323323
# MSBuild Binary and Structured Log
@@ -326,8 +326,10 @@ ASALocalRun/
326326
# NVidia Nsight GPU debugger configuration file
327327
*.nvuser
328328

329-
# MFractors (Xamarin productivity tool) working folder
329+
# MFractors (Xamarin productivity tool) working folder
330330
.mfractor/
331331

332332
# Development settings
333333
*.Development.json
334+
335+
.DS_Store

‎Directory.Packages.props‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="Ardalis.ApiEndpoints" Version="4.0.1" />
7+
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
8+
<PackageVersion Include="FluentAssertions" Version="6.10.0" />
9+
<PackageVersion Include="FluentValidation" Version="11.5.1" />
10+
<PackageVersion Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
11+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
12+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.3" />
13+
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.3" />
14+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
15+
<PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
16+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
17+
<PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
18+
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
19+
<PackageVersion Include="System.Runtime" Version="4.3.1" />
20+
<PackageVersion Include="xunit" Version="2.4.2" />
21+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
22+
</ItemGroup>
23+
</Project>

‎sample/Ardalis.Result.Sample.Core/Ardalis.Result.Sample.Core.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
54
<AssemblyName>Ardalis.Result.Sample.Core</AssemblyName>
65
<RootNamespace>Ardalis.Result.Sample.Core</RootNamespace>
76
</PropertyGroup>
87

98
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.3" />
11-
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
12-
<PackageReference Include="System.Runtime" Version="4.3.1" />
9+
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" />
10+
<PackageReference Include="System.ComponentModel.Annotations" />
11+
<PackageReference Include="System.Runtime" />
1312
</ItemGroup>
1413

1514
<ItemGroup>

‎sample/Ardalis.Result.Sample.UnitTests/Ardalis.Result.Sample.UnitTests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
5-
64
<IsPackable>false</IsPackable>
75
</PropertyGroup>
86

97
<ItemGroup>
10-
<PackageReference Include="FluentAssertions" Version="6.10.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
12-
<PackageReference Include="xunit" Version="2.4.2" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
8+
<PackageReference Include="FluentAssertions" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10+
<PackageReference Include="xunit" />
11+
<PackageReference Include="xunit.runner.visualstudio">
1412
<PrivateAssets>all</PrivateAssets>
1513
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1614
</PackageReference>
17-
<PackageReference Include="coverlet.collector" Version="3.2.0">
15+
<PackageReference Include="coverlet.collector">
1816
<PrivateAssets>all</PrivateAssets>
1917
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2018
</PackageReference>

‎sample/Ardalis.Result.SampleMinimalApi.FunctionalTests/Ardalis.Result.SampleMinimalApi.FunctionalTests.csproj‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
4-
53
<IsPackable>false</IsPackable>
64
</PropertyGroup>
75

86
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.3" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
11-
<PackageReference Include="xunit" Version="2.4.2" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
7+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
9+
<PackageReference Include="xunit" />
10+
<PackageReference Include="xunit.runner.visualstudio">
1311
<PrivateAssets>all</PrivateAssets>
1412
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1513
</PackageReference>
16-
<PackageReference Include="coverlet.collector" Version="3.2.0">
14+
<PackageReference Include="coverlet.collector">
1715
<PrivateAssets>all</PrivateAssets>
1816
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1917
</PackageReference>
@@ -22,5 +20,5 @@
2220
<ItemGroup>
2321
<ProjectReference Include="..\Ardalis.Result.SampleMinimalApi\Ardalis.Result.SampleMinimalApi.csproj" />
2422
</ItemGroup>
25-
23+
2624
</Project>

‎sample/Ardalis.Result.SampleMinimalApi/Ardalis.Result.SampleMinimalApi.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
5-
<Nullable>enable</Nullable>
64
<ImplicitUsings>enable</ImplicitUsings>
75
</PropertyGroup>
86

97
<ItemGroup>
10-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
8+
<PackageReference Include="Swashbuckle.AspNetCore" />
119
</ItemGroup>
1210

1311
<ItemGroup>

‎sample/Ardalis.Result.SampleWeb.FunctionalTests/Ardalis.Result.SampleWeb.FunctionalTests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
5-
64
<IsPackable>false</IsPackable>
75
</PropertyGroup>
86

97
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.3" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
12-
<PackageReference Include="xunit" Version="2.4.2" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
8+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" />
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10+
<PackageReference Include="xunit" />
11+
<PackageReference Include="xunit.runner.visualstudio">
1412
<PrivateAssets>all</PrivateAssets>
1513
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1614
</PackageReference>
17-
<PackageReference Include="coverlet.collector" Version="3.2.0">
15+
<PackageReference Include="coverlet.collector">
1816
<PrivateAssets>all</PrivateAssets>
1917
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2018
</PackageReference>

‎sample/Ardalis.Result.SampleWeb/Ardalis.Result.SampleWeb.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
5-
</PropertyGroup>
6-
73
<ItemGroup>
8-
<PackageReference Include="Ardalis.ApiEndpoints" Version="4.0.1" />
9-
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" Version="11.1.0" />
10-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
11-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
12-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
4+
<PackageReference Include="Ardalis.ApiEndpoints" />
5+
<PackageReference Include="MediatR.Extensions.Microsoft.DependencyInjection" />
6+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" />
7+
<PackageReference Include="Swashbuckle.AspNetCore" />
8+
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" />
139
</ItemGroup>
1410

1511
<ItemGroup>

‎sample/Directory.Build.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFramework>net7.0</TargetFramework>
4+
<Nullable>enable</Nullable>
5+
</PropertyGroup>
6+
</Project>

‎src/Ardalis.Result.AspNetCore/Ardalis.Result.AspNetCore.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
54
<PackageId>Ardalis.Result.AspNetCore</PackageId>
65
<Title>Ardalis.Result.AspNetCore</Title>
7-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8-
<Authors>Steve Smith (@ardalis); Shady Nagy (@ShadyNagy)</Authors>
9-
<Company>Ardalis.com</Company>
10-
<PackageProjectUrl>https://github.com/ardalis/result</PackageProjectUrl>
116
<Description>Adds ASP.NET Core filters that translate from Result to ActionResult.</Description>
127
<Summary>Adds ASP.NET Core filters that translate from Result to ActionResult.</Summary>
13-
<RepositoryUrl>https://github.com/ardalis/result</RepositoryUrl>
148
<PackageTags>result pattern web api aspnetcore mvc</PackageTags>
15-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
169
<PackageReleaseNotes>PRs 92 and 112. Adding support for .NET 7 and ability to improve Swagger/OpenAPI specifications when using the TranslateResultToActionResult attribute.</PackageReleaseNotes>
17-
<Version>7.0.0</Version>
1810
<AssemblyName>Ardalis.Result.AspNetCore</AssemblyName>
19-
<PackageIcon>icon.png</PackageIcon>
20-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
21-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2211
</PropertyGroup>
2312

2413
<ItemGroup>
25-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" />
2615
</ItemGroup>
2716

2817
<ItemGroup Condition="$(TargetFramework) == 'net7.0'">

0 commit comments

Comments
 (0)