Skip to content

Commit 41e117f

Browse files
author
Bart Koelman
committed
Renamed MSBuild variables
1 parent 1e25da8 commit 41e117f

File tree

16 files changed

+29
-29
lines changed

16 files changed

+29
-29
lines changed

Directory.Build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
22
<PropertyGroup>
3-
<NetCoreAppVersion>net6.0</NetCoreAppVersion>
4-
<AspNetCoreVersion>6.0.*</AspNetCoreVersion>
3+
<TargetFrameworkName>net6.0</TargetFrameworkName>
4+
<AspNetVersion>6.0.*</AspNetVersion>
55
<EFCoreVersion>6.0.*</EFCoreVersion>
6-
<NpgsqlPostgreSQLVersion>6.0.*</NpgsqlPostgreSQLVersion>
6+
<EFCorePostgresVersion>6.0.*</EFCorePostgresVersion>
77
<MicrosoftCodeAnalysisVersion>4.*</MicrosoftCodeAnalysisVersion>
88
<HumanizerVersion>2.*</HumanizerVersion>
99
<JsonApiDotNetCoreVersionPrefix>5.0.0</JsonApiDotNetCoreVersionPrefix>

benchmarks/Benchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
4+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

src/Examples/GettingStarted/GettingStarted.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>

src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -11,6 +11,6 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
14-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
14+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
1515
</ItemGroup>
1616
</Project>

src/Examples/MultiDbContextExample/MultiDbContextExample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>

src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -12,6 +12,6 @@
1212
<ItemGroup>
1313
<PackageReference Include="Dapper" Version="2.0.123" />
1414
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
15-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
15+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
1616
</ItemGroup>
1717
</Project>

src/Examples/ReportsExample/ReportsExample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -11,6 +11,6 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
14-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
14+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
1515
</ItemGroup>
1616
</Project>

src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
4-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
54
<IsPackable>true</IsPackable>
65
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
76
</PropertyGroup>
87

98
<PropertyGroup>
9+
<VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
1010
<PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;rest;web-api</PackageTags>
1111
<Description>A framework for building JSON:API compliant REST APIs using ASP.NET and Entity Framework Core. Includes support for Atomic Operations. The ultimate goal of this library is to eliminate as much boilerplate as possible by offering out-of-the-box features such as sorting, filtering and pagination. You just need to focus on defining the resources and implementing your custom business logic. This library has been designed around dependency injection making extensibility incredibly easy.</Description>
1212
<Authors>json-api-dotnet</Authors>

test/DiscoveryTests/DiscoveryTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>

test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
2020
<PackageReference Include="Macross.Json.Extensions" Version="2.0.0" />
21-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
21+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
2222
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
2323
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
2424
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />

test/MultiDbContextTests/MultiDbContextTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -16,7 +16,7 @@
1616

1717
<ItemGroup>
1818
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
19-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
19+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
2121
<PackageReference Include="Moq" Version="$(MoqVersion)" />
2222
</ItemGroup>

test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
1515
<PackageReference Include="Moq" Version="$(MoqVersion)" />
1616
</ItemGroup>

test/SourceGeneratorDebugger/SourceGeneratorDebugger.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
<OutputType>Exe</OutputType>
55
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
66
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
@@ -16,6 +16,6 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetCoreVersion)" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetVersion)" />
2020
</ItemGroup>
2121
</Project>

test/SourceGeneratorTests/SourceGeneratorTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>

test/TestBuildingBlocks/TestBuildingBlocks.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -11,10 +11,10 @@
1111
<PackageReference Include="Bogus" Version="34.0.1" />
1212
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
1313
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
15-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(AspNetCoreVersion)" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
15+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(AspNetVersion)" />
1616
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
17-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
17+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
1818
<PackageReference Include="xunit" Version="$(XUnitVersion)" />
1919
<PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" PrivateAssets="All" />
2020
</ItemGroup>

test/UnitTests/UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(NetCoreAppVersion)</TargetFramework>
3+
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>

0 commit comments

Comments
 (0)