Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reversion to 2.3.8. #2125

Merged
merged 3 commits into from
Oct 23, 2020
Merged

Reversion to 2.3.8. #2125

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f5a96d
Reversion to 2.3.8.
michaelcfanning Oct 22, 2020
56c0a10
Merge branch 'master' into 2-3-8
eddynaka Oct 22, 2020
e200bd7
fixing grouping + end of line in versionConstants file
eddynaka Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/Sarif/Autogenerated/Address.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.Serialization;

Copy link
Collaborator

@eddynaka eddynaka Oct 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we add the new grouping for autogenerated files? #Closed

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already fixed

In reply to: 510432670 [](ancestors = 510432670)

using Microsoft.CodeAnalysis.Sarif.Readers;

using Newtonsoft.Json;

namespace Microsoft.CodeAnalysis.Sarif
Expand Down Expand Up @@ -204,4 +206,4 @@ private void Init(int absoluteAddress, int? relativeAddress, int? length, string
}
}
}
}
}
4 changes: 3 additions & 1 deletion src/Sarif/Autogenerated/Invocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -487,4 +489,4 @@ protected virtual void Init(string commandLine, IEnumerable<string> arguments, I
}
}
}
}
}
4 changes: 3 additions & 1 deletion src/Sarif/Autogenerated/ReportingConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -157,4 +159,4 @@ private void Init(bool enabled, FailureLevel level, double rank, IDictionary<str
}
}
}
}
}
4 changes: 3 additions & 1 deletion src/Sarif/Autogenerated/ReportingDescriptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -312,4 +314,4 @@ private void Init(string id, IEnumerable<string> deprecatedIds, string guid, IEn
}
}
}
}
}
4 changes: 3 additions & 1 deletion src/Sarif/Autogenerated/Result.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -666,4 +668,4 @@ private void Init(string ruleId, int ruleIndex, ReportingDescriptorReference rul
}
}
}
}
}
4 changes: 3 additions & 1 deletion src/Sarif/Autogenerated/Run.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
using System.Collections.Generic;
using System.ComponentModel;
using System.Runtime.Serialization;
Copy link
Member Author

@michaelcfanning michaelcfanning Oct 22, 2020 •
edited by eddynaka
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Serialization [](start = 21, length = 13)

why are we seeing these changes? isn't our dotnet-format exclusion getting honored? we can certainly update the autogenerator code to make this fix. #Closed

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably when you opened / saved, it separated in groups.
About the real fix, sure that would be a good idea!

In reply to: 510438497 [](ancestors = 510438497)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already fixed

In reply to: 510440931 [](ancestors = 510440931,510438497)


using Microsoft.CodeAnalysis.Sarif.Readers;

using Newtonsoft.Json;

namespace Microsoft.CodeAnalysis.Sarif
Expand Down Expand Up @@ -682,4 +684,4 @@ private void Init(Tool tool, IEnumerable<Invocation> invocations, Conversion con
}
}
}
}
}
4 changes: 3 additions & 1 deletion src/Sarif/Autogenerated/SarifLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -186,4 +188,4 @@ private void Init(Uri schemaUri, SarifVersion version, IEnumerable<Run> runs, IE
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/Sarif/VersionConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ public static class VersionConstants
public const string SchemaVersionAsPublishedToSchemaStoreOrg = "2.1.0-rtm.5";
public const string StableSarifVersion = "2.1.0";
}
}
}
Copy link
Collaborator

@eddynaka eddynaka Oct 22, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should have a new line in the end. With dotnet-format, we are checking that as well

Run dotnet-format --folder --check --exclude .\src\Sarif\Autogenerated\
  Formatting code files in workspace 'D:\a\sarif-sdk\sarif-sdk'.
  sarif-sdk\src\Sarif\VersionConstants.cs(11,2): Fix final newline.
  Formatted code file 'D:\a\sarif-sdk\sarif-sdk\src\Sarif\VersionConstants.cs'.
  Format complete in 5983ms.
``` #Closed

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be the following, I think. This will still work in the pipeline (where the bld and packages dirs don't exist)

Run dotnet-format --folder --check --exclude .\src\Sarif\Autogenerated\ --exclude .\src\packages\ --exclude .\bld\

In reply to: 510433793 [](ancestors = 510433793)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no problem, i can create a new pr adding those exclusions. The point here is that we need to add a new line in the end for this file :)

In reply to: 510439559 [](ancestors = 510439559,510433793)

4 changes: 2 additions & 2 deletions src/build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
-->
<VersionPrefix>2.3.7</VersionPrefix>
<PreviousVersionPrefix>2.3.6</PreviousVersionPrefix>
<VersionPrefix>2.3.8</VersionPrefix>
<PreviousVersionPrefix>2.3.7</PreviousVersionPrefix>

<!-- SchemaVersionAsPublishedToSchemaStoreOrg identifies the current published version on json schema store at https://schemastore.azurewebsites.net/schemas/json/ -->
<SchemaVersionAsPublishedToSchemaStoreOrg>2.1.0-rtm.5</SchemaVersionAsPublishedToSchemaStoreOrg>
Expand Down