Skip to content

Commit a7d50c5

Browse files
committed
Made the compile tasks depend on the nuget restore tasks
1 parent a131148 commit a7d50c5

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

rakefile.rb

+5-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
end
1818

1919
desc "Compiles solution and runs unit tests"
20-
task :default => [:clean, :assembly_info, :nuget_restore, :compile, :test, :publish, :package]
20+
task :default => [:clean, :assembly_info, :compile, :test, :publish, :package]
2121

2222
desc "Executes all Xunit tests"
2323
task :test => [:xunit]
2424

2525
desc "Compiles solution and runs unit tests for Mono"
26-
task :mono => [:clean, :assembly_info, :nuget_restore_mono, :compilemono, :testmono]
26+
task :mono => [:clean, :assembly_info, :compilemono, :testmono]
2727

2828
desc "Executes all tests with Mono"
2929
task :testmono => [:xunitmono]
@@ -48,14 +48,14 @@
4848
end
4949

5050
desc "Compile solution file"
51-
msbuild :compile => [:assembly_info] do |msb|
51+
msbuild :compile => [:nuget_restore, :assembly_info] do |msb|
5252
msb.properties = { :configuration => CONFIGURATION, "VisualStudioVersion" => get_vs_version() }
5353
msb.targets :Clean, :Build
5454
msb.solution = SOLUTION_FILE
5555
end
5656

5757
desc "Compile solution file for Mono"
58-
xbuild :compilemono => [:assembly_info] do |xb|
58+
xbuild :compilemono => [:nuget_restore_mono, :assembly_info] do |xb|
5959
xb.solution = SOLUTION_FILE
6060
xb.properties = { :configuration => CONFIGURATIONMONO, "TargetFrameworkProfile" => "", "TargetFrameworkVersion" => "v4.5" }
6161
end
@@ -168,7 +168,7 @@
168168
nupkgs.each do |nupkg|
169169
puts "Pushing #{nupkg}"
170170
nuget_push = NuGetPush.new
171-
nuget_push.apikey = args.api_key if !args.empty?
171+
nuget_push.apikey = args.api_key if !args.empty?
172172
nuget_push.command = "tools/nuget/NuGet.exe"
173173
nuget_push.package = "\"" + nupkg + "\""
174174
nuget_push.create_only = false
@@ -252,8 +252,6 @@ def get_assembly_version(file)
252252
return result[1] if !result.nil?
253253
end
254254
end
255-
256-
''
257255
end
258256

259257
def get_vs_version()

0 commit comments

Comments
 (0)