Skip to content

[wasm] Don't deploy the NetCoreAppMinimum BinaryFormatter copy on browser/wasi #132475

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

Draft
pavelsavara wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[wasm] Don't deploy the NetCoreAppMinimum BinaryFormatter copy on browser/wasi #132475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...crosoft.Extensions.Hosting/tests/UnitTests/Microsoft.Extensions.Hosting.Unit.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Collections.NonGeneric/tests/System.Collections.NonGeneric.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...ibraries/System.Collections.Specialized/tests/System.Collections.Specialized.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Collections/tests/System.Collections.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj" Private="true" SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj" Private="true" SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
<ItemGroup>
<RdXmlFile Include="default.rd.xml" />
Expand Down
2 changes: 1 addition & 1 deletion ...es/System.ComponentModel.Annotations/tests/System.ComponentModel.Annotations.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...ries/System.ComponentModel.Primitives/tests/System.ComponentModel.Primitives.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...ystem.ComponentModel.TypeConverter/tests/System.ComponentModel.TypeConverter.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\TestResx.resx">
Expand Down
2 changes: 1 addition & 1 deletion ...uration.ConfigurationManager/tests/System.Configuration.ConfigurationManager.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Data.Common/tests/System.Data.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
<!-- S.D.SqlClient isn't live built anymore. -->
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Formats.Nrbf/tests/System.Formats.Nrbf.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion 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 @@ -59,6 +59,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.ObjectModel/tests/System.ObjectModel.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>

<ItemGroup Condition="'$(TargetOS)' == 'browser'">
Expand Down
2 changes: 1 addition & 1 deletion ....Extensions/tests/BinaryFormatTests/System.Resources.Extensions.BinaryFormat.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...em.Resources.Extensions/tests/CompatTests/System.Resources.Extensions.Compat.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Windows.Extensions\src\System.Windows.Extensions.csproj" Condition="'$(TargetPlatformIdentifier)' == 'windows'" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Resources.Extensions/tests/System.Resources.Extensions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
<ProjectReference Include="$(LibrariesProjectRoot)System.Windows.Extensions\src\System.Windows.Extensions.csproj" Condition="'$(TargetPlatformIdentifier)' == 'windows'" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...ntime.Serialization.Formatters/tests/System.Runtime.Serialization.Formatters.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
<ProjectReference Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System.Reflection.Metadata.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion ...ntime.Serialization.Primitives/tests/System.Runtime.Serialization.Primitives.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...ests/System.Resources.ResourceManager.Tests/System.Resources.ResourceManager.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
<!--
MSBuild on .NET Core doesn't support non-string resources. See https://github.com/Microsoft/msbuild/issues/2221
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime/tests/System.Runtime.Tests/System.Runtime.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
<Import Project="$(CommonTestPath)ComplianceTests\GB18030\GB18030.Shared.projitems" />
</Project>
2 changes: 1 addition & 1 deletion src/libraries/System.Security.Cryptography/tests/System.Security.Cryptography.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,6 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...Text.RegularExpressions/tests/FunctionalTests/System.Text.RegularExpressions.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Threading.Channels/tests/System.Threading.Channels.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<!-- Reference the `NetCoreAppMinimum` build which has a functional BinaryFormatter and force a private copy to ensure it's not excluded -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Runtime.Serialization.Formatters\src\System.Runtime.Serialization.Formatters.csproj"
Private="true"
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" />
SetTargetFramework="TargetFramework=$(NetCoreAppMinimum)" Condition="'$(TargetOS)' != 'browser' and '$(TargetOS)' != 'wasi'" />
Comment thread
pavelsavara marked this conversation as resolved.
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
Expand Down
Loading