Skip to content

Commit 0b8dc7f

Browse files
ngbrownngbrown
committed
NH-3807 - .netstandard 2.0 project
1 parent 3d57340 commit 0b8dc7f

File tree

107 files changed

+1006
-7179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+1006
-7179
lines changed

‎src/NHibernate.DomainModel/AssemblyInfo.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,5 @@
22
using System.Reflection;
33

44
[assembly: CLSCompliantAttribute(false)]
5-
[assembly: AssemblyTitleAttribute("NHibernate.DomainModel")]
6-
[assembly: AssemblyDescriptionAttribute("The Domain Model used by the Unit Tests.")]
7-
[assembly: AssemblyCompanyAttribute("NHibernate.info")]
8-
[assembly: AssemblyProductAttribute("NHibernate.DomainModel")]
9-
[assembly: AssemblyCopyrightAttribute("Licensed under LGPL.")]
105
[assembly: AssemblyDelaySignAttribute(false)]
116

‎src/NHibernate.DomainModel/NHibernate.DomainModel.csproj‎

Lines changed: 20 additions & 305 deletions
Original file line numberDiff line numberDiff line change
@@ -1,315 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
33
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProductVersion>9.0.30729</ProductVersion>
7-
<SchemaVersion>2.0</SchemaVersion>
8-
<ProjectGuid>{5C649B55-1B3F-4C38-9998-1B043E94A244}</ProjectGuid>
9-
<OutputType>Library</OutputType>
10-
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>NHibernate.DomainModel</RootNamespace>
12-
<AssemblyName>NHibernate.DomainModel</AssemblyName>
13-
<FileUpgradeFlags>
14-
</FileUpgradeFlags>
15-
<OldToolsVersion>3.5</OldToolsVersion>
16-
<UpgradeBackupLocation>
17-
</UpgradeBackupLocation>
18-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
19-
<PublishUrl>publish\</PublishUrl>
20-
<Install>true</Install>
21-
<InstallFrom>Disk</InstallFrom>
22-
<UpdateEnabled>false</UpdateEnabled>
23-
<UpdateMode>Foreground</UpdateMode>
24-
<UpdateInterval>7</UpdateInterval>
25-
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
26-
<UpdatePeriodically>false</UpdatePeriodically>
27-
<UpdateRequired>false</UpdateRequired>
28-
<MapFileExtensions>true</MapFileExtensions>
29-
<ApplicationRevision>0</ApplicationRevision>
30-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
31-
<IsWebBootstrapper>false</IsWebBootstrapper>
32-
<UseApplicationTrust>false</UseApplicationTrust>
33-
<BootstrapperEnabled>true</BootstrapperEnabled>
34-
<TargetFrameworkProfile />
4+
<TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
5+
<Description>The Domain Model used by the Unit Tests.</Description>
6+
<DisableImplicitPackageTargetFallback>true</DisableImplicitPackageTargetFallback>
7+
8+
<IsPackable>false</IsPackable>
359
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
37-
<DebugSymbols>true</DebugSymbols>
38-
<DebugType>full</DebugType>
39-
<Optimize>false</Optimize>
40-
<OutputPath>bin\Debug-2.0\</OutputPath>
41-
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
42-
<IntermediateOutputPath>obj\Debug-2.0\</IntermediateOutputPath>
43-
<DefineConstants>TRACE;DEBUG;NET,NET_2_0</DefineConstants>
44-
<ErrorReport>prompt</ErrorReport>
45-
<WarningLevel>4</WarningLevel>
46-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
47-
<Prefer32Bit>false</Prefer32Bit>
48-
</PropertyGroup>
49-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
50-
<DebugType>pdbonly</DebugType>
51-
<Optimize>true</Optimize>
52-
<OutputPath>bin\Release-2.0\</OutputPath>
53-
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
54-
<IntermediateOutputPath>obj\Release-2.0\</IntermediateOutputPath>
55-
<DefineConstants>TRACE</DefineConstants>
56-
<ErrorReport>prompt</ErrorReport>
57-
<WarningLevel>4</WarningLevel>
58-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
59-
<Prefer32Bit>false</Prefer32Bit>
60-
</PropertyGroup>
61-
<ItemGroup>
62-
<Reference Include="Iesi.Collections, Version=4.0.0.0, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
63-
<HintPath>..\packages\Iesi.Collections.4.0.1.4000\lib\net40\Iesi.Collections.dll</HintPath>
64-
</Reference>
65-
<Reference Include="System" />
66-
<Reference Include="System.Core">
67-
<RequiredTargetFramework>3.5</RequiredTargetFramework>
68-
</Reference>
69-
<Reference Include="System.Data" />
70-
<Reference Include="System.Xml" />
71-
</ItemGroup>
72-
<ItemGroup>
73-
<Compile Include="..\SharedAssemblyInfo.cs">
74-
<Link>SharedAssemblyInfo.cs</Link>
75-
</Compile>
76-
<Compile Include="A.cs" />
77-
<Compile Include="Abstract.cs" />
78-
<Compile Include="AbstractProxy.cs" />
79-
<Compile Include="AssemblyInfo.cs" />
80-
<Compile Include="Assignable.cs" />
81-
<Compile Include="B.cs" />
82-
<Compile Include="Bar.cs" />
83-
<Compile Include="BarProxy.cs" />
84-
<Compile Include="BasicNameable.cs" />
85-
<Compile Include="Baz.cs" />
86-
<Compile Include="Blobber.cs" />
87-
<Compile Include="Broken.cs" />
88-
<Compile Include="C1.cs" />
89-
<Compile Include="C2.cs" />
90-
<Compile Include="Category.cs" />
91-
<Compile Include="Child.cs" />
92-
<Compile Include="Circular.cs" />
93-
<Compile Include="Component.cs" />
94-
<Compile Include="ComponentCollection.cs" />
95-
<Compile Include="Componentizable.cs" />
96-
<Compile Include="CompositeElement.cs" />
97-
<Compile Include="Contained.cs" />
98-
<Compile Include="Container.cs" />
99-
<Compile Include="Custom.cs" />
100-
<Compile Include="CustomPersister.cs" />
101-
<Compile Include="D.cs" />
102-
<Compile Include="Detail.cs" />
103-
<Compile Include="DoubleStringType.cs" />
104-
<Compile Include="Down.cs" />
105-
<Compile Include="E.cs" />
106-
<Compile Include="Eye.cs" />
107-
<Compile Include="Fee.cs" />
108-
<Compile Include="Fixed.cs" />
109-
<Compile Include="Fo.cs" />
110-
<Compile Include="Foo.cs" />
111-
<Compile Include="FooComponent.cs" />
112-
<Compile Include="FooProxy.cs" />
113-
<Compile Include="FooStatus.cs" />
114-
<Compile Include="Fum.cs" />
115-
<Compile Include="FumCompositeID.cs" />
116-
<Compile Include="Fumm.cs" />
117-
<Compile Include="Glarch.cs" />
118-
<Compile Include="GlarchProxy.cs" />
119-
<Compile Include="Holder.cs" />
120-
<Compile Include="Immutable.cs" />
121-
<Compile Include="INameable.cs" />
122-
<Compile Include="INamed.cs" />
123-
<Compile Include="Inner.cs" />
124-
<Compile Include="InnerKey.cs" />
125-
<Compile Include="Jay.cs" />
126-
<Compile Include="Location.cs" />
127-
<Compile Include="Lower.cs" />
128-
<Compile Include="M.cs" />
129-
<Compile Include="Many.cs" />
130-
<Compile Include="Master.cs" />
131-
<Compile Include="Middle.cs" />
132-
<Compile Include="MiddleKey.cs" />
133-
<Compile Include="MoreStuff.cs" />
134-
<Compile Include="Multi.cs" />
135-
<Compile Include="Multiplicity.cs" />
136-
<Compile Include="MultiplicityType.cs" />
137-
<Compile Include="N.cs" />
138-
<Compile Include="NestingComponent.cs" />
139-
<Compile Include="NHSpecific\AuditComponent.cs" />
140-
<Compile Include="NHSpecific\BasicClass.cs" />
141-
<Compile Include="NHSpecific\BasicObject.cs" />
142-
<Compile Include="NHSpecific\BasicSerializable.cs" />
143-
<Compile Include="NHSpecific\BasicTime.cs" />
144-
<Compile Include="NHSpecific\Child.cs" />
145-
<Compile Include="NHSpecific\ClassWithNullColumns.cs" />
146-
<Compile Include="NHSpecific\GetSetHelper.cs" />
147-
<Compile Include="NHSpecific\InvalidProxyClass.cs" />
148-
<Compile Include="NHSpecific\LazyLoadBug.cs" />
149-
<Compile Include="NHSpecific\Node.cs" />
150-
<Compile Include="NHSpecific\NullableInt32.cs" />
151-
<Compile Include="NHSpecific\NullableInt32Converter.cs" />
152-
<Compile Include="NHSpecific\NullableInt32Type.cs" />
153-
<Compile Include="NHSpecific\NullableTypesType.cs" />
154-
<Compile Include="NHSpecific\NullInt32UserType.cs" />
155-
<Compile Include="NHSpecific\Optimistic.cs" />
156-
<Compile Include="NHSpecific\Parent.cs" />
157-
<Compile Include="NHSpecific\ParentComparer.cs" />
158-
<Compile Include="NHSpecific\SexType.cs" />
159-
<Compile Include="NHSpecific\SimpleComponent.cs" />
160-
<Compile Include="NHSpecific\Team.cs" />
161-
<Compile Include="NHSpecific\UnsavedType.cs" />
162-
<Compile Include="Northwind\Entities\Address.cs" />
163-
<Compile Include="Northwind\Entities\Animal.cs" />
164-
<Compile Include="Northwind\Entities\AnotherEntity.cs" />
165-
<Compile Include="Northwind\Entities\Customer.cs" />
166-
<Compile Include="Northwind\Entities\Employee.cs" />
167-
<Compile Include="Northwind\Entities\Entity.cs" />
168-
<Compile Include="Northwind\Entities\Northwind.cs" />
169-
<Compile Include="Northwind\Entities\Order.cs" />
170-
<Compile Include="Northwind\Entities\OrderLine.cs" />
171-
<Compile Include="Northwind\Entities\Patient.cs" />
172-
<Compile Include="Northwind\Entities\Product.cs" />
173-
<Compile Include="Northwind\Entities\ProductCategory.cs" />
174-
<Compile Include="Northwind\Entities\Region.cs" />
175-
<Compile Include="Northwind\Entities\Role.cs" />
176-
<Compile Include="Northwind\Entities\Shipper.cs" />
177-
<Compile Include="Northwind\Entities\Supplier.cs" />
178-
<Compile Include="Northwind\Entities\Territory.cs" />
179-
<Compile Include="Northwind\Entities\Timesheet.cs" />
180-
<Compile Include="Northwind\Entities\User.cs" />
181-
<Compile Include="Northwind\Entities\UserComponent.cs" />
182-
<Compile Include="Northwind\Entities\UserDto.cs" />
183-
<Compile Include="NotMono.cs" />
184-
<Compile Include="One.cs" />
185-
<Compile Include="Outer.cs" />
186-
<Compile Include="OuterKey.cs" />
187-
<Compile Include="Parent.cs" />
188-
<Compile Include="Part.cs" />
189-
<Compile Include="Po.cs" />
190-
<Compile Include="Qux.cs" />
191-
<Compile Include="Result.cs" />
192-
<Compile Include="ReverseComparator.cs" />
193-
<Compile Include="S.cs" />
194-
<Compile Include="Several.cs" />
195-
<Compile Include="Simple.cs" />
196-
<Compile Include="Single.cs" />
197-
<Compile Include="Sortable.cs" />
198-
<Compile Include="StringComparator.cs" />
199-
<Compile Include="Stuff.cs" />
200-
<Compile Include="SubComponent.cs" />
201-
<Compile Include="SubDetail.cs" />
202-
<Compile Include="SubMulti.cs" />
203-
<Compile Include="Super.cs" />
204-
<Compile Include="Top.cs" />
205-
<Compile Include="Trivial.cs" />
206-
<Compile Include="TrivialClass.cs" />
207-
<Compile Include="Up.cs" />
208-
<Compile Include="Vetoer.cs" />
209-
<Compile Include="W.cs" />
210-
<Compile Include="X.cs" />
211-
<Compile Include="Y.cs" />
212-
<Compile Include="Z.cs" />
213-
</ItemGroup>
214-
<ItemGroup>
215-
<EmbeddedResource Include="ABC.hbm.xml" />
216-
<EmbeddedResource Include="ABCExtends.hbm.xml" />
217-
<EmbeddedResource Include="ABCProxy.hbm.xml" />
218-
<EmbeddedResource Include="Baz.hbm.xml" />
219-
<EmbeddedResource Include="Blobber.hbm.xml" />
220-
<EmbeddedResource Include="Broken.hbm.xml" />
221-
<EmbeddedResource Include="Category.hbm.xml" />
222-
<EmbeddedResource Include="Circular.hbm.xml" />
223-
<EmbeddedResource Include="Componentizable.hbm.xml" />
224-
<EmbeddedResource Include="Container.hbm.xml" />
225-
<EmbeddedResource Include="Custom.hbm.xml" />
226-
<EmbeddedResource Include="Eye.hbm.xml" />
227-
<EmbeddedResource Include="Fee.hbm.xml" />
228-
<EmbeddedResource Include="Fo.hbm.xml" />
229-
<EmbeddedResource Include="FooBar.hbm.xml" />
230-
<EmbeddedResource Include="Fum.hbm.xml" />
231-
<EmbeddedResource Include="Fumm.hbm.xml" />
232-
<EmbeddedResource Include="Glarch.hbm.xml" />
233-
<EmbeddedResource Include="Holder.hbm.xml" />
234-
<EmbeddedResource Include="Immutable.hbm.xml" />
235-
<EmbeddedResource Include="INameable.hbm.xml" />
236-
<EmbeddedResource Include="Location.hbm.xml" />
237-
<EmbeddedResource Include="Many.hbm.xml" />
238-
<EmbeddedResource Include="MasterDetail.hbm.xml" />
239-
<EmbeddedResource Include="Middle.hbm.xml" />
240-
<EmbeddedResource Include="MN.hbm.xml" />
241-
<EmbeddedResource Include="Multi.hbm.xml" />
242-
<EmbeddedResource Include="MultiExtends.hbm.xml" />
243-
<EmbeddedResource Include="NHSpecific\BasicClass.hbm.xml" />
244-
<EmbeddedResource Include="NHSpecific\BasicObject.hbm.xml" />
245-
<EmbeddedResource Include="NHSpecific\BasicSerializable.hbm.xml" />
246-
<EmbeddedResource Include="NHSpecific\BasicTime.hbm.xml" />
247-
<EmbeddedResource Include="NHSpecific\Child.hbm.xml" />
248-
<EmbeddedResource Include="NHSpecific\ClassWithNullColumns.hbm.xml" />
249-
<EmbeddedResource Include="NHSpecific\LazyLoadBug.hbm.xml" />
250-
<EmbeddedResource Include="NHSpecific\Node.hbm.xml" />
251-
<EmbeddedResource Include="NHSpecific\Parent.hbm.xml" />
252-
<EmbeddedResource Include="NHSpecific\SexType.hbm.xml" />
253-
<EmbeddedResource Include="NHSpecific\SimpleComponent.hbm.xml" />
254-
<EmbeddedResource Include="NHSpecific\Team.hbm.xml" />
255-
<EmbeddedResource Include="NHSpecific\UnsavedType.hbm.xml" />
256-
<EmbeddedResource Include="One.hbm.xml" />
257-
<EmbeddedResource Include="ParentChild.hbm.xml" />
258-
<EmbeddedResource Include="Qux.hbm.xml" />
259-
<EmbeddedResource Include="Simple.hbm.xml" />
260-
<EmbeddedResource Include="SingleSeveral.hbm.xml" />
261-
<EmbeddedResource Include="Stuff.hbm.xml" />
262-
<EmbeddedResource Include="UpDown.hbm.xml" />
263-
<EmbeddedResource Include="Vetoer.hbm.xml" />
264-
<EmbeddedResource Include="WZ.hbm.xml" />
265-
<EmbeddedResource Include="XY.hbm.xml" />
266-
</ItemGroup>
267-
<ItemGroup>
268-
<EmbeddedResource Include="Northwind\Mappings\Animal.hbm.xml" />
269-
<EmbeddedResource Include="Northwind\Mappings\AnotherEntity.hbm.xml" />
270-
<EmbeddedResource Include="Northwind\Mappings\Customer.hbm.xml" />
271-
<EmbeddedResource Include="Northwind\Mappings\Employee.hbm.xml" />
272-
<EmbeddedResource Include="Northwind\Mappings\Order.hbm.xml" />
273-
<EmbeddedResource Include="Northwind\Mappings\OrderLine.hbm.xml" />
274-
<EmbeddedResource Include="Northwind\Mappings\Patient.hbm.xml" />
275-
<EmbeddedResource Include="Northwind\Mappings\Product.hbm.xml" />
276-
<EmbeddedResource Include="Northwind\Mappings\ProductCategory.hbm.xml" />
277-
<EmbeddedResource Include="Northwind\Mappings\Region.hbm.xml" />
278-
<EmbeddedResource Include="Northwind\Mappings\Role.hbm.xml" />
279-
<EmbeddedResource Include="Northwind\Mappings\Shipper.hbm.xml" />
280-
<EmbeddedResource Include="Northwind\Mappings\Supplier.hbm.xml" />
281-
<EmbeddedResource Include="Northwind\Mappings\Territory.hbm.xml" />
282-
<EmbeddedResource Include="Northwind\Mappings\TimeSheet.hbm.xml" />
283-
<EmbeddedResource Include="Northwind\Mappings\User.hbm.xml" />
284-
</ItemGroup>
285-
<ItemGroup>
286-
<ProjectReference Include="..\NHibernate\NHibernate.csproj">
287-
<Project>{5909BFE7-93CF-4E5F-BE22-6293368AF01D}</Project>
288-
<Name>NHibernate</Name>
289-
</ProjectReference>
290-
</ItemGroup>
291-
<ItemGroup>
292-
<EmbeddedResource Include="NHSpecific\GetSetHelper.hbm.xml" />
293-
<EmbeddedResource Include="NHSpecific\Optimistic.hbm.xml" />
294-
</ItemGroup>
10+
29511
<ItemGroup>
296-
<EmbeddedResource Include="Query.hbm.xml" />
12+
<None Remove="**\*.hbm.xml" />
13+
<EmbeddedResource Include="**\*.hbm.xml" />
29714
</ItemGroup>
15+
29816
<ItemGroup>
299-
<Service Include="..\..\..\..\trunk\nhibernate\src\NHibernate.DomainModel\{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
17+
<PackageReference Include="Iesi.Collections" Version="4.0.2" />
30018
</ItemGroup>
19+
30120
<ItemGroup>
302-
<Folder Include="Properties\" />
21+
<ProjectReference Include="..\NHibernate\NHibernate.csproj" />
30322
</ItemGroup>
23+
30424
<ItemGroup>
305-
<None Include="packages.config" />
25+
<Content Include="../../LICENSE.txt" />
30626
</ItemGroup>
307-
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
308-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
309-
Other similar extension points exist, see Microsoft.Common.targets.
310-
<Target Name="BeforeBuild">
311-
</Target>
312-
<Target Name="AfterBuild">
313-
</Target>
314-
-->
315-
</Project>
27+
28+
<Import Project="../SharedAssemblyInfo.targets" />
29+
30+
</Project>

‎src/NHibernate.DomainModel/packages.config‎

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

0 commit comments

Comments
 (0)