Skip to content

Commit d1713f0

Browse files
koenbeukkoenbeuk
committed
Formatted xml
1 parent 3d34b7d commit d1713f0

File tree

11 files changed

+151
-159
lines changed

11 files changed

+151
-159
lines changed

‎Directory.Build.props‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
<Project>
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
5+
<LangVersion>12.0</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
8+
<NoWarn>CS1591</NoWarn>
9+
<ImplicitUsings>enable</ImplicitUsings>
10+
</PropertyGroup>
211

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
6-
<LangVersion>12.0</LangVersion>
7-
<Nullable>enable</Nullable>
8-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
9-
<NoWarn>CS1591</NoWarn>
10-
<ImplicitUsings>enable</ImplicitUsings>
11-
</PropertyGroup>
12-
13-
<PropertyGroup>
14-
<Authors>Koen Bekkenutte</Authors>
15-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
16-
<PackageProjectUrl>https://github.com/koenbeuk/EntityFrameworkCore.Projectables</PackageProjectUrl>
17-
<RepositoryUrl>https://github.com/koenbeuk/EntityFrameworkCore.Projectables.git</RepositoryUrl>
18-
<RepositoryType>git</RepositoryType>
19-
<PackageReleaseNotes>https://github.com/koenbeuk/EntityFrameworkCore.Projectables/releases</PackageReleaseNotes>
20-
<Description>Project over properties and functions in your linq queries</Description>
21-
</PropertyGroup>
22-
12+
<PropertyGroup>
13+
<Authors>Koen Bekkenutte</Authors>
14+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15+
<PackageProjectUrl>https://github.com/koenbeuk/EntityFrameworkCore.Projectables</PackageProjectUrl>
16+
<RepositoryUrl>https://github.com/koenbeuk/EntityFrameworkCore.Projectables.git</RepositoryUrl>
17+
<RepositoryType>git</RepositoryType>
18+
<PackageReleaseNotes>https://github.com/koenbeuk/EntityFrameworkCore.Projectables/releases</PackageReleaseNotes>
19+
<Description>Project over properties and functions in your linq queries</Description>
20+
</PropertyGroup>
2321
</Project>

‎EntityFrameworkCore.Projectables.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1818
ProjectSection(SolutionItems) = preProject
1919
.editorconfig = .editorconfig
2020
Directory.Build.props = Directory.Build.props
21-
Directory.Packages.props = Directory.Packages.props
2221
EndProjectSection
2322
EndProject
2423
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkCore.Projectables", "src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj", "{EE4D6CC1-78DE-4279-A567-C3D360C479F8}"

‎benchmarks/EntityFrameworkCore.Projectables.Benchmarks/EntityFrameworkCore.Projectables.Benchmarks.csproj‎

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

33
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<IsPackable>false</IsPackable>
4+
<OutputType>Exe</OutputType>
5+
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="BenchmarkDotNet" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
9+
<PackageReference Include="BenchmarkDotNet" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
1111
</ItemGroup>
1212

1313
<ItemGroup>
14-
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
15-
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj" />
14+
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
15+
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj" />
1616
</ItemGroup>
1717

1818
</Project>

‎samples/ReadmeSample/ReadmeSample.csproj‎

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

3-
<PropertyGroup>
4-
<OutputType>Exe</OutputType>
5-
<Nullable>disable</Nullable>
6-
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<Nullable>disable</Nullable>
6+
<IsPackable>false</IsPackable>
7+
</PropertyGroup>
88

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
11-
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
12-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
11+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
12+
</ItemGroup>
1313

14-
<ItemGroup>
15-
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
16-
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj" />
17-
</ItemGroup>
14+
<ItemGroup>
15+
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
16+
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj" />
17+
</ItemGroup>
1818

1919
</Project>

‎src/Directory.Build.props‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,27 @@
11
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
23

3-
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
4+
<PropertyGroup Label="Build">
5+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
7+
</PropertyGroup>
48

5-
<PropertyGroup Label="Build">
6-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
8-
</PropertyGroup>
9+
<PropertyGroup Label="Signing">
10+
<SignAssembly>true</SignAssembly>
11+
<AssemblyOriginatorKeyFile>../../Key.snk</AssemblyOriginatorKeyFile>
12+
</PropertyGroup>
913

10-
<PropertyGroup Label="Signing">
11-
<SignAssembly>true</SignAssembly>
12-
<AssemblyOriginatorKeyFile>../../Key.snk</AssemblyOriginatorKeyFile>
13-
</PropertyGroup>
14+
<PropertyGroup Label="Source Link">
15+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
16+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
17+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
18+
</PropertyGroup>
1419

15-
<PropertyGroup Label="Source Link">
16-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
18-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
19-
</PropertyGroup>
20+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
21+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
22+
</PropertyGroup>
2023

21-
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
22-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
23-
</PropertyGroup>
24-
25-
<ItemGroup Label="Package References">
26-
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
27-
</ItemGroup>
24+
<ItemGroup Label="Package References">
25+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" />
26+
</ItemGroup>
2827
</Project>

‎src/EntityFrameworkCore.Projectables.Abstractions/EntityFrameworkCore.Projectables.Abstractions.csproj‎

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

33
<PropertyGroup>
4-
<RootNamespace>EntityFrameworkCore.Projectables</RootNamespace>
5-
<PackageReadmeFile>README.md</PackageReadmeFile>
6-
<TargetFramework>net8.0</TargetFramework>
4+
<RootNamespace>EntityFrameworkCore.Projectables</RootNamespace>
5+
<PackageReadmeFile>README.md</PackageReadmeFile>
76
</PropertyGroup>
87

98
<ItemGroup>
10-
<ProjectReference Include="..\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" Pack="false">
11-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
12-
<OutputItemType>Content</OutputItemType>
13-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
14-
</ProjectReference>
9+
<ProjectReference Include="..\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" Pack="false">
10+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
11+
<OutputItemType>Content</OutputItemType>
12+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
13+
</ProjectReference>
1514
</ItemGroup>
1615

1716
<ItemGroup>
18-
<!-- Package the generator in the analyzer directory of the nuget package -->
19-
<None Include="$(OutputPath)\EntityFrameworkCore.Projectables.Generator.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
17+
<!-- Package the generator in the analyzer directory of the nuget package -->
18+
<None Include="$(OutputPath)\EntityFrameworkCore.Projectables.Generator.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
2019
</ItemGroup>
2120

2221
<ItemGroup>
23-
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
22+
<None Include="..\..\README.md" Pack="true" PackagePath="\" />
2423
</ItemGroup>
2524

2625
</Project>

‎src/EntityFrameworkCore.Projectables.Generator/EntityFrameworkCore.Projectables.Generator.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<NoWarn>$(NoWarn);NU5128</NoWarn>
6-
<IsPackable>false</IsPackable>
7-
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
8-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<NoWarn>$(NoWarn);NU5128</NoWarn>
6+
<IsPackable>false</IsPackable>
7+
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
8+
</PropertyGroup>
99

10-
<ItemGroup>
11-
<Compile Include="..\EntityFrameworkCore.Projectables.Abstractions\NullConditionalRewriteSupport.cs" Link="NullConditionalRewriteSupport.cs" />
12-
<Compile Include="..\EntityFrameworkCore.Projectables\Services\ProjectionExpressionClassNameGenerator.cs" Link="ProjectionExpressionClassNameGenerator.cs" />
13-
</ItemGroup>
10+
<ItemGroup>
11+
<Compile Include="..\EntityFrameworkCore.Projectables.Abstractions\NullConditionalRewriteSupport.cs" Link="NullConditionalRewriteSupport.cs" />
12+
<Compile Include="..\EntityFrameworkCore.Projectables\Services\ProjectionExpressionClassNameGenerator.cs" Link="ProjectionExpressionClassNameGenerator.cs" />
13+
</ItemGroup>
1414

15-
<ItemGroup>
16-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
17-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
18-
</ItemGroup>
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" PrivateAssets="all" />
17+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" PrivateAssets="all" />
18+
</ItemGroup>
1919
</Project>

‎src/EntityFrameworkCore.Projectables/EntityFrameworkCore.Projectables.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<PackageReadmeFile>README.md</PackageReadmeFile>
54
</PropertyGroup>
@@ -15,6 +14,4 @@
1514
<ItemGroup>
1615
<None Include="..\..\README.md" Pack="true" PackagePath="\"/>
1716
</ItemGroup>
18-
19-
2017
</Project>

‎tests/EntityFrameworkCore.Projectables.FunctionalTests/EntityFrameworkCore.Projectables.FunctionalTests.csproj‎

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

3-
<PropertyGroup>
4-
<IsPackable>false</IsPackable>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<IsPackable>false</IsPackable>
5+
</PropertyGroup>
66

7-
<ItemGroup>
8-
<PackageReference Include="coverlet.collector">
9-
<PrivateAssets>all</PrivateAssets>
10-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11-
</PackageReference>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
14-
<PackageReference Include="ScenarioTests.XUnit" />
15-
<PackageReference Include="Verify.Xunit" />
16-
<PackageReference Include="xunit" />
17-
<PackageReference Include="xunit.runner.visualstudio">
18-
<PrivateAssets>all</PrivateAssets>
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20-
</PackageReference>
21-
</ItemGroup>
7+
<ItemGroup>
8+
<PackageReference Include="coverlet.collector">
9+
<PrivateAssets>all</PrivateAssets>
10+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
11+
</PackageReference>
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
14+
<PackageReference Include="ScenarioTests.XUnit" />
15+
<PackageReference Include="Verify.Xunit" />
16+
<PackageReference Include="xunit" />
17+
<PackageReference Include="xunit.runner.visualstudio">
18+
<PrivateAssets>all</PrivateAssets>
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
</PackageReference>
21+
</ItemGroup>
2222

23-
<ItemGroup>
24-
<None Remove="**\*.verified.txt" />
25-
<None Remove="**\*.received.txt" />
26-
</ItemGroup>
23+
<ItemGroup>
24+
<None Remove="**\*.verified.txt" />
25+
<None Remove="**\*.received.txt" />
26+
</ItemGroup>
2727

28-
<ItemGroup>
29-
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
30-
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj" />
31-
</ItemGroup>
28+
<ItemGroup>
29+
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
30+
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj" />
31+
</ItemGroup>
3232

3333
</Project>

‎tests/EntityFrameworkCore.Projectables.Generator.Tests/EntityFrameworkCore.Projectables.Generator.Tests.csproj‎

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

3-
<PropertyGroup>
4-
<IsPackable>false</IsPackable>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<IsPackable>false</IsPackable>
5+
</PropertyGroup>
66

7-
<ItemGroup>
8-
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" />
9-
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj" />
10-
</ItemGroup>
11-
12-
<ItemGroup>
13-
<PackageReference Include="Basic.Reference.Assemblies.Net80" />
14-
<PackageReference Include="coverlet.collector">
15-
<PrivateAssets>all</PrivateAssets>
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
</PackageReference>
18-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
19-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
21-
<PackageReference Include="Verify.Xunit" />
22-
<PackageReference Include="xunit" />
23-
<PackageReference Include="xunit.runner.visualstudio">
24-
<PrivateAssets>all</PrivateAssets>
25-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26-
</PackageReference>
27-
</ItemGroup>
7+
<ItemGroup>
8+
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables.Generator\EntityFrameworkCore.Projectables.Generator.csproj" />
9+
<ProjectReference Include="..\..\src\EntityFrameworkCore.Projectables\EntityFrameworkCore.Projectables.csproj" />
10+
</ItemGroup>
11+
12+
<ItemGroup>
13+
<PackageReference Include="Basic.Reference.Assemblies.Net80" />
14+
<PackageReference Include="coverlet.collector">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
21+
<PackageReference Include="Verify.Xunit" />
22+
<PackageReference Include="xunit" />
23+
<PackageReference Include="xunit.runner.visualstudio">
24+
<PrivateAssets>all</PrivateAssets>
25+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
26+
</PackageReference>
27+
</ItemGroup>
2828

2929
</Project>

0 commit comments

Comments
 (0)