Skip to content

Commit 0ac6335

Browse files
committed
Merge pull request #326 from chester89/v2.0.2
version 2.0.2
2 parents 6302b20 + aea486a commit 0ac6335

File tree

69 files changed

+562
-4840
lines changed

Some content is hidden

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

69 files changed

+562
-4840
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,3 @@ build
2727
*.nupkg
2828
logs/
2929
src/CommonAssemblyInfo.cs
30-
src/FluentNHibernate.nuspec

Build.bat

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

MIRROR

Whitespace-only changes.

RakeFile

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,12 @@ namespace :source do
7272
info.product_name = 'FluentNHibernate'
7373
info.description = commit_hash[0..(commit_hash.length - 3)]
7474
info.copyright = "Copyright 2008-#{Time.new.year} James Gregory and contributors (Paul Batum, Hudson Akridge et al). All rights reserved."
75-
info.namespaces = ['System.Security']
75+
info.namespaces = ['System', 'System.Security', 'System.Runtime.CompilerServices']
76+
77+
info.custom_attributes = {
78+
:CLSCompliant => true,
79+
:InternalsVisibleTo => "FluentNHibernate.Testing"
80+
}
7681

7782
puts "The new version is #{info.version}"
7883
end
@@ -94,7 +99,7 @@ namespace :source do
9499
DefineConstants: nh_version_precompiler_switch,
95100
WarningLevel: 0
96101
}
97-
msbuild.targets [:Clean, :Build]
102+
msbuild.targets [:Build]
98103
msbuild.solution = SLN
99104
msbuild.verbosity = :minimal
100105
msbuild.parameters = ["/p:TargetFrameworkVersion=#{Platform.config['build']['msbuild_runtime']}"]
@@ -222,6 +227,31 @@ namespace :package do
222227
end
223228
end
224229

230+
task :upgradeNhVersion, :version do |cmd, args|
231+
fail "Please provide version number to work with" if not args.has_key?(:version)
232+
puts "Updating NH version to #{args[:version]}"
233+
puts "Editing packages.config files..."
234+
packages_configs = Rake::FileList['**/packages.config']
235+
packages_configs.each do |pc|
236+
update_xml pc do |xml|
237+
xml.root.elements["package[@id='NHibernate']"].attributes['version'] = args[:version]
238+
end
239+
puts "Upgraded #{pc}"
240+
end
241+
242+
puts "Editing .csproj files..."
243+
project_files = Rake::FileList['**/*.csproj']
244+
project_files.each do |pf|
245+
update_xml pf do |xml|
246+
old_value = xml.root.elements["ItemGroup[1]/Reference[contains(@Include, 'NHibernate')]/HintPath"].text
247+
new_value = old_value.gsub(/(\d+).(\d+).(\d+).(\d+)/, args[:version])
248+
xml.root.elements["ItemGroup[1]/Reference[contains(@Include, 'NHibernate')]/HintPath"].text = new_value
249+
end
250+
puts "Upgraded #{pf}"
251+
end
252+
puts "Done."
253+
end
254+
225255
nugetpack :nupack do |nu|
226256
nu.command = 'tools/nuget/NuGet.exe'
227257
nu.nuspec = NUSPEC
@@ -240,6 +270,7 @@ def update_xml(xml_path)
240270
#Open up the xml file
241271
xml_file = File.new(xml_path)
242272
xml = REXML::Document.new xml_file
273+
xml.context[:attribute_quote] = :quote
243274

244275
#Allow caller to make the changes
245276
yield xml
@@ -257,4 +288,4 @@ task :sln do
257288
Thread.new do
258289
system "devenv #{SLN}"
259290
end
260-
end
291+
end

buildsupport/BuildUtils.rb

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

buildsupport/ILMerge.exe

-753 KB
Binary file not shown.

buildsupport/ILRepack.rb

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

buildsupport/RakeFile

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

buildsupport/Ruby_Not_Installed.txt

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

buildsupport/common.rb

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

0 commit comments

Comments
 (0)