Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,6 +396,7 @@ private class TrailingAngleBracketPolicy : JsonNamingPolicy
[Theory]
[InlineData(typeof(KeyNameNullPolicy), "Key")]
[InlineData(typeof(ValueNameNullPolicy), "Value")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidPropertyNameFail(Type policyType, string offendingProperty)
{
var options = new JsonSerializerOptions
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,7 @@ public async Task PublicParameterlessCtor_MultiplePublicParameterizedCtors_WithA

#if !BUILDING_SOURCE_GENERATOR_TESTS // These are compile-time warnings from the source generator.
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task MultipleAttributes_NotSupported()
{
async Task RunTestAsync<T>()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ public async Task CaseInsensitiveFails()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("Multi-dim arrays not supported.")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ClassWithUnsupportedCollectionTypes()
{
Exception e;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,6 +324,7 @@ public class ClassWithTwoExtensionProperties
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidExtensionPropertyFail()
{
// Baseline
Expand DownExpand Up@@ -798,7 +799,7 @@ public async Task DeserializeIntoJsonObjectProperty()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif

[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoSystemObjectProperty()
{
string json = @"{""MyDict"":{""Property1"":1}}";
Expand DownExpand Up@@ -1088,6 +1089,7 @@ public class ClassWithInvalidExtensionPropertyStringJsonNode
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ExtensionProperty_InvalidDictionary()
{
var obj1 = new ClassWithInvalidExtensionPropertyStringString();
Expand DownExpand Up@@ -1147,6 +1149,7 @@ public class ClassWithMultipleDictionaries
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoImmutableDictionaryProperty()
{
// baseline
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public async Task CustomNamePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task NullNamePolicy()
{
var options = new JsonSerializerOptions();
Expand DownExpand Up@@ -127,6 +128,7 @@ public async Task JsonPropertyNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameAttributeDuplicateDesignTimeFail()
{
{
Expand All@@ -141,6 +143,7 @@ public async Task JsonNameAttributeDuplicateDesignTimeFail()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCamelCasingFail()
{
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,6 +325,7 @@ public class ClassWithMixedPropertyAccessors_PropertyAttributes
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,7 @@ public async Task Ignore_PublicProperty_ConflictWithPublicDuePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes()
{
// Serialize
Expand All@@ -353,6 +354,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes()
{
// Serialize
Expand All@@ -367,6 +369,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -390,6 +393,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -413,6 +417,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -437,6 +442,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -461,6 +467,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -477,6 +484,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -493,6 +501,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -519,6 +528,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -545,6 +555,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -572,6 +583,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -1138,6 +1150,7 @@ public async Task JsonIgnoreAttribute()
// Needs support for more collections.
[ActiveIssue("https://github.com/dotnet/runtime/issues/53393")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71981")]
public async Task JsonIgnoreAttribute_UnsupportedCollection()
{
string json =
Expand DownExpand Up@@ -1178,7 +1191,7 @@ public async Task JsonIgnoreAttribute_UnsupportedCollection()

var dictionary = new Dictionary<object, object>();
// Uri is an unsupported dictionary key.
dictionary.Add(new Uri("http://foo"), "bar");
dictionary.Add(new Uri("http://typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]"), "bar");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like an accidental change, could you revert please? cc @krwq

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm actually surprised that this doesn't break other platforms.


var concurrentDictionary = new ConcurrentDictionary<object, object>(dictionary);

Expand DownExpand Up@@ -2413,6 +2426,7 @@ public class ClassWithThingsToIgnore_PerProperty
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand All@@ -2433,6 +2447,7 @@ public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(T
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail_EmptyJson(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("", type));
Expand DownExpand Up@@ -2745,6 +2760,7 @@ public async Task JsonIgnoreCondition_Polymorphic()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task SerializationMetadataNotComputedWhenMemberIgnored()
{
string janePayload = @"{""Name"":""Jane Doe""}";
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,6 +300,7 @@ public PropertyVisibilityTests_Default()
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public override async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
// Exception messages direct users to use JsonSourceGenerationMode.Metadata to see a more detailed error.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ public void DeserializeInvalidType(Type type)

[Theory]
[MemberData(nameof(TypesWithInvalidMembers_WithMembers))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task TypeWithInvalidMember(Type classType, Type invalidMemberType, string invalidMemberName)
{
static void ValidateException(InvalidOperationException ex, Type classType, Type invalidMemberType, string invalidMemberName)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ public async Task JsonNullNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCaseInsensitiveFail()
{
string json = @"{""myInt"":1,""MyInt"":2}";
Expand Down
13 changes: 11 additions & 2 deletions src/libraries/tests.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- https://github.com/dotnet/runtime/issues/65356 - OOM while linking -->
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
<!-- Disabling for AOT, and HighAOT - https://github.com/dotnet/runtime/issues/71848 -->
<!--<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />-->

<!-- https://github.com/dotnet/runtime/issues/65411 - possible OOM when compiling
System.Text.Json.SourceGeneration.Roslyn4.0.Tests.dll.bc -> .o -->
Expand DownExpand Up@@ -64,10 +65,18 @@
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\browser-eventpipe\Wasm.Browser.EventPipe.Sample.csproj" />
</ItemGroup>

<!-- wasm EAT/AOT -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(RunDisabledWasmTests)' != 'true' and '$(EnableAggressiveTrimming)' == 'true'">
<!-- Disabling for EAT/AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Wasm aot on all platforms -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true'">
<!-- https://github.com/dotnet/runtime/issues/66118 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\UnitTests\System.Text.RegularExpressions.Unit.Tests.csproj" />
<!-- Normally run with HighAOT, but disabling there, and for AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Projects that don't support code coverage measurement. -->
Expand DownExpand Up@@ -564,7 +573,7 @@
</ItemGroup>

<ItemGroup>
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true'"
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true' and '$(RunAOTCompilation)' == 'true'"
Include="@(HighAOTResourceRequiringProject)" />
</ItemGroup>

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,6 +396,7 @@ private class TrailingAngleBracketPolicy : JsonNamingPolicy
[Theory]
[InlineData(typeof(KeyNameNullPolicy), "Key")]
[InlineData(typeof(ValueNameNullPolicy), "Value")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidPropertyNameFail(Type policyType, string offendingProperty)
{
var options = new JsonSerializerOptions
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,7 @@ public async Task PublicParameterlessCtor_MultiplePublicParameterizedCtors_WithA

#if !BUILDING_SOURCE_GENERATOR_TESTS // These are compile-time warnings from the source generator.
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task MultipleAttributes_NotSupported()
{
async Task RunTestAsync<T>()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ public async Task CaseInsensitiveFails()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("Multi-dim arrays not supported.")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ClassWithUnsupportedCollectionTypes()
{
Exception e;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,6 +324,7 @@ public class ClassWithTwoExtensionProperties
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidExtensionPropertyFail()
{
// Baseline
Expand DownExpand Up@@ -798,7 +799,7 @@ public async Task DeserializeIntoJsonObjectProperty()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif

[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoSystemObjectProperty()
{
string json = @"{""MyDict"":{""Property1"":1}}";
Expand DownExpand Up@@ -1088,6 +1089,7 @@ public class ClassWithInvalidExtensionPropertyStringJsonNode
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ExtensionProperty_InvalidDictionary()
{
var obj1 = new ClassWithInvalidExtensionPropertyStringString();
Expand DownExpand Up@@ -1147,6 +1149,7 @@ public class ClassWithMultipleDictionaries
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoImmutableDictionaryProperty()
{
// baseline
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public async Task CustomNamePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task NullNamePolicy()
{
var options = new JsonSerializerOptions();
Expand DownExpand Up@@ -127,6 +128,7 @@ public async Task JsonPropertyNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameAttributeDuplicateDesignTimeFail()
{
{
Expand All@@ -141,6 +143,7 @@ public async Task JsonNameAttributeDuplicateDesignTimeFail()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCamelCasingFail()
{
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,6 +325,7 @@ public class ClassWithMixedPropertyAccessors_PropertyAttributes
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,7 @@ public async Task Ignore_PublicProperty_ConflictWithPublicDuePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes()
{
// Serialize
Expand All@@ -353,6 +354,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes()
{
// Serialize
Expand All@@ -367,6 +369,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -390,6 +393,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -413,6 +417,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -437,6 +442,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -461,6 +467,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -477,6 +484,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -493,6 +501,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -519,6 +528,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -545,6 +555,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -572,6 +583,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -1138,6 +1150,7 @@ public async Task JsonIgnoreAttribute()
// Needs support for more collections.
[ActiveIssue("https://github.com/dotnet/runtime/issues/53393")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71981")]
public async Task JsonIgnoreAttribute_UnsupportedCollection()
{
string json =
Expand DownExpand Up@@ -1178,7 +1191,7 @@ public async Task JsonIgnoreAttribute_UnsupportedCollection()

var dictionary = new Dictionary<object, object>();
// Uri is an unsupported dictionary key.
dictionary.Add(new Uri("http://foo"), "bar");
dictionary.Add(new Uri("http://typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]"), "bar");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like an accidental change, could you revert please? cc @krwq

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm actually surprised that this doesn't break other platforms.


var concurrentDictionary = new ConcurrentDictionary<object, object>(dictionary);

Expand DownExpand Up@@ -2413,6 +2426,7 @@ public class ClassWithThingsToIgnore_PerProperty
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand All@@ -2433,6 +2447,7 @@ public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(T
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail_EmptyJson(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("", type));
Expand DownExpand Up@@ -2745,6 +2760,7 @@ public async Task JsonIgnoreCondition_Polymorphic()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task SerializationMetadataNotComputedWhenMemberIgnored()
{
string janePayload = @"{""Name"":""Jane Doe""}";
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,6 +300,7 @@ public PropertyVisibilityTests_Default()
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public override async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
// Exception messages direct users to use JsonSourceGenerationMode.Metadata to see a more detailed error.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ public void DeserializeInvalidType(Type type)

[Theory]
[MemberData(nameof(TypesWithInvalidMembers_WithMembers))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task TypeWithInvalidMember(Type classType, Type invalidMemberType, string invalidMemberName)
{
static void ValidateException(InvalidOperationException ex, Type classType, Type invalidMemberType, string invalidMemberName)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ public async Task JsonNullNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCaseInsensitiveFail()
{
string json = @"{""myInt"":1,""MyInt"":2}";
Expand Down
13 changes: 11 additions & 2 deletions src/libraries/tests.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- https://github.com/dotnet/runtime/issues/65356 - OOM while linking -->
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
<!-- Disabling for AOT, and HighAOT - https://github.com/dotnet/runtime/issues/71848 -->
<!--<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />-->

<!-- https://github.com/dotnet/runtime/issues/65411 - possible OOM when compiling
System.Text.Json.SourceGeneration.Roslyn4.0.Tests.dll.bc -> .o -->
Expand DownExpand Up@@ -64,10 +65,18 @@
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\browser-eventpipe\Wasm.Browser.EventPipe.Sample.csproj" />
</ItemGroup>

<!-- wasm EAT/AOT -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(RunDisabledWasmTests)' != 'true' and '$(EnableAggressiveTrimming)' == 'true'">
<!-- Disabling for EAT/AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Wasm aot on all platforms -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true'">
<!-- https://github.com/dotnet/runtime/issues/66118 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\UnitTests\System.Text.RegularExpressions.Unit.Tests.csproj" />
<!-- Normally run with HighAOT, but disabling there, and for AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Projects that don't support code coverage measurement. -->
Expand DownExpand Up@@ -564,7 +573,7 @@
</ItemGroup>

<ItemGroup>
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true'"
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true' and '$(RunAOTCompilation)' == 'true'"
Include="@(HighAOTResourceRequiringProject)" />
</ItemGroup>

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,6 +396,7 @@ private class TrailingAngleBracketPolicy : JsonNamingPolicy
[Theory]
[InlineData(typeof(KeyNameNullPolicy), "Key")]
[InlineData(typeof(ValueNameNullPolicy), "Value")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidPropertyNameFail(Type policyType, string offendingProperty)
{
var options = new JsonSerializerOptions
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,7 @@ public async Task PublicParameterlessCtor_MultiplePublicParameterizedCtors_WithA

#if !BUILDING_SOURCE_GENERATOR_TESTS // These are compile-time warnings from the source generator.
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task MultipleAttributes_NotSupported()
{
async Task RunTestAsync<T>()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ public async Task CaseInsensitiveFails()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("Multi-dim arrays not supported.")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ClassWithUnsupportedCollectionTypes()
{
Exception e;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,6 +324,7 @@ public class ClassWithTwoExtensionProperties
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidExtensionPropertyFail()
{
// Baseline
Expand DownExpand Up@@ -798,7 +799,7 @@ public async Task DeserializeIntoJsonObjectProperty()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif

[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoSystemObjectProperty()
{
string json = @"{""MyDict"":{""Property1"":1}}";
Expand DownExpand Up@@ -1088,6 +1089,7 @@ public class ClassWithInvalidExtensionPropertyStringJsonNode
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ExtensionProperty_InvalidDictionary()
{
var obj1 = new ClassWithInvalidExtensionPropertyStringString();
Expand DownExpand Up@@ -1147,6 +1149,7 @@ public class ClassWithMultipleDictionaries
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoImmutableDictionaryProperty()
{
// baseline
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public async Task CustomNamePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task NullNamePolicy()
{
var options = new JsonSerializerOptions();
Expand DownExpand Up@@ -127,6 +128,7 @@ public async Task JsonPropertyNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameAttributeDuplicateDesignTimeFail()
{
{
Expand All@@ -141,6 +143,7 @@ public async Task JsonNameAttributeDuplicateDesignTimeFail()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCamelCasingFail()
{
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,6 +325,7 @@ public class ClassWithMixedPropertyAccessors_PropertyAttributes
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,7 @@ public async Task Ignore_PublicProperty_ConflictWithPublicDuePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes()
{
// Serialize
Expand All@@ -353,6 +354,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes()
{
// Serialize
Expand All@@ -367,6 +369,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -390,6 +393,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -413,6 +417,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -437,6 +442,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -461,6 +467,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -477,6 +484,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -493,6 +501,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -519,6 +528,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -545,6 +555,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -572,6 +583,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -1138,6 +1150,7 @@ public async Task JsonIgnoreAttribute()
// Needs support for more collections.
[ActiveIssue("https://github.com/dotnet/runtime/issues/53393")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71981")]
public async Task JsonIgnoreAttribute_UnsupportedCollection()
{
string json =
Expand DownExpand Up@@ -1178,7 +1191,7 @@ public async Task JsonIgnoreAttribute_UnsupportedCollection()

var dictionary = new Dictionary<object, object>();
// Uri is an unsupported dictionary key.
dictionary.Add(new Uri("http://foo"), "bar");
dictionary.Add(new Uri("http://typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]"), "bar");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like an accidental change, could you revert please? cc @krwq

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm actually surprised that this doesn't break other platforms.


var concurrentDictionary = new ConcurrentDictionary<object, object>(dictionary);

Expand DownExpand Up@@ -2413,6 +2426,7 @@ public class ClassWithThingsToIgnore_PerProperty
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand All@@ -2433,6 +2447,7 @@ public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(T
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail_EmptyJson(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("", type));
Expand DownExpand Up@@ -2745,6 +2760,7 @@ public async Task JsonIgnoreCondition_Polymorphic()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task SerializationMetadataNotComputedWhenMemberIgnored()
{
string janePayload = @"{""Name"":""Jane Doe""}";
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,6 +300,7 @@ public PropertyVisibilityTests_Default()
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public override async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
// Exception messages direct users to use JsonSourceGenerationMode.Metadata to see a more detailed error.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ public void DeserializeInvalidType(Type type)

[Theory]
[MemberData(nameof(TypesWithInvalidMembers_WithMembers))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task TypeWithInvalidMember(Type classType, Type invalidMemberType, string invalidMemberName)
{
static void ValidateException(InvalidOperationException ex, Type classType, Type invalidMemberType, string invalidMemberName)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ public async Task JsonNullNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCaseInsensitiveFail()
{
string json = @"{""myInt"":1,""MyInt"":2}";
Expand Down
13 changes: 11 additions & 2 deletions src/libraries/tests.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- https://github.com/dotnet/runtime/issues/65356 - OOM while linking -->
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
<!-- Disabling for AOT, and HighAOT - https://github.com/dotnet/runtime/issues/71848 -->
<!--<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />-->

<!-- https://github.com/dotnet/runtime/issues/65411 - possible OOM when compiling
System.Text.Json.SourceGeneration.Roslyn4.0.Tests.dll.bc -> .o -->
Expand DownExpand Up@@ -64,10 +65,18 @@
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\browser-eventpipe\Wasm.Browser.EventPipe.Sample.csproj" />
</ItemGroup>

<!-- wasm EAT/AOT -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(RunDisabledWasmTests)' != 'true' and '$(EnableAggressiveTrimming)' == 'true'">
<!-- Disabling for EAT/AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Wasm aot on all platforms -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true'">
<!-- https://github.com/dotnet/runtime/issues/66118 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\UnitTests\System.Text.RegularExpressions.Unit.Tests.csproj" />
<!-- Normally run with HighAOT, but disabling there, and for AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Projects that don't support code coverage measurement. -->
Expand DownExpand Up@@ -564,7 +573,7 @@
</ItemGroup>

<ItemGroup>
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true'"
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true' and '$(RunAOTCompilation)' == 'true'"
Include="@(HighAOTResourceRequiringProject)" />
</ItemGroup>

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,6 +396,7 @@ private class TrailingAngleBracketPolicy : JsonNamingPolicy
[Theory]
[InlineData(typeof(KeyNameNullPolicy), "Key")]
[InlineData(typeof(ValueNameNullPolicy), "Value")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidPropertyNameFail(Type policyType, string offendingProperty)
{
var options = new JsonSerializerOptions
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,7 @@ public async Task PublicParameterlessCtor_MultiplePublicParameterizedCtors_WithA

#if !BUILDING_SOURCE_GENERATOR_TESTS // These are compile-time warnings from the source generator.
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task MultipleAttributes_NotSupported()
{
async Task RunTestAsync<T>()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ public async Task CaseInsensitiveFails()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("Multi-dim arrays not supported.")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ClassWithUnsupportedCollectionTypes()
{
Exception e;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,6 +324,7 @@ public class ClassWithTwoExtensionProperties
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidExtensionPropertyFail()
{
// Baseline
Expand DownExpand Up@@ -798,7 +799,7 @@ public async Task DeserializeIntoJsonObjectProperty()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif

[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoSystemObjectProperty()
{
string json = @"{""MyDict"":{""Property1"":1}}";
Expand DownExpand Up@@ -1088,6 +1089,7 @@ public class ClassWithInvalidExtensionPropertyStringJsonNode
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ExtensionProperty_InvalidDictionary()
{
var obj1 = new ClassWithInvalidExtensionPropertyStringString();
Expand DownExpand Up@@ -1147,6 +1149,7 @@ public class ClassWithMultipleDictionaries
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoImmutableDictionaryProperty()
{
// baseline
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public async Task CustomNamePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task NullNamePolicy()
{
var options = new JsonSerializerOptions();
Expand DownExpand Up@@ -127,6 +128,7 @@ public async Task JsonPropertyNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameAttributeDuplicateDesignTimeFail()
{
{
Expand All@@ -141,6 +143,7 @@ public async Task JsonNameAttributeDuplicateDesignTimeFail()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCamelCasingFail()
{
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,6 +325,7 @@ public class ClassWithMixedPropertyAccessors_PropertyAttributes
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,7 @@ public async Task Ignore_PublicProperty_ConflictWithPublicDuePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes()
{
// Serialize
Expand All@@ -353,6 +354,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes()
{
// Serialize
Expand All@@ -367,6 +369,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -390,6 +393,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -413,6 +417,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -437,6 +442,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -461,6 +467,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -477,6 +484,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -493,6 +501,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -519,6 +528,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -545,6 +555,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -572,6 +583,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -1138,6 +1150,7 @@ public async Task JsonIgnoreAttribute()
// Needs support for more collections.
[ActiveIssue("https://github.com/dotnet/runtime/issues/53393")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71981")]
public async Task JsonIgnoreAttribute_UnsupportedCollection()
{
string json =
Expand DownExpand Up@@ -1178,7 +1191,7 @@ public async Task JsonIgnoreAttribute_UnsupportedCollection()

var dictionary = new Dictionary<object, object>();
// Uri is an unsupported dictionary key.
dictionary.Add(new Uri("http://foo"), "bar");
dictionary.Add(new Uri("http://typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]"), "bar");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like an accidental change, could you revert please? cc @krwq

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm actually surprised that this doesn't break other platforms.


var concurrentDictionary = new ConcurrentDictionary<object, object>(dictionary);

Expand DownExpand Up@@ -2413,6 +2426,7 @@ public class ClassWithThingsToIgnore_PerProperty
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand All@@ -2433,6 +2447,7 @@ public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(T
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail_EmptyJson(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("", type));
Expand DownExpand Up@@ -2745,6 +2760,7 @@ public async Task JsonIgnoreCondition_Polymorphic()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task SerializationMetadataNotComputedWhenMemberIgnored()
{
string janePayload = @"{""Name"":""Jane Doe""}";
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,6 +300,7 @@ public PropertyVisibilityTests_Default()
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public override async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
// Exception messages direct users to use JsonSourceGenerationMode.Metadata to see a more detailed error.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ public void DeserializeInvalidType(Type type)

[Theory]
[MemberData(nameof(TypesWithInvalidMembers_WithMembers))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task TypeWithInvalidMember(Type classType, Type invalidMemberType, string invalidMemberName)
{
static void ValidateException(InvalidOperationException ex, Type classType, Type invalidMemberType, string invalidMemberName)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ public async Task JsonNullNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCaseInsensitiveFail()
{
string json = @"{""myInt"":1,""MyInt"":2}";
Expand Down
13 changes: 11 additions & 2 deletions src/libraries/tests.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- https://github.com/dotnet/runtime/issues/65356 - OOM while linking -->
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
<!-- Disabling for AOT, and HighAOT - https://github.com/dotnet/runtime/issues/71848 -->
<!--<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />-->

<!-- https://github.com/dotnet/runtime/issues/65411 - possible OOM when compiling
System.Text.Json.SourceGeneration.Roslyn4.0.Tests.dll.bc -> .o -->
Expand DownExpand Up@@ -64,10 +65,18 @@
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\browser-eventpipe\Wasm.Browser.EventPipe.Sample.csproj" />
</ItemGroup>

<!-- wasm EAT/AOT -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(RunDisabledWasmTests)' != 'true' and '$(EnableAggressiveTrimming)' == 'true'">
<!-- Disabling for EAT/AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Wasm aot on all platforms -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true'">
<!-- https://github.com/dotnet/runtime/issues/66118 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\UnitTests\System.Text.RegularExpressions.Unit.Tests.csproj" />
<!-- Normally run with HighAOT, but disabling there, and for AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Projects that don't support code coverage measurement. -->
Expand DownExpand Up@@ -564,7 +573,7 @@
</ItemGroup>

<ItemGroup>
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true'"
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true' and '$(RunAOTCompilation)' == 'true'"
Include="@(HighAOTResourceRequiringProject)" />
</ItemGroup>

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,6 +396,7 @@ private class TrailingAngleBracketPolicy : JsonNamingPolicy
[Theory]
[InlineData(typeof(KeyNameNullPolicy), "Key")]
[InlineData(typeof(ValueNameNullPolicy), "Value")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidPropertyNameFail(Type policyType, string offendingProperty)
{
var options = new JsonSerializerOptions
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,7 @@ public async Task PublicParameterlessCtor_MultiplePublicParameterizedCtors_WithA

#if !BUILDING_SOURCE_GENERATOR_TESTS // These are compile-time warnings from the source generator.
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task MultipleAttributes_NotSupported()
{
async Task RunTestAsync<T>()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ public async Task CaseInsensitiveFails()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("Multi-dim arrays not supported.")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ClassWithUnsupportedCollectionTypes()
{
Exception e;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,6 +324,7 @@ public class ClassWithTwoExtensionProperties
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidExtensionPropertyFail()
{
// Baseline
Expand DownExpand Up@@ -798,7 +799,7 @@ public async Task DeserializeIntoJsonObjectProperty()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif

[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoSystemObjectProperty()
{
string json = @"{""MyDict"":{""Property1"":1}}";
Expand DownExpand Up@@ -1088,6 +1089,7 @@ public class ClassWithInvalidExtensionPropertyStringJsonNode
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ExtensionProperty_InvalidDictionary()
{
var obj1 = new ClassWithInvalidExtensionPropertyStringString();
Expand DownExpand Up@@ -1147,6 +1149,7 @@ public class ClassWithMultipleDictionaries
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoImmutableDictionaryProperty()
{
// baseline
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public async Task CustomNamePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task NullNamePolicy()
{
var options = new JsonSerializerOptions();
Expand DownExpand Up@@ -127,6 +128,7 @@ public async Task JsonPropertyNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameAttributeDuplicateDesignTimeFail()
{
{
Expand All@@ -141,6 +143,7 @@ public async Task JsonNameAttributeDuplicateDesignTimeFail()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCamelCasingFail()
{
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,6 +325,7 @@ public class ClassWithMixedPropertyAccessors_PropertyAttributes
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,7 @@ public async Task Ignore_PublicProperty_ConflictWithPublicDuePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes()
{
// Serialize
Expand All@@ -353,6 +354,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes()
{
// Serialize
Expand All@@ -367,6 +369,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -390,6 +393,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -413,6 +417,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -437,6 +442,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -461,6 +467,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -477,6 +484,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -493,6 +501,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -519,6 +528,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -545,6 +555,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -572,6 +583,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -1138,6 +1150,7 @@ public async Task JsonIgnoreAttribute()
// Needs support for more collections.
[ActiveIssue("https://github.com/dotnet/runtime/issues/53393")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71981")]
public async Task JsonIgnoreAttribute_UnsupportedCollection()
{
string json =
Expand DownExpand Up@@ -1178,7 +1191,7 @@ public async Task JsonIgnoreAttribute_UnsupportedCollection()

var dictionary = new Dictionary<object, object>();
// Uri is an unsupported dictionary key.
dictionary.Add(new Uri("http://foo"), "bar");
dictionary.Add(new Uri("http://typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]"), "bar");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like an accidental change, could you revert please? cc @krwq

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm actually surprised that this doesn't break other platforms.


var concurrentDictionary = new ConcurrentDictionary<object, object>(dictionary);

Expand DownExpand Up@@ -2413,6 +2426,7 @@ public class ClassWithThingsToIgnore_PerProperty
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand All@@ -2433,6 +2447,7 @@ public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(T
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail_EmptyJson(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("", type));
Expand DownExpand Up@@ -2745,6 +2760,7 @@ public async Task JsonIgnoreCondition_Polymorphic()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task SerializationMetadataNotComputedWhenMemberIgnored()
{
string janePayload = @"{""Name"":""Jane Doe""}";
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,6 +300,7 @@ public PropertyVisibilityTests_Default()
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public override async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
// Exception messages direct users to use JsonSourceGenerationMode.Metadata to see a more detailed error.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ public void DeserializeInvalidType(Type type)

[Theory]
[MemberData(nameof(TypesWithInvalidMembers_WithMembers))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task TypeWithInvalidMember(Type classType, Type invalidMemberType, string invalidMemberName)
{
static void ValidateException(InvalidOperationException ex, Type classType, Type invalidMemberType, string invalidMemberName)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ public async Task JsonNullNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCaseInsensitiveFail()
{
string json = @"{""myInt"":1,""MyInt"":2}";
Expand Down
13 changes: 11 additions & 2 deletions src/libraries/tests.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- https://github.com/dotnet/runtime/issues/65356 - OOM while linking -->
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
<!-- Disabling for AOT, and HighAOT - https://github.com/dotnet/runtime/issues/71848 -->
<!--<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />-->

<!-- https://github.com/dotnet/runtime/issues/65411 - possible OOM when compiling
System.Text.Json.SourceGeneration.Roslyn4.0.Tests.dll.bc -> .o -->
Expand DownExpand Up@@ -64,10 +65,18 @@
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\browser-eventpipe\Wasm.Browser.EventPipe.Sample.csproj" />
</ItemGroup>

<!-- wasm EAT/AOT -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(RunDisabledWasmTests)' != 'true' and '$(EnableAggressiveTrimming)' == 'true'">
<!-- Disabling for EAT/AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Wasm aot on all platforms -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true'">
<!-- https://github.com/dotnet/runtime/issues/66118 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\UnitTests\System.Text.RegularExpressions.Unit.Tests.csproj" />
<!-- Normally run with HighAOT, but disabling there, and for AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Projects that don't support code coverage measurement. -->
Expand DownExpand Up@@ -564,7 +573,7 @@
</ItemGroup>

<ItemGroup>
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true'"
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true' and '$(RunAOTCompilation)' == 'true'"
Include="@(HighAOTResourceRequiringProject)" />
</ItemGroup>

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,6 +396,7 @@ private class TrailingAngleBracketPolicy : JsonNamingPolicy
[Theory]
[InlineData(typeof(KeyNameNullPolicy), "Key")]
[InlineData(typeof(ValueNameNullPolicy), "Value")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidPropertyNameFail(Type policyType, string offendingProperty)
{
var options = new JsonSerializerOptions
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,7 @@ public async Task PublicParameterlessCtor_MultiplePublicParameterizedCtors_WithA

#if !BUILDING_SOURCE_GENERATOR_TESTS // These are compile-time warnings from the source generator.
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task MultipleAttributes_NotSupported()
{
async Task RunTestAsync<T>()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ public async Task CaseInsensitiveFails()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("Multi-dim arrays not supported.")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ClassWithUnsupportedCollectionTypes()
{
Exception e;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,6 +324,7 @@ public class ClassWithTwoExtensionProperties
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidExtensionPropertyFail()
{
// Baseline
Expand DownExpand Up@@ -798,7 +799,7 @@ public async Task DeserializeIntoJsonObjectProperty()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif

[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoSystemObjectProperty()
{
string json = @"{""MyDict"":{""Property1"":1}}";
Expand DownExpand Up@@ -1088,6 +1089,7 @@ public class ClassWithInvalidExtensionPropertyStringJsonNode
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ExtensionProperty_InvalidDictionary()
{
var obj1 = new ClassWithInvalidExtensionPropertyStringString();
Expand DownExpand Up@@ -1147,6 +1149,7 @@ public class ClassWithMultipleDictionaries
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoImmutableDictionaryProperty()
{
// baseline
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public async Task CustomNamePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task NullNamePolicy()
{
var options = new JsonSerializerOptions();
Expand DownExpand Up@@ -127,6 +128,7 @@ public async Task JsonPropertyNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameAttributeDuplicateDesignTimeFail()
{
{
Expand All@@ -141,6 +143,7 @@ public async Task JsonNameAttributeDuplicateDesignTimeFail()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCamelCasingFail()
{
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,6 +325,7 @@ public class ClassWithMixedPropertyAccessors_PropertyAttributes
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,7 @@ public async Task Ignore_PublicProperty_ConflictWithPublicDuePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes()
{
// Serialize
Expand All@@ -353,6 +354,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes()
{
// Serialize
Expand All@@ -367,6 +369,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -390,6 +393,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -413,6 +417,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -437,6 +442,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -461,6 +467,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -477,6 +484,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -493,6 +501,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -519,6 +528,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -545,6 +555,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -572,6 +583,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -1138,6 +1150,7 @@ public async Task JsonIgnoreAttribute()
// Needs support for more collections.
[ActiveIssue("https://github.com/dotnet/runtime/issues/53393")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71981")]
public async Task JsonIgnoreAttribute_UnsupportedCollection()
{
string json =
Expand DownExpand Up@@ -1178,7 +1191,7 @@ public async Task JsonIgnoreAttribute_UnsupportedCollection()

var dictionary = new Dictionary<object, object>();
// Uri is an unsupported dictionary key.
dictionary.Add(new Uri("http://foo"), "bar");
dictionary.Add(new Uri("http://typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]"), "bar");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like an accidental change, could you revert please? cc @krwq

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm actually surprised that this doesn't break other platforms.


var concurrentDictionary = new ConcurrentDictionary<object, object>(dictionary);

Expand DownExpand Up@@ -2413,6 +2426,7 @@ public class ClassWithThingsToIgnore_PerProperty
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand All@@ -2433,6 +2447,7 @@ public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(T
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail_EmptyJson(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("", type));
Expand DownExpand Up@@ -2745,6 +2760,7 @@ public async Task JsonIgnoreCondition_Polymorphic()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task SerializationMetadataNotComputedWhenMemberIgnored()
{
string janePayload = @"{""Name"":""Jane Doe""}";
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,6 +300,7 @@ public PropertyVisibilityTests_Default()
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public override async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
// Exception messages direct users to use JsonSourceGenerationMode.Metadata to see a more detailed error.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ public void DeserializeInvalidType(Type type)

[Theory]
[MemberData(nameof(TypesWithInvalidMembers_WithMembers))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task TypeWithInvalidMember(Type classType, Type invalidMemberType, string invalidMemberName)
{
static void ValidateException(InvalidOperationException ex, Type classType, Type invalidMemberType, string invalidMemberName)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ public async Task JsonNullNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCaseInsensitiveFail()
{
string json = @"{""myInt"":1,""MyInt"":2}";
Expand Down
13 changes: 11 additions & 2 deletions src/libraries/tests.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- https://github.com/dotnet/runtime/issues/65356 - OOM while linking -->
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
<!-- Disabling for AOT, and HighAOT - https://github.com/dotnet/runtime/issues/71848 -->
<!--<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />-->

<!-- https://github.com/dotnet/runtime/issues/65411 - possible OOM when compiling
System.Text.Json.SourceGeneration.Roslyn4.0.Tests.dll.bc -> .o -->
Expand DownExpand Up@@ -64,10 +65,18 @@
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\browser-eventpipe\Wasm.Browser.EventPipe.Sample.csproj" />
</ItemGroup>

<!-- wasm EAT/AOT -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(RunDisabledWasmTests)' != 'true' and '$(EnableAggressiveTrimming)' == 'true'">
<!-- Disabling for EAT/AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Wasm aot on all platforms -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true'">
<!-- https://github.com/dotnet/runtime/issues/66118 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\UnitTests\System.Text.RegularExpressions.Unit.Tests.csproj" />
<!-- Normally run with HighAOT, but disabling there, and for AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Projects that don't support code coverage measurement. -->
Expand DownExpand Up@@ -564,7 +573,7 @@
</ItemGroup>

<ItemGroup>
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true'"
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true' and '$(RunAOTCompilation)' == 'true'"
Include="@(HighAOTResourceRequiringProject)" />
</ItemGroup>

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,6 +396,7 @@ private class TrailingAngleBracketPolicy : JsonNamingPolicy
[Theory]
[InlineData(typeof(KeyNameNullPolicy), "Key")]
[InlineData(typeof(ValueNameNullPolicy), "Value")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidPropertyNameFail(Type policyType, string offendingProperty)
{
var options = new JsonSerializerOptions
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,7 @@ public async Task PublicParameterlessCtor_MultiplePublicParameterizedCtors_WithA

#if !BUILDING_SOURCE_GENERATOR_TESTS // These are compile-time warnings from the source generator.
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task MultipleAttributes_NotSupported()
{
async Task RunTestAsync<T>()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ public async Task CaseInsensitiveFails()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("Multi-dim arrays not supported.")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ClassWithUnsupportedCollectionTypes()
{
Exception e;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,6 +324,7 @@ public class ClassWithTwoExtensionProperties
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidExtensionPropertyFail()
{
// Baseline
Expand DownExpand Up@@ -798,7 +799,7 @@ public async Task DeserializeIntoJsonObjectProperty()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif

[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoSystemObjectProperty()
{
string json = @"{""MyDict"":{""Property1"":1}}";
Expand DownExpand Up@@ -1088,6 +1089,7 @@ public class ClassWithInvalidExtensionPropertyStringJsonNode
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ExtensionProperty_InvalidDictionary()
{
var obj1 = new ClassWithInvalidExtensionPropertyStringString();
Expand DownExpand Up@@ -1147,6 +1149,7 @@ public class ClassWithMultipleDictionaries
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoImmutableDictionaryProperty()
{
// baseline
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public async Task CustomNamePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task NullNamePolicy()
{
var options = new JsonSerializerOptions();
Expand DownExpand Up@@ -127,6 +128,7 @@ public async Task JsonPropertyNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameAttributeDuplicateDesignTimeFail()
{
{
Expand All@@ -141,6 +143,7 @@ public async Task JsonNameAttributeDuplicateDesignTimeFail()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCamelCasingFail()
{
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,6 +325,7 @@ public class ClassWithMixedPropertyAccessors_PropertyAttributes
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,7 @@ public async Task Ignore_PublicProperty_ConflictWithPublicDuePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes()
{
// Serialize
Expand All@@ -353,6 +354,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes()
{
// Serialize
Expand All@@ -367,6 +369,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -390,6 +393,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -413,6 +417,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -437,6 +442,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -461,6 +467,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -477,6 +484,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -493,6 +501,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -519,6 +528,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -545,6 +555,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -572,6 +583,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -1138,6 +1150,7 @@ public async Task JsonIgnoreAttribute()
// Needs support for more collections.
[ActiveIssue("https://github.com/dotnet/runtime/issues/53393")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71981")]
public async Task JsonIgnoreAttribute_UnsupportedCollection()
{
string json =
Expand DownExpand Up@@ -1178,7 +1191,7 @@ public async Task JsonIgnoreAttribute_UnsupportedCollection()

var dictionary = new Dictionary<object, object>();
// Uri is an unsupported dictionary key.
dictionary.Add(new Uri("http://foo"), "bar");
dictionary.Add(new Uri("http://typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]"), "bar");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like an accidental change, could you revert please? cc @krwq

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm actually surprised that this doesn't break other platforms.


var concurrentDictionary = new ConcurrentDictionary<object, object>(dictionary);

Expand DownExpand Up@@ -2413,6 +2426,7 @@ public class ClassWithThingsToIgnore_PerProperty
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand All@@ -2433,6 +2447,7 @@ public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(T
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail_EmptyJson(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("", type));
Expand DownExpand Up@@ -2745,6 +2760,7 @@ public async Task JsonIgnoreCondition_Polymorphic()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task SerializationMetadataNotComputedWhenMemberIgnored()
{
string janePayload = @"{""Name"":""Jane Doe""}";
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,6 +300,7 @@ public PropertyVisibilityTests_Default()
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public override async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
// Exception messages direct users to use JsonSourceGenerationMode.Metadata to see a more detailed error.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ public void DeserializeInvalidType(Type type)

[Theory]
[MemberData(nameof(TypesWithInvalidMembers_WithMembers))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task TypeWithInvalidMember(Type classType, Type invalidMemberType, string invalidMemberName)
{
static void ValidateException(InvalidOperationException ex, Type classType, Type invalidMemberType, string invalidMemberName)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ public async Task JsonNullNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCaseInsensitiveFail()
{
string json = @"{""myInt"":1,""MyInt"":2}";
Expand Down
13 changes: 11 additions & 2 deletions src/libraries/tests.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- https://github.com/dotnet/runtime/issues/65356 - OOM while linking -->
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
<!-- Disabling for AOT, and HighAOT - https://github.com/dotnet/runtime/issues/71848 -->
<!--<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />-->

<!-- https://github.com/dotnet/runtime/issues/65411 - possible OOM when compiling
System.Text.Json.SourceGeneration.Roslyn4.0.Tests.dll.bc -> .o -->
Expand DownExpand Up@@ -64,10 +65,18 @@
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\browser-eventpipe\Wasm.Browser.EventPipe.Sample.csproj" />
</ItemGroup>

<!-- wasm EAT/AOT -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(RunDisabledWasmTests)' != 'true' and '$(EnableAggressiveTrimming)' == 'true'">
<!-- Disabling for EAT/AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Wasm aot on all platforms -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true'">
<!-- https://github.com/dotnet/runtime/issues/66118 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\UnitTests\System.Text.RegularExpressions.Unit.Tests.csproj" />
<!-- Normally run with HighAOT, but disabling there, and for AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Projects that don't support code coverage measurement. -->
Expand DownExpand Up@@ -564,7 +573,7 @@
</ItemGroup>

<ItemGroup>
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true'"
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true' and '$(RunAOTCompilation)' == 'true'"
Include="@(HighAOTResourceRequiringProject)" />
</ItemGroup>

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line numberDiff line numberDiff line change
Expand Up@@ -396,6 +396,7 @@ private class TrailingAngleBracketPolicy : JsonNamingPolicy
[Theory]
[InlineData(typeof(KeyNameNullPolicy), "Key")]
[InlineData(typeof(ValueNameNullPolicy), "Value")]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidPropertyNameFail(Type policyType, string offendingProperty)
{
var options = new JsonSerializerOptions
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,6 +115,7 @@ public async Task PublicParameterlessCtor_MultiplePublicParameterizedCtors_WithA

#if !BUILDING_SOURCE_GENERATOR_TESTS // These are compile-time warnings from the source generator.
[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task MultipleAttributes_NotSupported()
{
async Task RunTestAsync<T>()
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -317,6 +317,7 @@ public async Task CaseInsensitiveFails()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("Multi-dim arrays not supported.")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ClassWithUnsupportedCollectionTypes()
{
Exception e;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -324,6 +324,7 @@ public class ClassWithTwoExtensionProperties
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task InvalidExtensionPropertyFail()
{
// Baseline
Expand DownExpand Up@@ -798,7 +799,7 @@ public async Task DeserializeIntoJsonObjectProperty()
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif

[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoSystemObjectProperty()
{
string json = @"{""MyDict"":{""Property1"":1}}";
Expand DownExpand Up@@ -1088,6 +1089,7 @@ public class ClassWithInvalidExtensionPropertyStringJsonNode
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task ExtensionProperty_InvalidDictionary()
{
var obj1 = new ClassWithInvalidExtensionPropertyStringString();
Expand DownExpand Up@@ -1147,6 +1149,7 @@ public class ClassWithMultipleDictionaries
#if BUILDING_SOURCE_GENERATOR_TESTS
[ActiveIssue("https://github.com/dotnet/runtime/issues/58945")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task DeserializeIntoImmutableDictionaryProperty()
{
// baseline
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,6 +64,7 @@ public async Task CustomNamePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task NullNamePolicy()
{
var options = new JsonSerializerOptions();
Expand DownExpand Up@@ -127,6 +128,7 @@ public async Task JsonPropertyNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameAttributeDuplicateDesignTimeFail()
{
{
Expand All@@ -141,6 +143,7 @@ public async Task JsonNameAttributeDuplicateDesignTimeFail()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCamelCasingFail()
{
{
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -325,6 +325,7 @@ public class ClassWithMixedPropertyAccessors_PropertyAttributes
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -339,6 +339,7 @@ public async Task Ignore_PublicProperty_ConflictWithPublicDuePolicy()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes()
{
// Serialize
Expand All@@ -353,6 +354,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes()
{
// Serialize
Expand All@@ -367,6 +369,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -390,6 +393,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_SingleInheritance()
{
// Serialize
Expand All@@ -413,6 +417,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -437,6 +442,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDueAttributes_DoubleInheritance()
{
// Serialize
Expand All@@ -461,6 +467,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -477,6 +484,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -493,6 +501,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -519,6 +528,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_SingleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand All@@ -545,6 +555,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicProperty_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -572,6 +583,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task Throw_PublicPropertyAndField_ConflictDuePolicy_DobuleInheritance()
{
var options = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase };
Expand DownExpand Up@@ -1138,6 +1150,7 @@ public async Task JsonIgnoreAttribute()
// Needs support for more collections.
[ActiveIssue("https://github.com/dotnet/runtime/issues/53393")]
#endif
[ActiveIssue("https://github.com/dotnet/runtime/issues/71981")]
public async Task JsonIgnoreAttribute_UnsupportedCollection()
{
string json =
Expand DownExpand Up@@ -1178,7 +1191,7 @@ public async Task JsonIgnoreAttribute_UnsupportedCollection()

var dictionary = new Dictionary<object, object>();
// Uri is an unsupported dictionary key.
dictionary.Add(new Uri("http://foo"), "bar");
dictionary.Add(new Uri("http://typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]"), "bar");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks like an accidental change, could you revert please? cc @krwq

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I'm actually surprised that this doesn't break other platforms.


var concurrentDictionary = new ConcurrentDictionary<object, object>(dictionary);

Expand DownExpand Up@@ -2413,6 +2426,7 @@ public class ClassWithThingsToIgnore_PerProperty
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("{}", type));
Expand All@@ -2433,6 +2447,7 @@ public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail(T
[Theory]
[InlineData(typeof(ClassWithBadIgnoreAttribute))]
[InlineData(typeof(StructWithBadIgnoreAttribute))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public virtual async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail_EmptyJson(Type type)
{
InvalidOperationException ex = await Assert.ThrowsAsync<InvalidOperationException>(async () => await Serializer.DeserializeWrapper("", type));
Expand DownExpand Up@@ -2745,6 +2760,7 @@ public async Task JsonIgnoreCondition_Polymorphic()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task SerializationMetadataNotComputedWhenMemberIgnored()
{
string janePayload = @"{""Name"":""Jane Doe""}";
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -300,6 +300,7 @@ public PropertyVisibilityTests_Default()
[InlineData(typeof(ClassWithPrivate_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithInternal_InitOnlyProperty_WithJsonIncludeProperty))]
[InlineData(typeof(ClassWithProtected_InitOnlyProperty_WithJsonIncludeProperty))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public override async Task NonPublicProperty_WithJsonInclude_Invalid(Type type)
{
// Exception messages direct users to use JsonSourceGenerationMode.Metadata to see a more detailed error.
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ public void DeserializeInvalidType(Type type)

[Theory]
[MemberData(nameof(TypesWithInvalidMembers_WithMembers))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task TypeWithInvalidMember(Type classType, Type invalidMemberType, string invalidMemberName)
{
static void ValidateException(InvalidOperationException ex, Type classType, Type invalidMemberType, string invalidMemberName)
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ public async Task JsonNullNameAttribute()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/71838", typeof(PlatformDetection), nameof(PlatformDetection.IsBrowser), nameof(PlatformDetection.IsMonoAOT))]
public async Task JsonNameConflictOnCaseInsensitiveFail()
{
string json = @"{""myInt"":1,""MyInt"":2}";
Expand Down
13 changes: 11 additions & 2 deletions src/libraries/tests.proj
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@
<ItemGroup Condition="'$(TargetOS)' == 'Browser'">
<!-- https://github.com/dotnet/runtime/issues/65356 - OOM while linking -->
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj" />
<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
<!-- Disabling for AOT, and HighAOT - https://github.com/dotnet/runtime/issues/71848 -->
<!--<HighAOTResourceRequiringProject Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />-->

<!-- https://github.com/dotnet/runtime/issues/65411 - possible OOM when compiling
System.Text.Json.SourceGeneration.Roslyn4.0.Tests.dll.bc -> .o -->
Expand DownExpand Up@@ -64,10 +65,18 @@
<ProjectExclusions Include="$(MonoProjectRoot)sample\wasm\browser-eventpipe\Wasm.Browser.EventPipe.Sample.csproj" />
</ItemGroup>

<!-- wasm EAT/AOT -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(RunDisabledWasmTests)' != 'true' and '$(EnableAggressiveTrimming)' == 'true'">
<!-- Disabling for EAT/AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Wasm aot on all platforms -->
<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true' and '$(RunAOTCompilation)' == 'true'">
<!-- https://github.com/dotnet/runtime/issues/66118 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\UnitTests\System.Text.RegularExpressions.Unit.Tests.csproj" />
<!-- Normally run with HighAOT, but disabling there, and for AOT - https://github.com/dotnet/runtime/issues/71848 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.RegularExpressions\tests\FunctionalTests\System.Text.RegularExpressions.Tests.csproj" />
</ItemGroup>

<!-- Projects that don't support code coverage measurement. -->
Expand DownExpand Up@@ -564,7 +573,7 @@
</ItemGroup>

<ItemGroup>
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true'"
<ProjectExclusions Condition="'$(RunHighAOTResourceRequiringTestsOnly)' != 'true' and '$(RunAOTCompilation)' == 'true'"
Include="@(HighAOTResourceRequiringProject)" />
</ItemGroup>

Expand Down