Skip to content

Commit d5ffdd6

Browse files
committed
Adapted scripts to mono 3.4
1 parent 3f819c7 commit d5ffdd6

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

Ninject.Extensions.Factory.build

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
</copy>
3636

3737
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}" output="${current.path.build}/${product.assembly}" doc="${current.path.build}/${product.docfile}" keyfile="${path.src}/${product.keyfile}">
38-
<arg line="/filealign:512" unless="${nant.settings.currentframework == 'mono-2.0'}"/>
38+
<arg line="/filealign:512"/>
39+
<arg value="-sdk:2" if="${string::contains(build.platform, 'mono-3.5')}"/>
40+
<arg value="-sdk:4" if="${string::contains(build.platform, 'mono-4.0')}"/>
3941
<sources basedir="${path.src}">
4042
<include name="${build.asminfo}"/>
4143
<include name="${product.name}/**/*.cs"/>
@@ -59,6 +61,8 @@
5961

6062
<csc noconfig="true" warnaserror="true" target="library" debug="${build.debug}" optimize="${build.optimize}" define="${build.defines}"
6163
output="${current.path.test}/${product.assembly.test}">
64+
<arg value="-sdk:2" if="${string::contains(build.platform, 'mono-3.5')}"/>
65+
<arg value="-sdk:4" if="${string::contains(build.platform, 'mono-4.0')}"/>
6266
<sources basedir="${path.src}">
6367
<include name="${product.name}.Test/**/*.cs"/>
6468
</sources>

Ninject.include

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -343,13 +343,6 @@
343343
<property name="nuget.add" value="false"/>
344344
<property name="build.platform" value="netcf-3.5" overwrite="true"/>
345345
</target>
346-
347-
<target name="config-platform-mono-2.0">
348-
<property name="nant.settings.currentframework" value="mono-2.0"/>
349-
<property name="build.defines" value="${global.build.defines},NET,NET_35,MONO,MONO_20,NO_GENERIC_MOQ" />
350-
<property name="nuget.add" value="false"/>
351-
<property name="build.platform" value="mono-2.0" overwrite="true"/>
352-
</target>
353346

354347
<target name="config-platform-mono-3.5">
355348
<property name="nant.settings.currentframework" value="mono-3.5"/>

tools/nant/NAnt.exe.config

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2941,6 +2941,7 @@
29412941

29422942
<property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/3.5')}" />
29432943
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
2944+
<property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.5/mcs.exe')}" />
29442945

29452946
<target name="configure-from-pkg-config">
29462947
<property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
@@ -2979,7 +2980,7 @@
29792980
<attribute name="managed">true</attribute>
29802981
</task>
29812982
<task name="csc">
2982-
<attribute name="exename">gmcs</attribute>
2983+
<attribute name="exename">${csc.tool}</attribute>
29832984
<attribute name="managed">true</attribute>
29842985
<attribute name="langversion">linq</attribute>
29852986
<attribute name="supportspackagereferences">true</attribute>
@@ -3096,6 +3097,7 @@
30963097

30973098
<property name="toolDirectory" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.0')}" />
30983099
<property name="runtimeEngine" value="${path::combine(sdkInstallRoot, 'bin/mono.exe')}" />
3100+
<property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.5/mcs.exe')}" />
30993101

31003102
<target name="configure-from-pkg-config">
31013103
<property name="mono.version" value="${pkg-config::get-mod-version('mono')}" />
@@ -3134,7 +3136,7 @@
31343136
<attribute name="managed">true</attribute>
31353137
</task>
31363138
<task name="csc">
3137-
<attribute name="exename">dmcs</attribute>
3139+
<attribute name="exename">${csc.tool}</attribute>
31383140
<attribute name="managed">true</attribute>
31393141
<attribute name="langversion">linq</attribute>
31403142
<attribute name="supportspackagereferences">true</attribute>
@@ -3534,7 +3536,7 @@
35343536
<attribute name="managed">true</attribute>
35353537
</task>
35363538
<task name="csc">
3537-
<attribute name="exename">gmcs</attribute>
3539+
<attribute name="exename">mcs</attribute>
35383540
<attribute name="managed">true</attribute>
35393541
<attribute name="supportspackagereferences">true</attribute>
35403542
<attribute name="supportsnowarnlist">true</attribute>
@@ -3543,6 +3545,7 @@
35433545
<attribute name="supportskeyfile">true</attribute>
35443546
<attribute name="supportsdelaysign">true</attribute>
35453547
<attribute name="supportslangversion">true</attribute>
3548+
<arg value="--langversion:ISO-2" />
35463549
</task>
35473550
<task name="jsc">
35483551
<attribute name="exename">mjs</attribute>
@@ -3629,13 +3632,14 @@
36293632
<property name="resgen.supportsexternalfilereferences" value="false" />
36303633
<property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
36313634
<property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/3.5')}" />
3635+
<property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.5/mcs.exe')}" />
36323636
</project>
36333637
<tasks>
36343638
<task name="al">
36353639
<attribute name="managed">true</attribute>
36363640
</task>
36373641
<task name="csc">
3638-
<attribute name="exename">gmcs</attribute>
3642+
<attribute name="exename">${csc.tool}</attribute>
36393643
<attribute name="managed">true</attribute>
36403644
<attribute name="langversion">linq</attribute>
36413645
<attribute name="supportspackagereferences">true</attribute>
@@ -3734,13 +3738,14 @@
37343738
<property name="resgen.supportsexternalfilereferences" value="false" />
37353739
<property name="prefix" value="${pkg-config::get-variable('mono', 'prefix')}" />
37363740
<property name="toolDirectory" value="${path::combine(prefix, 'lib/mono/4.0')}" />
3741+
<property name="csc.tool" value="${path::combine(frameworkAssemblyDirectory, 'mono/4.5/mcs.exe')}" />
37373742
</project>
37383743
<tasks>
37393744
<task name="al">
37403745
<attribute name="managed">true</attribute>
37413746
</task>
37423747
<task name="csc">
3743-
<attribute name="exename">dmcs</attribute>
3748+
<attribute name="exename">${csc.tool}</attribute>
37443749
<attribute name="managed">true</attribute>
37453750
<attribute name="langversion">linq</attribute>
37463751
<attribute name="supportspackagereferences">true</attribute>

0 commit comments

Comments
 (0)