Skip to content

Commit ab7cf62

Browse files
committed
Use the SolutionDir related paths in the project files
1 parent d2991bb commit ab7cf62

32 files changed

Lines changed: 86 additions & 78 deletions

File tree

Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
3737
<ProjectAssetsFile>$(MSBuildProjectExtensionsPath)project.assets.json</ProjectAssetsFile>
3838
<ProjectAssetsCacheFile>$(MSBuildProjectExtensionsPath)$(MSBuildProjectName).assets.cache</ProjectAssetsCacheFile>
39+
<OrmKeyFile>$(SolutionDir)Orm\Orm.snk</OrmKeyFile>
3940
</PropertyGroup>
4041

4142
<PropertyGroup>
@@ -59,7 +60,7 @@
5960
<PackageIcon>do-nuget.png</PackageIcon>
6061
<PackageLicense>Apache-2.0</PackageLicense>
6162
<PackageTags>DataObjects.Net ORM BLL Persistence</PackageTags>
62-
<PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages</PackageOutputPath>
63+
<PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages\</PackageOutputPath>
6364
<RepositoryUrl>https://github.com/DataObjects-NET/dataobjects-net</RepositoryUrl>
6465
<RepositoryType>git</RepositoryType>
6566
</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="$(SolutionDir)Directory.Build.props" />
4+
<PropertyGroup>
5+
<ExtensionsKeyFile>$(MSBuildThisFileDirectory)Extensions.snk</ExtensionsKeyFile>
6+
</PropertyGroup>
7+
</Project>

Extensions/TestCommon/TestCommon.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +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>
77
<SignAssembly>true</SignAssembly>
8-
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
8+
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
99
</PropertyGroup>
10-
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
10+
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1111
<ItemGroup>
1212
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
1313
<PackageReference Include="NUnit" Version="3.12.0" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +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-
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
6+
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
99
<PackageReference Include="NUnit" Version="3.12.0" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +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>
88
<PackageId>Xtensive.Orm.BulkOperations</PackageId>
99
<Title>Bulk operations extension for $(DoProductName)</Title>
1010
<AssemblyTitle>$(Title)</AssemblyTitle>
1111
<PackageDescription>Adds support for bulk insert, update and delete operations for $(DoProductName)-powered domain models</PackageDescription>
1212
<SignAssembly>true</SignAssembly>
13-
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
13+
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
1414
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1515
</PropertyGroup>
1616
<ItemGroup>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +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-
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
6+
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
77
<ItemGroup>
88
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
99
<PackageReference Include="NUnit" Version="3.12.0" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +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>
88
<PackageId>Xtensive.Orm.Localization</PackageId>
99
<Title>Localization extension for $(DoProductName)</Title>
1010
<AssemblyTitle>$(Title)</AssemblyTitle>
1111
<PackageDescription>Adds support for easy localization for $(DoProductName)-powered domain models</PackageDescription>
1212
<SignAssembly>true</SignAssembly>
13-
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
13+
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
1414
</PropertyGroup>
15-
<Import Project="..\..\MSBuild\DataObjects.Net.InternalBuild.targets" />
15+
<Import Project="$(SolutionDir)MSBuild\DataObjects.Net.InternalBuild.targets" />
1616
<ItemGroup>
1717
<ProjectReference Include="..\..\Orm\Xtensive.Orm\Xtensive.Orm.csproj" />
1818
</ItemGroup>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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
<ItemGroup>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +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>
88
<PackageId>Xtensive.Orm.Logging.NLog</PackageId>
99
<Title>$(DoProductName) logging provider for NLog</Title>
1010
<AssemblyTitle>$(Title)</AssemblyTitle>
1111
<PackageDescription>Adds support for logging via NLog for $(DoProductName)</PackageDescription>
1212
<SignAssembly>true</SignAssembly>
13-
<AssemblyOriginatorKeyFile>..\Extensions.snk</AssemblyOriginatorKeyFile>
13+
<AssemblyOriginatorKeyFile>$(ExtensionsKeyFile)</AssemblyOriginatorKeyFile>
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<PackageReference Include="NLog" Version="4.5.0" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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
<ItemGroup>

0 commit comments

Comments
 (0)