From 5f5a96d7cf96dd1641b4af64a4c895da90506479 Mon Sep 17 00:00:00 2001 From: Michael Fanning Date: Thu, 22 Oct 2020 13:15:38 -0700 Subject: [PATCH 1/2] Reversion to 2.3.8. --- src/Sarif/Autogenerated/Address.cs | 4 +++- src/Sarif/Autogenerated/Invocation.cs | 4 +++- src/Sarif/Autogenerated/ReportingConfiguration.cs | 4 +++- src/Sarif/Autogenerated/ReportingDescriptor.cs | 4 +++- src/Sarif/Autogenerated/Result.cs | 4 +++- src/Sarif/Autogenerated/Run.cs | 4 +++- src/Sarif/Autogenerated/SarifLog.cs | 4 +++- src/Sarif/VersionConstants.cs | 2 +- src/build.props | 4 ++-- 9 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/Sarif/Autogenerated/Address.cs b/src/Sarif/Autogenerated/Address.cs index ddaef8100..0538ddc2f 100644 --- a/src/Sarif/Autogenerated/Address.cs +++ b/src/Sarif/Autogenerated/Address.cs @@ -6,7 +6,9 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; + using Microsoft.CodeAnalysis.Sarif.Readers; + using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif @@ -204,4 +206,4 @@ private void Init(int absoluteAddress, int? relativeAddress, int? length, string } } } -} \ No newline at end of file +} diff --git a/src/Sarif/Autogenerated/Invocation.cs b/src/Sarif/Autogenerated/Invocation.cs index b40d01327..f877a5e98 100644 --- a/src/Sarif/Autogenerated/Invocation.cs +++ b/src/Sarif/Autogenerated/Invocation.cs @@ -5,7 +5,9 @@ using System.CodeDom.Compiler; using System.Collections.Generic; using System.Runtime.Serialization; + using Microsoft.CodeAnalysis.Sarif.Readers; + using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif @@ -487,4 +489,4 @@ protected virtual void Init(string commandLine, IEnumerable arguments, I } } } -} \ No newline at end of file +} diff --git a/src/Sarif/Autogenerated/ReportingConfiguration.cs b/src/Sarif/Autogenerated/ReportingConfiguration.cs index a560cbffa..320ca9201 100644 --- a/src/Sarif/Autogenerated/ReportingConfiguration.cs +++ b/src/Sarif/Autogenerated/ReportingConfiguration.cs @@ -6,7 +6,9 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; + using Microsoft.CodeAnalysis.Sarif.Readers; + using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif @@ -157,4 +159,4 @@ private void Init(bool enabled, FailureLevel level, double rank, IDictionary deprecatedIds, string guid, IEn } } } -} \ No newline at end of file +} diff --git a/src/Sarif/Autogenerated/Result.cs b/src/Sarif/Autogenerated/Result.cs index cae285333..451e10051 100644 --- a/src/Sarif/Autogenerated/Result.cs +++ b/src/Sarif/Autogenerated/Result.cs @@ -6,7 +6,9 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; + using Microsoft.CodeAnalysis.Sarif.Readers; + using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif @@ -666,4 +668,4 @@ private void Init(string ruleId, int ruleIndex, ReportingDescriptorReference rul } } } -} \ No newline at end of file +} diff --git a/src/Sarif/Autogenerated/Run.cs b/src/Sarif/Autogenerated/Run.cs index 424ef49f0..e6e75f668 100644 --- a/src/Sarif/Autogenerated/Run.cs +++ b/src/Sarif/Autogenerated/Run.cs @@ -6,7 +6,9 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; + using Microsoft.CodeAnalysis.Sarif.Readers; + using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif @@ -682,4 +684,4 @@ private void Init(Tool tool, IEnumerable invocations, Conversion con } } } -} \ No newline at end of file +} diff --git a/src/Sarif/Autogenerated/SarifLog.cs b/src/Sarif/Autogenerated/SarifLog.cs index 9a94b3602..97611a7e2 100644 --- a/src/Sarif/Autogenerated/SarifLog.cs +++ b/src/Sarif/Autogenerated/SarifLog.cs @@ -5,7 +5,9 @@ using System.CodeDom.Compiler; using System.Collections.Generic; using System.Runtime.Serialization; + using Microsoft.CodeAnalysis.Sarif.Readers; + using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif @@ -186,4 +188,4 @@ private void Init(Uri schemaUri, SarifVersion version, IEnumerable runs, IE } } } -} \ No newline at end of file +} diff --git a/src/Sarif/VersionConstants.cs b/src/Sarif/VersionConstants.cs index a548b060a..c65777505 100644 --- a/src/Sarif/VersionConstants.cs +++ b/src/Sarif/VersionConstants.cs @@ -8,4 +8,4 @@ public static class VersionConstants public const string SchemaVersionAsPublishedToSchemaStoreOrg = "2.1.0-rtm.5"; public const string StableSarifVersion = "2.1.0"; } -} +} \ No newline at end of file diff --git a/src/build.props b/src/build.props index 4cf9a34b4..5dff582a6 100644 --- a/src/build.props +++ b/src/build.props @@ -21,8 +21,8 @@ having all the relevant values in one place. This property is actually used by the PowerShell script that hides ("delists") the previous package versions on nuget.org. --> - 2.3.7 - 2.3.6 + 2.3.8 + 2.3.7 2.1.0-rtm.5 From e200bd74d6cfe809141d61faf66d780f97c6d976 Mon Sep 17 00:00:00 2001 From: Eddy Nakamura Date: Thu, 22 Oct 2020 18:50:35 -0300 Subject: [PATCH 2/2] fixing grouping + end of line in versionConstants file --- src/Sarif/Autogenerated/Address.cs | 2 -- src/Sarif/Autogenerated/Invocation.cs | 2 -- src/Sarif/Autogenerated/ReportingConfiguration.cs | 2 -- src/Sarif/Autogenerated/ReportingDescriptor.cs | 2 -- src/Sarif/Autogenerated/Result.cs | 2 -- src/Sarif/Autogenerated/Run.cs | 2 -- src/Sarif/Autogenerated/SarifLog.cs | 2 -- src/Sarif/VersionConstants.cs | 2 +- 8 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/Sarif/Autogenerated/Address.cs b/src/Sarif/Autogenerated/Address.cs index 0538ddc2f..db496d5da 100644 --- a/src/Sarif/Autogenerated/Address.cs +++ b/src/Sarif/Autogenerated/Address.cs @@ -6,9 +6,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; - using Microsoft.CodeAnalysis.Sarif.Readers; - using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif diff --git a/src/Sarif/Autogenerated/Invocation.cs b/src/Sarif/Autogenerated/Invocation.cs index f877a5e98..87a813ef1 100644 --- a/src/Sarif/Autogenerated/Invocation.cs +++ b/src/Sarif/Autogenerated/Invocation.cs @@ -5,9 +5,7 @@ using System.CodeDom.Compiler; using System.Collections.Generic; using System.Runtime.Serialization; - using Microsoft.CodeAnalysis.Sarif.Readers; - using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif diff --git a/src/Sarif/Autogenerated/ReportingConfiguration.cs b/src/Sarif/Autogenerated/ReportingConfiguration.cs index 320ca9201..74423da0c 100644 --- a/src/Sarif/Autogenerated/ReportingConfiguration.cs +++ b/src/Sarif/Autogenerated/ReportingConfiguration.cs @@ -6,9 +6,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; - using Microsoft.CodeAnalysis.Sarif.Readers; - using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif diff --git a/src/Sarif/Autogenerated/ReportingDescriptor.cs b/src/Sarif/Autogenerated/ReportingDescriptor.cs index 3957c2c93..36caa2001 100644 --- a/src/Sarif/Autogenerated/ReportingDescriptor.cs +++ b/src/Sarif/Autogenerated/ReportingDescriptor.cs @@ -5,9 +5,7 @@ using System.CodeDom.Compiler; using System.Collections.Generic; using System.Runtime.Serialization; - using Microsoft.CodeAnalysis.Sarif.Readers; - using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif diff --git a/src/Sarif/Autogenerated/Result.cs b/src/Sarif/Autogenerated/Result.cs index 451e10051..38baa1189 100644 --- a/src/Sarif/Autogenerated/Result.cs +++ b/src/Sarif/Autogenerated/Result.cs @@ -6,9 +6,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; - using Microsoft.CodeAnalysis.Sarif.Readers; - using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif diff --git a/src/Sarif/Autogenerated/Run.cs b/src/Sarif/Autogenerated/Run.cs index e6e75f668..36fde1617 100644 --- a/src/Sarif/Autogenerated/Run.cs +++ b/src/Sarif/Autogenerated/Run.cs @@ -6,9 +6,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Runtime.Serialization; - using Microsoft.CodeAnalysis.Sarif.Readers; - using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif diff --git a/src/Sarif/Autogenerated/SarifLog.cs b/src/Sarif/Autogenerated/SarifLog.cs index 97611a7e2..42139f4b4 100644 --- a/src/Sarif/Autogenerated/SarifLog.cs +++ b/src/Sarif/Autogenerated/SarifLog.cs @@ -5,9 +5,7 @@ using System.CodeDom.Compiler; using System.Collections.Generic; using System.Runtime.Serialization; - using Microsoft.CodeAnalysis.Sarif.Readers; - using Newtonsoft.Json; namespace Microsoft.CodeAnalysis.Sarif diff --git a/src/Sarif/VersionConstants.cs b/src/Sarif/VersionConstants.cs index c65777505..a548b060a 100644 --- a/src/Sarif/VersionConstants.cs +++ b/src/Sarif/VersionConstants.cs @@ -8,4 +8,4 @@ public static class VersionConstants public const string SchemaVersionAsPublishedToSchemaStoreOrg = "2.1.0-rtm.5"; public const string StableSarifVersion = "2.1.0"; } -} \ No newline at end of file +}