More packaging work

samueldjack · Mar 10, 2011 · 00122de · 00122de
1 parent 59bcf16
commit 00122de
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/MarkdownDeep/Properties/AssemblyInfo.cs b/MarkdownDeep/Properties/AssemblyInfo.cs
@@ -32,7 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
-//[assembly: AssemblyFileVersion("1.0.*")]
-
+[assembly: AssemblyVersion("1.1.*")]
 [assembly: InternalsVisibleTo("MarkdownDeepTests")]
diff --git a/MarkdownDeepJS/MarkdownDeep License.txt b/MarkdownDeepJS/MarkdownDeep License.txt
@@ -0,0 +1,16 @@
+MarkdownDeep License
+====================
+
+MarkdownDeep - <http://www.toptensoftware.com/markdowndeep>  
+Copyright (C) 2010-2011 Topten Software
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this product except in 
+compliance with the License. You may obtain a copy of the License at
+
+<http://www.apache.org/licenses/LICENSE-2.0>
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is 
+distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+See the License for the specific language governing permissions and limitations under the License.
+
+
diff --git a/MarkdownDeepJS/MarkdownDeep Quick Reference.txt b/MarkdownDeepJS/MarkdownDeep Quick Reference.txt
@@ -1,19 +1,6 @@
 MarkdownDeep Quick Reference
 ============================
 
-<http://www.toptensoftware.com/markdowndeep>
-
-Copyright © 2010-2011 Topten Software
-
-MarkdownDeep and its associated files are subject to different license terms for commercial vs non-commercial use.
-Please refer to the following - <http://www.toptensoftware.com/markdowndeep/license> - for more information.
-
-Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either 
-express or implied. 
-
-Please refer to the web site for latest versions, usage instructions, license terms, to report a bug, etc...
-
-
 Setting up the Client Side Editor
 ---------------------------------
 

diff --git a/MarkdownDeepJS/MarkdownDeepJS.csproj b/MarkdownDeepJS/MarkdownDeepJS.csproj
@@ -61,6 +61,7 @@
     <Reference Include="System.Web.Mobile" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="MarkdownDeep License.txt" />
     <Content Include="MarkdownDeep Quick Reference.txt" />
     <Content Include="dingus_min.html" />
     <Content Include="dingus.css" />

diff --git a/MarkdownDeepJS/MarkdownDeepJS.nuspec b/MarkdownDeepJS/MarkdownDeepJS.nuspec
@@ -25,6 +25,7 @@ Package includes:
 		<file src="MarkdownDeepLib.min.js" target="Content\Scripts" />
 		<file src="mdd_*" target="Content\Scripts" />
 		<file src="MarkdownDeep Quick Reference.txt" target="Content\Scripts" />
+		<file src="MarkdownDeep License.txt" target="Content\Scripts" />
 		<file src="..\MarkdownDeep\bin\Release\MarkdownDeep.dll" target="lib\.NetFramework 3.5" />
 		<file src="..\MarkdownDeep\bin\Release\MarkdownDeep.pdb" target="lib\.NetFramework 3.5" />
 	</files>

diff --git a/Output/MarkdownDeep.Full.1.1.nupkg b/Output/MarkdownDeep.Full.1.1.nupkg
diff --git a/Output/MarkdownDeep.NET.1.1.nupkg b/Output/MarkdownDeep.NET.1.1.nupkg