Skip to content

Update powershell to consume the latest preview packages for .NET Core 1.1.0 release (November) #2472

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
mirichmo merged 6 commits into from
Oct 14, 2016
Merged

Update powershell to consume the latest preview packages for .NET Core 1.1.0 release (November) #2472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
db07a32
Update powershell to depend on latest dotnet core packages (preview1-…
daxian-dbw Oct 12, 2016
d155f7e
Update build.psm1 to not remove IL assemblies after crossgen because …
daxian-dbw Oct 12, 2016
b540879
Avoid calling static members from 'Microsoft.Win32.Registry' on UNIX,…
daxian-dbw Oct 12, 2016
ea40c8b
Exclude 'Registry' and 'Certificate' providers from UNIX PS since the…
daxian-dbw Oct 13, 2016
dcd8c3d
Fix test failures due to changes in .NET Core and the exclusion of 'C…
daxian-dbw Oct 13, 2016
e807b4f
Make Pester skip the redirection test for '[Encoding]::Default' inste…
daxian-dbw Oct 13, 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
14 changes: 13 additions & 1 deletion build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2376,7 +2376,12 @@ function Start-CrossGen {
throw "crossgen is not available for this platform"
}

$crossGenPath = Get-ChildItem $crossGenSearchPath -Recurse | ? { $_.FullName -match $crossGenRuntime } | select -First 1 | % { $_.FullName }
# Get the CrossGen.exe for the correct runtime with the latest version
$crossGenPath = Get-ChildItem $crossGenSearchPath -Recurse | `
Where-Object { $_.FullName -match $crossGenRuntime } | `
Sort-Object -Property FullName -Descending | `
Select-Object -First 1 | `
ForEach-Object { $_.FullName }
if (-not $crossGenPath) {
throw "Unable to find latest version of crossgen.exe. 'Please run Start-PSBuild -Clean' first, and then try again."
}
Expand Down Expand Up @@ -2432,6 +2437,12 @@ function Start-CrossGen {
Generate-CrossGenAssembly -CrossgenPath $crossGenPath -AssemblyPath $assemblyPath
}

<#
# The latest dotnet.exe from .NET Core 1.1.0 preview packages starts
# to check the existence of all TPA assemblies, including those built
# from local projects (e.g. powershell assemblies). The TPA assemblies
# in '.deps.json' are IL assemblies, so we cannot remove those ILs.
#
Write-Verbose "PowerShell Ngen assemblies have been generated, deleting ILs..." -Verbose
foreach ($assemblyName in $psCoreAssemblyList) {
# Remove the IL assembly and its symbols.
Expand All @@ -2440,6 +2451,7 @@ function Start-CrossGen {
Remove-Item $assemblyPath -Force -ErrorAction SilentlyContinue
Remove-Item $symbolsPath -Force -ErrorAction SilentlyContinue
}
#>
}

# Cleans the PowerShell repo
Expand Down
4 changes: 2 additions & 2 deletions docs/cmdlet-example/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"netstandard1.3": {
"imports": [ "net40" ],
"dependencies": {
"Microsoft.NETCore": "5.0.1",
"Microsoft.NETCore.Portable.Compatibility": "1.0.1"
"Microsoft.NETCore": "5.0.3-preview1-001100-00",
"Microsoft.NETCore.Portable.Compatibility": "1.0.3-beta-24514-00"
}
}
}
Expand Down
1 change: 1 addition & 0 deletions nuget.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
</packageSources>
</configuration>
88 changes: 44 additions & 44 deletions src/Microsoft.PackageManagement.ArchiverProviders/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"name": "Microsoft.PackageManagement.ArchiverProviders",
"version": "1.0.0-*",
"name": "Microsoft.PackageManagement.ArchiverProviders",
"version": "1.0.0-*",

"buildOptions": {
"warningsAsErrors": true
},
"buildOptions": {
"warningsAsErrors": true
},

"configurations": {
"Linux": {
"buildOptions": {
"define": ["UNIX"]
}
}
},
"configurations": {
"Linux": {
"buildOptions": {
"define": ["UNIX"]
}
}
},

"dependencies": {
"System.Management.Automation": "1.0.0-*",
"Microsoft.PackageManagement": "1.0.0-*"
},
"dependencies": {
"System.Management.Automation": "1.0.0-*",
"Microsoft.PackageManagement": "1.0.0-*"
},

"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
"System.Xml.Linq": "",
"System.Numerics": "",
"System.Data": "",
"System.DirectoryServices": "",
"System.Security": "",
"System.Transactions": "",
"System.Runtime.Serialization": "",
"System.Management": "",
"System.Configuration": "",
"System.Configuration.Install": "",
"System.Net": "",
"System.Net.Http": "",
"System.IO.Compression": "",
"System.IO.Compression.FileSystem": ""
}
},
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
"System.Xml.Linq": "",
"System.Numerics": "",
"System.Data": "",
"System.DirectoryServices": "",
"System.Security": "",
"System.Transactions": "",
"System.Runtime.Serialization": "",
"System.Management": "",
"System.Configuration": "",
"System.Configuration.Install": "",
"System.Net": "",
"System.Net.Http": "",
"System.IO.Compression": "",
"System.IO.Compression.FileSystem": ""
}
},

"netstandard1.6": {
"imports": ["dnxcore50"],
"buildOptions": {
"define": ["CORECLR"],
"netstandard1.6": {
"imports": ["dnxcore50"],
"buildOptions": {
"define": ["CORECLR"],
"debugType": "portable"
}
}
}
}
}
}
}
94 changes: 47 additions & 47 deletions src/Microsoft.PackageManagement.CoreProviders/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
{
"name": "Microsoft.PackageManagement.CoreProviders",
"version": "1.0.0-*",
"name": "Microsoft.PackageManagement.CoreProviders",
"version": "1.0.0-*",

"buildOptions": {
"warningsAsErrors": true
},
"buildOptions": {
"warningsAsErrors": true
},

"configurations": {
"Linux": {
"buildOptions": {
"define": ["UNIX"]
}
}
},
"configurations": {
"Linux": {
"buildOptions": {
"define": ["UNIX"]
}
}
},

"dependencies": {
"System.Management.Automation": "1.0.0-*",
"Microsoft.PackageManagement": "1.0.0-*"
},
"dependencies": {
"System.Management.Automation": "1.0.0-*",
"Microsoft.PackageManagement": "1.0.0-*"
},

"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
"System.Xml.Linq": "",
"System.Numerics": "",
"System.Data": "",
"System.DirectoryServices": "",
"System.Security": "",
"System.Transactions": "",
"System.Runtime.Serialization": "",
"System.Management": "",
"System.Configuration": "",
"System.Configuration.Install": "",
"System.Net": "",
"System.Net.Http": "",
"System.IO.Compression": "",
"System.IO.Compression.FileSystem": ""
}
},
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
"System.Xml.Linq": "",
"System.Numerics": "",
"System.Data": "",
"System.DirectoryServices": "",
"System.Security": "",
"System.Transactions": "",
"System.Runtime.Serialization": "",
"System.Management": "",
"System.Configuration": "",
"System.Configuration.Install": "",
"System.Net": "",
"System.Net.Http": "",
"System.IO.Compression": "",
"System.IO.Compression.FileSystem": ""
}
},

"netstandard1.6": {
"imports": ["dnxcore50"],
"buildOptions": {
"define": ["CORECLR", "PORTABLE"],
"netstandard1.6": {
"imports": ["dnxcore50"],
"buildOptions": {
"define": ["CORECLR", "PORTABLE"],
"debugType": "portable",
"compile": {
"exclude": [ "ProgramsProvider.cs"]
}
}
}
}
"compile": {
"exclude": [ "ProgramsProvider.cs"]
}
}
}
}
}
88 changes: 44 additions & 44 deletions src/Microsoft.PackageManagement.MetaProvider.PowerShell/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"name": "Microsoft.PackageManagement.MetaProvider.PowerShell",
"version": "1.0.0-*",
"name": "Microsoft.PackageManagement.MetaProvider.PowerShell",
"version": "1.0.0-*",

"buildOptions": {
"warningsAsErrors": true
},
"buildOptions": {
"warningsAsErrors": true
},

"configurations": {
"Linux": {
"buildOptions": {
"define": ["UNIX"]
}
}
},
"configurations": {
"Linux": {
"buildOptions": {
"define": ["UNIX"]
}
}
},

"dependencies": {
"System.Management.Automation": "1.0.0-*",
"Microsoft.PackageManagement": "1.0.0-*"
},
"dependencies": {
"System.Management.Automation": "1.0.0-*",
"Microsoft.PackageManagement": "1.0.0-*"
},

"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
"System.Xml.Linq": "",
"System.Numerics": "",
"System.Data": "",
"System.DirectoryServices": "",
"System.Security": "",
"System.Transactions": "",
"System.Runtime.Serialization": "",
"System.Management": "",
"System.Configuration": "",
"System.Configuration.Install": "",
"System.Net": "",
"System.Net.Http": "",
"System.IO.Compression": "",
"System.IO.Compression.FileSystem": ""
}
},
"frameworks": {
"net451": {
"frameworkAssemblies": {
"System.Runtime": "",
"System.Xml": "",
"System.Xml.Linq": "",
"System.Numerics": "",
"System.Data": "",
"System.DirectoryServices": "",
"System.Security": "",
"System.Transactions": "",
"System.Runtime.Serialization": "",
"System.Management": "",
"System.Configuration": "",
"System.Configuration.Install": "",
"System.Net": "",
"System.Net.Http": "",
"System.IO.Compression": "",
"System.IO.Compression.FileSystem": ""
}
},

"netstandard1.6": {
"imports": ["dnxcore50"],
"buildOptions": {
"define": ["CORECLR"],
"netstandard1.6": {
"imports": ["dnxcore50"],
"buildOptions": {
"define": ["CORECLR"],
"debugType": "portable"
}
}
}
}
}
}
}
Loading