Skip to content

Commit 8c0e9ec

Browse files
hazzikhazzik
authored
Merge branch 'master' into CacheBuild
2 parents b7312bb + ca534fe commit 8c0e9ec

File tree

477 files changed

+11600
-3543
lines changed

Some content is hidden

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

477 files changed

+11600
-3543
lines changed

‎Tools/msbuild.cmd‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Tools/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
88
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
99
<package id="NUnit.Extension.VSProjectLoader" version="3.6.0" targetFramework="net461" />
10-
<package id="CSharpAsyncGenerator.CommandLine" version="0.7.0" targetFramework="net461" />
10+
<package id="CSharpAsyncGenerator.CommandLine" version="0.8.1" targetFramework="net461" />
1111
<package id="vswhere" version="2.1.4" targetFramework="net461" />
1212
</packages>

‎build-common/NHibernate.props‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@
2121
<PackageLicenseUrl>https://raw.githubusercontent.com/nhibernate/nhibernate-core/master/LICENSE.txt</PackageLicenseUrl>
2222
<RepositoryUrl>https://github.com/nhibernate/nhibernate-core.git</RepositoryUrl>
2323
<RepositoryType>git</RepositoryType>
24+
25+
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
26+
<TreatSpecificWarningsAsErrors />
2427
</PropertyGroup>
2528
</Project>

‎build-common/common-project.xml‎

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

‎build-common/common.xml‎

Lines changed: 13 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
<?xml version="1.0" ?>
22
<project xmlns="http://nant.sf.net/release/0.85-rc3/nant.xsd">
3-
4-
<!--
5-
Use this to determine if the key file NHibernate.snk should be used to
6-
sign the assemblies. Defaults to true since private key is present
7-
in CVS.
8-
-->
9-
<property name="sign" value="true" overwrite="false" />
10-
113
<!--
124
if Visual Studio Help Integration Kit has been installed
135
then change this to true or include -D:vshik.installed=true in the command line.
@@ -22,9 +14,6 @@
2214
-->
2315
<property name="nunit2report.installed" value="false" overwrite="false" />
2416

25-
<property name="nant-version.current" value="${assemblyname::get-version(assembly::get-name(nant::get-assembly()))}" />
26-
<property name="nant-version.required" value="0.91.4312.0" /> <!-- Nant 0.91 release version -->
27-
2817
<!-- Path to the folder that contain the external assemblies -->
2918
<property name="lib.dir" value="lib" dynamic="true" />
3019

@@ -36,88 +25,29 @@
3625
<!-- properties used to connect to database for testing -->
3726
<include buildfile="nhibernate-properties.xml" />
3827

39-
<!-- named project configurations -->
40-
<target name="set-debug-project-configuration" description="Perform a 'debug' build">
41-
<property name="build.release" value="false" />
42-
<property name="build.debug" value="true" />
43-
<property name="build.name" value="NHibernate-${project.version}-${project.config}" />
44-
</target>
45-
46-
<target name="set-release-project-configuration" description="Perform a 'release' build">
47-
<property name="build.release" value="true" />
48-
<property name="build.debug" value="pdbonly" />
49-
<property name="build.name" value="NHibernate-${project.version}" />
50-
</target>
51-
52-
<target name="set-project-configuration">
28+
<target name="common.init" description="Initializes build properties">
5329
<property name="project.config" value="debug" overwrite="false" />
54-
<if test="${not(target::exists('set-' + project.config + '-project-configuration'))}">
55-
<fail message="Unknown configuration: '${project.config}'" />
56-
</if>
57-
58-
<call target="set-${project.config}-project-configuration" />
59-
30+
<property name="build.name" value="NHibernate-${project.version}" if="${project.config == 'release'}"/>
31+
<property name="build.name" value="NHibernate-${project.version}-${project.config}" unless="${project.config == 'release'}" />
6032
<property name="build.root.dir" value="${root.dir}/build/${build.name}" />
6133
<property name="build.dir" value="${build.root.dir}" />
6234
<property name="bin.dir" value="${build.dir}/bin" />
6335
<property name="testresults.dir" value="${bin.dir}/test-results" />
6436
<property name="tools.dir" value="${root.dir}/Tools"/>
6537
</target>
6638

67-
<target name="display-current-runtime">
68-
<echo message="" />
69-
<echo message="----------------------------------------------------------" />
70-
<echo message=" ${framework::get-description(framework::get-target-framework())}" />
71-
<echo message="----------------------------------------------------------" />
72-
<echo message="" />
73-
<echo message="framework : ${framework::get-target-framework()}" />
74-
<echo message="description : ${framework::get-description(framework::get-target-framework())}" />
75-
<echo message="sdk directory : ${framework::get-sdk-directory(framework::get-target-framework())}" />
76-
<echo message="framework directory : ${framework::get-framework-directory(framework::get-target-framework())}" />
77-
<echo message="assembly directory : ${framework::get-assembly-directory(framework::get-target-framework())}" />
78-
<echo message="runtime engine : ${framework::get-runtime-engine(framework::get-target-framework())}" />
79-
<echo message="" />
39+
<target name="common.download-nuget" depends="common.init">
40+
<get
41+
src="https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
42+
dest="${tools.dir}/nuget.exe"
43+
usetimestamp="true"
44+
/>
8045
</target>
8146

82-
<target name="common.init"
83-
depends="set-project-configuration"
84-
description="Initializes build properties">
85-
86-
<fileset id="project.sources" failonempty="true">
87-
<include name="**/*.cs" />
88-
</fileset>
89-
<resourcefileset id="project.resources" />
47+
<target name="common.nuget-restore" depends="common.init common.download-nuget">
48+
<exec basedir="${tools.dir}" workingdir="${root.dir}/Tools" program="NuGet.exe">
49+
<arg value="install" />
50+
</exec>
9051
</target>
9152

92-
<target name="common.get-nuget-package-path">
93-
<xmlpeek
94-
file="${tools.dir}/packages.config"
95-
xpath="/packages/package[@id = '${nuget-package-id}']/@version"
96-
property="nuget-package-version" />
97-
<property name="nuget-package-path" value="${tools.dir}/${nuget-package-id}.${nuget-package-version}/" />
98-
</target>
99-
100-
<target name="common.find-async-generator-console">
101-
<property name="nuget-package-id" value="CSharpAsyncGenerator.CommandLine" />
102-
<call target="common.get-nuget-package-path" />
103-
<property name="async-generator-console" value="${nuget-package-path}/tools/AsyncGenerator.CommandLine.exe" />
104-
</target>
105-
106-
<target name="common.find-nunit">
107-
<property name="nuget-package-id" value="NUnit.ConsoleRunner" />
108-
<call target="common.get-nuget-package-path" />
109-
<property name="nunit-console" value="${nuget-package-path}/tools/nunit3-console.exe" />
110-
</target>
111-
112-
<target name="common.find-ndoc">
113-
<property name="ndoc-console" value="${tools.dir}/ndoc/NDocConsole.exe" />
114-
</target>
115-
116-
<target name="nuget.set-properties">
117-
<property name="nuget.nupackages.relative-dir" value="nuget_gallery" />
118-
119-
<property name="nuget.nupackages.dir" value="${build.dir}/${nuget.nupackages.relative-dir}" />
120-
<property name="nuget.nupackages.pushbatfile" value="${nuget.nupackages.dir}/NuGetPush.bat" />
121-
</target>
122-
12353
</project>

‎build-common/teamcity-hibernate.cfg.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,7 @@
2424
<property name="adonet.wrap_result_sets">false</property>
2525

2626
<property name="odbc.explicit_datetime_scale"></property>
27+
<property name="oracle.use_n_prefixed_types_for_unicode"></property>
28+
<property name="query.default_cast_length"></property>
2729
</session-factory>
2830
</hibernate-configuration>

0 commit comments

Comments
 (0)