Skip to content

Commit e3d8da5

Browse files
committed
Improve build
This swaps the workaround for Mono for a real targeting pack.
1 parent c99156f commit e3d8da5

8 files changed

Lines changed: 21 additions & 31 deletions

File tree

CSF.Entities/CSF.Entities.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
3636
</PropertyGroup>
3737

38-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
38+
<ItemGroup>
39+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
40+
</ItemGroup>
3941

4042
<ItemGroup>
4143
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Resources\ExceptionMessages.resx">

CSF.ORM.Entities/CSF.ORM.Entities.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
<RootNamespace>CSF.ORM</RootNamespace>
2626
</PropertyGroup>
2727

28-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
28+
<ItemGroup>
29+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
30+
</ItemGroup>
2931

3032
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
3133
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.Entities.xml</DocumentationFile>

CSF.ORM.NHibernate.Common/CSF.ORM.NHibernate.Common.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
3131
</PropertyGroup>
3232

33-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
33+
<ItemGroup>
34+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
35+
</ItemGroup>
3436

3537
<ItemGroup>
3638
<Reference Include="System.Runtime" Condition="$(TargetFramework.StartsWith('net4'))" />

CSF.ORM.NHibernate4/CSF.ORM.NHibernate4.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
4040
</PropertyGroup>
4141

42-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
42+
<ItemGroup>
43+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
44+
</ItemGroup>
4345

4446
<ItemGroup>
4547
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Resources\ExceptionMessages.resx">

CSF.ORM.NHibernate5/CSF.ORM.NHibernate5.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@
3939
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
4040
</PropertyGroup>
4141

42-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
42+
<ItemGroup>
43+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
44+
</ItemGroup>
4345

4446
<ItemGroup>
4547
<EmbeddedResource Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " Update="Resources\ExceptionMessages.resx">

CSF.ORM/CSF.ORM.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
<AssemblyOriginatorKeyFile>..\CSF-Software-OSS.snk</AssemblyOriginatorKeyFile>
2424
</PropertyGroup>
2525

26-
<Import Project="..\Tools\EnableNet45BuildOnUnix.targets" />
26+
<ItemGroup>
27+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
28+
</ItemGroup>
2729

2830
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2931
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\CSF.ORM.xml</DocumentationFile>

Tests/CSF.PersistenceTester.IntegrationTests/CSF.PersistenceTester.IntegrationTests.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,7 @@
6060
<LogicalName>CreateSchema.sql</LogicalName>
6161
</EmbeddedResource>
6262
</ItemGroup>
63-
<Import Project="..\..\Tools\EnableNet45BuildOnUnix.targets" />
63+
<ItemGroup>
64+
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" Condition="'$(TargetFramework.TrimEnd(`0123456789`))' == 'net'" />
65+
</ItemGroup>
6466
</Project>

Tools/EnableNet45BuildOnUnix.targets

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)