From 830c6b50d284df7b63d3c0fbe3269759759a90fb Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 14 Mar 2016 16:51:05 -0700 Subject: [PATCH 1/4] Fix runtime facade package versions These packages had their semantic versions get updated, but the corresponding packages in the facade were forgotten. --- src/TypeCatalogGen/Runtime/project.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TypeCatalogGen/Runtime/project.json b/src/TypeCatalogGen/Runtime/project.json index b4170d5c70..ec36da4d45 100644 --- a/src/TypeCatalogGen/Runtime/project.json +++ b/src/TypeCatalogGen/Runtime/project.json @@ -7,7 +7,7 @@ "NETStandard.Library": "1.0.0-rc3-23907", "System.Runtime.Loader": "4.0.0-rc3-23907", "System.Security.SecureString": "1.0.0-*", - "System.Runtime.Serialization.Xml": "4.1.0-rc3-23907", + "System.Runtime.Serialization.Xml": "4.1.1-rc3-23907", "System.Threading.ThreadPool": "4.0.10-rc3-23907", "Microsoft.CSharp": "4.0.1-rc3-23907", "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23907", @@ -30,8 +30,8 @@ "System.Net.NetworkInformation": "4.1.0-rc3-23907", "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23907", "System.Security.AccessControl": "4.0.0-rc3-23907", - "System.Security.Cryptography.Algorithms": "4.0.0-rc3-23907", - "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23907", + "System.Security.Cryptography.Algorithms": "4.1.0-rc3-23907", + "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23907", "System.Threading.Thread": "4.0.0-rc3-23907", "System.Threading.Tasks.Parallel": "4.0.1-rc3-23907", "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23907", From 447b3ef729211185fcc144de980d04376217b8b0 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 14 Mar 2016 16:20:56 -0700 Subject: [PATCH 2/4] Update xUnit runner to netstandardapp1.5 This was enabled in dotnet/coreclr.xunit#12 --- test/csharp/project.json | 7 +++---- xunit.sh | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/test/csharp/project.json b/test/csharp/project.json index ae84d5abc3..c1dfc110dc 100644 --- a/test/csharp/project.json +++ b/test/csharp/project.json @@ -5,13 +5,12 @@ "authors": [ "andschwa" ], "dependencies": { - "Microsoft.PowerShell.Linux.Host": "1.0.0-*", - "System.IO.Compression": "4.0.1-rc3-23903" + "Microsoft.PowerShell.Linux.Host": "1.0.0-*" }, "frameworks": { - "dnxcore50": { - "imports": [ "netstandardapp1.5", "portable-net45+win8" ], + "netstandardapp1.5": { + "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { "xunit": "2.1.0", "dotnet-test-xunit": "1.0.0-dev-*" diff --git a/xunit.sh b/xunit.sh index eb8cc0ff5c..6b0a7c7d55 100755 --- a/xunit.sh +++ b/xunit.sh @@ -22,7 +22,7 @@ pushd test/csharp ## Build dotnet build ## Work-around dotnet/cli#753 -cp -r ../../src/Microsoft.PowerShell.Linux.Host/{Modules,*ps1xml} bin/Debug/dnxcore50/ubuntu.14.04-x64 +cp -r ../../src/Microsoft.PowerShell.Linux.Host/{Modules,*ps1xml} bin/Debug/netstandardapp1.5/ubuntu.14.04-x64 ## Test dotnet test popd From 9bd361abe1b7cf6627a60c4b6d5970d4033f2f9f Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 14 Mar 2016 16:55:25 -0700 Subject: [PATCH 3/4] Bump .NET package builds to 23914 --- .../project.json | 2 +- .../project.json | 4 +- .../project.json | 4 +- .../project.json | 4 +- .../project.json | 2 +- src/System.Management.Automation/project.json | 62 ++++++++-------- src/System.Security.SecureString/project.json | 2 +- src/TypeCatalogGen/Runtime/project.json | 70 +++++++++---------- 8 files changed, 75 insertions(+), 75 deletions(-) diff --git a/src/Microsoft.Management.Infrastructure.Native/project.json b/src/Microsoft.Management.Infrastructure.Native/project.json index edc1244b5d..6d17e1681b 100644 --- a/src/Microsoft.Management.Infrastructure.Native/project.json +++ b/src/Microsoft.Management.Infrastructure.Native/project.json @@ -11,7 +11,7 @@ "warningsAsErrors": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23907", + "NETStandard.Library": "1.0.0-rc3-23914", "System.Security.SecureString": "1.0.0-*" } }, diff --git a/src/Microsoft.Management.Infrastructure/project.json b/src/Microsoft.Management.Infrastructure/project.json index 88b42d795e..ea24aa869a 100644 --- a/src/Microsoft.Management.Infrastructure/project.json +++ b/src/Microsoft.Management.Infrastructure/project.json @@ -19,8 +19,8 @@ "define": [ "_CORECLR" ] }, "dependencies": { - "System.Runtime.Serialization.Xml": "4.1.1-rc3-23907", - "System.Threading.ThreadPool": "4.0.10-rc3-23907" + "System.Runtime.Serialization.Xml": "4.1.1-rc3-23914", + "System.Threading.ThreadPool": "4.0.10-rc3-23914" } }, "net451": { diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index b1284e39b9..a0762bbfc4 100644 --- a/src/Microsoft.PowerShell.Commands.Management/project.json +++ b/src/Microsoft.PowerShell.Commands.Management/project.json @@ -19,8 +19,8 @@ "define": [ "CORECLR" ] }, "dependencies": { - "System.ServiceProcess.ServiceController": "4.1.0-rc3-23907", - "System.Net.NameResolution": "4.0.0-rc3-23907" + "System.ServiceProcess.ServiceController": "4.1.0-rc3-23914", + "System.Net.NameResolution": "4.0.0-rc3-23914" } }, "net451": { diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json index 2a19750e45..65841bc9f0 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json @@ -22,8 +22,8 @@ "define": [ "CORECLR" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23907", - "System.Runtime.Loader": "4.0.0-rc3-23907" + "NETStandard.Library": "1.0.0-rc3-23914", + "System.Runtime.Loader": "4.0.0-rc3-23914" } } }, diff --git a/src/Microsoft.PowerShell.Linux.Host/project.json b/src/Microsoft.PowerShell.Linux.Host/project.json index 048b170cbb..de2fc0a42b 100644 --- a/src/Microsoft.PowerShell.Linux.Host/project.json +++ b/src/Microsoft.PowerShell.Linux.Host/project.json @@ -12,7 +12,7 @@ "dependencies": { "Microsoft.NETCore.Unsupported.Platform.API": "1.0.0-rc3-00001", "Newtonsoft.Json": "8.0.2", - "System.Xml.XDocument": "4.0.11-rc3-23907", + "System.Xml.XDocument": "4.0.11-rc3-23914", "Microsoft.PowerShell.Commands.Management": "1.0.0-*", "Microsoft.PowerShell.Commands.Utility": "1.0.0-*" }, diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index 427134bde8..29515ab250 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -29,37 +29,37 @@ "dependencies": { "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "1.0.0-*", - "Microsoft.CSharp": "4.0.1-rc3-23907", - "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23907", - "System.Collections.Specialized": "4.0.1-rc3-23907", - "System.Collections.NonGeneric": "4.0.1-rc3-23907", - "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23907", - "System.ComponentModel.TypeConverter": "4.0.1-rc3-23907", - "System.Data.Common": "4.0.1-rc3-23907", - "System.Diagnostics.Contracts": "4.0.1-rc3-23907", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23907", - "System.Diagnostics.Process": "4.1.0-rc3-23907", - "System.Diagnostics.StackTrace": "4.0.1-rc3-23907", - "System.Diagnostics.TraceSource": "4.0.0-rc3-23907", - "System.Dynamic.Runtime": "4.0.11-rc3-23907", - "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23907", - "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23907", - "System.IO.FileSystem.Watcher": "4.0.0-rc3-23907", - "System.IO.Pipes": "4.0.0-rc3-23907", - "System.Linq.Expressions": "4.0.11-rc3-23907", - "System.Net.Http": "4.0.1-rc3-23907", - "System.Net.NetworkInformation": "4.1.0-rc3-23907", - "System.Reflection.Emit": "4.0.1-rc3-23907", - "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23907", - "System.Reflection.TypeExtensions": "4.1.0-rc3-23907", - "System.Security.AccessControl": "4.0.0-rc3-23907", - "System.Security.Cryptography.Algorithms": "4.1.0-rc3-23907", - "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23907", - "System.Threading.Thread": "4.0.0-rc3-23907", - "System.Threading.Tasks.Parallel": "4.0.1-rc3-23907", - "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23907", - "System.Xml.XmlDocument": "4.0.1-rc3-23907", - "System.Xml.XmlSerializer": "4.0.11-rc3-23907" + "Microsoft.CSharp": "4.0.1-rc3-23914", + "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23914", + "System.Collections.Specialized": "4.0.1-rc3-23914", + "System.Collections.NonGeneric": "4.0.1-rc3-23914", + "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23914", + "System.ComponentModel.TypeConverter": "4.0.1-rc3-23914", + "System.Data.Common": "4.0.1-rc3-23914", + "System.Diagnostics.Contracts": "4.0.1-rc3-23914", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23914", + "System.Diagnostics.Process": "4.1.0-rc3-23914", + "System.Diagnostics.StackTrace": "4.0.1-rc3-23914", + "System.Diagnostics.TraceSource": "4.0.0-rc3-23914", + "System.Dynamic.Runtime": "4.0.11-rc3-23914", + "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23914", + "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23914", + "System.IO.FileSystem.Watcher": "4.0.0-rc3-23914", + "System.IO.Pipes": "4.0.0-rc3-23914", + "System.Linq.Expressions": "4.0.11-rc3-23914", + "System.Net.Http": "4.0.1-rc3-23914", + "System.Net.NetworkInformation": "4.1.0-rc3-23914", + "System.Reflection.Emit": "4.0.1-rc3-23914", + "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23914", + "System.Reflection.TypeExtensions": "4.1.0-rc3-23914", + "System.Security.AccessControl": "4.0.0-rc3-23914", + "System.Security.Cryptography.Algorithms": "4.1.0-rc3-23914", + "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23914", + "System.Threading.Thread": "4.0.0-rc3-23914", + "System.Threading.Tasks.Parallel": "4.0.1-rc3-23914", + "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23914", + "System.Xml.XmlDocument": "4.0.1-rc3-23914", + "System.Xml.XmlSerializer": "4.0.11-rc3-23914" } }, "net451": { diff --git a/src/System.Security.SecureString/project.json b/src/System.Security.SecureString/project.json index 3f11e3b663..f7097db418 100644 --- a/src/System.Security.SecureString/project.json +++ b/src/System.Security.SecureString/project.json @@ -12,7 +12,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23907" + "NETStandard.Library": "1.0.0-rc3-23914" }, "imports": [ "dnxcore50" ] } diff --git a/src/TypeCatalogGen/Runtime/project.json b/src/TypeCatalogGen/Runtime/project.json index ec36da4d45..753fc83930 100644 --- a/src/TypeCatalogGen/Runtime/project.json +++ b/src/TypeCatalogGen/Runtime/project.json @@ -4,42 +4,42 @@ "dependencies": { "Microsoft.NETCore.Unsupported.Platform.API": "1.0.0-rc3-00001", - "NETStandard.Library": "1.0.0-rc3-23907", - "System.Runtime.Loader": "4.0.0-rc3-23907", + "NETStandard.Library": "1.0.0-rc3-23914", + "System.Runtime.Loader": "4.0.0-rc3-23914", "System.Security.SecureString": "1.0.0-*", - "System.Runtime.Serialization.Xml": "4.1.1-rc3-23907", - "System.Threading.ThreadPool": "4.0.10-rc3-23907", - "Microsoft.CSharp": "4.0.1-rc3-23907", - "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23907", - "System.Collections.Specialized": "4.0.1-rc3-23907", - "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23907", - "System.ComponentModel.TypeConverter": "4.0.1-rc3-23907", - "System.Data.Common": "4.0.1-rc3-23907", - "System.Diagnostics.Contracts": "4.0.1-rc3-23907", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23907", - "System.Diagnostics.Process": "4.1.0-rc3-23907", - "System.Diagnostics.StackTrace": "4.0.1-rc3-23907", - "System.Diagnostics.TraceSource": "4.0.0-rc3-23907", - "System.Dynamic.Runtime": "4.0.11-rc3-23907", - "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23907", - "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23907", - "System.IO.FileSystem.Watcher": "4.0.0-rc3-23907", - "System.IO.Pipes": "4.0.0-rc3-23907", - "System.Linq.Expressions": "4.0.11-rc3-23907", - "System.Net.Http": "4.0.1-rc3-23907", - "System.Net.NetworkInformation": "4.1.0-rc3-23907", - "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23907", - "System.Security.AccessControl": "4.0.0-rc3-23907", - "System.Security.Cryptography.Algorithms": "4.1.0-rc3-23907", - "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23907", - "System.Threading.Thread": "4.0.0-rc3-23907", - "System.Threading.Tasks.Parallel": "4.0.1-rc3-23907", - "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23907", - "System.Xml.XmlDocument": "4.0.1-rc3-23907", - "System.Xml.XmlSerializer": "4.0.11-rc3-23907", - "System.ServiceProcess.ServiceController": "4.1.0-rc3-23907", - "System.Net.NameResolution": "4.0.0-rc3-23907", - "System.Xml.XDocument": "4.0.11-rc3-23907" + "System.Runtime.Serialization.Xml": "4.1.1-rc3-23914", + "System.Threading.ThreadPool": "4.0.10-rc3-23914", + "Microsoft.CSharp": "4.0.1-rc3-23914", + "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23914", + "System.Collections.Specialized": "4.0.1-rc3-23914", + "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23914", + "System.ComponentModel.TypeConverter": "4.0.1-rc3-23914", + "System.Data.Common": "4.0.1-rc3-23914", + "System.Diagnostics.Contracts": "4.0.1-rc3-23914", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23914", + "System.Diagnostics.Process": "4.1.0-rc3-23914", + "System.Diagnostics.StackTrace": "4.0.1-rc3-23914", + "System.Diagnostics.TraceSource": "4.0.0-rc3-23914", + "System.Dynamic.Runtime": "4.0.11-rc3-23914", + "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23914", + "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23914", + "System.IO.FileSystem.Watcher": "4.0.0-rc3-23914", + "System.IO.Pipes": "4.0.0-rc3-23914", + "System.Linq.Expressions": "4.0.11-rc3-23914", + "System.Net.Http": "4.0.1-rc3-23914", + "System.Net.NetworkInformation": "4.1.0-rc3-23914", + "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23914", + "System.Security.AccessControl": "4.0.0-rc3-23914", + "System.Security.Cryptography.Algorithms": "4.1.0-rc3-23914", + "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23914", + "System.Threading.Thread": "4.0.0-rc3-23914", + "System.Threading.Tasks.Parallel": "4.0.1-rc3-23914", + "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23914", + "System.Xml.XmlDocument": "4.0.1-rc3-23914", + "System.Xml.XmlSerializer": "4.0.11-rc3-23914", + "System.ServiceProcess.ServiceController": "4.1.0-rc3-23914", + "System.Net.NameResolution": "4.0.0-rc3-23914", + "System.Xml.XDocument": "4.0.11-rc3-23914" }, "frameworks": { From 3eeda101c3d410684971ad9a48304ee82bc0e1d0 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 14 Mar 2016 17:03:58 -0700 Subject: [PATCH 4/4] Bump NETStandard.Library to 1.5.0-rc2-23911 The rc3-23914 version does not restore `System.Private.Uri` correctly, but this version does. Bug reported to dotnet/corefx#6883. --- src/Microsoft.Management.Infrastructure.Native/project.json | 2 +- .../project.json | 2 +- src/System.Security.SecureString/project.json | 2 +- src/TypeCatalogGen/Runtime/project.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Microsoft.Management.Infrastructure.Native/project.json b/src/Microsoft.Management.Infrastructure.Native/project.json index 6d17e1681b..a716d30c04 100644 --- a/src/Microsoft.Management.Infrastructure.Native/project.json +++ b/src/Microsoft.Management.Infrastructure.Native/project.json @@ -11,7 +11,7 @@ "warningsAsErrors": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23914", + "NETStandard.Library": "1.5.0-rc2-23911", "System.Security.SecureString": "1.0.0-*" } }, diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json index 65841bc9f0..5cf5dbe85b 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json @@ -22,7 +22,7 @@ "define": [ "CORECLR" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23914", + "NETStandard.Library": "1.5.0-rc2-23911", "System.Runtime.Loader": "4.0.0-rc3-23914" } } diff --git a/src/System.Security.SecureString/project.json b/src/System.Security.SecureString/project.json index f7097db418..6398fd036b 100644 --- a/src/System.Security.SecureString/project.json +++ b/src/System.Security.SecureString/project.json @@ -12,7 +12,7 @@ "frameworks": { "netstandard1.5": { "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23914" + "NETStandard.Library": "1.5.0-rc2-23911" }, "imports": [ "dnxcore50" ] } diff --git a/src/TypeCatalogGen/Runtime/project.json b/src/TypeCatalogGen/Runtime/project.json index 753fc83930..a0ba935645 100644 --- a/src/TypeCatalogGen/Runtime/project.json +++ b/src/TypeCatalogGen/Runtime/project.json @@ -4,7 +4,7 @@ "dependencies": { "Microsoft.NETCore.Unsupported.Platform.API": "1.0.0-rc3-00001", - "NETStandard.Library": "1.0.0-rc3-23914", + "NETStandard.Library": "1.5.0-rc2-23911", "System.Runtime.Loader": "4.0.0-rc3-23914", "System.Security.SecureString": "1.0.0-*", "System.Runtime.Serialization.Xml": "4.1.1-rc3-23914",