Skip to content

Commit 7474313

Browse files
alex-kulakovalex-kulakov
committed
Merge branch 'master' into async-enumerable-1
2 parents 35079ab + 516af15 commit 7474313

15 files changed

Lines changed: 267 additions & 251 deletions

‎.editorconfig‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ indent_size = 2
1818
indent_style = space
1919
tab_width = 2
2020

21+
# props files
22+
[*.props]
23+
# Indentation options
24+
25+
indent_size = 2
26+
indent_style = space
27+
tab_width = 2
28+
2129
# C# files
2230
[*.cs]
2331
# Indentation options

‎Directory.Build.props‎

Lines changed: 87 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,84 +1,87 @@
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-
<TargetFramework>netcoreapp3.1</TargetFramework>
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-
<OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
40-
</PropertyGroup>
41-
42-
<PropertyGroup>
43-
<GeneratePackageOnBuild Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</GeneratePackageOnBuild>
44-
<GeneratePackageOnBuild Condition="$(GeneratePackageOnBuild)=='' AND '$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
45-
<IncludeSymbols Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</IncludeSymbols>
46-
<IncludeSymbols Condition="$(IncludeSymbols)=='' AND '$(Configuration)' == 'Release'">true</IncludeSymbols>
47-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
48-
</PropertyGroup>
49-
50-
<!-- Populate standard properties. -->
51-
<PropertyGroup>
52-
<Product>$(DoProductName)</Product>
53-
<Company>$(DoProductAuthors)</Company>
54-
<Authors>$(DoProductAuthors)</Authors>
55-
<Version>$(DoVersionName)</Version>
56-
<AssemblyVersion>$(DoMajor).$(DoMinor).0.0</AssemblyVersion>
57-
<FileVersion>$(DoMajor).$(DoMinor).$(DoPatch).$(DoBuildNumber)</FileVersion>
58-
<Copyright>$(DoProductCopyright)</Copyright>
59-
<PackageProjectUrl>https://dataobjects.net/</PackageProjectUrl>
60-
<PackageIcon>do-nuget.png</PackageIcon>
61-
<PackageLicense>Apache-2.0</PackageLicense>
62-
<PackageTags>DataObjects.Net ORM BLL Persistence</PackageTags>
63-
<PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages\</PackageOutputPath>
64-
<RepositoryUrl>https://github.com/DataObjects-NET/dataobjects-net</RepositoryUrl>
65-
<RepositoryType>git</RepositoryType>
66-
</PropertyGroup>
67-
68-
<ItemGroup>
69-
<None Include="$(DoPackageIcon)" Visible="false" >
70-
<PackagePath>.</PackagePath>
71-
<Pack>true</Pack>
72-
</None>
73-
<None Include="$(DoRevFile)" Visible="false" Condition="Exists('$(DoRevFile)')" >
74-
<PackagePath>.</PackagePath>
75-
<Pack>true</Pack>
76-
</None>
77-
</ItemGroup>
78-
<Target Name="ExportRev" Condition="Exists('.git\index') AND '$(Configuration)' == 'Release'">
79-
<MakeDir Directories="_Build" />
80-
<Exec Command="git rev-parse HEAD > rev.txt" WorkingDirectory="_Build" />
81-
</Target>
82-
83-
<Import Condition="Exists('User.Directory.Build.props')" Project="User.Directory.Build.props" />
84-
</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) == ''">$([MSBuild]::EnsureTrailingSlash(
26+
$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</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+
<OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
40+
</PropertyGroup>
41+
42+
<PropertyGroup>
43+
<GeneratePackageOnBuild Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Weaver'">false</GeneratePackageOnBuild>
44+
<GeneratePackageOnBuild Condition="$(MSBuildProjectName) == 'Xtensive.Orm.Manual'">false</GeneratePackageOnBuild>
45+
<GeneratePackageOnBuild Condition="$(MSBuildProjectName) == 'TestCommon'">false</GeneratePackageOnBuild>
46+
<GeneratePackageOnBuild Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</GeneratePackageOnBuild>
47+
<GeneratePackageOnBuild Condition="$(GeneratePackageOnBuild)=='' AND '$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
48+
49+
<IncludeSymbols Condition="$(GeneratePackageOnBuild) == 'true'">true</IncludeSymbols>
50+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
51+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
52+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
53+
</PropertyGroup>
54+
55+
<ItemGroup>
56+
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
57+
<PackageReference Condition="$(GeneratePackageOnBuild) == 'true'"
58+
Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
59+
</ItemGroup>
60+
61+
<!-- Populate standard properties. -->
62+
<PropertyGroup>
63+
<Product>$(DoProductName)</Product>
64+
<Company>$(DoProductAuthors)</Company>
65+
<Authors>$(DoProductAuthors)</Authors>
66+
<Version>$(DoVersionName)</Version>
67+
<AssemblyVersion>$(DoMajor).$(DoMinor).0.0</AssemblyVersion>
68+
<FileVersion>$(DoMajor).$(DoMinor).$(DoPatch).$(DoBuildNumber)</FileVersion>
69+
<Copyright>$(DoProductCopyright)</Copyright>
70+
<PackageProjectUrl>https://dataobjects.net/</PackageProjectUrl>
71+
<PackageIcon>do-nuget.png</PackageIcon>
72+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
73+
<PackageTags>DataObjects.Net ORM BLL Persistence</PackageTags>
74+
<PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages\</PackageOutputPath>
75+
<RepositoryUrl>https://github.com/DataObjects-NET/dataobjects-net</RepositoryUrl>
76+
<RepositoryType>git</RepositoryType>
77+
</PropertyGroup>
78+
79+
<ItemGroup>
80+
<None Include="$(DoPackageIcon)" Visible="false" >
81+
<PackagePath>.</PackagePath>
82+
<Pack>true</Pack>
83+
</None>
84+
</ItemGroup>
85+
86+
<Import Condition="Exists('User.Directory.Build.props')" Project="User.Directory.Build.props" />
87+
</Project>

‎Extensions/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(SolutionDir)Directory.Build.props" />
3+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
44
<PropertyGroup>
55
<ExtensionsKeyFile>$(MSBuildThisFileDirectory)Extensions.snk</ExtensionsKeyFile>
66
</PropertyGroup>

‎MSBuild/DataObjects.Net.InternalBuild.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<XtensiveOrmPath>$(SolutionDir)_Build\$(Configuration)\</XtensiveOrmPath>
66
</PropertyGroup>
77

8-
<Import Project="$(MSBuildThisFileDirectory)\DataObjects.Net.targets" />
8+
<Import Project="$(MSBuildThisFileDirectory)DataObjects.Net.targets" />
99

1010
</Project>

‎MSBuild/DataObjects.Net.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<PropertyGroup>
1212
<CompileDependsOn>$(CompileDependsOn);XtensiveOrmBuild</CompileDependsOn>
1313
<XtensiveOrmPath Condition="'$(XtensiveOrmPath)'==''">$(MSBuildThisFileDirectory)</XtensiveOrmPath>
14-
<XtensiveOrmPath Condition="!HasTrailingSlash('$(XtensiveOrmPath)')">$(XtensiveOrmPath)\</XtensiveOrmPath>
14+
<XtensiveOrmPath Condition="!HasTrailingSlash('$(XtensiveOrmPath)')">$(XtensiveOrmPath)</XtensiveOrmPath>
1515
<XtensiveOrmWeaver Condition="'$(XtensiveOrmWeaver)'==''">$(XtensiveOrmPath)tools\weaver\Xtensive.Orm.Weaver.dll</XtensiveOrmWeaver>
1616
<XtensiveOrmBuildDependsOn>$(XtensiveOrmBuildDependsOn)</XtensiveOrmBuildDependsOn>
1717
</PropertyGroup>

Orm/Xtensive.Orm/NuGetContent/build/netstandard2.0/Xtensive.Orm.targets renamed to Orm/Xtensive.Orm/NuGetContent/build/netcoreapp3.1/Xtensive.Orm.targets

File renamed without changes.

‎Orm/Xtensive.Orm/Xtensive.Orm.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyTitle>$(Title)</AssemblyTitle>
1212
<PackageDescription>$(DoProductName) is the object-relational mapper (ORM) and business logic layer (BLL) framework</PackageDescription>
1313
<SignAssembly>true</SignAssembly>
14-
<AssemblyOriginatorKeyFile>..\Orm.snk</AssemblyOriginatorKeyFile>
14+
<AssemblyOriginatorKeyFile>$(OrmKeyFile)</AssemblyOriginatorKeyFile>
1515
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1616
<WarningLevel>4</WarningLevel>
1717
<NoWarn>1591</NoWarn>

‎TestFileForBuildServerTests.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
Change1
2-
Change2
2+
Change2
3+
Change3

‎Weaver/Xtensive.Orm.Weaver/AssemblyChecker.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (C) 2013 Xtensive LLC.
2-
// All rights reserved.
3-
// For conditions of distribution and use, see license.
1+
// Copyright (C) 2013-2020 Xtensive LLC.
2+
// This code is distributed under MIT license terms.
3+
// See the License.txt file in the project root for more information.
44
// Created by: Denis Krjuchkov
55
// Created: 2013.09.02
66

@@ -12,17 +12,17 @@ namespace Xtensive.Orm.Weaver
1212
public sealed class AssemblyChecker
1313
{
1414
private readonly Dictionary<string, byte[]> frameworkAssemblies = new Dictionary<string, byte[]>(WeavingHelper.AssemblyNameComparer);
15-
private readonly Dictionary<string, byte[]> netStandardAssemblies = new Dictionary<string, byte[]>(WeavingHelper.AssemblyNameComparer);
15+
private readonly Dictionary<string, byte[]> netCoreAssemblies = new Dictionary<string, byte[]>(WeavingHelper.AssemblyNameComparer);
1616

1717

1818
public void RegisterFrameworkAssembly(string name, string publicKeyToken)
1919
{
2020
frameworkAssemblies.Add(name, WeavingHelper.ParsePublicKeyToken(publicKeyToken));
2121
}
2222

23-
public void RegisterNetStandardAssembly(string name, string publicKeyToken)
23+
public void RegisterNetCoreAssembly(string name, string publicKeyToken)
2424
{
25-
netStandardAssemblies.Add(name, WeavingHelper.ParsePublicKeyToken(publicKeyToken));
25+
netCoreAssemblies.Add(name, WeavingHelper.ParsePublicKeyToken(publicKeyToken));
2626
}
2727

2828
public bool IsFrameworkAssembly(AssemblyNameReference reference)
@@ -31,10 +31,10 @@ public bool IsFrameworkAssembly(AssemblyNameReference reference)
3131
return frameworkAssemblies.TryGetValue(reference.Name, out expectedToken) && reference.HasPublicKeyToken(expectedToken);
3232
}
3333

34-
public bool IsNetStandardAssembly(AssemblyNameReference reference)
34+
public bool IsNetCoreAssembly(AssemblyNameReference reference)
3535
{
3636
byte[] expectedToken;
37-
return netStandardAssemblies.TryGetValue(reference.Name, out expectedToken) && reference.HasPublicKeyToken(expectedToken);
37+
return netCoreAssemblies.TryGetValue(reference.Name, out expectedToken) && reference.HasPublicKeyToken(expectedToken);
3838
}
3939
}
4040
}

‎Weaver/Xtensive.Orm.Weaver/AssemblyProcessor.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (C) 2013 Xtensive LLC.
2-
// All rights reserved.
3-
// For conditions of distribution and use, see license.
1+
// Copyright (C) 2020 Xtensive LLC.
2+
// This code is distributed under MIT license terms.
3+
// See the License.txt file in the project root for more information.
44
// Created by: Denis Krjuchkov
55
// Created: 2013.08.19
66

@@ -57,7 +57,7 @@ private IEnumerable<ProcessorStage> GetStages()
5757
new LoadAssemblyStage(),
5858
new ImportReferencesStage(),
5959
new RegisterFrameworkAssembliesStage(),
60-
new RegisterNetStandardAssembliesStage(),
60+
new RegisterNetCoreAssembliesStage(),
6161
new FindPersistentTypesStage(),
6262
new ModifyPersistentTypesStage(),
6363
new MarkAssemblyStage(),

0 commit comments

Comments
 (0)