8000 Update .NET packages and CLI by andyleejordan · Pull Request #633 · PowerShell/PowerShell · GitHub
[go: up one dir, main page]
Skip to content

Update .NET packages and CLI #633

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

Merged
merged 5 commits into from
Mar 7, 2016
Merged

Update .NET packages and CLI #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e12f5a4
Bump .NET packages to 23907
andyleejordan Mar 7, 2016
93f8a33
Bump versions of upgraded packages
andyleejordan Mar 7, 2016
faec94f
Add Microsoft.NETCore.Unsupported.Platform.API package
andyleejordan Mar 7, 2016
24eaf8b
Add newly required packages
andyleejordan Mar 7, 2016
5718110
Bump .NET CLI to build 1638
andyleejordan Mar 7, 2016
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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Management.Infrastructure.Native/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-*"
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.Management.Infrastructure/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.Commands.Management/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.PowerShell.Linux.Host/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-*"
},
Expand Down
59 changes: 31 additions & 28 deletions src/System.Management.Automation/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion src/System.Security.SecureString/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23829"
"NETStandard.Library": "1.0.0-rc3-23907"
},
"imports": [ "dnxcore50" ]
}
Expand Down
79 changes: 40 additions & 39 deletions src/TypeCatalogGen/Runtime/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
}
}
2 changes: 1 addition & 1 deletion src/windows-build
Open in desktop
Submodule windows-build updated from 64f2c7 to 1eef0f
0