Skip to content

Bump packages and fix dependencies #605

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
Andy Jordan (andyleejordan) merged 9 commits into from
Mar 1, 2016
Merged

Bump packages and fix dependencies #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
840c634
Bump .NET packages to 23829
andyleejordan Mar 1, 2016
ee7ea80
Bump CLI to 1.0.0.001598
andyleejordan Mar 1, 2016
9f88341
Remove trailing comma from project.json
andyleejordan Mar 1, 2016
744e1e2
Add System.Xml.XDocument dependency to host
andyleejordan Mar 1, 2016
da9f506
Update runtime facade with additional packages
andyleejordan Mar 1, 2016
855891d
Clean up TypeCatalogGen dependencies
andyleejordan Mar 1, 2016
3abbf62
Fix TypeCatalogGen script
andyleejordan Mar 1, 2016
fd9140f
Update CorePsTypeCatalog
andyleejordan Mar 1, 2016
96be23d
Add simple regression test for Add-Type
andyleejordan Mar 1, 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.001540-1
- sudo apt-get install -y dotnet=1.0.0.001598-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.001540-1
sudo apt-get install dotnet=1.0.0.001598-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.001540 -channel beta
./install.ps1 -version 1.0.0.001598 -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 @@ -19,7 +19,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.001540 -channel beta
- ps: ./install.ps1 -version 1.0.0.001598 -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-23826",
"NETStandard.Library": "1.0.0-rc3-23829",
"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-23826",
"System.Threading.ThreadPool": "4.0.10-rc3-23826"
"System.Runtime.Serialization.Xml": "4.1.0-rc3-23829",
"System.Threading.ThreadPool": "4.0.10-rc3-23829"
}
},
"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-23826",
"System.Net.NameResolution": "4.0.0-rc3-23826"
"System.ServiceProcess.ServiceController": "4.1.0-rc3-23829",
"System.Net.NameResolution": "4.0.0-rc3-23829"
}
},
"dnx451": {
Expand Down
69 changes: 67 additions & 2 deletions src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs
View file
Open in desktop

Large diffs are not rendered by default.

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-23826",
"System.Runtime.Loader": "4.0.0-rc3-23826"
"NETStandard.Library": "1.0.0-rc3-23829",
"System.Runtime.Loader": "4.0.0-rc3-23829"
}
}
},
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.PowerShell.Linux.Host/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

"dependencies": {
"Newtonsoft.Json": "8.0.2",
"System.Xml.XDocument": "4.0.11-rc3-23829",
"Microsoft.PowerShell.Commands.Management": "1.0.0-*",
"Microsoft.PowerShell.Commands.Utility": "1.0.0-*"
},
Expand Down
56 changes: 28 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,34 @@
"dependencies": {
"Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "1.0.0-*",

"Microsoft.CSharp": "4.0.1-rc3-23826",
"Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23826",
"System.Collections.Specialized": "4.0.1-rc3-23826",
"System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23826",
"System.ComponentModel.TypeConverter": "4.0.1-rc3-23826",
"System.Data.Common": "4.0.1-rc3-23826",
"System.Diagnostics.Contracts": "4.0.1-rc3-23826",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23826",
"System.Diagnostics.Process": "4.1.0-rc3-23826",
"System.Diagnostics.StackTrace": "4.0.1-rc3-23826",
"System.Diagnostics.TraceSource": "4.0.0-rc3-23826",
"System.Dynamic.Runtime": "4.0.11-rc3-23826",
"System.IO.FileSystem.AccessControl": "4.0.0-rc3-23826",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23826",
"System.IO.FileSystem.Watcher": "4.0.0-rc3-23826",
"System.IO.Pipes": "4.0.0-rc3-23826",
"System.Linq.Expressions": "4.0.11-rc3-23826",
"System.Net.Http": "4.0.1-rc3-23826",
"System.Net.NetworkInformation": "4.1.0-rc3-23826",
"System.Reflection.Emit.Lightweight": "4.0.1-rc3-23826",
"System.Security.AccessControl": "4.0.0-rc3-23826",
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23826",
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23826",
"System.Threading.Thread": "4.0.0-rc3-23826",
"System.Threading.Tasks.Parallel": "4.0.1-rc3-23826",
"System.Xml.XPath.XmlDocument": "4.0.1-rc3-23826",
"System.Xml.XmlDocument": "4.0.1-rc3-23826",
"System.Xml.XmlSerializer": "4.0.11-rc3-23826",
"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"
}
},
"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-23826"
"NETStandard.Library": "1.0.0-rc3-23829"
},
"imports": [ "dnxcore50" ]
}
Expand Down
73 changes: 39 additions & 34 deletions src/TypeCatalogGen/Runtime/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,49 @@
{
"version": "1.0.0-*",
"description": "Facade to generate folder of dependencies",
"authors": [ "andschwa" ],

"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23826",

"Microsoft.CSharp": "4.0.1-rc3-23826",
"Microsoft.Win32.Registry.AccessControl": "4.0.0-rc3-23826",
"System.Collections.Specialized": "4.0.1-rc3-23826",
"System.ComponentModel.EventBasedAsync": "4.0.11-rc3-23826",
"System.ComponentModel.TypeConverter": "4.0.1-rc3-23826",
"System.Data.Common": "4.0.1-rc3-23826",
"System.Diagnostics.Contracts": "4.0.1-rc3-23826",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc3-23826",
"System.Diagnostics.TraceSource": "4.0.0-rc3-23826",
"System.Dynamic.Runtime": "4.0.11-rc3-23826",
"System.IO.FileSystem.AccessControl": "4.0.0-rc3-23826",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc3-23826",
"System.IO.FileSystem.Watcher": "4.0.0-rc3-23826",
"System.IO.Pipes": "4.0.0-rc3-23826",
"System.Linq.Expressions": "4.0.11-rc3-23826",
"System.Net.Http": "4.0.1-rc3-23826",
"System.Net.NetworkInformation": "4.1.0-rc3-23826",
"System.Reflection.Emit.Lightweight": "4.0.1-rc3-23826",
"System.Security.AccessControl": "4.0.0-rc3-23826",
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23826",
"System.Security.Cryptography.X509Certificates": "4.0.0-rc3-23826",
"System.Threading.Tasks.Parallel": "4.0.1-rc3-23826",
"System.Xml.XPath.XmlDocument": "4.0.1-rc3-23826",
"System.Xml.XmlDocument": "4.0.1-rc3-23826",
"System.Xml.XmlSerializer": "4.0.11-rc3-23826",

"System.ServiceProcess.ServiceController": "4.1.0-rc3-23826",
"System.Net.NameResolution": "4.0.0-rc3-23826"
},
"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"
},

"frameworks": {
"netstandard1.5": {
"imports": [ "dnxcore50", "portable-net45+win8" ]
"netstandardapp1.5": {
"imports": [ "dnxcore50", "netstandardapp1.5", "portable-net45+win8" ]
}
}
}
6 changes: 5 additions & 1 deletion src/TypeCatalogGen/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
. mono-snapshot mono
export DOTNET_REFERENCE_ASSEMBLIES_PATH=$MONO_PREFIX/lib/mono/xbuild-frameworks/

(cd Runtime && dotnet restore && dotnet publish --framework dnxcore50 --runtime ubuntu.14.04-x64 --output bin)
pushd Runtime
dotnet restore
dotnet publish --output bin
popd

ls Runtime/bin/*.dll | sed ':a;N;$!ba;s/\n/;/g' > powershell.inc

dotnet restore
Expand Down
6 changes: 3 additions & 3 deletions src/TypeCatalogGen/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
},

"dependencies": {
"System.Reflection.Metadata": "1.1.1-beta-23516",
"System.Collections.Immutable": "1.1.38-beta-23516"
"System.Reflection.Metadata": "1.1.0",
"System.Collections.Immutable": "1.1.37"
},

"compileFiles": [
"../monad/monad/nttargets/assemblies/core/PSAssemblyLoadContext/TypeCatalogGen/TypeCatalogGen.cs"
],

"frameworks": {
"dnx451": {
"net45": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.IO": "",
Expand Down
5 changes: 5 additions & 0 deletions test/powershell/Add-Type.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Describe "Add-Type" {
It "Should not throw given a simple class definition" {
{ Add-Type -TypeDefinition "public static class foo { }" } | Should Not Throw
}
}