Merge pull request #6 from Microsoft/1-0-6

Remove default plug-ins and pre-release data from driver command base…

BuildAndTest.cmd

@@ -6,7 +6,7 @@ SETLOCAL
 
 set MAJOR=1
 set MINOR=0
-set PATCH=5
+set PATCH=6
 set PRERELEASE=-beta
 
 set VERSION_CONSTANTS=src\Sarif.Driver\VersionConstants.cs

src/Sarif.Driver/Sarif.Driver.csproj

@@ -132,6 +132,7 @@
     <Compile Include="Sdk\MessageUtilities.cs" />
     <Compile Include="Sdk\NoteDescriptors.cs" />
     <Compile Include="Sdk\PerLanguageOption.cs" />
+    <Compile Include="Sdk\PlugInDriverCommand.cs" />
     <Compile Include="Sdk\PropertyBag.cs" />
     <Compile Include="Sdk\PropertyBagExtensionMethods.cs" />
     <Compile Include="Sdk\ResultLogger.cs" />

src/Sarif.Driver/Sdk/DriverCommand.cs

@@ -9,14 +9,6 @@ namespace Microsoft.CodeAnalysis.Sarif.Driver.Sdk
 {
     public abstract class DriverCommand<T> 
     {
-        public virtual IEnumerable<Assembly> DefaultPlugInAssemblies
-        {
-            get { return null;  }
-            set { throw new InvalidOperationException(); }
-        }
-
-        public abstract string Prerelease { get; }
-
         abstract public int Run(T options);
 
         public const int FAILURE = 1;

src/Sarif.Driver/Sdk/ExportConfigurationCommandBase.cs

@@ -9,7 +9,7 @@ using System.Reflection;
 
 namespace Microsoft.CodeAnalysis.Sarif.Driver.Sdk
 {
-    public abstract class ExportConfigurationCommandBase : DriverCommand<ExportConfigurationOptions>
+    public abstract class ExportConfigurationCommandBase : PlugInDriverCommand<ExportConfigurationOptions>
     {
         public override int Run(ExportConfigurationOptions exportOptions)
         {

src/Sarif.Driver/Sdk/ExportRulesMetadataCommandBase.cs

@@ -15,7 +15,7 @@ using Newtonsoft.Json;
 
 namespace Microsoft.CodeAnalysis.Sarif.Driver.Sdk
 {
-    public abstract class ExportRulesMetadataCommandBase : DriverCommand<ExportRulesMetadataOptions>
+    public abstract class ExportRulesMetadataCommandBase : PlugInDriverCommand<ExportRulesMetadataOptions>
     {
 
         public override int Run(ExportRulesMetadataOptions exportOptions)

src/Sarif.Driver/Sdk/PlugInDriverCommand.cs

@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+
+namespace Microsoft.CodeAnalysis.Sarif.Driver.Sdk
+{
+    public abstract class PlugInDriverCommand<T> : DriverCommand<T>
+    {
+        public virtual IEnumerable<Assembly> DefaultPlugInAssemblies
+        {
+            get { return null; }
+            set { throw new InvalidOperationException(); }
+        }
+
+        public abstract string Prerelease { get; }
+    }
+}

src/Sarif.Driver/VersionConstants.cs

@@ -5,7 +5,7 @@ namespace Microsoft.CodeAnalysis.Sarif
     public static class VersionConstants                                       
     {                                                                          
         public const string Prerelease = "-beta";                       
-        public const string AssemblyVersion = "1.0.4";       
+        public const string AssemblyVersion = "1.0.6";       
         public const string FileVersion = AssemblyVersion + ".0";              
         public const string Version = AssemblyVersion + Prerelease;            
     }