From feef62c5ea00e17def14e403c2d019234230c11a Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 8 Apr 2016 21:02:04 -0700 Subject: [PATCH 1/3] Bump .NET Core packages to 24004 --- .../project.json | 2 +- .../project.json | 4 +- .../project.json | 4 +- .../project.json | 4 +- .../project.json | 6 +- .../project.json | 4 +- src/System.Management.Automation/project.json | 60 +++++++++---------- src/System.Security.SecureString/project.json | 2 +- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/Microsoft.Management.Infrastructure.Native/project.json b/src/Microsoft.Management.Infrastructure.Native/project.json index 6a7c31c2e..15a08f9b2 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.5.0-rc3-23931-00", + "NETStandard.Library": "1.5.0-rc3-24004-00", "System.Security.SecureString": "1.0.0-*" } }, diff --git a/src/Microsoft.Management.Infrastructure/project.json b/src/Microsoft.Management.Infrastructure/project.json index 91dd158d4..e76693770 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-23931-00", - "System.Threading.ThreadPool": "4.0.10-rc3-23931-00" + "System.Runtime.Serialization.Xml": "4.1.1-rc3-24004-00", + "System.Threading.ThreadPool": "4.0.10-rc3-24004-00" } }, "net451": { diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index c2b5201ac..02bdaf99d 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-23931-00", - "System.Net.NameResolution": "4.0.0-rc3-23931-00" + "System.ServiceProcess.ServiceController": "4.1.0-rc3-24004-00", + "System.Net.NameResolution": "4.0.0-rc3-24004-00" } }, "net451": { diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json index 47593ad94..b364735b6 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.5.0-rc3-23931-00", - "System.Runtime.Loader": "4.0.0-rc3-23931-00" + "NETStandard.Library": "1.5.0-rc3-24004-00", + "System.Runtime.Loader": "4.0.0-rc3-24004-00" } } } diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json index 5948cbf14..6ba83afa9 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json @@ -23,9 +23,9 @@ "define": [ "CORECLR" ] }, "dependencies": { - "System.Security.Principal": "4.0.1-rc3-23931-00", - "System.Security.Principal.Windows": "4.0.0-rc3-23931-00", - "System.Diagnostics.TraceSource": "4.0.0-rc3-23931-00", + "System.Security.Principal": "4.0.1-rc3-24004-00", + "System.Security.Principal.Windows": "4.0.0-rc3-24004-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24004-00", "System.Security.SecureString": "1.0.0-*" } } diff --git a/src/Microsoft.PowerShell.CoreConsoleHost/project.json b/src/Microsoft.PowerShell.CoreConsoleHost/project.json index 1473ec447..bee6b0578 100644 --- a/src/Microsoft.PowerShell.CoreConsoleHost/project.json +++ b/src/Microsoft.PowerShell.CoreConsoleHost/project.json @@ -11,8 +11,8 @@ "dependencies": { "Newtonsoft.Json": "8.0.2", - "System.Xml.XDocument": "4.0.11-rc3-23931-00", - "System.IO.MemoryMappedFiles": "4.0.0-rc3-23931-00", + "System.Xml.XDocument": "4.0.11-rc3-24004-00", + "System.IO.MemoryMappedFiles": "4.0.0-rc3-24004-00", "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 cb230fb51..fbfa7018d 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -30,36 +30,36 @@ "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "1.0.0-*", "Microsoft.PowerShell.CoreCLR.Eventing": "1.0.0-*", - "Microsoft.CSharp": "4.0.1-rc3-23931-00", - "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23931-00", - "System.Collections.Specialized": "4.0.1-rc3-23931-00", - "System.Collections.NonGeneric": "4.0.1-rc3-23931-00", - "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23931-00", - "System.ComponentModel.TypeConverter": "4.0.1-rc3-23931-00", - "System.Data.Common": "4.0.1-rc3-23931-00", - "System.Diagnostics.Contracts": "4.0.1-rc3-23931-00", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23931-00", - "System.Diagnostics.Process": "4.1.0-rc3-23931-00", - "System.Diagnostics.StackTrace": "4.0.1-rc3-23931-00", - "System.Diagnostics.TraceSource": "4.0.0-rc3-23931-00", - "System.Dynamic.Runtime": "4.0.11-rc3-23931-00", - "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23931-00", - "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23931-00", - "System.IO.FileSystem.Watcher": "4.0.0-rc3-23931-00", - "System.IO.Pipes": "4.0.0-rc3-23931-00", - "System.Linq.Expressions": "4.0.11-rc3-23931-00", - "System.Net.Http": "4.0.1-rc3-23931-00", - "System.Net.NetworkInformation": "4.1.0-rc3-23931-00", - "System.Reflection.Emit": "4.0.1-rc3-23931-00", - "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23931-00", - "System.Security.AccessControl": "4.0.0-rc3-23931-00", - "System.Security.Cryptography.Algorithms": "4.1.0-rc3-23931-00", - "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-23931-00", - "System.Threading.Thread": "4.0.0-rc3-23931-00", - "System.Threading.Tasks.Parallel": "4.0.1-rc3-23931-00", - "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23931-00", - "System.Xml.XmlDocument": "4.0.1-rc3-23931-00", - "System.Xml.XmlSerializer": "4.0.11-rc3-23931-00" + "Microsoft.CSharp": "4.0.1-rc3-24004-00", + "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-24004-00", + "System.Collections.Specialized": "4.0.1-rc3-24004-00", + "System.Collections.NonGeneric": "4.0.1-rc3-24004-00", + "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-24004-00", + "System.ComponentModel.TypeConverter": "4.0.1-rc3-24004-00", + "System.Data.Common": "4.0.1-rc3-24004-00", + "System.Diagnostics.Contracts": "4.0.1-rc3-24004-00", + "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24004-00", + "System.Diagnostics.Process": "4.1.0-rc3-24004-00", + "System.Diagnostics.StackTrace": "4.0.1-rc3-24004-00", + "System.Diagnostics.TraceSource": "4.0.0-rc3-24004-00", + "System.Dynamic.Runtime": "4.0.11-rc3-24004-00", + "System.IO.FileSystem.AccessControl": "4.0.0-rc3-24004-00", + "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-24004-00", + "System.IO.FileSystem.Watcher": "4.0.0-rc3-24004-00", + "System.IO.Pipes": "4.0.0-rc3-24004-00", + "System.Linq.Expressions": "4.0.11-rc3-24004-00", + "System.Net.Http": "4.0.1-rc3-24004-00", + "System.Net.NetworkInformation": "4.1.0-rc3-24004-00", + "System.Reflection.Emit": "4.0.1-rc3-24004-00", + "System.Reflection.Emit.Lightweight": "4.0.1-rc3-24004-00", + "System.Security.AccessControl": "4.0.0-rc3-24004-00", + "System.Security.Cryptography.Algorithms": "4.1.0-rc3-24004-00", + "System.Security.Cryptography.X509Certificates": "4.1.0-rc3-24004-00", + "System.Threading.Thread": "4.0.0-rc3-24004-00", + "System.Threading.Tasks.Parallel": "4.0.1-rc3-24004-00", + "System.Xml.XPath.XmlDocument": "4.0.1-rc3-24004-00", + "System.Xml.XmlDocument": "4.0.1-rc3-24004-00", + "System.Xml.XmlSerializer": "4.0.11-rc3-24004-00" } }, "net451": { diff --git a/src/System.Security.SecureString/project.json b/src/System.Security.SecureString/project.json index cc96ec59f..7d2cfc174 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.5.0-rc3-23931-00" + "NETStandard.Library": "1.5.0-rc3-24004-00" }, "imports": [ "dnxcore50" ] } From 7ace2b6b64ba51b0353a44b4c7d54a5b30f3a122 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 8 Apr 2016 21:09:27 -0700 Subject: [PATCH 2/3] Fix NuGet warnings by depending on NuGet.Packaging.Core And upgrade dotnet-test-xunit --- test/csharp/project.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/csharp/project.json b/test/csharp/project.json index d516b354a..8c4dad546 100644 --- a/test/csharp/project.json +++ b/test/csharp/project.json @@ -12,8 +12,9 @@ "netstandardapp1.5": { "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { + "NuGet.Packaging.Core": "3.5.0-beta-1145", "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-79755-47" + "dotnet-test-xunit": "1.0.0-dev-91790-12" } } }, From 022a63c6d2fcb9d141eaaf843b22f820442e010d Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 8 Apr 2016 21:58:05 -0700 Subject: [PATCH 3/3] Fix whitespace in csharp/project.json --- test/csharp/project.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/csharp/project.json b/test/csharp/project.json index 8c4dad546..bb9f4e9a2 100644 --- a/test/csharp/project.json +++ b/test/csharp/project.json @@ -5,18 +5,18 @@ "authors": [ "andschwa" ], "dependencies": { - "Microsoft.PowerShell.CoreConsoleHost": "1.0.0-*" + "Microsoft.PowerShell.CoreConsoleHost": "1.0.0-*" }, "frameworks": { - "netstandardapp1.5": { - "imports": [ "dnxcore50", "portable-net45+win8" ], - "dependencies": { + "netstandardapp1.5": { + "imports": [ "dnxcore50", "portable-net45+win8" ], + "dependencies": { "NuGet.Packaging.Core": "3.5.0-beta-1145", - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-91790-12" - } - } + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-dev-91790-12" + } + } }, "testRunner": "xunit",