Skip to content

Upgrade SDK to 6.0.100-rc.1.21411.13 #57143

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

Upgrade SDK to 6.0.100-rc.1.21411.13 #57143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
043a5e3
Upgrade SDK to 6.0.100-rc.1.21379.2
ViktorHofer Aug 10, 2021
dc94950
set StaticWebAssetsEnabled=false
lewing Aug 10, 2021
cf597f1
Remove IsSupported2 since asserting it is true when it might not be
lewing Aug 11, 2021
dc42abc
Try enabling the runtimeconfig generator everywhere
lewing Aug 11, 2021
55674cf
Revert part of runtimeconfig parser change
lewing Aug 11, 2021
a9b4686
Fix System.Text.Json tests to run with trimming by setting MetadataUp…
eerhardt Aug 11, 2021
bfaa2f7
Disable bundling tests on Mac due to bug
agocke Aug 11, 2021
4f83413
Make ProcessInfo tests resilient to RuntimeConfig switches on command…
Aug 11, 2021
cb336a0
Update global.json
danmoseley Aug 12, 2021
d93e250
Update to latest SDK.
eerhardt Aug 12, 2021
6b50bfb
ignore runtimeconfig switches _if_ they show up
Aug 12, 2021
df6f5e2
Remove test which uses `dotnet run, which is SDK-specific
agocke Aug 12, 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
Prev Previous commit
Next Next commit
Fix System.Text.Json tests to run with trimming by setting MetadataUp… 
…daterSupport=true.

Work around SDK issue by overwriting EnableUnsafeUTF7Encoding in System.Text.Encoding
  • Loading branch information
@eerhardt
eerhardt committed Aug 11, 2021
commit a9b46861ac675c1d5355467c5d8fc828c7d9214e
7 changes: 7 additions & 0 deletions src/libraries/System.Text.Encoding/tests/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project>
<Import Project="..\..\Directory.Build.targets" />
<PropertyGroup>
<!-- workaround https://github.com/dotnet/sdk/pull/19677. This can be removed when we get an SDK that has that fix. -->
<EnableUnsafeUTF7Encoding>true</EnableUnsafeUTF7Encoding>
</PropertyGroup>
</Project>
2 changes: 2 additions & 0 deletions src/libraries/System.Text.Json/tests/System.Text.Json.Tests/System.Text.Json.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<!-- these tests depend on the pdb files. Causes test failures like:
[FAIL] System.Text.Json.Tests.DebuggerTests.DefaultJsonElement -->
<DebuggerSupport Condition="'$(DebuggerSupport)' == '' and '$(TargetOS)' == 'Browser'">true</DebuggerSupport>
<!-- Needed for JsonSerializerOptionsUpdateHandler tests -->
<MetadataUpdaterSupport Condition="'$(MetadataUpdaterSupport)' == '' and '$(TargetOS)' == 'Browser'">true</MetadataUpdaterSupport>
<WasmXHarnessArgs>$(WasmXHarnessArgs) --timeout=1800</WasmXHarnessArgs>
</PropertyGroup>
<!-- DesignTimeBuild requires all the TargetFramework Derived Properties to not be present in the first property group. -->
Expand Down