Skip to content

Commit 9576925

Browse files
Merge pull request #887 from YuliiaKovalova/dev/ykovalova/make_ExtendedPropertyReassignmentEventArgs_public
Make ExtendedPropertyReassignmentEventArgs & ExtendedPropertyInitialValueSetEventArgs public
2 parents c1b405f + 6f8a5d7 commit 9576925

File tree

3 files changed

+9
-121
lines changed

3 files changed

+9
-121
lines changed

src/StructuredLogger/BinaryLogger/BuildEventArgsReader.cs

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,18 +1365,18 @@ private BuildEventArgs ReadPropertyReassignmentEventArgs()
13651365
{
13661366
if (_fileFormatVersion >= 25)
13671367
{
1368-
var extendedEvent = new ExtendedPropertyReassignmentEventArgs(
1368+
var reassignmentMessage = GetPropertyReassignmentMessage(propertyName, newValue, previousValue, $"{fields.File} ({fields.LineNumber},{fields.ColumnNumber})");
1369+
var reassignmentEvent = new PropertyReassignmentEventArgs(
13691370
propertyName,
13701371
previousValue,
13711372
newValue,
1372-
fields.File,
1373-
fields.LineNumber,
1374-
fields.ColumnNumber,
1375-
GetPropertyReassignmentMessage(propertyName, newValue, previousValue, $"{fields.File} ({fields.LineNumber},{fields.ColumnNumber})"));
1373+
// the message contains the location
1374+
reassignmentMessage,
1375+
reassignmentMessage);
13761376

1377-
SetCommonFields(extendedEvent, fields);
1377+
SetCommonFields(reassignmentEvent, fields);
13781378

1379-
return extendedEvent;
1379+
return reassignmentEvent;
13801380
}
13811381
else
13821382
{
@@ -1437,17 +1437,11 @@ private BuildEventArgs ReadPropertyInitialValueSetEventArgs()
14371437
message = FormatResourceStringIgnoreCodeAndKeyword(Strings.PropertyAssignment, propertyName, propertyValue, formattedSource);
14381438
}
14391439

1440-
var e = new ExtendedPropertyInitialValueSetEventArgs(
1440+
var e = new PropertyInitialValueSetEventArgs(
14411441
propertyName,
14421442
propertyValue,
14431443
propertySource,
1444-
fields.File,
1445-
fields.LineNumber,
1446-
fields.ColumnNumber,
1447-
message,
1448-
fields.HelpKeyword,
1449-
fields.SenderName,
1450-
fields.Importance);
1444+
message);
14511445
SetCommonFields(e, fields);
14521446

14531447
return e;

src/StructuredLogger/BinaryLogger/ExtendedPropertyInitialValueSetEventArgs.cs

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/StructuredLogger/BinaryLogger/ExtendedPropertyReassignmentEventArgs.cs

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)