diff options
9 files changed, 22 insertions, 4 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2fa780e0b5e..6ab177bb875 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -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> diff --git a/eng/Versions.props b/eng/Versions.props index 987a01311c4..72f17c83aa2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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> diff --git a/eng/testing/ILLinkDescriptors/ILLink.Descriptors.Serialization.xml b/eng/testing/ILLinkDescriptors/ILLink.Descriptors.Serialization.xml index be8b9078732..b9a57857cac 100644 --- a/eng/testing/ILLinkDescriptors/ILLink.Descriptors.Serialization.xml +++ b/eng/testing/ILLinkDescriptors/ILLink.Descriptors.Serialization.xml @@ -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> diff --git a/src/libraries/System.Runtime.Serialization.Schema/tests/ILLink.Descriptors.xml b/src/libraries/System.Runtime.Serialization.Schema/tests/ILLink.Descriptors.xml new file mode 100644 index 00000000000..0ec4ea37a8d --- /dev/null +++ b/src/libraries/System.Runtime.Serialization.Schema/tests/ILLink.Descriptors.xml @@ -0,0 +1,5 @@ +<linker> + <assembly fullname="System.CodeDom"> + <type fullname="Microsoft.CSharp.CSharpCodeProvider" /> + </assembly> +</linker> diff --git a/src/libraries/System.Runtime.Serialization.Schema/tests/System.Runtime.Serialization.Schema.Tests.csproj b/src/libraries/System.Runtime.Serialization.Schema/tests/System.Runtime.Serialization.Schema.Tests.csproj index 6515ccf3936..a4bc7d88777 100644 --- a/src/libraries/System.Runtime.Serialization.Schema/tests/System.Runtime.Serialization.Schema.Tests.csproj +++ b/src/libraries/System.Runtime.Serialization.Schema/tests/System.Runtime.Serialization.Schema.Tests.csproj @@ -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> diff --git a/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/RoundTripTest.cs b/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/RoundTripTest.cs index 67c31622ace..b8fe734b1a5 100644 --- a/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/RoundTripTest.cs +++ b/src/libraries/System.Runtime.Serialization.Schema/tests/System/Runtime/Serialization/Schema/RoundTripTest.cs @@ -20,6 +20,7 @@ namespace System.Runtime.Serialization.Schema.Tests } [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 diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs b/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs index 9b0f071947d..f0abe32501a 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/DataContractSerializer.cs @@ -4107,6 +4107,7 @@ public static partial class DataContractSerializerTests } [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( @@ -4165,6 +4166,7 @@ public static partial class DataContractSerializerTests } [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. diff --git a/src/libraries/System.Runtime.Serialization.Xml/tests/XsdDataContractExporterTests/ExporterApiTests.cs b/src/libraries/System.Runtime.Serialization.Xml/tests/XsdDataContractExporterTests/ExporterApiTests.cs index 03e2c5f5a91..3697cb0412a 100644 --- a/src/libraries/System.Runtime.Serialization.Xml/tests/XsdDataContractExporterTests/ExporterApiTests.cs +++ b/src/libraries/System.Runtime.Serialization.Xml/tests/XsdDataContractExporterTests/ExporterApiTests.cs @@ -87,6 +87,7 @@ namespace System.Runtime.Serialization.Xml.XsdDataContractExporterTests } [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) { diff --git a/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj b/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj index 5f698b4d9a4..6dc96ec2632 100644 --- a/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj +++ b/src/mono/sample/wasm/browser-eventpipe/Wasm.Browser.EventPipe.Sample.csproj @@ -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" > |