Internalized litjson, use Cake.Common & Cake.Core from NuGet

cake-contrib · Sep 15, 2015 · 4c48038 · 4c48038
1 parent bce9fb4
commit 4c48038
Show file tree

Hide file tree

Showing 10 changed files with 521 additions and 34 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,4 +1,6 @@
-### New in 0.1.0 (Released 2015/06/27)
+### New in 0.1.1 (Released 2015/09/15)
+* Internalized some classes and fixed categories for documentation
+### New in 0.1.0 (Released 2015/09/15)
 * Removed obsolete code
 * Added xml/pdb to NuGet
 ### New in 0.0.2 (Released 2015/06/27)

diff --git a/addinprep.cake b/addinprep.cake
diff --git a/src/Cake.Slack/Cake.Slack.csproj b/src/Cake.Slack/Cake.Slack.csproj
@@ -42,12 +42,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Cake.Common">
-      <HintPath>..\..\tools\Cake\Cake.Common.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\Cake.Common.0.5.4\lib\net45\Cake.Common.dll</HintPath>
     </Reference>
     <Reference Include="Cake.Core">
-      <HintPath>..\..\tools\Cake\Cake.Core.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\Cake.Core.0.5.4\lib\net45\Cake.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -83,13 +81,17 @@
     <None Include="slack.cake">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="T4\IncludeHeader.ttinclude" />
+    <None Include="T4\IncludeWebFile.ttinclude" />
   </ItemGroup>
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PreBuildEvent>powershell.exe -NoLogo -NonInteractive -ExecutionPolicy Unrestricted -NoProfile -Command  "cd $(SolutionDir)..\;.\build.ps1 -Script .\addinprep.cake"</PreBuildEvent>
+    <PreBuildEvent>
+    </PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/src/Cake.Slack/Include_T4Include.cs b/src/Cake.Slack/Include_T4Include.cs
@@ -1,6 +1,7 @@
 //Disable documentation warning for external code
 #pragma warning disable 1591
 #pragma warning disable 1587
+#pragma warning disable 3019
 // ############################################################################
 // #                                                                          #
 // #        ---==>  T H I S  F I L E  I S   G E N E R A T E D  <==---         #
@@ -51,7 +52,7 @@ namespace Cake.Slack
 
     namespace LitJson
     {
-        public enum JsonType
+        internal enum JsonType
         {
             None,
 
@@ -64,7 +65,7 @@ public enum JsonType
             Boolean
         }
 
-        public interface IJsonWrapper : IList, IOrderedDictionary
+        internal interface IJsonWrapper : IList, IOrderedDictionary
         {
             bool IsArray   { get; }
             bool IsBoolean { get; }
@@ -121,7 +122,7 @@ namespace Cake.Slack
 
     namespace LitJson
     {
-        public class JsonData : IJsonWrapper, IEquatable<JsonData>
+        internal class JsonData : IJsonWrapper, IEquatable<JsonData>
         {
             #region Fields
             private IList<JsonData>               inst_array;
@@ -1126,7 +1127,7 @@ namespace Cake.Slack
 
     namespace LitJson
     {
-        public class JsonException : ApplicationException
+        internal class JsonException : ApplicationException
         {
             public JsonException () : base ()
             {
@@ -1269,15 +1270,15 @@ public IDictionary<string, PropertyMetadata> Properties {
 
 
         internal delegate void ExporterFunc    (object obj, JsonWriter writer);
-        public   delegate void ExporterFunc<T> (T obj, JsonWriter writer);
+        internal   delegate void ExporterFunc<T> (T obj, JsonWriter writer);
 
         internal delegate object ImporterFunc                (object input);
-        public   delegate TValue ImporterFunc<TJson, TValue> (TJson input);
+        internal   delegate TValue ImporterFunc<TJson, TValue> (TJson input);
 
-        public delegate IJsonWrapper WrapperFactory ();
+        internal delegate IJsonWrapper WrapperFactory ();
 
 
-        public class JsonMapper
+        internal class JsonMapper
         {
             #region Fields
             private static readonly int max_nesting_depth;
@@ -2132,7 +2133,7 @@ namespace Cake.Slack
 
     namespace LitJson
     {
-        public enum JsonToken
+        internal enum JsonToken
         {
             None,
 
@@ -2154,7 +2155,7 @@ public enum JsonToken
         }
 
 
-        public class JsonReader
+        internal class JsonReader
         {
             #region Fields
             private static readonly IDictionary<int, IDictionary<int, int[]>> parse_table;
@@ -2634,7 +2635,7 @@ internal class WriterContext
             public int  Padding;
         }
 
-        public class JsonWriter
+        internal class JsonWriter
         {
             #region Fields
             private static readonly NumberFormatInfo number_format;
@@ -3086,7 +3087,7 @@ namespace Cake.Slack
 
     namespace LitJson
     {
-        public class JsonMockWrapper : IJsonWrapper
+        internal class JsonMockWrapper : IJsonWrapper
         {
             public bool IsArray   { get { return false; } }
             public bool IsBoolean { get { return false; } }
@@ -4157,7 +4158,7 @@ namespace Cake.Slack.Include
     static partial class MetaData
     {
         public const string RootPath        = @"https://raw.github.com/";
-        public const string IncludeDate     = @"2015-09-15T16:30:30";
+        public const string IncludeDate     = @"2015-09-15T23:12:17";
 
         public const string Include_0       = @"https://raw.github.com/WCOMAB/litjson/master/src/LitJson/IJsonWrapper.cs";
         public const string Include_1       = @"https://raw.github.com/WCOMAB/litjson/master/src/LitJson/JsonData.cs";

diff --git a/src/Cake.Slack/Include_T4Include.tt b/src/Cake.Slack/Include_T4Include.tt
@@ -1,6 +1,7 @@
 //Disable documentation warning for external code
 #pragma warning disable 1591
 #pragma warning disable 1587
+#pragma warning disable 3019
 <#
     // Whenever this file is saved the files in the Includes section is downloaded
     // from GitHub (you can download from other websources by changing rootpath)
@@ -9,15 +10,15 @@
     Includes    = new []
         {
             // Lit JSON
-            Include (@"WCOMAB/litjson/master/src/LitJson/IJsonWrapper.cs"),
-            Include (@"WCOMAB/litjson/master/src/LitJson/JsonData.cs"),
-            Include (@"WCOMAB/litjson/master/src/LitJson/JsonException.cs"),
-            Include (@"WCOMAB/litjson/master/src/LitJson/JsonMapper.cs"),
-            Include (@"WCOMAB/litjson/master/src/LitJson/JsonReader.cs"),
-            Include (@"WCOMAB/litjson/master/src/LitJson/JsonWriter.cs"),
-            Include (@"WCOMAB/litjson/master/src/LitJson/JsonMockWrapper.cs"),
-            Include (@"WCOMAB/litjson/master/src/LitJson/Lexer.cs"),
-            Include (@"WCOMAB/litjson/master/src/LitJson/ParserToken.cs")
+            Include (@"WCOMAB/litjson/master/src/LitJson/IJsonWrapper.cs",      internalize: true),
+            Include (@"WCOMAB/litjson/master/src/LitJson/JsonData.cs",          internalize: true),
+            Include (@"WCOMAB/litjson/master/src/LitJson/JsonException.cs",     internalize: true),
+            Include (@"WCOMAB/litjson/master/src/LitJson/JsonMapper.cs",        internalize: true),
+            Include (@"WCOMAB/litjson/master/src/LitJson/JsonReader.cs",        internalize: true),
+            Include (@"WCOMAB/litjson/master/src/LitJson/JsonWriter.cs",        internalize: true),
+            Include (@"WCOMAB/litjson/master/src/LitJson/JsonMockWrapper.cs",   internalize: true),
+            Include (@"WCOMAB/litjson/master/src/LitJson/Lexer.cs",             internalize: true),
+            Include (@"WCOMAB/litjson/master/src/LitJson/ParserToken.cs",       internalize: true)
         };
 #>
-<#@ include file="$(SolutionDir)\packages\T4Include.1.1.4\T4\IncludeWebFile.ttinclude" #>
+<#@ include file="T4\IncludeWebFile.ttinclude" #>
diff --git a/src/Cake.Slack/SlackAliases.cs b/src/Cake.Slack/SlackAliases.cs
@@ -7,6 +7,7 @@ namespace Cake.Slack
     /// <summary>
     /// Contains aliases related to SlackProvider API
     /// </summary>
+    [CakeAliasCategoryAttribute("Slack")]
     public static class SlackAliases
     {
         /// <summary>
@@ -16,7 +17,6 @@ public static class SlackAliases
         /// <returns>A <see cref="SlackProvider"/> instance.</returns>
         [CakePropertyAlias(Cache = true)]
         [CakeNamespaceImportAttribute("Cake.Slack.Chat")]
-        [CakeAliasCategoryAttribute("Slack")]
         public static SlackProvider Slack(this ICakeContext context)
         {
             if (context == null)