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.

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

[main] Update dependencies from dotnet/linker #73894

Merged
merged 12 commits into from
Aug 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -234,9 +234,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e680411c22e33f45821f4ae64365a2970b2430a6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22412.3">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22412.4">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>1ef0acf496369c15911dd5fe78e2d100659fa389</Sha>
<Sha>fda7b09fc005acb865deaf526c7adbb1be27a5f9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="1.0.0-prerelease.22411.1">
<Uri>https://github.com/dotnet/xharness</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>7.0.0-preview-20220721.1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22412.3</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkTasksVersion>7.0.100-1.22412.4</MicrosoftNETILLinkTasksVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-rc.1.22408.1</MicrosoftNETCoreRuntimeICUTransportVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,11 @@
<assembly fullname="System.Private.Xml.Linq">
<type fullname="System.Xml.Linq.XElement" />
</assembly>
<assembly fullname="System.Private.DataContractSerialization">
<type fullname="System.Runtime.Serialization.DateTimeOffsetAdapter" />
<type fullname="System.Runtime.Serialization.MemoryStreamAdapter" />
</assembly>
<assembly fullname="System.Collections.Immutable">
<type fullname="System.Collections.Immutable.ImmutableArray`1" />
</assembly>
</linker>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<linker>
<assembly fullname="System.CodeDom">
<type fullname="Microsoft.CSharp.CSharpCodeProvider" />
</assembly>
</linker>
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<Compile Include="System\Runtime\Serialization\Schema\DataContracts.cs" />
<Compile Include="System\Runtime\Serialization\Schema\Import\ImportOptionsTests.cs" />
<Compile Include="System\Runtime\Serialization\Schema\SchemaUtils.cs" />

<TrimmerRootDescriptor Include="ILLink.Descriptors.xml" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ public RoundTripTest(ITestOutputHelper output)
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73961", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
public void RountTripTest()
{
// AppContext SetSwitch seems to be unreliable in the unit test case. So let's not rely on it
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4107,6 +4107,7 @@ public static void DCS_SampleICollectionTExplicitWithoutDC()
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73961", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
public static void DCS_MemoryStream_Serialize_UsesBuiltInAdapter()
{
ValidateObject(
Expand Down Expand Up @@ -4165,6 +4166,7 @@ static void ValidateObject(MemoryStream original, string expectedXml, byte[] exp
}

[Fact]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73961", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
public static void DCS_MemoryStream_Deserialize_CompatibleWithFullFramework()
{
// The payloads in this test were generated by a Full Framework application.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public static IEnumerable<object[]> CanExport_MemberData()
}

[Theory]
[ActiveIssue("https://github.com/dotnet/runtime/issues/73961", typeof(PlatformDetection), nameof(PlatformDetection.IsBuiltWithAggressiveTrimming), nameof(PlatformDetection.IsBrowser))]
[MemberData(nameof(Export_MemberData))]
public void Export(string testname, Action<XsdDataContractExporter> export, Action<string, XmlSchemaSet> schemaCheck = null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<RunScriptCommand>$(ExecXHarnessCmd) wasm test-browser --app=. --browser=Chrome $(XHarnessBrowserPathArg) --html-file=index.html --output-directory=$(XHarnessOutput) -- $(MSBuildProjectName).dll</RunScriptCommand>
<FeatureWasmPerfTracing>true</FeatureWasmPerfTracing>
<FeatureWasmThreads Condition="false">true</FeatureWasmThreads>
<NoWarn>CA2007</NoWarn> <!-- consider ConfigureAwait() -->
<NoWarn>$(NoWarn);CA2007</NoWarn> <!-- consider ConfigureAwait() -->
</PropertyGroup>

<Target Name="CheckThreadsEnabled" BeforeTargets="Compile" >
Expand Down