Skip to content

Commit 1e38810

Browse files
brianrobbrianrob
authored
Increment Versions and Disable Nettrace V6 Support (#2178)
* Increment Versions * Temporarily disable nettrace v6 support.
1 parent d9d860f commit 1e38810

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<PropertyGroup>
2121
<!-- These are the versions of the things we are CREATING in this repository -->
22-
<ReleaseVersion>3.1.19</ReleaseVersion>
22+
<ReleaseVersion>3.1.20</ReleaseVersion>
2323
<FastSerializationVersion>$(ReleaseVersion)</FastSerializationVersion>
2424
<HeapDumpDllVersion>$(ReleaseVersion)</HeapDumpDllVersion>
2525
<MemoryGraphVersion>$(ReleaseVersion)</MemoryGraphVersion>

‎src/TraceEvent/EventPipe/EventPipeEventSource.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private EventPipeEventSource(PinnedStreamReader streamReader, string name, bool
5151
ParseHeadersAndInitCaches();
5252
}
5353

54-
const int MaxSupportedMajorVersion = 6;
54+
const int MaxSupportedMajorVersion = 5;
5555

5656
private void ParseHeadersAndInitCaches()
5757
{

‎src/TraceEvent/TraceEvent.Tests/Parsing/EventPipeParsing.cs‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ public void SkipExtraMetadataParameterSpaceV5()
812812
Assert.Equal(1, eventCount);
813813
}
814814

815-
[Fact]
815+
[Fact(Skip = "NetTrace V6 Support Disabled")]
816816
public void ParseMinimalTraceV6()
817817
{
818818
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -852,7 +852,7 @@ public void ThrowsExceptionOnUnsupportedMajorVersion()
852852
}
853853
}
854854

855-
[Fact]
855+
[Fact(Skip ="NetTrace V6 Support Disabled")]
856856
public void MinorVersionIncrementsAreSupported()
857857
{
858858
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -864,7 +864,7 @@ public void MinorVersionIncrementsAreSupported()
864864
Assert.Equal(6, source.FileFormatVersionNumber);
865865
}
866866

867-
[Fact]
867+
[Fact(Skip = "NetTrace V6 Support Disabled")]
868868
public void ParseV6TraceBlockStandardFields()
869869
{
870870
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -881,7 +881,7 @@ public void ParseV6TraceBlockStandardFields()
881881
Assert.Equal(0, source.NumberOfProcessors);
882882
}
883883

884-
[Fact]
884+
[Fact(Skip = "NetTrace V6 Support Disabled")]
885885
public void ParseV6TraceBlockKeyValuePairs()
886886
{
887887
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -929,7 +929,7 @@ public void ParseV6TraceBlockKeyValuePairs()
929929
}
930930

931931
// In the V6 format readers are expected to skip over any block types they don't recognize. This allows future extensibility.
932-
[Fact]
932+
[Fact(Skip = "NetTrace V6 Support Disabled")]
933933
public void V6UnrecognizedBlockTypesAreSkipped()
934934
{
935935
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -948,7 +948,7 @@ public void V6UnrecognizedBlockTypesAreSkipped()
948948
Assert.Equal(6, source.FileFormatVersionNumber);
949949
}
950950

951-
[Fact]
951+
[Fact(Skip = "NetTrace V6 Support Disabled")]
952952
public void ParseV6Metadata()
953953
{
954954
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -991,7 +991,7 @@ public void ParseV6Metadata()
991991
}
992992

993993

994-
[Fact]
994+
[Fact(Skip = "NetTrace V6 Support Disabled")]
995995
public void ParseV6MetadataArrayParam()
996996
{
997997
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1029,7 +1029,7 @@ public void ParseV6MetadataArrayParam()
10291029
Assert.Equal(1, eventCount);
10301030
}
10311031

1032-
[Fact]
1032+
[Fact(Skip = "NetTrace V6 Support Disabled")]
10331033
public void ParseV6MetadataObjectParam()
10341034
{
10351035
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1069,7 +1069,7 @@ public void ParseV6MetadataObjectParam()
10691069
Assert.Equal(1, eventCount);
10701070
}
10711071

1072-
[Fact]
1072+
[Fact(Skip = "NetTrace V6 Support Disabled")]
10731073
public void ParseV6OptionalMetadata()
10741074
{
10751075
Guid testGuid = Guid.Parse("CA0A7B93-622D-42C9-AFF8-7A09FDA2E30C");
@@ -1109,7 +1109,7 @@ public void ParseV6OptionalMetadata()
11091109
}
11101110

11111111
// Ensure that we can add extra bytes into the metadata encoding everywhere the format says we should be allowed to
1112-
[Fact]
1112+
[Fact(Skip = "NetTrace V6 Support Disabled")]
11131113
public void SkipExtraMetadataSpaceV6()
11141114
{
11151115
Guid testGuid = Guid.Parse("CA0A7B93-622D-42C9-AFF8-7A09FDA2E30C");
@@ -1161,7 +1161,7 @@ public void SkipExtraMetadataSpaceV6()
11611161
Assert.Equal("TestEvent2", metadata2.EventName);
11621162
}
11631163

1164-
[Fact]
1164+
[Fact(Skip = "NetTrace V6 Support Disabled")]
11651165
public void ParseV6LengthPrefixedStrings()
11661166
{
11671167
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1220,7 +1220,7 @@ public void ParseV6LengthPrefixedStrings()
12201220
}
12211221

12221222

1223-
[Fact]
1223+
[Fact(Skip = "NetTrace V6 Support Disabled")]
12241224
public void ParseV6VarInts()
12251225
{
12261226
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1292,7 +1292,7 @@ public void ParseV6VarInts()
12921292
}
12931293

12941294
// Ensure that the new string and varint types still work properly nested inside a struct
1295-
[Fact]
1295+
[Fact(Skip = "NetTrace V6 Support Disabled")]
12961296
public void ParseV6NestedVarIntsAndStrings()
12971297
{
12981298
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1336,7 +1336,7 @@ public void ParseV6NestedVarIntsAndStrings()
13361336
Assert.Equal(1, eventCount);
13371337
}
13381338

1339-
[Fact]
1339+
[Fact(Skip = "NetTrace V6 Support Disabled")]
13401340
public void V6MissingThreadBlockThrowsException()
13411341
{
13421342
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1352,7 +1352,7 @@ public void V6MissingThreadBlockThrowsException()
13521352
Assert.Throws<FormatException>(() => source.Process());
13531353
}
13541354

1355-
[Fact]
1355+
[Fact(Skip = "NetTrace V6 Support Disabled")]
13561356
public void V6MismatchedRemoveThreadBlockThrowsException()
13571357
{
13581358
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1376,7 +1376,7 @@ public void V6MismatchedRemoveThreadBlockThrowsException()
13761376
Assert.Throws<FormatException>(() => source.Process());
13771377
}
13781378

1379-
[Fact]
1379+
[Fact(Skip = "NetTrace V6 Support Disabled")]
13801380
public void V6RefAfterRemoveThreadBlockThrowsException()
13811381
{
13821382
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1400,7 +1400,7 @@ public void V6RefAfterRemoveThreadBlockThrowsException()
14001400
Assert.Throws<FormatException>(() => source.Process());
14011401
}
14021402

1403-
[Fact]
1403+
[Fact(Skip = "NetTrace V6 Support Disabled")]
14041404
public void V6DoubleRemoveThreadBlockThrowsException()
14051405
{
14061406
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1428,7 +1428,7 @@ public void V6DoubleRemoveThreadBlockThrowsException()
14281428
Assert.Throws<FormatException>(() => source.Process());
14291429
}
14301430

1431-
[Fact]
1431+
[Fact(Skip = "NetTrace V6 Support Disabled")]
14321432
public void V6ParseSimpleThreadBlock()
14331433
{
14341434
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1472,7 +1472,7 @@ public void V6ParseSimpleThreadBlock()
14721472
Assert.Equal(3, eventCount);
14731473
}
14741474

1475-
[Fact]
1475+
[Fact(Skip = "NetTrace V6 Support Disabled")]
14761476
public void V6ParseMultipleThreadBlocks()
14771477
{
14781478
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1561,7 +1561,7 @@ public void V6ParseMultipleThreadBlocks()
15611561
Assert.Equal(8, eventCount);
15621562
}
15631563

1564-
[Fact]
1564+
[Fact(Skip = "NetTrace V6 Support Disabled")]
15651565
public void V6ParseOptionalThreadData()
15661566
{
15671567
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1601,7 +1601,7 @@ public void V6ParseOptionalThreadData()
16011601
Assert.Equal(1, eventCount);
16021602
}
16031603

1604-
[Theory]
1604+
[Theory(Skip = "NetTrace V6 Support Disabled")]
16051605
[InlineData(true)]
16061606
[InlineData(false)]
16071607
public void V6ParseEventLabelLists(bool useCompressedEventHeaders)
@@ -1719,7 +1719,7 @@ public void V6ParseEventLabelLists(bool useCompressedEventHeaders)
17191719
}
17201720

17211721

1722-
[Fact]
1722+
[Fact(Skip = "NetTrace V6 Support Disabled")]
17231723
public void ParseV6CompressedEventHeaders()
17241724
{
17251725
// these are arbitrary random constants
@@ -1815,7 +1815,7 @@ public void ParseV6CompressedEventHeaders()
18151815
Assert.Equal(7, eventCount);
18161816
}
18171817

1818-
[Fact]
1818+
[Fact(Skip = "NetTrace V6 Support Disabled")]
18191819
public void V6SequencePointDoesNotFlushThreadsByDefault()
18201820
{
18211821
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1845,7 +1845,7 @@ public void V6SequencePointDoesNotFlushThreadsByDefault()
18451845
Assert.Equal(1, eventCount);
18461846
}
18471847

1848-
[Fact]
1848+
[Fact(Skip = "NetTrace V6 Support Disabled")]
18491849
public void V6RedefinedThreadIndexThrowsFormatException()
18501850
{
18511851
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1867,7 +1867,7 @@ public void V6RedefinedThreadIndexThrowsFormatException()
18671867
Assert.Throws<FormatException>(() => source.Process());
18681868
}
18691869

1870-
[Fact]
1870+
[Fact(Skip = "NetTrace V6 Support Disabled")]
18711871
public void V6SequencePointCanFlushThreadsOnDemand()
18721872
{
18731873
EventPipeWriterV6 writer = new EventPipeWriterV6();
@@ -1901,7 +1901,7 @@ public void V6SequencePointCanFlushThreadsOnDemand()
19011901
Assert.Equal(1, eventCount);
19021902
}
19031903

1904-
[Fact]
1904+
[Fact(Skip = "NetTrace V6 Support Disabled")]
19051905
public void V6SequencePointDetectsDroppedEvents()
19061906
{
19071907
EventPipeWriterV6 writer = new EventPipeWriterV6();

0 commit comments

Comments
 (0)