Skip to content

Make Microsoft.NETCore.Platforms pack from CSProj #50468

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
ericstj merged 9 commits into from
Apr 2, 2021
Merged

Make Microsoft.NETCore.Platforms pack from CSProj #50468

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7fcec2b
Use CSProj for packing Platforms package
ericstj Mar 29, 2021
d3d6392
Port GenerateRuntimeGraph task
ericstj Mar 30, 2021
b82c38f
Refactor GenerateRuntimeGraph into separate files
ericstj Mar 30, 2021
f7ce36b
Add test for GenerateRuntimeGraph
ericstj Mar 31, 2021
63adcb3
Fix up path to runtime.json
ericstj Mar 31, 2021
4682bce
Don't filter inner builds when building Platforms task
ericstj Mar 31, 2021
0b8d0e0
Skip tests RuntimeGraph task tests on some platforms
ericstj Mar 31, 2021
7a6ccaf
Exclude browser from testing instead of wasm
ericstj Apr 2, 2021
5aec6a7
Another try at suppressing testing on Browser
ericstj Apr 2, 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
Another try at suppressing testing on Browser
  • Loading branch information
@ericstj
ericstj committed Apr 2, 2021
commit 5aec6a7cfa8a7a8dd546a163af3ac31f91fed3b9
6 changes: 6 additions & 0 deletions src/libraries/Microsoft.NETCore.Platforms/tests/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

using Xunit;

[assembly: SkipOnMono("MSBuild is not supported on Browser", TestPlatforms.Browser)]
4 changes: 2 additions & 2 deletions src/libraries/Microsoft.NETCore.Platforms/tests/Microsoft.NETCore.Platforms.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(NetCoreAppCurrent);net472</TargetFrameworks>
<!-- MSBuild won't work everywhere -->
<SkipTestsOnPlatform Condition="'$(TargetsMobile)' == 'true' or '$(TargetsBrowser)' == 'true'">true</SkipTestsOnPlatform>
<IgnoreForCI Condition="'$(TargetOS)' == 'Browser'">true</IgnoreForCI>
</PropertyGroup>

<ItemGroup>
Expand All @@ -12,6 +11,7 @@
</ItemGroup>

<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="GenerateRuntimeGraphTests.cs" />
<Compile Include="Log.cs" />
<Compile Include="TestBuildEngine.cs" />
Expand Down