Skip to content

Commit 8c6e23c

Browse files
authored
Merge pull request #68 from DataObjects-NET/nuget-packages-fix
Fixes different issues of packaging
2 parents bf04b0b + 298a83e commit 8c6e23c

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

Directory.Build.props

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,22 @@
3939
</PropertyGroup>
4040

4141
<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>
4245
<GeneratePackageOnBuild Condition="$(MSBuildProjectName.Contains('Tests')) == 'true'">false</GeneratePackageOnBuild>
4346
<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>
4452
</PropertyGroup>
53+
<ItemGroup>
54+
<SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
55+
<PackageReference Condition="$(GeneratePackageOnBuild) == 'true'"
56+
Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
57+
</ItemGroup>
4558

4659
<!-- Populate standard properties. -->
4760
<PropertyGroup>
@@ -54,7 +67,7 @@
5467
<Copyright>$(DoProductCopyright)</Copyright>
5568
<PackageProjectUrl>https://dataobjects.net/</PackageProjectUrl>
5669
<PackageIcon>do-nuget.png</PackageIcon>
57-
<PackageLicense>Apache-2.0</PackageLicense>
70+
<PackageLicense>MIT</PackageLicense>
5871
<PackageTags>DataObjects.Net ORM BLL Persistence</PackageTags>
5972
<PackageOutputPath>$(MSBuildThisFileDirectory)_Build\$(Configuration)\packages</PackageOutputPath>
6073
<RepositoryUrl>https://github.com/DataObjects-NET/dataobjects-net</RepositoryUrl>
@@ -63,12 +76,7 @@
6376

6477
<ItemGroup>
6578
<None Include="$(DoPackageIcon)" Pack="true" PackagePath="." Visible="false" />
66-
<None Include="$(DoRevFile)" Pack="true" PackagePath="." Visible="false" Condition="Exists('$(DoRevFile)')" />
6779
</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>
7280

7381
<Import Condition="Exists('User.Directory.Build.props')" Project="User.Directory.Build.props" />
7482
</Project>

0 commit comments

Comments
 (0)