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.

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

[master] Update dependencies from dotnet/sdk #7208

Merged
merged 30 commits into from
Apr 21, 2020
Merged

[master] Update dependencies from dotnet/sdk #7208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
449edd1
Update dependencies from https://github.com/dotnet/sdk build 20200417.2
dotnet-maestro[bot] Apr 17, 2020
4827a17
Update dependencies from https://github.com/dotnet/sdk build 20200417.3
dotnet-maestro[bot] Apr 17, 2020
8c73c1f
Update dependencies from https://github.com/dotnet/sdk build 20200417.4
dotnet-maestro[bot] Apr 17, 2020
8b60711
Update dependencies from https://github.com/dotnet/sdk build 20200417.5
dotnet-maestro[bot] Apr 17, 2020
a04e05c
Update dependencies from https://github.com/dotnet/sdk build 20200417.6
dotnet-maestro[bot] Apr 17, 2020
efadc4f
Update dependencies from https://github.com/dotnet/sdk build 20200417.7
dotnet-maestro[bot] Apr 17, 2020
c6e3c10
Update dependencies from https://github.com/dotnet/sdk build 20200417.8
dotnet-maestro[bot] Apr 18, 2020
76245d9
Update dependencies from https://github.com/dotnet/sdk build 20200418.1
dotnet-maestro[bot] Apr 18, 2020
40a2c92
Update dependencies from https://github.com/dotnet/sdk build 20200418.2
dotnet-maestro[bot] Apr 18, 2020
abc03cd
Update dependencies from https://github.com/dotnet/sdk build 20200418.3
dotnet-maestro[bot] Apr 18, 2020
22f235f
Update dependencies from https://github.com/dotnet/sdk build 20200418.4
dotnet-maestro[bot] Apr 19, 2020
16663fa
Update dependencies from https://github.com/dotnet/sdk build 20200419.1
dotnet-maestro[bot] Apr 19, 2020
596740f
Update dependencies from https://github.com/dotnet/sdk build 20200419.2
dotnet-maestro[bot] Apr 19, 2020
ea20421
Update dependencies from https://github.com/dotnet/sdk build 20200419.3
dotnet-maestro[bot] Apr 20, 2020
5ddf7e7
Update dependencies from https://github.com/dotnet/sdk build 20200420.1
dotnet-maestro[bot] Apr 20, 2020
5db6536
Update dependencies from https://github.com/dotnet/sdk build 20200420.2
dotnet-maestro[bot] Apr 20, 2020
14193d2
Update dependencies from https://github.com/dotnet/sdk build 20200420.3
dotnet-maestro[bot] Apr 20, 2020
b6114d1
Switch to using RuntimeInformation APIs instead of deprecated Platfor…
dsplaisted Apr 20, 2020
ea0a071
Update dependencies from https://github.com/dotnet/sdk build 20200420.4
dotnet-maestro[bot] Apr 20, 2020
932c1a6
Update dependencies from https://github.com/dotnet/sdk build 20200420.5
dotnet-maestro[bot] Apr 20, 2020
e6db6ca
Update dependencies from https://github.com/dotnet/sdk build 20200420.7
dotnet-maestro[bot] Apr 21, 2020
0aa6e59
Update dependencies from https://github.com/dotnet/sdk build 20200420.8
dotnet-maestro[bot] Apr 21, 2020
d2744b7
Update dependencies from https://github.com/dotnet/sdk build 20200420.10
dotnet-maestro[bot] Apr 21, 2020
6642be9
Update dependencies from https://github.com/dotnet/sdk build 20200420.12
dotnet-maestro[bot] Apr 21, 2020
79f773e
Update dependencies from https://github.com/dotnet/sdk build 20200420.13
dotnet-maestro[bot] Apr 21, 2020
4913c36
Update dependencies from https://github.com/dotnet/sdk build 20200421.1
dotnet-maestro[bot] Apr 21, 2020
b934984
Update dependencies from https://github.com/dotnet/sdk build 20200421.2
dotnet-maestro[bot] Apr 21, 2020
32d28c4
Update dependencies from https://github.com/dotnet/sdk build 20200421.3
dotnet-maestro[bot] Apr 21, 2020
327911d
Update dependencies from https://github.com/dotnet/sdk build 20200421.4
dotnet-maestro[bot] Apr 21, 2020
bbdfc71
Update dependencies from https://github.com/dotnet/sdk build 20200421.5
dotnet-maestro[bot] Apr 21, 2020
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
Expand Up @@ -79,13 +79,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>1b50638acb1defc7d7ccaba5b2a0f4b0c50c0b3d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.4.20217.1">
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.5.20221.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>af10fe4cb05c7b90e2d0b0293dba769b54f396ad</Sha>
<Sha>8f0e581f439e00b706f0366cb434c2e49f6da73b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.4.20217.1">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.5.20221.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>af10fe4cb05c7b90e2d0b0293dba769b54f396ad</Sha>
<Sha>8f0e581f439e00b706f0366cb434c2e49f6da73b</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-preview.4.20216.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
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
Expand Up @@ -49,8 +49,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>5.0.100-preview.4.20217.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.4.20217.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>5.0.100-preview.5.20221.5</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.5.20221.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "5.0.100-preview.1.20154.9",
"dotnet": "5.0.100-preview.4.20217.10",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRuntimePackageVersion)"
Expand Down
3 changes: 2 additions & 1 deletion test/EndToEnd/GivenSelfContainedAppsRollForward.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Xml.Linq;
using FluentAssertions;
using Microsoft.DotNet.TestFramework;
Expand All @@ -20,7 +21,7 @@ internal void ItRollsForwardToTheLatestVersion(string packageName, string minorV
PackageName = packageName,
MinorVersion = minorVersion,
// Set RuntimeIdentifier to opt in to roll-forward behavior
RuntimeIdentifier = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier()
RuntimeIdentifier = RuntimeInformation.RuntimeIdentifier
};

var testInstance = testProjectCreator.Create();
Expand Down
3 changes: 2 additions & 1 deletion test/EndToEnd/ProjectBuildTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices;
using System.Xml.Linq;
using Microsoft.DotNet.PlatformAbstractions;
using Microsoft.DotNet.TestFramework;
Expand Down Expand Up @@ -127,7 +128,7 @@ private void TestTemplateBuild(string templateName, bool selfContained = false)
.Execute(newArgs)
.Should().Pass();

var buildArgs = selfContained ? "" :$"-r {RuntimeEnvironment.GetRuntimeIdentifier()}";
var buildArgs = selfContained ? "" :$"-r {RuntimeInformation.RuntimeIdentifier}";
var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
new BuildCommand()
.WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet
Expand Down
5 changes: 3 additions & 2 deletions test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyFactAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using Microsoft.DotNet.PlatformAbstractions;

using System.Runtime.InteropServices;
using Xunit;

namespace Microsoft.DotNet.Tools.Test.Utilities
Expand All @@ -10,7 +11,7 @@ public class UnixOnlyFactAttribute : FactAttribute
{
public UnixOnlyFactAttribute()
{
if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows)
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
this.Skip = "This test requires Unix to run";
}
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.DotNet.Tools.Tests.Utilities/UnixOnlyTheoryAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using Microsoft.DotNet.PlatformAbstractions;
using System.Runtime.InteropServices;
using Xunit;

namespace Microsoft.DotNet.Tools.Test.Utilities
Expand All @@ -10,7 +10,7 @@ public class UnixOnlyTheoryAttribute : TheoryAttribute
{
public UnixOnlyTheoryAttribute()
{
if (RuntimeEnvironment.OperatingSystemPlatform == Platform.Windows)
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
this.Skip = "This test requires Unix to run";
}
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyFactAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using Microsoft.DotNet.PlatformAbstractions;
using System.Runtime.InteropServices;
using Xunit;

namespace Microsoft.DotNet.Tools.Test.Utilities
Expand All @@ -10,7 +10,7 @@ public class WindowsOnlyFactAttribute : FactAttribute
{
public WindowsOnlyFactAttribute()
{
if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows)
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
this.Skip = "This test requires Windows to run";
}
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.DotNet.Tools.Tests.Utilities/WindowsOnlyTheoryAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using Microsoft.DotNet.PlatformAbstractions;
using System.Runtime.InteropServices;
using Xunit;

namespace Microsoft.DotNet.Tools.Test.Utilities
Expand All @@ -10,7 +10,7 @@ public class WindowsOnlyTheoryAttribute : TheoryAttribute
{
public WindowsOnlyTheoryAttribute()
{
if (RuntimeEnvironment.OperatingSystemPlatform != Platform.Windows)
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
this.Skip = "This test requires Windows to run";
}
Expand Down