Skip to content

Make JsonGenerator be an incremental generator #57088

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
eerhardt merged 12 commits into from
Aug 27, 2021
Merged

Make JsonGenerator be an incremental generator #57088

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
92da59a
Make JsonGenerator be an incremental generator
chsienki Aug 9, 2021
bfa08f6
Improve incrementalism by doing less work when not applicable
chsienki Aug 19, 2021
f3e16e2
Fix typo
chsienki Aug 20, 2021
1e67b4a
PR feedback
eerhardt Aug 25, 2021
0e7c57a
Change SourceGeneration.UnitTests to SourceGeneration.Unit.Tests so i…
eerhardt Aug 25, 2021
0d72cd7
Get unit tests running after IIncrementalGenerator migration
eerhardt Aug 25, 2021
7de17b1
Fix duplicate file name tests by working around https://github.com/do…
eerhardt Aug 25, 2021
2333830
Fix unit tests now that they are running in CI against non-English la…
eerhardt Aug 26, 2021
85643af
PR feedback
eerhardt Aug 26, 2021
1cc6013
Fix System.Text.Json.SourceGeneration.Unit.Tests on WASM
eerhardt Aug 26, 2021
15c9106
Disable STJ.SourceGeneration.Unit.Tests on Browser
eerhardt Aug 27, 2021
cfe9b4c
Merge remote-tracking branch 'upstream/main' into incremental_json
eerhardt Aug 27, 2021
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
3 changes: 3 additions & 0 deletions src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Primitives\tests\System.Security.Cryptography.Primitives.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.Xml\tests\System.Security.Cryptography.Xml.Tests.csproj" />
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Security.Cryptography.X509Certificates\tests\System.Security.Cryptography.X509Certificates.Tests.csproj" />

Copy link
Contributor

@steveharter steveharter Aug 27, 2021

Choose a reason for hiding this comment

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

FWIW this change under the condition:

<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true'">

Copy link
Member

@eerhardt eerhardt Aug 27, 2021

Choose a reason for hiding this comment

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

I'm not sure I understand the comment.

There are different levels of "exclude a test for wasm". This ItemGroup excludes the test for all WASM. The next group down excludes the test for "AOT" and "EnableAggressiveTrimming" WASM legs.

Copy link
Contributor

@steveharter steveharter Aug 27, 2021

Choose a reason for hiding this comment

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

Just adding a note since the raw github view here doesn't show the parent condition (since it is too far above). May save someone from opening the .cs file and manually finding that LOC.

<!-- https://github.com/dotnet/runtime/issues/58226 -->
<ProjectExclusions Include="$(MSBuildThisFileDirectory)System.Text.Json\tests\System.Text.Json.SourceGeneration.Unit.Tests\System.Text.Json.SourceGeneration.Unit.Tests.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'Browser' and '$(BuildAOTTestsOnHelix)' == 'true' and '$(RunDisabledWasmTests)' != 'true'">
Expand Down