Skip to content

[release/6.0.1xx-preview5] Update dependencies from dotnet/installer #11672

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 5 commits into from
May 28, 2021
Merged

[release/6.0.1xx-preview5] Update dependencies from dotnet/installer #11672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbfa9aa
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] May 25, 2021
faff1c6
[dotnet] Manually update to the latest .NET 5 preview 5.
rolfbjarne May 26, 2021
0d13c74
Try again.
rolfbjarne May 26, 2021
99c7763
[tests] Skip code that needs System.ComponentModel.Composition or Sys…
rolfbjarne May 27, 2021
44b1847
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] May 27, 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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.4.21218.6">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.5.21277.1">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>2455d34cebebfa62772f57be93b2cf99d14dbad2</Sha>
<Sha>847f8d3b2b55bacffe11f59dae16ecf4e9fb5149</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21212.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.5.21264.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/mono/linker</Uri>
<Sha>6bfa2c0657d2dcfd6dce684ab34b470ce567631a</Sha>
<Sha>7a5c445a69359415b7ff18b91cd24472ef9509ff</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.4.21218.6</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.2.21212.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.5.21277.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.5.21264.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
</PropertyGroup>
</Project>
5 changes: 4 additions & 1 deletion tests/linker/ios/link all/MEFTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
#if !NET // https://github.com/xamarin/xamarin-macios/issues/11710
using System;
using System.Collections.Generic;
using System.ComponentModel.Composition;
using System.ComponentModel.Composition.Hosting;
Expand Down Expand Up @@ -78,3 +79,5 @@ public void ExportServices ()
}
}
}
#endif // !NET

4 changes: 4 additions & 0 deletions tests/linker/ios/link sdk/LinkSdkRegressionTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
using System.Diagnostics;
using System.Globalization;
using System.IO;
#if !NET // https://github.com/xamarin/xamarin-macios/issues/11710
using System.Json;
#endif
using System.Linq;
using System.Net;
using System.Net.NetworkInformation;
Expand Down Expand Up @@ -623,6 +625,7 @@ public void Synchronized_3904 ()
Assert.NotNull (getInstance (), "Location");
}

#if !NET // https://github.com/xamarin/xamarin-macios/issues/11710
[Test]
[Culture ("en")]
public void Json_Parse_4415 ()
Expand All @@ -635,6 +638,7 @@ public void Json_Parse_4415 ()
f *= 10;
Assert.AreNotEqual (f, (float) v, "non-equal");
}
#endif // !NET

[Test]
[Culture ("en")]
Expand Down