Skip to content

Commit c74ca43

Browse files
committed
specify target fr version for xbuild
1 parent 467cd81 commit c74ca43

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

RakeFile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,23 +88,25 @@ namespace :source do
8888
task :choose_build_runner do |cmd, args|
8989
task_name = 'source:' + (Platform.is_nix()? 'x': 'ms') + 'build'
9090

91+
args.with_defaults :nhibernate_version => ('NH' + NH_VERSION.gsub('.', ''))
92+
puts 'Precompiler switch: ' + args[:nhibernate_version]
93+
9194
Rake::Task[task_name].reenable
9295
Rake::Task[task_name].invoke(args)
9396
end
9497

9598
xbuild :xbuild do |xb|
9699
xb.solution = SLN
97100
xb.targets = [:Clean, :Build]
98-
xb.properties = {:Configuration => "Release"}
101+
xb.properties = {
102+
:verbosity => :minimal,
103+
:Configuration => "Release",
104+
:DefineConstants => args[:nhibernate_version],
105+
:TargetFrameworkVersion => Platform.config['build']['target_framework']
106+
}
99107
end
100108

101-
msbuild :msbuild, [:nhibernate_version] => :nhibernate_version do |msbuild, args|
102-
args.with_defaults :nhibernate_version => NH_VERSION
103-
104-
nh_version_precompiler_switch = 'NH' + args.nhibernate_version.gsub('.', '')
105-
106-
puts 'Precompiler switch: ' + nh_version_precompiler_switch
107-
109+
msbuild :msbuild, [:nhibernate_version] => :nhibernate_version do |msbuild, args|
108110
msbuild.properties = {
109111
configuration: :Release,
110112
DefineConstants: nh_version_precompiler_switch,
@@ -113,7 +115,7 @@ namespace :source do
113115
msbuild.targets [:Clean, :Build]
114116
msbuild.solution = SLN
115117
msbuild.verbosity = :minimal
116-
msbuild.parameters = ["/p:TargetFrameworkVersion=#{Platform.config['build']['msbuild_runtime']}"]
118+
msbuild.parameters = ["/p:TargetFrameworkVersion=#{Platform.config['build']['target_framework']}"]
117119
end
118120
end
119121

config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"build":
1010
{
1111
"nh_precompiler_switch": "3.x",
12-
"msbuild_runtime": "v3.5"
12+
"target_framework": "v3.5"
1313
},
1414
"tests":
1515
{

0 commit comments

Comments
 (0)