Skip to content

Commit 8921697

Browse files
alex-kulakovalex-kulakov
authored
Merge pull request #58 from servicetitan/net-core-31
Net Core 3.1
2 parents 7b36c27 + bc8bf5c commit 8921697

201 files changed

Lines changed: 845 additions & 808 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,22 @@ max_line_length = 120
1010
[*.md]
1111
trim_trailing_whitespace = false
1212

13+
# csproj files
14+
[*.csproj]
15+
# Indentation options
16+
17+
indent_size = 2
18+
indent_style = space
19+
tab_width = 2
20+
21+
# props files
22+
[*.props]
23+
# Indentation options
24+
25+
indent_size = 2
26+
indent_style = space
27+
tab_width = 2
28+
1329
# C# files
1430
[*.cs]
1531
# Indentation options

‎Directory.Build.props‎

Lines changed: 86 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,86 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
4-
<Import Project="$(MSBuildThisFileDirectory)Version.props" />
5-
6-
<!-- Compute intermediate values. To avoid conflicts name all custom variables with Do prefix. -->
7-
<PropertyGroup>
8-
<DoBuildNumber>$(BUILD_NUMBER)</DoBuildNumber>
9-
<DoBuildNumber Condition="'$(DoBuildNumber)'==''">0</DoBuildNumber>
10-
<DoBuildYear>$([System.DateTime]::Today.Year)</DoBuildYear>
11-
<DoProductName>DataObjects.Net</DoProductName>
12-
<DoProductAuthors>Xtensive LLC and contributors</DoProductAuthors>
13-
<DoProductCopyright>2003-$(DoBuildYear) $(DoProductAuthors)</DoProductCopyright>
14-
<DoVersionSuffix Condition="'$(DoVersionSuffix)'=='dev'">dev-$(DoBuildNumber)</DoVersionSuffix>
15-
<DoMajor>$([System.Version]::new($(DoVersion)).Major)</DoMajor>
16-
<DoMinor>$([System.Version]::new($(DoVersion)).Minor)</DoMinor>
17-
<DoPatch>$([System.Version]::new($(DoVersion)).Build)</DoPatch>
18-
<DoVersionName>$(DoMajor).$(DoMinor).$(DoPatch)</DoVersionName>
19-
<DoVersionName Condition="'$(DoVersionSuffix)'!=''">$(DoVersionName)-$(DoVersionSuffix)</DoVersionName>
20-
<DoPackageIcon>$(MSBuildThisFileDirectory)do-nuget.png</DoPackageIcon>
21-
<DoRevFile>$(MSBuildThisFileDirectory)_Build\rev.txt</DoRevFile>
22-
</PropertyGroup>
23-
24-
<PropertyGroup>
25-
<LangVersion>8.0</LangVersion>
26-
<SolutionDir Condition="$(SolutionDir) == ''">$(MSBuildThisFileDirectory.TrimEnd('\').TrimEnd('/'))\</SolutionDir>
27-
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
28-
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
29-
<NoLogo>true</NoLogo>
30-
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
31-
<ArtifactsDir Condition="'$(ArtifactsDir)'==''">$(SolutionDir)_Build\</ArtifactsDir>
32-
<BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(ArtifactsDir)obj\$(Configuration)\$(MSBuildProjectName)'))\</BaseIntermediateOutputPath>
33-
<BaseOutputPath >$([System.IO.Path]::GetFullPath('$(ArtifactsDir)bin\$(Configuration)'))\</BaseOutputPath>
34-
<BaseOutputPath Condition="$(MSBuildProjectName.Contains('Tests'))">$([System.IO.Path]::GetFullPath('$(ArtifactsDir)tests'))\</BaseOutputPath>
35-
<OutputPath>$(BaseOutputPath)</OutputPath>
36-
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
37-
<ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
38-
<ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
39-
</PropertyGroup>
40-
41-
<PropertyGroup>
42-
<GeneratePackageOnBuild Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</GeneratePackageOnBuild>
43-
<GeneratePackageOnBuild Condition="$(GeneratePackageOnBuild)=='' AND '$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
44-
</PropertyGroup>
45-
46-
<!-- Populate standard properties. -->
47-
<PropertyGroup>
48-
<Product>$(DoProductName)</Product>
49-
<Company>$(DoProductAuthors)</Company>
50-
<Authors>$(DoProductAuthors)</Authors>
51-
<Version>$(DoVersionName)</Version>
52-
<AssemblyVersion>$(DoMajor).$(DoMinor).0.0</AssemblyVersion>
53-
<FileVersion>$(DoMajor).$(DoMinor).$(DoPatch).$(DoBuildNumber)</FileVersion>
54-
<Copyright>$(DoProductCopyright)</Copyright>
55-
<PackageProjectUrl>https://dataobjects.net/</PackageProjectUrl>
56-
<PackageIcon>do-nuget.png</PackageIcon>
57-
<PackageLicense>Apache-2.0</PackageLicense>
58-
<PackageTags>DataObjects.Net ORM BLL Persistence</PackageTags>
59-
<PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages</PackageOutputPath>
60-
<RepositoryUrl>https://github.com/DataObjects-NET/dataobjects-net</RepositoryUrl>
61-
<RepositoryType>git</RepositoryType>
62-
</PropertyGroup>
63-
64-
<ItemGroup>
65-
<None Include="$(DoPackageIcon)" Pack="true" PackagePath="." Visible="false" />
66-
<None Include="$(DoRevFile)" Pack="true" PackagePath="." Visible="false" Condition="Exists('$(DoRevFile)')" />
67-
</ItemGroup>
68-
<Target Name="ExportRev" Condition="Exists('.git\index') AND '$(Configuration)' == 'Release'">
69-
<MakeDir Directories="_Build" />
70-
<Exec Command="git rev-parse HEAD > rev.txt" WorkingDirectory="_Build" />
71-
</Target>
72-
73-
<Import Condition="Exists('User.Directory.Build.props')" Project="User.Directory.Build.props" />
74-
</Project>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<Import Project="$(MSBuildThisFileDirectory)Version.props" />
5+
6+
<!-- Compute intermediate values. To avoid conflicts name all custom variables with Do prefix. -->
7+
<PropertyGroup>
8+
<DoBuildNumber>$(BUILD_NUMBER)</DoBuildNumber>
9+
<DoBuildNumber Condition="'$(DoBuildNumber)'==''">0</DoBuildNumber>
10+
<DoBuildYear>$([System.DateTime]::Today.Year)</DoBuildYear>
11+
<DoProductName>DataObjects.Net</DoProductName>
12+
<DoProductAuthors>Xtensive LLC and contributors</DoProductAuthors>
13+
<DoProductCopyright>2003-$(DoBuildYear) $(DoProductAuthors)</DoProductCopyright>
14+
<DoVersionSuffix Condition="'$(DoVersionSuffix)'=='dev'">dev-$(DoBuildNumber)</DoVersionSuffix>
15+
<DoMajor>$([System.Version]::new($(DoVersion)).Major)</DoMajor>
16+
<DoMinor>$([System.Version]::new($(DoVersion)).Minor)</DoMinor>
17+
<DoPatch>$([System.Version]::new($(DoVersion)).Build)</DoPatch>
18+
<DoVersionName>$(DoMajor).$(DoMinor).$(DoPatch)</DoVersionName>
19+
<DoVersionName Condition="'$(DoVersionSuffix)'!=''">$(DoVersionName)-$(DoVersionSuffix)</DoVersionName>
20+
<DoPackageIcon>$(MSBuildThisFileDirectory)do-nuget.png</DoPackageIcon>
21+
</PropertyGroup>
22+
23+
<PropertyGroup>
24+
<TargetFramework>netcoreapp3.1</TargetFramework>
25+
<SolutionDir Condition="$(SolutionDir) == ''">$(MSBuildThisFileDirectory.TrimEnd('\').TrimEnd('/'))\</SolutionDir>
26+
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
27+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
28+
<NoLogo>true</NoLogo>
29+
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
30+
<ArtifactsDir Condition="'$(ArtifactsDir)'==''">$(SolutionDir)_Build\</ArtifactsDir>
31+
<BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(ArtifactsDir)obj\$(Configuration)\$(MSBuildProjectName)'))\</BaseIntermediateOutputPath>
32+
<BaseOutputPath >$([System.IO.Path]::GetFullPath('$(ArtifactsDir)bin\$(Configuration)'))\</BaseOutputPath>
33+
<BaseOutputPath Condition="$(MSBuildProjectName.Contains('Tests'))">$([System.IO.Path]::GetFullPath('$(ArtifactsDir)tests'))\</BaseOutputPath>
34+
<OutputPath>$(BaseOutputPath)</OutputPath>
35+
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
36+
<ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
37+
<ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
38+
<OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
39+
</PropertyGroup>
40+
41+
<PropertyGroup>
42+
<GeneratePackageOnBuild Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Weaver'">false</GeneratePackageOnBuild>
43+
<GeneratePackageOnBuild Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Manual'">false</GeneratePackageOnBuild>
44+
<GeneratePackageOnBuild Condition="$(MSBuildProjectName) == 'TestCommon'">false</GeneratePackageOnBuild>
45+
<GeneratePackageOnBuild Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</GeneratePackageOnBuild>
46+
<GeneratePackageOnBuild Condition="$(GeneratePackageOnBuild)=='' AND '$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
47+
48+
<IncludeSymbols Condition="$(GeneratePackageOnBuild) == 'true'">true</IncludeSymbols>
49+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
50+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
51+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
52+
</PropertyGroup>
53+
54+
<ItemGroup>
55+
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
56+
<PackageReference Condition="$(GeneratePackageOnBuild) == 'true'"
57+
Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
58+
</ItemGroup>
59+
60+
<!-- Populate standard properties. -->
61+
<PropertyGroup>
62+
<Product>$(DoProductName)</Product>
63+
<Company>$(DoProductAuthors)</Company>
64+
<Authors>$(DoProductAuthors)</Authors>
65+
<Version>$(DoVersionName)</Version>
66+
<AssemblyVersion>$(DoMajor).$(DoMinor).0.0</AssemblyVersion>
67+
<FileVersion>$(DoMajor).$(DoMinor).$(DoPatch).$(DoBuildNumber)</FileVersion>
68+
<Copyright>$(DoProductCopyright)</Copyright>
69+
<PackageProjectUrl>https://dataobjects.net/</PackageProjectUrl>
70+
<PackageIcon>do-nuget.png</PackageIcon>
71+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
72+
<PackageTags>DataObjects.Net ORM BLL Persistence</PackageTags>
73+
<PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages\</PackageOutputPath>
74+
<RepositoryUrl>https://github.com/DataObjects-NET/dataobjects-net</RepositoryUrl>
75+
<RepositoryType>git</RepositoryType>
76+
</PropertyGroup>
77+
78+
<ItemGroup>
79+
<None Include="$(DoPackageIcon)" Visible="false" >
80+
<PackagePath>.</PackagePath>
81+
<Pack>true</Pack>
82+
</None>
83+
</ItemGroup>
84+
85+
<Import Condition="Exists('User.Directory.Build.props')" Project="User.Directory.Build.props" />
86+
</Project>

‎Extensions/Directory.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(SolutionDir)Directory.Build.props" />
4+
<PropertyGroup>
5+
<ExtensionsKeyFile>$(MSBuildThisFileDirectory)Extensions.snk</ExtensionsKeyFile>
6+
</PropertyGroup>
7+
</Project>

‎Extensions/TestCommon/TestCommon.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
3+
<OutputPath>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
44
<DocumentationFile />
55
</PropertyGroup>
66
<PropertyGroup>
7-
<TargetFramework>netcoreapp2.0</TargetFramework>
87
<SignAssembly>true</SignAssembly>
9-
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
8+
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
109
</PropertyGroup>
11-
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
10+
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1211
<ItemGroup>
1312
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
1413
<PackageReference Include="NUnit" Version="3.12.0" />

‎Extensions/Xtensive.Orm.BulkOperations.Tests/Xtensive.Orm.BulkOperations.Tests.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
3+
<OutputPath>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
44
<DocumentationFile />
55
</PropertyGroup>
6-
<PropertyGroup>
7-
<TargetFramework>netcoreapp2.0</TargetFramework>
8-
</PropertyGroup>
9-
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
6+
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
107
<ItemGroup>
118
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
129
<PackageReference Include="NUnit" Version="3.12.0" />

‎Extensions/Xtensive.Orm.BulkOperations/Internals/SetOperation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.Linq;
44
using System.Linq.Expressions;

‎Extensions/Xtensive.Orm.BulkOperations/Xtensive.Orm.BulkOperations.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
4-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
5-
<DocumentationFile>..\..\_Build\$(Configuration)\lib\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<OutputPath>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
5+
<DocumentationFile>$(SolutionDir)_Build\$(Configuration)\lib\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
</PropertyGroup>
77
<PropertyGroup>
8-
<TargetFramework>netstandard2.0</TargetFramework>
98
<PackageId>Xtensive.Orm.BulkOperations</PackageId>
109
<Title>Bulk operations extension for $(DoProductName)</Title>
1110
<AssemblyTitle>$(Title)</AssemblyTitle>
1211
<PackageDescription>Adds support for bulk insert, update and delete operations for $(DoProductName)-powered domain models</PackageDescription>
1312
<SignAssembly>true</SignAssembly>
14-
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
13+
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
1514
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1615
</PropertyGroup>
1716
<ItemGroup>

‎Extensions/Xtensive.Orm.Localization.Tests/Xtensive.Orm.Localization.Tests.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
3+
<OutputPath>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
44
<DocumentationFile />
55
</PropertyGroup>
6-
<PropertyGroup>
7-
<TargetFramework>netcoreapp2.0</TargetFramework>
8-
</PropertyGroup>
9-
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
6+
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
107
<ItemGroup>
118
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
129
<PackageReference Include="NUnit" Version="3.12.0" />

‎Extensions/Xtensive.Orm.Localization/Xtensive.Orm.Localization.csproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<IsPackable>true</IsPackable>
4-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
5-
<DocumentationFile>..\..\_Build\$(Configuration)\lib\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<OutputPath>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
5+
<DocumentationFile>$(SolutionDir)_Build\$(Configuration)\lib\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
66
</PropertyGroup>
77
<PropertyGroup>
8-
<TargetFramework>netstandard2.0</TargetFramework>
98
<PackageId>Xtensive.Orm.Localization</PackageId>
109
<Title>Localization extension for $(DoProductName)</Title>
1110
<AssemblyTitle>$(Title)</AssemblyTitle>
1211
<PackageDescription>Adds support for easy localization for $(DoProductName)-powered domain models</PackageDescription>
1312
<SignAssembly>true</SignAssembly>
14-
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
13+
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
1514
</PropertyGroup>
16-
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
15+
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1716
<ItemGroup>
1817
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
1918
</ItemGroup>

‎Extensions/Xtensive.Orm.Logging.NLog.Tests/Xtensive.Orm.Logging.NLog.Tests.csproj‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
3+
<OutputPath>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
44
<DocumentationFile />
55
</PropertyGroup>
6-
<PropertyGroup>
7-
<TargetFramework>netcoreapp2.0</TargetFramework>
8-
</PropertyGroup>
96
<ItemGroup>
107
<None Include="App.config" />
118
<None Include="NLog.config">

0 commit comments

Comments
 (0)