Skip to content

Remove ILStrip temporarily to retain ActiveIssue attributes in release mobile device configuration #59762

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
merged 3 commits into from
Sep 30, 2021
Merged

Remove ILStrip temporarily to retain ActiveIssue attributes in release mobile device configuration #59762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
363990f
Remove ILStrip temporarily to retain ActiveIssue attributes in releas…
Sep 29, 2021
3a65931
Merge remote-tracking branch 'upstream/main' into mobile_release_remo…
Sep 29, 2021
45c3575
Add Android Active Issue
Sep 29, 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
6 changes: 3 additions & 3 deletions eng/testing/tests.mobile.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
Condition="'$(RuntimeConfigParserTasksAssemblyPath)' != ''" />

<Target Name="GenerateRuntimeConfig" Condition="'$(TargetOS)' != 'Browser'"
Inputs="$(PublishDir)$(AssemblyName).runtimeconfig.json"
Inputs="$(PublishDir)$(AssemblyName).runtimeconfig.json"
Outputs="$(PublishDir)runtimeconfig.bin">
<PropertyGroup>
<RuntimeConfigFilePath>$(PublishDir)$(AssemblyName).runtimeconfig.json</RuntimeConfigFilePath>
Expand Down Expand Up @@ -208,7 +208,7 @@
<Output TaskParameter="CompiledAssemblies" ItemName="BundleAssemblies" />
</MonoAOTCompiler>

<ILStrip Condition="'$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true'" Assemblies="@(BundleAssemblies)" />
<!-- <ILStrip Condition="'$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true'" Assemblies="@(BundleAssemblies)" /> -->

<ItemGroup>
<BundleAssemblies Include="@(_BundleNonAotAssemblies)" />
Expand Down Expand Up @@ -249,7 +249,7 @@
SkipUnchangedFiles="true"
Condition="'$(ArchiveTests)' == 'true' and '$(IgnoreForCI)' != 'true' and '$(GenerateXcodeProject)' == 'true'" />

<RemoveDir Condition="'$(ArchiveTests)' == 'true' and '$(IgnoreForCI)' != 'true'"
<RemoveDir Condition="'$(ArchiveTests)' == 'true' and '$(IgnoreForCI)' != 'true'"
Directories="$(OutDir)" />
</Target>

Expand Down
1 change: 1 addition & 0 deletions src/libraries/System.Security.Cryptography.X509Certificates/tests/CollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,7 @@ public static void ExportCertificatePems_SingleCert()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/59777", TestPlatforms.Android)]
public static void ExportCertificatePems_MultiCert()
{
const string MultiPem = "-----BEGIN CERTIFICATE-----\n" +
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/tests.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@

<ItemGroup Condition="('$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS') and '$(RunDisablediOSTests)' != 'true'">
<ProjectExclusions Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" />

<!-- Functional tests on devices have problems with return codes from mlaunch -->
<ProjectExclusions Include="$(RepoRoot)\src\tests\FunctionalTests\$(TargetOS)\Device\**\*.Test.csproj" />
</ItemGroup>
Expand Down