Skip to content
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

Jump to bottom

[wasm] Modify System.Net.Request to throw PNSE on Browser WASM #40274

Merged
5 commits merged into from
Aug 4, 2020
Merged

[wasm] Modify System.Net.Request to throw PNSE on Browser WASM #40274

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
671a409
[wasm] Modify System.Net.Request to throw PNSE on Browser WASM
MaximLipnin Aug 3, 2020
535a91b
[wasm] Re-enable System.ComponentModel.EventBasedAsync.Tests.Backgrou…
MaximLipnin Aug 3, 2020
b6ef7d2
Make the CS0809 build warning depend on if PNSE assembly is going to …
MaximLipnin Aug 3, 2020
19284ca
Update src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
MaximLipnin Aug 3, 2020
0bc4ffa
Remove redundant condition
MaximLipnin Aug 3, 2020
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
1 change: 0 additions & 1 deletion src/libraries/System.ComponentModel.EventBasedAsync/tests/BackgroundWorkerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ public void DisposeTwiceShouldNotThrow()
}

[ConditionalFact(typeof(PlatformDetection), nameof(PlatformDetection.IsPreciseGcSupported))]
[ActiveIssue("https://github.com/dotnet/runtime/issues/38283", TestPlatforms.Browser)]
public void TestFinalization()
{
// BackgroundWorker has a finalizer that exists purely for backwards compatibility
Expand Down
3 changes: 3 additions & 0 deletions src/libraries/System.Net.Requests/src/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,4 +267,7 @@
<data name="net_invalid_host" xml:space="preserve">
<value>The specified value is not a valid Host header string.</value>
</data>
<data name="SystemNetRequests_PlatformNotSupported" xml:space="preserve">
<value>System.Net.Requests is not supported on this platform.</value>
</data>
</root>
8 changes: 6 additions & 2 deletions src/libraries/System.Net.Requests/src/System.Net.Requests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
<TargetFrameworks>$(NetCoreAppCurrent)-Windows_NT;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PropertyGroup>
<GeneratePlatformNotSupportedAssemblyMessage Condition="'$(TargetsBrowser)' == 'true'">SR.SystemNetRequests_PlatformNotSupported</GeneratePlatformNotSupportedAssemblyMessage>
<NoWarn Condition="'$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">$(NoWarn);CS0809</NoWarn>
</PropertyGroup>
<ItemGroup Condition="'$(TargetsBrowser)' != 'true'">
<Compile Include="System\Net\AuthenticationManager.cs" />
<Compile Include="System\Net\Authorization.cs" />
<Compile Include="System\Net\FileWebRequest.cs" />
Expand Down Expand Up @@ -77,7 +81,7 @@
Link="Common\System\Net\ContextAwareResult.Windows.cs" />
<Compile Include="System\Net\WebExceptionPal.Windows.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetsUnix)' == 'true' or '$(TargetsBrowser)' == 'true' ">
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
<Compile Include="$(CommonPath)System\Net\ContextAwareResult.Unix.cs"
Link="Common\System\Net\ContextAwareResult.Unix.cs" />
<Compile Include="System\Net\WebExceptionPal.Unix.cs" />
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Requests/tests/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
using Xunit;

[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/34690", TestPlatforms.Windows, TargetFrameworkMonikers.Netcoreapp, TestRuntimes.Mono)]
[assembly: ActiveIssue("https://github.com/dotnet/runtime/issues/38283", TestPlatforms.Browser)]
[assembly: SkipOnMono("System.Net.Requests is not supported on Browser.", TestPlatforms.Browser)]
1 change: 1 addition & 0 deletions src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<IncludeRemoteExecutor>true</IncludeRemoteExecutor>
<TargetFrameworks>$(NetCoreAppCurrent)</TargetFrameworks>
<DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
Expand Down