Skip to content

Commit 3725fdf

Browse files
alex-kulakovalex-kulakov
committed
Merge branch '6.0' into 6.0-connection-handlers
2 parents 2d590da + 9d7af48 commit 3725fdf

File tree

34 files changed

+90
-96
lines changed

34 files changed

+90
-96
lines changed

‎Directory.Build.props

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,17 @@
2929
<NoLogo>true</NoLogo>
3030
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
3131
<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>
32+
<BaseIntermediateOutputPath>$(ArtifactsDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
33+
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
34+
<BaseOutputPath>$(ArtifactsDir)bin\$(Configuration)\</BaseOutputPath>
35+
<BaseOutputPath Condition="$(MSBuildProjectName.Contains('Tests'))
36+
OR $(MSBuildProjectName) == 'TestCommon'
37+
OR $(MSBuildProjectName) == 'Xtensive.Orm.Manual'">$(ArtifactsDir)tests\$(Configuration)\</BaseOutputPath>
38+
<OutputPath>$(BaseOutputPath)lib\</OutputPath>
3639
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
3740
<ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
3841
<ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
42+
<OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
3943
</PropertyGroup>
4044

4145
<PropertyGroup>
@@ -69,7 +73,7 @@
6973
<PackageIcon>do-nuget.png</PackageIcon>
7074
<PackageLicense>MIT</PackageLicense>
7175
<PackageTags>DataObjects.Net ORM BLL Persistence</PackageTags>
72-
<PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages</PackageOutputPath>
76+
<PackageOutputPath>$(BaseOutputPath)packages\</PackageOutputPath>
7377
<RepositoryUrl>https://github.com/DataObjects-NET/dataobjects-net</RepositoryUrl>
7478
<RepositoryType>git</RepositoryType>
7579
</PropertyGroup>

‎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="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
4+
<PropertyGroup>
5+
<ExtensionsKeyFile>$(MSBuildThisFileDirectory)Extensions.snk</ExtensionsKeyFile>
6+
</PropertyGroup>
7+
</Project>

‎Extensions/TestCommon/TestCommon.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<PropertyGroup>
76
<TargetFramework>netcoreapp2.0</TargetFramework>
87
<SignAssembly>true</SignAssembly>
9-
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
8+
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
109
</PropertyGroup>
1110
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
1211
<ItemGroup>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<PropertyGroup>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
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+
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
65
</PropertyGroup>
76
<PropertyGroup>
87
<TargetFramework>netstandard2.0</TargetFramework>
@@ -11,7 +10,7 @@
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<PropertyGroup>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
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+
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
65
</PropertyGroup>
76
<PropertyGroup>
87
<TargetFramework>netstandard2.0</TargetFramework>
@@ -11,7 +10,7 @@
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>
1615
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
1716
<ItemGroup>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<PropertyGroup>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
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+
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
65
</PropertyGroup>
76
<PropertyGroup>
87
<TargetFramework>netstandard2.0</TargetFramework>
@@ -11,7 +10,7 @@
1110
<AssemblyTitle>$(Title)</AssemblyTitle>
1211
<PackageDescription>Adds support for logging via NLog for $(DoProductName)</PackageDescription>
1312
<SignAssembly>true</SignAssembly>
14-
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
13+
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
1514
</PropertyGroup>
1615
<ItemGroup>
1716
<PackageReference Include="NLog" Version="4.5.0" />

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>..\..\_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<PropertyGroup>

0 commit comments

Comments
 (0)