Skip to content

Commit

Permalink
Revert "Matched assembly versioning to actual versioning"
Browse files Browse the repository at this point in the history
This reverts commit 8e51bf1.
  • Loading branch information
kf6kjg committed Aug 7, 2018
1 parent 70fdebd commit dc933ba
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ after_build:
- ps: |
If (Test-Path "bin/OpenSim.Framework.Servers.dll") {
$halcyon_version = (Get-ChildItem -Path bin/OpenSim.Framework.Servers.dll | % versioninfo).ProductVersion
Update-AppveyorBuild -Version "$halcyon_version-$env:APPVEYOR_BUILD_NUMBER"
Update-AppveyorBuild -Version "0.$($halcyon_version.Substring(0, $halcyon_version.lastIndexOf('.')))-$env:APPVEYOR_BUILD_NUMBER"
}
- ps: Rename-Item -Path bin -NewName halcyon

Expand Down
10 changes: 5 additions & 5 deletions OpenSim/Framework/Servers/VersionInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@

using System.Reflection;

// Version format is Major.Minor.Patch.Revision
// Using the "build" number, the 3rd value, as patch is a bit non-standard from MS's perspective. However this is what https://semver.org/ uses it as.
// Using a * for the last number means auto-fill with the # days since 2000. Good for us here as we've always historically used the revision field as a unique ID value. Originally it was the SVN revision number, but since the switch to git that went away.
[assembly: AssemblyVersion("0.9.40.*")]
// Using a * for the third number means auto-fill with the # days since 2000. Good for us here.
// That only leaves us with two in front, so we'll divide the first number by 10.
// i.e. 9.18.R in the assembly is presented as 0.9.18.R
[assembly: AssemblyVersion("9.40.*")]
// Do not provide AssemblyFileVersion and it will be kept in sync.

namespace OpenSim
Expand All @@ -56,7 +56,7 @@ private static string _Initialize()
if (_revision == null)
{
Version ver = typeof(VersionInfo).Assembly.GetName().Version;
_version = String.Format("{0}.{1}.{2}", ver.Major, ver.Minor, ver.Build);
_version = String.Format("{0}.{1}.{2}", ver.Major/10, ver.Major % 10, ver.Minor);
_revision = ver.Build.ToString();
}
return _revision;
Expand Down

0 comments on commit dc933ba

Please sign in to comment.