From db7d0fd03436bc1e63b9ac54ce363055d55fc1a3 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Tue, 28 Jan 2020 10:09:34 -0800 Subject: [PATCH 1/2] Update Dotnet host for testing and add RuntimeFrameworkVersion to nca5.0 package testing --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- .../netcoreapp5.0/settings.targets | 3 +++ 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97cfdefb853640..20f127edbb84f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ https://github.com/dotnet/corefx 5cee7c97d602f294e27c582d4dab81ec388f1d7b - + https://github.com/dotnet/runtime - 86bfd8d46b3817e2a027b23d829cd0d035cd8ad6 + 4011572bd462ad94bcfadb7c5b4dfcacfeae970a - - https://github.com/dotnet/core-setup - 8743c312a9d1ce4035140046d44bb959c44f194f + + https://github.com/dotnet/runtime + 4011572bd462ad94bcfadb7c5b4dfcacfeae970a - - https://github.com/dotnet/core-setup - 8743c312a9d1ce4035140046d44bb959c44f194f + + https://github.com/dotnet/runtime + 4011572bd462ad94bcfadb7c5b4dfcacfeae970a https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index a92ae567fe40da..3e2726a8b305bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ 5.0.0-beta.20079.8 5.0.0-beta.20079.8 - 5.0.0-alpha.1.20071.1 - 5.0.0-alpha.1.19563.6 - 5.0.0-alpha.1.19563.6 + 5.0.0-alpha.1.20077.11 + 5.0.0-alpha.1.20077.11 + 5.0.0-alpha.1.20077.11 2.1.0 3.0.0 diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets index bc6aa5222f1057..a8fa34134f4350 100644 --- a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets @@ -1,4 +1,7 @@ + + $(MicrosoftNETCoreAppVersion) + From f55145973e825d34ecf483c56f56f68835434cd3 Mon Sep 17 00:00:00 2001 From: Santiago Fernandez Madero Date: Thu, 30 Jan 2020 19:37:30 -0800 Subject: [PATCH 2/2] Update host version to latest containing musl arm fix --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20f127edbb84f3..3809a21e5928fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,17 +4,17 @@ https://github.com/dotnet/corefx 5cee7c97d602f294e27c582d4dab81ec388f1d7b - + https://github.com/dotnet/runtime - 4011572bd462ad94bcfadb7c5b4dfcacfeae970a + 665983a01f9c604bc3f704f469acb8a08c619d8a - + https://github.com/dotnet/runtime - 4011572bd462ad94bcfadb7c5b4dfcacfeae970a + 665983a01f9c604bc3f704f469acb8a08c619d8a - + https://github.com/dotnet/runtime - 4011572bd462ad94bcfadb7c5b4dfcacfeae970a + 665983a01f9c604bc3f704f469acb8a08c619d8a https://github.com/dotnet/corefx diff --git a/eng/Versions.props b/eng/Versions.props index 3e2726a8b305bb..c91fa410d05880 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,9 +71,9 @@ 5.0.0-beta.20079.8 5.0.0-beta.20079.8 - 5.0.0-alpha.1.20077.11 - 5.0.0-alpha.1.20077.11 - 5.0.0-alpha.1.20077.11 + 5.0.0-alpha.1.20080.9 + 5.0.0-alpha.1.20080.9 + 5.0.0-alpha.1.20080.9 2.1.0 3.0.0