Skip to content

Commit 06d4e28

Browse files
alex-kulakovalex-kulakov
committed
Merge branch 'master' into silent-table-cleanup-issue
2 parents 4309423 + af5f06a commit 06d4e28

33 files changed

Lines changed: 57 additions & 82 deletions

File tree

‎Directory.Build.props‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,15 @@
4141
<SolutionDir Condition="$(SolutionDir) == ''">$([MSBuild]::EnsureTrailingSlash(
4242
$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)', 'Orm.sln'))))</SolutionDir>
4343
<Configuration Condition="$(Configuration) == ''">Debug</Configuration>
44-
<ArtifactsDir Condition="'$(ArtifactsDir)' == ''">$(SolutionDir)_Build\</ArtifactsDir>
45-
<BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(ArtifactsDir)obj\$(Configuration)\$(MSBuildProjectName)'))\</BaseIntermediateOutputPath>
46-
<BaseOutputPath >$([System.IO.Path]::GetFullPath('$(ArtifactsDir)bin\$(Configuration)'))\</BaseOutputPath>
47-
<BaseOutputPath Condition="$(MSBuildProjectName.Contains('Tests'))">$([System.IO.Path]::GetFullPath('$(ArtifactsDir)tests'))\</BaseOutputPath>
48-
<OutputPath>$(BaseOutputPath)</OutputPath>
44+
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
45+
<ArtifactsDir Condition="'$(ArtifactsDir)'==''">$(SolutionDir)_Build\</ArtifactsDir>
46+
<BaseIntermediateOutputPath>$(ArtifactsDir)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
47+
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
48+
<BaseOutputPath>$(ArtifactsDir)bin\$(Configuration)\</BaseOutputPath>
49+
<BaseOutputPath Condition="$(MSBuildProjectName.Contains('Tests'))
50+
OR $(MSBuildProjectName) == 'TestCommon'
51+
OR $(MSBuildProjectName) == 'Xtensive.Orm.Manual'">$(ArtifactsDir)tests\$(Configuration)\</BaseOutputPath>
52+
<OutputPath>$(BaseOutputPath)lib\</OutputPath>
4953
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
5054
<ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
5155
<ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
@@ -65,7 +69,7 @@
6569
<PackageIcon>do-nuget.png</PackageIcon>
6670
<PackageLicenseExpression>MIT</PackageLicenseExpression>
6771
<PackageTags>DataObjects.Net ORM BLL Persistence</PackageTags>
68-
<PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages\</PackageOutputPath>
72+
<PackageOutputPath>$(BaseOutputPath)packages\</PackageOutputPath>
6973
<RepositoryUrl>https://github.com/DataObjects-NET/dataobjects-net</RepositoryUrl>
7074
<RepositoryType>git</RepositoryType>
7175

‎Extensions/TestCommon/TestCommon.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<OutputPath>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<PropertyGroup>
@@ -21,4 +20,4 @@
2120
<ItemGroup>
2221
<Folder Include="Properties\" />
2322
</ItemGroup>
24-
</Project>
23+
</Project>

‎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>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />

‎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>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
5-
<DocumentationFile>$(SolutionDir)_Build\$(Configuration)\lib\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
65
</PropertyGroup>
76
<PropertyGroup>
87
<PackageId>Xtensive.Orm.BulkOperations</PackageId>
@@ -22,4 +21,4 @@
2221
<ItemGroup>
2322
<Folder Include="Properties\" />
2423
</ItemGroup>
25-
</Project>
24+
</Project>

‎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>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />

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

Lines changed: 1 addition & 2 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>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
5-
<DocumentationFile>$(SolutionDir)_Build\$(Configuration)\lib\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
65
</PropertyGroup>
76
<PropertyGroup>
87
<PackageId>Xtensive.Orm.Localization</PackageId>

‎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>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<ItemGroup>

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

Lines changed: 1 addition & 2 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>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
5-
<DocumentationFile>$(SolutionDir)_Build\$(Configuration)\lib\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
65
</PropertyGroup>
76
<PropertyGroup>
87
<PackageId>Xtensive.Orm.Logging.NLog</PackageId>

‎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>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
43
<DocumentationFile />
54
</PropertyGroup>
65
<ItemGroup>

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

Lines changed: 1 addition & 2 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>$(SolutionDir)_Build\$(Configuration)\lib\</OutputPath>
5-
<DocumentationFile>$(SolutionDir)_Build\$(Configuration)\lib\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
4+
<DocumentationFile>$(OutputPath)$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
65
</PropertyGroup>
76
<PropertyGroup>
87
<PackageId>Xtensive.Orm.Logging.log4net</PackageId>

0 commit comments

Comments
 (0)