Skip to content
This repository has been archived by the owner on Apr 30, 2021. It is now read-only.

Commit

Permalink
Merge pull request #155 from coreycoto/nuget_version_hell
Browse files Browse the repository at this point in the history
Updated MindTouch.Build. Updated DReAM version.
  • Loading branch information
bjorg committed Jan 26, 2016
2 parents 4f9a643 + 9413900 commit 2d0b6f6
Show file tree
Hide file tree
Showing 18 changed files with 46 additions and 37 deletions.
Binary file modified build/mindtouch.build.common.dll
Binary file not shown.
Binary file modified build/mindtouch.build.exe
Binary file not shown.
Binary file modified build/mindtouch.build.tasks.dll
Binary file not shown.
27 changes: 18 additions & 9 deletions mindtouch.build.xml
Original file line number Diff line number Diff line change
@@ -1,44 +1,53 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<assemblies
commit-versioned="true"
commit-versioned="true"
major="2"
minor="5"
minor="6"
release="0"
revision="0">
<assembly
name="mindtouch.dream"
publicKeyToken="b17e0197b56911d2"
assemblyinfo-path="src/mindtouch.dream/AssemblyInfo.cs"
remap="true" />
remap="true"
compatible-with="2.5.0.0" />
<assembly
name="mindtouch.dream.test"
publicKeyToken="b17e0197b56911d2"
assemblyinfo-path="src/mindtouch.dream.test/Properties/AssemblyInfo.cs"
remap="true" />
remap="true"
compatible-with="2.5.0.0" />
<assembly
name="mindtouch.core"
publicKeyToken="b17e0197b56911d2"
assemblyinfo-path="src/mindtouch.core/AssemblyInfo.cs" />
assemblyinfo-path="src/mindtouch.core/AssemblyInfo.cs"
remap="true"
compatible-with="2.5.0.0" />
<assembly
name="mindtouch.host"
publicKeyToken="b17e0197b56911d2"
assemblyinfo-path="src/mindtouch.host/AssemblyInfo.cs" />
assemblyinfo-path="src/mindtouch.host/AssemblyInfo.cs"
remap="true"
compatible-with="2.5.0.0" />
<assembly
name="mindtouch.sqs"
publicKeyToken="b17e0197b56911d2"
assemblyinfo-path="src/mindtouch.sqs/Properties/AssemblyInfo.cs"
remap="true" />
remap="true"
compatible-with="2.5.0.0" />
<assembly
name="mindtouch.blueprints"
publicKeyToken="b17e0197b56911d2"
assemblyinfo-path="src/mindtouch.blueprints/AssemblyInfo.cs"
remap="true" />
remap="true"
compatible-with="2.5.0.0" />
<assembly
name="mindtouch.db"
publicKeyToken="b17e0197b56911d2"
assemblyinfo-path="src/mindtouch.db/Properties/AssemblyInfo.cs"
remap="true" />
remap="true"
compatible-with="2.5.0.0" />
<assembly
file="SgmlReaderDll.dll" />
</assemblies>
Expand Down
4 changes: 2 additions & 2 deletions src/mindtouch.bench/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
4 changes: 2 additions & 2 deletions src/mindtouch.blueprints/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
[assembly: GitBranch("")]
[assembly: GitRevision("")]
[assembly: GitUri("https://github.com/MindTouch/DReAM")]
4 changes: 2 additions & 2 deletions src/mindtouch.core/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
[assembly: GitBranch("")]
[assembly: GitRevision("")]
[assembly: GitUri("https://github.com/MindTouch/DReAM")]
Expand Down
4 changes: 2 additions & 2 deletions src/mindtouch.db/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
[assembly: GitBranch("")]
[assembly: GitRevision("")]
[assembly: GitUri("https://github.com/MindTouch/DReAM")]
Expand Down
4 changes: 2 additions & 2 deletions src/mindtouch.dream.test/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
[assembly: GitBranch("")]
[assembly: GitRevision("")]
[assembly: GitUri("https://github.com/MindTouch/DReAM")]
Expand Down
4 changes: 2 additions & 2 deletions src/mindtouch.dream/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
[assembly: GitBranch("")]
[assembly: GitRevision("")]
[assembly: GitUri("https://github.com/MindTouch/DReAM")]
Expand Down
4 changes: 2 additions & 2 deletions src/mindtouch.host/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
[assembly: GitBranch("")]
[assembly: GitRevision("")]
[assembly: GitUri("https://github.com/MindTouch/DReAM")]
4 changes: 2 additions & 2 deletions src/mindtouch.sqs/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
[assembly: GitBranch("")]
[assembly: GitRevision("")]
[assembly: GitUri("https://github.com/MindTouch/DReAM")]
Expand Down
4 changes: 2 additions & 2 deletions src/tests/DreamMisc/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
4 changes: 2 additions & 2 deletions src/tests/MindTouchTest.Dream/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
4 changes: 2 additions & 2 deletions src/tests/MindTouchTest.Sqs/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
4 changes: 2 additions & 2 deletions src/tests/PriorityQueue/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]
4 changes: 2 additions & 2 deletions src/tests/Storage/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]

[assembly: log4net.Config.XmlConfigurator(Watch = true)]
4 changes: 2 additions & 2 deletions src/tests/test.mindtouch.core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("2.5.0.*")]
[assembly: AssemblyFileVersion("2.5.0.0")]
[assembly: AssemblyVersion("2.6.0")]
[assembly: AssemblyFileVersion("2.6.0.0")]

[assembly: log4net.Config.XmlConfigurator(Watch = true)]
#if SIGNED
Expand Down

0 comments on commit 2d0b6f6

Please sign in to comment.