Skip to content

Commit 0e865be

Browse files
bkoelmanbkoelman
committed
Test: inline MSBuild variables from Directory.Build.props
1 parent 508e9a9 commit 0e865be

File tree

18 files changed

+62
-62
lines changed

18 files changed

+62
-62
lines changed

‎benchmarks/Benchmarks.csproj

Lines changed: 2 additions & 2 deletions
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>$(TargetFrameworkName)</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<ServerGarbageCollection>true</ServerGarbageCollection>
66
</PropertyGroup>
77

@@ -11,7 +11,7 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
14-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" PrivateAssets="all">
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.*" PrivateAssets="all">
1515
<!-- This reference solely exists to prevent build warnings for conflicting versions of Microsoft.CodeAnalysis. -->
1616
</PackageReference>
1717
</ItemGroup>

‎src/Examples/DatabasePerTenantExample/DatabasePerTenantExample.csproj

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

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

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

‎src/Examples/GettingStarted/GettingStarted.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>$(TargetFrameworkName)</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -10,6 +10,6 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.*" />
1414
</ItemGroup>
1515
</Project>

‎src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj

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

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

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

‎src/Examples/MultiDbContextExample/MultiDbContextExample.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>$(TargetFrameworkName)</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -10,6 +10,6 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(EFCoreVersion)" />
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.*" />
1414
</ItemGroup>
1515
</Project>

‎src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj

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

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

1212
<ItemGroup>
1313
<PackageReference Include="Dapper" Version="2.0.123" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
15-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.*" />
15+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.*" />
1616
</ItemGroup>
1717
</Project>

‎src/Examples/ReportsExample/ReportsExample.csproj

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

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

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

‎src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>$(TargetFrameworkName);netstandard1.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0;netstandard1.0</TargetFrameworks>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<RootNamespace>JsonApiDotNetCore</RootNamespace>
77
<LangVersion>latest</LangVersion>
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
11+
<VersionPrefix>5.1.2</VersionPrefix>
1212
<PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;rest;web-api</PackageTags>
1313
<Description>Annotations for JsonApiDotNetCore, a framework for building JSON:API compliant REST APIs using ASP.NET and Entity Framework Core.</Description>
1414
<Authors>json-api-dotnet</Authors>

‎src/JsonApiDotNetCore.SourceGenerators/JsonApiDotNetCore.SourceGenerators.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<PropertyGroup>
13-
<VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
13+
<VersionPrefix>5.1.2</VersionPrefix>
1414
<PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;rest;web-api</PackageTags>
1515
<Description>Source generators for JsonApiDotNetCore, a framework for building JSON:API compliant REST APIs using ASP.NET and Entity Framework Core.</Description>
1616
<Authors>json-api-dotnet</Authors>
@@ -46,7 +46,7 @@
4646
</Target>
4747

4848
<ItemGroup>
49-
<PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" PrivateAssets="all" GeneratePathProperty="true" />
49+
<PackageReference Include="Humanizer.Core" Version="2.14.1" PrivateAssets="all" GeneratePathProperty="true" />
5050
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" PrivateAssets="all" />
5151
</ItemGroup>
5252
</Project>

‎src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(TargetFrameworkName)</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<IsPackable>true</IsPackable>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
</PropertyGroup>
77

88
<PropertyGroup>
9-
<VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
9+
<VersionPrefix>5.1.2</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>
@@ -38,7 +38,7 @@
3838

3939
<ItemGroup>
4040
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
41-
<PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" />
41+
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
4242
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
4343
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
4444
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />

‎test/AnnotationTests/AnnotationTests.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-
<TargetFrameworks>$(TargetFrameworkName);netstandard1.0</TargetFrameworks>
3+
<TargetFrameworks>net6.0;netstandard1.0</TargetFrameworks>
44
<LangVersion>latest</LangVersion>
55
</PropertyGroup>
66

‎test/DiscoveryTests/DiscoveryTests.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>$(TargetFrameworkName)</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
@@ -9,8 +9,8 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
14-
<PackageReference Include="Moq" Version="$(MoqVersion)" />
12+
<PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
14+
<PackageReference Include="Moq" Version="4.18.2" />
1515
</ItemGroup>
1616
</Project>

‎test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj

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

66
<ItemGroup>
@@ -10,10 +10,10 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
13+
<PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.*" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.*" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.0.*" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
1818
</ItemGroup>
1919
</Project>

‎test/MultiDbContextTests/MultiDbContextTests.csproj

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

66
<ItemGroup>
@@ -9,9 +9,9 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
15-
<PackageReference Include="Moq" Version="$(MoqVersion)" />
12+
<PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.*" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
15+
<PackageReference Include="Moq" Version="4.18.2" />
1616
</ItemGroup>
1717
</Project>

‎test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj

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

66
<ItemGroup>
@@ -9,9 +9,9 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
15-
<PackageReference Include="Moq" Version="$(MoqVersion)" />
12+
<PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.*" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
15+
<PackageReference Include="Moq" Version="4.18.2" />
1616
</ItemGroup>
1717
</Project>

‎test/SourceGeneratorTests/SourceGeneratorTests.csproj

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

66
<ItemGroup>
@@ -10,9 +10,9 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
14-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
16-
<PackageReference Include="Moq" Version="$(MoqVersion)" />
13+
<PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
14+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.*" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
16+
<PackageReference Include="Moq" Version="4.18.2" />
1717
</ItemGroup>
1818
</Project>

‎test/TestBuildingBlocks/TestBuildingBlocks.csproj

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

66
<ItemGroup>
@@ -9,12 +9,12 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Bogus" Version="34.0.2" />
12-
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
12+
<PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
1313
<PackageReference Include="FluentAssertions" Version="6.8.0" />
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
16-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
17-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.*" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.*" />
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
17+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.*" />
1818
<PackageReference Include="xunit" Version="2.4.2" />
1919
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" PrivateAssets="All" />
2020
</ItemGroup>

‎test/UnitTests/UnitTests.csproj

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

66
<ItemGroup>
77
<ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
88
</ItemGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
14-
<PackageReference Include="Moq" Version="$(MoqVersion)" />
11+
<PackageReference Include="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.*" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
14+
<PackageReference Include="Moq" Version="4.18.2" />
1515
</ItemGroup>
1616
</Project>

0 commit comments

Comments
 (0)