Skip to content

Enable System.Text.Json tests on netfx #63803

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
krwq merged 5 commits into from
Jan 19, 2022
Merged

Enable System.Text.Json tests on netfx #63803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c433d47
Enable System.Text.Json tests on netfx
krwq Jan 14, 2022
10334c9
use NETFRAMEWORK define
krwq Jan 15, 2022
a018cc1
disable another two test cases after rebase
krwq Jan 17, 2022
fe627f5
disable last test case which repros only on CI for me
krwq Jan 17, 2022
ab3e971
add p2p only on netfx
krwq Jan 18, 2022
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
2 changes: 1 addition & 1 deletion docs/coding-guidelines/project-guidelines.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Pure netstandard configuration:
All supported targets with unique windows/unix build for netcoreapp:
```
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetFrameworkCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetFrameworkMinimum)</TargetFrameworks>
<PropertyGroup>
```

Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Text.Json/tests/Common/PropertyVisibilityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,7 @@ public async Task JsonIgnoreAttribute_UnsupportedCollection()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/63802", TargetFrameworkMonikers.NetFramework)]
public async Task JsonIgnoreAttribute_UnsupportedBigInteger()
{
string json = @"{""MyBigInteger"":1}";
Expand Down
3 changes: 1 addition & 2 deletions ...ibraries/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/ContextClasses.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Collections.Generic;
using System.Reflection;
using System.Text.Json.Serialization;
using System.Text.Json.Serialization.Metadata;

Expand All @@ -11,7 +10,7 @@ namespace System.Text.Json.SourceGeneration.Tests
public interface ITestContext
{
public JsonSourceGenerationMode JsonSourceGenerationMode { get; }
public bool IsIncludeFieldsEnabled => GetType().GetCustomAttribute<JsonSourceGenerationOptionsAttribute>()?.IncludeFields ?? false;
public bool IsIncludeFieldsEnabled { get; }

public JsonTypeInfo<Location> Location { get; }
public JsonTypeInfo<NumberTypes> NumberTypes { get; }
Expand Down
1 change: 1 addition & 0 deletions ...tem.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/JsonSerializerContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ public static void VariousNestingAndVisibilityLevelsAreSupported()
}

[ConditionalFact(typeof(RemoteExecutor), nameof(RemoteExecutor.IsSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/63802", TargetFrameworkMonikers.NetFramework)]
public static void Converters_AndTypeInfoCreator_NotRooted_WhenMetadataNotPresent()
{
RemoteExecutor.Invoke(
Expand Down
2 changes: 2 additions & 0 deletions ...son/tests/System.Text.Json.SourceGeneration.Tests/MetadataAndSerializationContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Text.Json.Serialization;
using System.Reflection;
using Xunit;

namespace System.Text.Json.SourceGeneration.Tests
Expand Down Expand Up @@ -44,6 +45,7 @@ namespace System.Text.Json.SourceGeneration.Tests
internal partial class MetadataAndSerializationContext : JsonSerializerContext, ITestContext
{
public JsonSourceGenerationMode JsonSourceGenerationMode => JsonSourceGenerationMode.Default;
public bool IsIncludeFieldsEnabled => GetType().GetCustomAttribute<JsonSourceGenerationOptionsAttribute>()?.IncludeFields ?? false;
}

public sealed class MetadataAndSerializationContextTests : RealWorldContextTests
Expand Down
3 changes: 3 additions & 0 deletions ...es/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/MetadataContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Text.Json.Serialization;
using System.Reflection;
using Xunit;

namespace System.Text.Json.SourceGeneration.Tests
Expand Down Expand Up @@ -43,6 +44,7 @@ namespace System.Text.Json.SourceGeneration.Tests
internal partial class MetadataWithPerTypeAttributeContext : JsonSerializerContext, ITestContext
{
public JsonSourceGenerationMode JsonSourceGenerationMode => JsonSourceGenerationMode.Metadata;
public bool IsIncludeFieldsEnabled => GetType().GetCustomAttribute<JsonSourceGenerationOptionsAttribute>()?.IncludeFields ?? false;
}

public sealed class MetadataWithPerTypeAttributeContextTests : RealWorldContextTests
Expand Down Expand Up @@ -127,6 +129,7 @@ public override void EnsureFastPathGeneratedAsExpected()
internal partial class MetadataContext : JsonSerializerContext, ITestContext
{
public JsonSourceGenerationMode JsonSourceGenerationMode => JsonSourceGenerationMode.Metadata;
public bool IsIncludeFieldsEnabled => GetType().GetCustomAttribute<JsonSourceGenerationOptionsAttribute>()?.IncludeFields ?? false;
}

[JsonConverter(typeof(JsonStringEnumConverter))]
Expand Down
2 changes: 2 additions & 0 deletions ...s/System.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/MixedModeContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Text.Json.Serialization;
using System.Reflection;
using Xunit;

namespace System.Text.Json.SourceGeneration.Tests
Expand Down Expand Up @@ -44,6 +45,7 @@ namespace System.Text.Json.SourceGeneration.Tests
internal partial class MixedModeContext : JsonSerializerContext, ITestContext
{
public JsonSourceGenerationMode JsonSourceGenerationMode => JsonSourceGenerationMode.Metadata | JsonSourceGenerationMode.Serialization;
public bool IsIncludeFieldsEnabled => GetType().GetCustomAttribute<JsonSourceGenerationOptionsAttribute>()?.IncludeFields ?? false;
}

public sealed class MixedModeContextTests : RealWorldContextTests
Expand Down
4 changes: 4 additions & 0 deletions ...on/tests/System.Text.Json.SourceGeneration.Tests/Serialization/PropertyVisibilityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,12 @@ public override async Task HonorJsonPropertyName_PrivateSetter()
[JsonSerializable(typeof(ClassWithNewSlotAttributedDecimalProperty))]
[JsonSerializable(typeof(ClassWithNewSlotDecimalProperty))]
[JsonSerializable(typeof(LargeStructWithValueAndReferenceTypes))]
#if !NETFRAMEWORK
[JsonSerializable(typeof(ClassWithUnsupportedBigInteger))]
[JsonSerializable(typeof(WrapperForClassWithUnsupportedBigInteger))]
[JsonSerializable(typeof(ClassWithIgnoredUnsupportedBigInteger))]
[JsonSerializable(typeof(WrapperForClassWithIgnoredUnsupportedBigInteger))]
#endif
[JsonSerializable(typeof(ClassWithThingsToIgnore))]
[JsonSerializable(typeof(ClassWithMixedPropertyAccessors_PropertyAttributes))]
[JsonSerializable(typeof(ClassWithPropertyPolicyConflictWhichThrows))]
Expand Down Expand Up @@ -422,10 +424,12 @@ public override async Task JsonIgnoreCondition_WhenWritingNull_OnValueType_Fail_
[JsonSerializable(typeof(ClassWithNewSlotAttributedDecimalProperty))]
[JsonSerializable(typeof(ClassWithNewSlotDecimalProperty))]
[JsonSerializable(typeof(LargeStructWithValueAndReferenceTypes))]
#if !NETFRAMEWORK
[JsonSerializable(typeof(ClassWithUnsupportedBigInteger))]
[JsonSerializable(typeof(WrapperForClassWithUnsupportedBigInteger))]
[JsonSerializable(typeof(ClassWithIgnoredUnsupportedBigInteger))]
[JsonSerializable(typeof(WrapperForClassWithIgnoredUnsupportedBigInteger))]
#endif
[JsonSerializable(typeof(ClassWithThingsToIgnore))]
[JsonSerializable(typeof(ClassWithMixedPropertyAccessors_PropertyAttributes))]
[JsonSerializable(typeof(ClassWithPropertyPolicyConflictWhichThrows))]
Expand Down
4 changes: 4 additions & 0 deletions ...stem.Text.Json/tests/System.Text.Json.SourceGeneration.Tests/SerializationContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.

using System.Text.Json.Serialization;
using System.Reflection;
using Xunit;

namespace System.Text.Json.SourceGeneration.Tests
Expand Down Expand Up @@ -44,6 +45,7 @@ namespace System.Text.Json.SourceGeneration.Tests
internal partial class SerializationContext : JsonSerializerContext, ITestContext
{
public JsonSourceGenerationMode JsonSourceGenerationMode => JsonSourceGenerationMode.Serialization;
public bool IsIncludeFieldsEnabled => GetType().GetCustomAttribute<JsonSourceGenerationOptionsAttribute>()?.IncludeFields ?? false;
}

[JsonSerializable(typeof(Location), GenerationMode = JsonSourceGenerationMode.Serialization)]
Expand Down Expand Up @@ -83,6 +85,7 @@ internal partial class SerializationContext : JsonSerializerContext, ITestContex
internal partial class SerializationWithPerTypeAttributeContext : JsonSerializerContext, ITestContext
{
public JsonSourceGenerationMode JsonSourceGenerationMode => JsonSourceGenerationMode.Serialization;
public bool IsIncludeFieldsEnabled => GetType().GetCustomAttribute<JsonSourceGenerationOptionsAttribute>()?.IncludeFields ?? false;
}

[JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase, IncludeFields = true)]
Expand Down Expand Up @@ -123,6 +126,7 @@ internal partial class SerializationWithPerTypeAttributeContext : JsonSerializer
internal partial class SerializationContextWithCamelCase : JsonSerializerContext, ITestContext
{
public JsonSourceGenerationMode JsonSourceGenerationMode => JsonSourceGenerationMode.Serialization;
public bool IsIncludeFieldsEnabled => GetType().GetCustomAttribute<JsonSourceGenerationOptionsAttribute>()?.IncludeFields ?? false;
}

public class SerializationContextTests : RealWorldContextTests
Expand Down
13 changes: 12 additions & 1 deletion ...s/System.Text.Json.SourceGeneration.Tests/System.Text.Json.SourceGeneration.Tests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<!-- SYSLIB0020: JsonSerializerOptions.IgnoreNullValues is obsolete -->
Expand Down Expand Up @@ -86,6 +86,17 @@
<Compile Include="TestClasses.CustomConverters.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<ProjectReference Include="..\..\src\System.Text.Json.csproj" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Collections.Immutable\src\System.Collections.Immutable.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'">
Copy link
Copy Markdown
Member

@eerhardt eerhardt Jan 18, 2022

Choose a reason for hiding this comment

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

Why are these 3 files needed?

Copy link
Copy Markdown
Member Author

@krwq krwq Jan 18, 2022

Choose a reason for hiding this comment

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

I'm getting following errors without it:

d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\UnsupportedTypesTests.cs(14,57): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\JsonSerializerContextTests.cs(86,39): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\JsonSerializerContextTests.cs(86,57): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(502,10): error CS0246: The type or namespace name 'DynamicDependencyAttribute' could not be found (are you missing a using directive or an assembly reference?) [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(502,10): error CS0246: The type or namespace name 'DynamicDependency' could not be found (are you missing a using directive or an assembly reference?) [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(502,28): error CS0122: 'DynamicallyAccessedMemberTypes' is inaccessible due to its protection level [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(502,80): error CS0122: 'DynamicallyAccessedMemberTypes' is inaccessible due to its protection level [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(529,10): error CS0246: The type or namespace name 'DynamicDependencyAttribute' could not be found (are you missing a using directive or an assembly reference?) [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(529,10): error CS0246: The type or namespace name 'DynamicDependency' could not be found (are you missing a using directive or an assembly reference?) [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(529,28): error CS0122: 'DynamicallyAccessedMemberTypes' is inaccessible due to its protection level [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(529,80): error CS0122: 'DynamicallyAccessedMemberTypes' is inaccessible due to its protection level [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(1087,36): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(1100,37): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(1112,59): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\ConstructorTests\ConstructorTests.ParameterMatching.cs(1112,73): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.InitOnly.cs(54,37): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.InitOnly.cs(59,37): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.InitOnly.cs(74,47): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.InitOnly.cs(92,47): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.NonPublicAccessors.cs(396,46): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.InitOnly.cs(64,45): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.InitOnly.cs(69,46): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.InitOnly.cs(80,45): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.InitOnly.cs(86,46): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.NonPublicAccessors.cs(384,44): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]
d:\src\runtime-2\src\libraries\System.Text.Json\tests\Common\PropertyVisibilityTests.NonPublicAccessors.cs(390,45): error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported [d:\src\runtime-2\src\libraries\System.Text.Json\tests\System.Text.Json.SourceGeneration.Tests\System.Text.Json.SourceGeneration.Roslyn3.11.Tests.csproj]

Copy link
Copy Markdown
Member Author

@krwq krwq Jan 18, 2022

Choose a reason for hiding this comment

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

IsExternalInit is related to: public int MyInt { get; private init; } and similar
the rest seem to actually use the attribute

Copy link
Copy Markdown
Member Author

@krwq krwq Jan 18, 2022

Choose a reason for hiding this comment

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

IsExternalInit case seems weird I don't have enough knowledge of this - possibly a compiler bug? (it should generate this class if it's not defined I think - assuming compiler emits that attribute)

Copy link
Copy Markdown
Member Author

@krwq krwq Jan 18, 2022

Choose a reason for hiding this comment

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

cc: @jaredpar

Copy link
Copy Markdown
Member

@eerhardt eerhardt Jan 18, 2022

Choose a reason for hiding this comment

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

I thought @ericstj fixed the IsExternalInit issue with #63472. Is that not the case?

Copy link
Copy Markdown
Member

@ericstj ericstj Jan 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I fixed consumption in .NETCore when a netstandard library derives from S.T.J types with init properties.

This is a different scenario. This is a netfx library which itself is trying to use init properties. Much like S.T.J it needs to define that type for the compiler to permit use of the feature. JSON is not exposing the type publicly.

Copy link
Copy Markdown
Contributor

@layomia layomia Jan 18, 2022

Choose a reason for hiding this comment

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

FWIW we're doing the same in the regular reflection-based tests. IsExternalInit still needs to be included for non-netcoreapp cases:

runtime/src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj

Lines 202 to 206 in fe627f5

<ItemGroup Condition="'$(TargetFramework)' != '$(NetCoreAppCurrent)'">
<Compile Include="$(CommonPath)System\Runtime\CompilerServices\IsExternalInit.cs" Link="Common\System\Runtime\CompilerServices\IsExternalInit.cs" />
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicDependencyAttribute.cs" />
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" />
</ItemGroup>
.

<Compile Include="$(CommonPath)System\Runtime\CompilerServices\IsExternalInit.cs" Link="Common\System\Runtime\CompilerServices\IsExternalInit.cs" />
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicDependencyAttribute.cs" />
<Compile Include="$(CoreLibSharedDir)System\Diagnostics\CodeAnalysis\DynamicallyAccessedMemberTypes.cs" />
</ItemGroup>

<Target Name="FixIncrementalCoreCompileWithAnalyzers" BeforeTargets="CoreCompile">
<ItemGroup>
<CustomAdditionalCompileInputs Include="@(Analyzer)" />
Expand Down
6 changes: 5 additions & 1 deletion .../System.Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/CompilationHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using System.CodeDom.Compiler;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Globalization;
Expand Down Expand Up @@ -31,16 +32,19 @@ public static Compilation CreateCompilation(
// Bypass System.Runtime error.
Assembly systemRuntimeAssembly = Assembly.Load("System.Runtime, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
Assembly systemCollectionsAssembly = Assembly.Load("System.Collections, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
// Needed on netfx
string systemRuntimeAssemblyPath = systemRuntimeAssembly.Location;
string systemCollectionsAssemblyPath = systemCollectionsAssembly.Location;

List<MetadataReference> references = new List<MetadataReference> {
MetadataReference.CreateFromFile(typeof(object).Assembly.Location),
MetadataReference.CreateFromFile(typeof(Attribute).Assembly.Location),
MetadataReference.CreateFromFile(typeof(Type).Assembly.Location),
MetadataReference.CreateFromFile(typeof(KeyValuePair).Assembly.Location),
MetadataReference.CreateFromFile(typeof(KeyValuePair<,>).Assembly.Location),
MetadataReference.CreateFromFile(typeof(ContractNamespaceAttribute).Assembly.Location),
MetadataReference.CreateFromFile(typeof(JavaScriptEncoder).Assembly.Location),
MetadataReference.CreateFromFile(typeof(GeneratedCodeAttribute).Assembly.Location),
MetadataReference.CreateFromFile(typeof(ReadOnlySpan<>).Assembly.Location),
MetadataReference.CreateFromFile(systemRuntimeAssemblyPath),
MetadataReference.CreateFromFile(systemCollectionsAssemblyPath),
};
Expand Down
2 changes: 2 additions & 0 deletions ....Text.Json/tests/System.Text.Json.SourceGeneration.Unit.Tests/JsonSourceGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,7 @@ public void UsePrivates()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/63802", TargetFrameworkMonikers.NetFramework)]
public void Record()
{
// Compile the referenced assembly first.
Expand Down Expand Up @@ -511,6 +512,7 @@ public record AppRecord(int Id)
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/63802", TargetFrameworkMonikers.NetFramework)]
public void RecordInExternalAssembly()
{
// Compile the referenced assembly first.
Expand Down
6 changes: 5 additions & 1 deletion ...ext.Json.SourceGeneration.Unit.Tests/System.Text.Json.SourceGeneration.Unit.Tests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
<TargetFrameworks>$(NetCoreAppCurrent);$(NetFrameworkMinimum)</TargetFrameworks>
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
</PropertyGroup>

Expand All @@ -17,6 +17,10 @@
<Compile Include="TypeWrapperTests.cs" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<Reference Include="System" />
</ItemGroup>

<Target Name="FixIncrementalCoreCompileWithAnalyzers" BeforeTargets="CoreCompile">
<ItemGroup>
<CustomAdditionalCompileInputs Include="@(Analyzer)" />
Expand Down