diff --git a/.travis.yml b/.travis.yml index 2095bc609..99ae89a88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: - sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' - sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 - sudo apt-get -qq update - - sudo apt-get install -y dotnet=1.0.0.001598-1 + - sudo apt-get install -y dotnet=1.0.0.001638-1 script: - dotnet restore - ./build.sh diff --git a/README.md b/README.md index 35f40c1db..a1de09dd2 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ Tested on Ubuntu 14.04. sudo sh -c 'echo "deb [arch=amd64] http://apt-mo.trafficmanager.net/repos/dotnet/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' sudo apt-key adv --keyserver apt-mo.trafficmanager.net --recv-keys 417A0893 sudo apt-get update -sudo apt-get install dotnet=1.0.0.001598-1 +sudo apt-get install dotnet=1.0.0.001638-1 ``` Then install the following additional build / debug tools: @@ -104,7 +104,7 @@ An MSI installer also exists, but this script avoids touching your system. ```powershell Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1 -OutFile install.ps1 -./install.ps1 -version 1.0.0.001598 -channel beta +./install.ps1 -version 1.0.0.001638 -channel beta ``` Note: diff --git a/appveyor.yml b/appveyor.yml index 357ddd1f2..0c0378b22 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +18,7 @@ install: - git config --global url.git@github.com:.insteadOf https://github.com/ - git submodule update --init --recursive -- src/monad src/windows-build src/Microsoft.PowerShell.Linux.Host/Modules/Pester - ps: Invoke-WebRequest -Uri https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/install.ps1 -OutFile install.ps1 - - ps: ./install.ps1 -version 1.0.0.001598 -channel beta + - ps: ./install.ps1 -version 1.0.0.001638 -channel beta build_script: - ps: | diff --git a/src/Microsoft.Management.Infrastructure.Native/project.json b/src/Microsoft.Management.Infrastructure.Native/project.json index 073dba129..6b5e9fc6b 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-23829", + "NETStandard.Library": "1.0.0-rc3-23907", "System.Security.SecureString": "1.0.0-*" } }, diff --git a/src/Microsoft.Management.Infrastructure/project.json b/src/Microsoft.Management.Infrastructure/project.json index d90fc4f0a..9b89d61d7 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.0-rc3-23829", - "System.Threading.ThreadPool": "4.0.10-rc3-23829" + "System.Runtime.Serialization.Xml": "4.1.1-rc3-23907", + "System.Threading.ThreadPool": "4.0.10-rc3-23907" } }, "dnx451": { diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index 22c533c09..6b384e62b 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-23829", - "System.Net.NameResolution": "4.0.0-rc3-23829" + "System.ServiceProcess.ServiceController": "4.1.0-rc3-23907", + "System.Net.NameResolution": "4.0.0-rc3-23907" } }, "dnx451": { diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json index 66a628b0d..2a19750e4 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-23829", - "System.Runtime.Loader": "4.0.0-rc3-23829" + "NETStandard.Library": "1.0.0-rc3-23907", + "System.Runtime.Loader": "4.0.0-rc3-23907" } } }, diff --git a/src/Microsoft.PowerShell.Linux.Host/project.json b/src/Microsoft.PowerShell.Linux.Host/project.json index 63ca7bc60..7c4954326 100644 --- a/src/Microsoft.PowerShell.Linux.Host/project.json +++ b/src/Microsoft.PowerShell.Linux.Host/project.json @@ -10,8 +10,9 @@ }, "dependencies": { + "Microsoft.NETCore.Unsupported.Platform.API": "1.0.0-rc3-00001", "Newtonsoft.Json": "8.0.2", - "System.Xml.XDocument": "4.0.11-rc3-23829", + "System.Xml.XDocument": "4.0.11-rc3-23907", "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 386cfc206..784385da8 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -29,34 +29,37 @@ "dependencies": { "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "1.0.0-*", - "Microsoft.CSharp": "4.0.1-rc3-23829", - "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23829", - "System.Collections.Specialized": "4.0.1-rc3-23829", - "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23829", - "System.ComponentModel.TypeConverter": "4.0.1-rc3-23829", - "System.Data.Common": "4.0.1-rc3-23829", - "System.Diagnostics.Contracts": "4.0.1-rc3-23829", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23829", - "System.Diagnostics.Process": "4.1.0-rc3-23829", - "System.Diagnostics.StackTrace": "4.0.1-rc3-23829", - "System.Diagnostics.TraceSource": "4.0.0-rc3-23829", - "System.Dynamic.Runtime": "4.0.11-rc3-23829", - "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23829", - "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23829", - "System.IO.FileSystem.Watcher": "4.0.0-rc3-23829", - "System.IO.Pipes": "4.0.0-rc3-23829", - "System.Linq.Expressions": "4.0.11-rc3-23829", - "System.Net.Http": "4.0.1-rc3-23829", - "System.Net.NetworkInformation": "4.1.0-rc3-23829", - "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23829", - "System.Security.AccessControl": "4.0.0-rc3-23829", - "System.Security.Cryptography.Algorithms": "4.0.0-rc3-23829", - "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23829", - "System.Threading.Thread": "4.0.0-rc3-23829", - "System.Threading.Tasks.Parallel": "4.0.1-rc3-23829", - "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23829", - "System.Xml.XmlDocument": "4.0.1-rc3-23829", - "System.Xml.XmlSerializer": "4.0.11-rc3-23829" + "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" } }, "dnx451": { diff --git a/src/System.Security.SecureString/project.json b/src/System.Security.SecureString/project.json index dd867e67d..3f11e3b66 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-23829" + "NETStandard.Library": "1.0.0-rc3-23907" }, "imports": [ "dnxcore50" ] } diff --git a/src/TypeCatalogGen/Runtime/project.json b/src/TypeCatalogGen/Runtime/project.json index fabda7112..b4170d5c7 100644 --- a/src/TypeCatalogGen/Runtime/project.json +++ b/src/TypeCatalogGen/Runtime/project.json @@ -3,47 +3,48 @@ "authors": [ "andschwa" ], "dependencies": { - "NETStandard.Library": "1.0.0-rc3-23829", - "System.Runtime.Loader": "4.0.0-rc3-23829", - "System.Security.SecureString": "1.0.0-*", - "System.Runtime.Serialization.Xml": "4.1.0-rc3-23829", - "System.Threading.ThreadPool": "4.0.10-rc3-23829", - "Microsoft.CSharp": "4.0.1-rc3-23829", - "Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23829", - "System.Collections.Specialized": "4.0.1-rc3-23829", - "System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23829", - "System.ComponentModel.TypeConverter": "4.0.1-rc3-23829", - "System.Data.Common": "4.0.1-rc3-23829", - "System.Diagnostics.Contracts": "4.0.1-rc3-23829", - "System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23829", - "System.Diagnostics.Process": "4.1.0-rc3-23829", - "System.Diagnostics.StackTrace": "4.0.1-rc3-23829", - "System.Diagnostics.TraceSource": "4.0.0-rc3-23829", - "System.Dynamic.Runtime": "4.0.11-rc3-23829", - "System.IO.FileSystem.AccessControl": "4.0.0-rc3-23829", - "System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23829", - "System.IO.FileSystem.Watcher": "4.0.0-rc3-23829", - "System.IO.Pipes": "4.0.0-rc3-23829", - "System.Linq.Expressions": "4.0.11-rc3-23829", - "System.Net.Http": "4.0.1-rc3-23829", - "System.Net.NetworkInformation": "4.1.0-rc3-23829", - "System.Reflection.Emit.Lightweight": "4.0.1-rc3-23829", - "System.Security.AccessControl": "4.0.0-rc3-23829", - "System.Security.Cryptography.Algorithms": "4.0.0-rc3-23829", - "System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23829", - "System.Threading.Thread": "4.0.0-rc3-23829", - "System.Threading.Tasks.Parallel": "4.0.1-rc3-23829", - "System.Xml.XPath.XmlDocument": "4.0.1-rc3-23829", - "System.Xml.XmlDocument": "4.0.1-rc3-23829", - "System.Xml.XmlSerializer": "4.0.11-rc3-23829", - "System.ServiceProcess.ServiceController": "4.1.0-rc3-23829", - "System.Net.NameResolution": "4.0.0-rc3-23829", - "System.Xml.XDocument": "4.0.11-rc3-23829" + "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", + "System.Security.SecureString": "1.0.0-*", + "System.Runtime.Serialization.Xml": "4.1.0-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.0.0-rc3-23907", + "System.Security.Cryptography.X509Certificates": "4.0.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" }, "frameworks": { - "netstandardapp1.5": { - "imports": [ "dnxcore50", "netstandardapp1.5", "portable-net45+win8" ] - } + "netstandardapp1.5": { + "imports": [ "dnxcore50", "netstandardapp1.5", "portable-net45+win8" ] + } } } diff --git a/src/windows-build b/src/windows-build index 64f2c7d5b..1eef0f382 160000 --- a/src/windows-build +++ b/src/windows-build @@ -1 +1 @@ -Subproject commit 64f2c7d5b3587d2fc94f683f8f7311686188dd97 +Subproject commit 1eef0f3829fd6c6f187c3b159b1220c5a23d3d7d