Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

formatting #123

Open
wants to merge 1 commit into
base: pre-csproj-formatting-
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 39 additions & 23 deletions efcore/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,37 +1,55 @@
<Project>
<!-- Define project type conventions. -->
<PropertyGroup>
<IsTrimmingTestProject Condition="$(MSBuildProjectName.EndsWith('.TrimmingTests'))">true</IsTrimmingTestProject>
<IsNativeAotTestProject Condition="$(MSBuildProjectName.EndsWith('.NativeAotTests'))">true</IsNativeAotTestProject>
<IsPublishedAppTestProject Condition="'$(IsTrimmingTestProject)' == 'true' or '$(IsNativeAotTestProject)' == 'true'">true</IsPublishedAppTestProject>
<IsSpecificationTestProject Condition="$(MSBuildProjectName.EndsWith('.Specification.Tests'))">true</IsSpecificationTestProject>
<IsUnitTestProject Condition=" '$(IsUnitTestProject)' == '' AND
<IsTrimmingTestProject Condition="$(MSBuildProjectName.EndsWith('.TrimmingTests'))"
>true</IsTrimmingTestProject
>
<IsNativeAotTestProject Condition="$(MSBuildProjectName.EndsWith('.NativeAotTests'))"
>true</IsNativeAotTestProject
>
<IsPublishedAppTestProject
Condition="'$(IsTrimmingTestProject)' == 'true' or '$(IsNativeAotTestProject)' == 'true'"
>true</IsPublishedAppTestProject
>
<IsSpecificationTestProject Condition="$(MSBuildProjectName.EndsWith('.Specification.Tests'))"
>true</IsSpecificationTestProject
>
<IsUnitTestProject
Condition=" '$(IsUnitTestProject)' == '' AND
'$(IsSpecificationTestProject)' != 'true' AND
( $(MSBuildProjectName.EndsWith('.Tests')) OR
$(MSBuildProjectName.EndsWith('.FunctionalTests'))) ">true</IsUnitTestProject>
$(MSBuildProjectName.EndsWith('.FunctionalTests'))) "
>true</IsUnitTestProject
>
<IsUnitTestProject Condition=" '$(IsUnitTestProject)' == '' ">false</IsUnitTestProject>
</PropertyGroup>

<PropertyGroup>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">win</TargetOsName>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</TargetOsName>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">linux</TargetOsName>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('FreeBSD'))">freebsd</TargetOsName>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))"
>win</TargetOsName
>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))"
>osx</TargetOsName
>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))"
>linux</TargetOsName
>
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('FreeBSD'))"
>freebsd</TargetOsName
>
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
<TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
<TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''"
>$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier
>
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<Import
Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
Condition="'$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' " />

Condition="'$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))' != '' "
/>
<PropertyGroup Condition="'$(CopyrightMicrosoft)' != ''">
<Copyright>$(CopyrightMicrosoft)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
</PropertyGroup>

<PropertyGroup>
<StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>
<PackageTags>Entity Framework Core;entity-framework-core;EF;Data;O/RM;EntityFramework;EntityFrameworkCore;EFCore</PackageTags>
Expand All @@ -42,23 +60,21 @@
<PackageProjectUrl>https://docs.microsoft.com/ef/core/</PackageProjectUrl>
<PackageIconFullPath>$(MSBuildThisFileDirectory)logo\ef-logo.png</PackageIconFullPath>
</PropertyGroup>

<PropertyGroup Condition="'$(DeveloperBuild)' == 'true'">
<WarningsNotAsErrors>$(WarningsNotAsErrors);CS1591;SA1636</WarningsNotAsErrors>
</PropertyGroup>

<!-- HACK: Work around #15093 -->
<PropertyGroup>
<NoWarn>$(NoWarn.Replace(';1591', ''))</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" />
</ItemGroup>

<Import Project="eng\testing\linker\trimmingTests.props" Condition="'$(IsPublishedAppTestProject)' == 'true'" />

<Import
Project="eng\testing\linker\trimmingTests.props"
Condition="'$(IsPublishedAppTestProject)' == 'true'"
/>
</Project>
32 changes: 21 additions & 11 deletions efcore/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
<Project>
<PropertyGroup>
<!-- Disable IsAotCompatible on non-DefaultNetCoreTargetFrameworks even if explicitly enabled or else we'll get NETSDK1210 errors -->
<IsAotCompatible Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'"></IsAotCompatible>
<IsAotCompatible
Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'"
></IsAotCompatible>
</PropertyGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
<Import Project="eng\testing\linker\trimmingTests.targets" Condition="'$(IsPublishedAppTestProject)' == 'true'" />

<Target Name="GetCustomAssemblyAttributes"
BeforeTargets="GetAssemblyAttributes"
Condition=" '$(MSBuildProjectExtension)' == '.csproj' "
DependsOnTargets="InitializeSourceControlInformation">
<Import
Project="eng\testing\linker\trimmingTests.targets"
Condition="'$(IsPublishedAppTestProject)' == 'true'"
/>
<Target
Name="GetCustomAssemblyAttributes"
BeforeTargets="GetAssemblyAttributes"
Condition=" '$(MSBuildProjectExtension)' == '.csproj' "
DependsOnTargets="InitializeSourceControlInformation"
>
<ItemGroup>
<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(SourceRevisionId)' != ''">
<AssemblyAttribute
Include="System.Reflection.AssemblyMetadataAttribute"
Condition="'$(SourceRevisionId)' != ''"
>
<_Parameter1>CommitHash</_Parameter1>
<_Parameter2>$(SourceRevisionId)</_Parameter2>
</AssemblyAttribute>

<AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(Serviceable)' == 'true'">
<AssemblyAttribute
Include="System.Reflection.AssemblyMetadataAttribute"
Condition="'$(Serviceable)' == 'true'"
>
<_Parameter1>Serviceable</_Parameter1>
<_Parameter2>True</_Parameter2>
</AssemblyAttribute>
Expand Down
40 changes: 32 additions & 8 deletions efcore/NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,39 @@
<!-- Begin: Package sources from dotnet-runtime -->
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<add
key="dotnet-eng"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
/>
<add
key="dotnet-tools"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"
/>
<add
key="dotnet8"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json"
/>
<add
key="dotnet8-transport"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json"
/>
<add
key="dotnet9"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json"
/>
<add
key="dotnet9-transport"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json"
/>
<add
key="dotnet-public"
value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json"
/>
<!-- Used for the Rich Navigation indexing task -->
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
<add
key="richnav"
value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json"
/>
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
13 changes: 8 additions & 5 deletions efcore/benchmark/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
<Project>
<Import Project="..\Directory.Build.props" />

<PropertyGroup>
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\rulesets\EFCore.test.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
<PackageReference Include="xunit.assert" Version="$(XunitVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />
<PackageReference
Include="Microsoft.Extensions.Configuration.Json"
Version="$(MicrosoftExtensionsConfigurationJsonVersion)"
/>
<PackageReference
Include="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)"
/>
</ItemGroup>

</Project>
9 changes: 4 additions & 5 deletions efcore/benchmark/EFCore.Benchmarks/EFCore.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.EntityFrameworkCore.Benchmarks</RootNamespace>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<Optimize>true</Optimize>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\EFCore.Relational\EFCore.Relational.csproj" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MicrosoftCodeAnalysisVersion)" />
<PackageReference
Include="Microsoft.CodeAnalysis.CSharp.Workspaces"
Version="$(MicrosoftCodeAnalysisVersion)"
/>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.EntityFrameworkCore.Benchmarks</RootNamespace>
<OutputType>Exe</OutputType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<Optimize>true</Optimize>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\EFCore.SqlServer\EFCore.SqlServer.csproj" />
<ProjectReference Include="..\EFCore.Benchmarks\EFCore.Benchmarks.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="config.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Remove="BenchmarkDotNet.Artifacts\**" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.EntityFrameworkCore.Benchmarks</RootNamespace>
<OutputType>Exe</OutputType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)' == 'Release'">
<Optimize>true</Optimize>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\EFCore.Benchmarks\EFCore.Benchmarks.csproj" />
<ProjectReference Include="..\..\src\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.1.6" />
</ItemGroup>

<ItemGroup>
<None Update="AdventureWorks2014.db">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand All @@ -28,5 +23,4 @@
</None>
<None Remove="BenchmarkDotNet.Artifacts\**" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions efcore/eng/Publishing.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<PropertyGroup>
<PublishingVersion>3</PublishingVersion>
<!-- This repo does its own symbol package generation. Arcade's symbols.nupkg generation conflicts with the symbol package generation in
<PropertyGroup>
<PublishingVersion>3</PublishingVersion>
<!-- This repo does its own symbol package generation. Arcade's symbols.nupkg generation conflicts with the symbol package generation in
this repo and causes confusion (due to empty symblos.nupkg's) in downstream processes -->
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
</PropertyGroup>
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
</PropertyGroup>
</Project>
15 changes: 12 additions & 3 deletions efcore/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,17 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>721c445e494a1d85d2d12e7a99ac2cd94bb898fa</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-alpha.1.23576.6">
<Dependency
Name="Microsoft.Extensions.Configuration.EnvironmentVariables"
Version="9.0.0-alpha.1.23576.6"
>
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>721c445e494a1d85d2d12e7a99ac2cd94bb898fa</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-alpha.1.23576.6">
<Dependency
Name="Microsoft.Extensions.Configuration.Abstractions"
Version="9.0.0-alpha.1.23576.6"
>
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>721c445e494a1d85d2d12e7a99ac2cd94bb898fa</Sha>
</Dependency>
Expand All @@ -29,7 +35,10 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>721c445e494a1d85d2d12e7a99ac2cd94bb898fa</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-alpha.1.23576.6">
<Dependency
Name="Microsoft.Extensions.HostFactoryResolver.Sources"
Version="9.0.0-alpha.1.23576.6"
>
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>721c445e494a1d85d2d12e7a99ac2cd94bb898fa</Sha>
</Dependency>
Expand Down
8 changes: 6 additions & 2 deletions efcore/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,12 @@
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''"
>false</StabilizePackageVersion
>
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'"
>release</DotNetFinalVersionKind
>
<DefaultNetCoreTargetFramework>net8.0</DefaultNetCoreTargetFramework>
</PropertyGroup>
<PropertyGroup Label="Arcade settings">
Expand Down
5 changes: 4 additions & 1 deletion efcore/eng/common/internal/NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
<configuration>
<packageSources>
<clear />
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
<add
key="dotnet-core-internal-tooling"
value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json"
/>
</packageSources>
</configuration>
Loading