diff --git a/build.psm1 b/build.psm1 index 27df1f3d7c..6b7a83a518 100644 --- a/build.psm1 +++ b/build.psm1 @@ -401,7 +401,7 @@ cmd.exe /C cd /d "$location" "&" "$($vcVarsPath)\vcvarsall.bat" "$NativeHostArch if($PSModuleRestore) { # Downloading the PowerShellGet and PackageManagement modules. - # $Options.Output is pointing to something like "...\src\powershell-win-core\bin\Debug\netcoreapp1.0\win10-x64\publish\powershell.exe", + # $Options.Output is pointing to something like "...\src\powershell-win-core\bin\Debug\netcoreapp1.1\win10-x64\publish\powershell.exe", # so we need to get its parent directory $publishPath = Split-Path $Options.Output -Parent log "Restore PowerShell modules to $publishPath" @@ -429,7 +429,7 @@ function New-PSOptions { [ValidateSet("Linux", "Debug", "Release", "CodeCoverage", "")] [string]$Configuration, - [ValidateSet("netcoreapp1.0", "net451")] + [ValidateSet("netcoreapp1.1", "net451")] [string]$Framework, # These are duplicated from Start-PSBuild @@ -506,7 +506,7 @@ function New-PSOptions { $Framework = if ($FullCLR) { "net451" } else { - "netcoreapp1.0" + "netcoreapp1.1" } Write-Verbose "Using framework '$Framework'" } @@ -893,7 +893,7 @@ function Start-PSxUnit { function Install-Dotnet { [CmdletBinding()] param( - [string]$Channel = "rel-1.0.0", + [string]$Channel = "preview", [string]$Version, [switch]$NoSudo ) @@ -902,9 +902,7 @@ function Install-Dotnet { # Note that when it is null, Invoke-Expression (but not &) must be used to interpolate properly $sudo = if (!$NoSudo) { "sudo" } - # this url is temporarely alternated because of https://github.com/dotnet/cli/issues/4715 - # it should be reverted back to "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain" ASAP - $obtainUrl = "https://raw.githubusercontent.com/dotnet/cli/9855dc0088cf7e56e24860c734f33fe8353f38a6/scripts/obtain" + $obtainUrl = "https://raw.githubusercontent.com/dotnet/cli/v1.0.0-preview2-1-3177/scripts/obtain" # Install for Linux and OS X if ($IsLinux -or $IsOSX) { @@ -924,7 +922,7 @@ function Install-Dotnet { Write-Warning "This script only removes prior versions of dotnet for Ubuntu 14.04 and OS X" } - # Install new dotnet 1.0.0 preview packages + # Install new dotnet 1.1.0 preview packages $installScript = "dotnet-install.sh" Start-NativeExecution { curl -sO $obtainUrl/$installScript @@ -952,11 +950,11 @@ function Start-PSBootstrap { SupportsShouldProcess=$true, ConfirmImpact="High")] param( - [string]$Channel = "rel-1.0.0", + [string]$Channel = "preview", # we currently pin dotnet-cli version, because tool # is currently migrating to msbuild toolchain # and requires constant updates to our build process. - [string]$Version = "1.0.0-preview3-003930", + [string]$Version = "1.0.0-preview2-1-003177", [switch]$Package, [switch]$NoSudo, [switch]$Force @@ -1152,7 +1150,7 @@ function Start-PSPackage { -not $Script:Options.CrossGen -or ## Last build didn't specify -CrossGen $Script:Options.Runtime -ne $Runtime -or ## Last build wasn't for the required RID $Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release' - $Script:Options.Framework -ne "netcoreapp1.0") ## Last build wasn't for CoreCLR + $Script:Options.Framework -ne "netcoreapp1.1") ## Last build wasn't for CoreCLR { # It's possible that the most recent build doesn't satisfy the package requirement but # an earlier build does. e.g., run the following in order on win10-x64: diff --git a/docs/building/linux.md b/docs/building/linux.md index bab74adc74..d710707861 100644 --- a/docs/building/linux.md +++ b/docs/building/linux.md @@ -101,7 +101,7 @@ Start-PSBuild Congratulations! If everything went right, PowerShell is now built. The `Start-PSBuild` script will output the location of the executable: -`./src/powershell-unix/bin/Linux/netcoreapp1.0/ubuntu.14.04-x64/powershell`. +`./src/powershell-unix/bin/Linux/netcoreapp1.1/ubuntu.14.04-x64/powershell`. You should now be running the `powershell` that you just built, if your run the above executable. You can run our cross-platform Pester tests with `Start-PSPester`, and our xUnit tests with `Start-PSxUnit`. diff --git a/docs/building/macos.md b/docs/building/macos.md index b5783deb9e..65595561bb 100644 --- a/docs/building/macos.md +++ b/docs/building/macos.md @@ -68,6 +68,6 @@ download the `pkg` from our GitHub releases page using your browser, complete th start a `powershell` session, and use `Start-PSBuild` from the module. The output directory will be slightly different because your runtime identifier is different. -PowerShell will be at `./src/powershell-unix/bin/Linux/netcoreapp1.0/osx.10.11-x64/powershell`, +PowerShell will be at `./src/powershell-unix/bin/Linux/netcoreapp1.1/osx.10.11-x64/powershell`, or `osx.10.10` depending on your operating system version. Note that configuration is still `Linux` because it would be silly to make yet another separate configuration when it's used solely to work-around a CLI issue. diff --git a/docs/building/windows-core.md b/docs/building/windows-core.md index 2a2f66f208..6c1b235a4c 100644 --- a/docs/building/windows-core.md +++ b/docs/building/windows-core.md @@ -64,7 +64,7 @@ Congratulations! If everything went right, PowerShell is now built and executabl This location is of the form `./[project]/bin/[configuration]/[framework]/[rid]/[binary name]`, and our project is `powershell`, configuration is `Debug` by default, -framework is `netcoreapp1.0`, runtime identifier is **probably** `win10-x64` +framework is `netcoreapp1.1`, runtime identifier is **probably** `win10-x64` (but will depend on your operating system; don't worry, `dotnet --info` will tell you what it was), and binary name is `powershell`. The function `Get-PSOutput` will return the path to the executable; diff --git a/docs/cmdlet-example/project.json b/docs/cmdlet-example/project.json index 396f9951fc..ea595874ff 100644 --- a/docs/cmdlet-example/project.json +++ b/docs/cmdlet-example/project.json @@ -11,7 +11,7 @@ "netstandard1.3": { "imports": [ "net40" ], "dependencies": { - "Microsoft.NETCore": "5.0.3-preview1-001100-00", + "Microsoft.NETCore": "5.0.3-rc2-0-0", "Microsoft.NETCore.Portable.Compatibility": "1.0.3-beta-24514-00" } } diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index 01c37832ab..744f2ac94d 100644 --- a/src/Microsoft.PowerShell.Commands.Management/project.json +++ b/src/Microsoft.PowerShell.Commands.Management/project.json @@ -93,9 +93,9 @@ } }, "dependencies": { - "System.ServiceProcess.ServiceController": "4.3.0-preview1-24530-04", - "System.Net.NameResolution": "4.3.0-preview1-24530-04", - "System.Net.Ping": "4.3.0-preview1-24530-04" + "System.ServiceProcess.ServiceController": "4.3.0", + "System.Net.NameResolution": "4.3.0", + "System.Net.Ping": "4.3.0" } }, "net451": { diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json index e554a34182..7228abf396 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/project.json +++ b/src/Microsoft.PowerShell.Commands.Utility/project.json @@ -105,8 +105,8 @@ }, "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.1-beta1-20160616-03", - "System.Diagnostics.TextWriterTraceListener": "4.3.0-preview1-24530-04" + "Microsoft.CodeAnalysis.CSharp": "2.0.0-rc", + "System.Diagnostics.TextWriterTraceListener": "4.3.0" } }, "net451": { diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json index f48efd36af..f17dd210a4 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/project.json +++ b/src/Microsoft.PowerShell.ConsoleHost/project.json @@ -61,8 +61,8 @@ } }, "dependencies": { - "System.Xml.XDocument": "4.3.0-preview1-24530-04", - "System.IO.MemoryMappedFiles": "4.3.0-preview1-24530-04" + "System.Xml.XDocument": "4.3.0", + "System.IO.MemoryMappedFiles": "4.3.0" } }, "net451": { diff --git a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json index 29cecce351..16d7323588 100644 --- a/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json @@ -41,11 +41,11 @@ "define": [ "CORECLR" ] }, "dependencies": { - "NETStandard.Library": "1.6.1-preview1-24530-04", - "System.Runtime.Loader": "4.3.0-preview1-24530-04", - "System.Reflection.Metadata": "1.4.1-preview1-24530-04", - "System.Reflection.TypeExtensions": "4.3.0-preview1-24530-04", - "System.Security.Cryptography.Algorithms": "4.3.0-preview1-24530-04" + "NETStandard.Library": "1.6.1", + "System.Runtime.Loader": "4.3.0", + "System.Reflection.Metadata": "1.4.1", + "System.Reflection.TypeExtensions": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0" } } } diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json index a4469a46c3..6505443942 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/project.json @@ -43,11 +43,11 @@ "define": [ "CORECLR" ] }, "dependencies": { - "NETStandard.Library": "1.6.1-preview1-24530-04", - "System.Security.Principal": "4.3.0-preview1-24530-04", - "System.Security.Principal.Windows": "4.3.0-preview1-24530-04", - "System.Diagnostics.TraceSource": "4.3.0-preview1-24530-04", - "System.Security.SecureString": "4.3.0-preview1-24530-04" + "NETStandard.Library": "1.6.1", + "System.Security.Principal": "4.3.0", + "System.Security.Principal.Windows": "4.3.0", + "System.Diagnostics.TraceSource": "4.3.0", + "System.Security.SecureString": "4.3.0" } } } diff --git a/src/Microsoft.PowerShell.LocalAccounts/project.json b/src/Microsoft.PowerShell.LocalAccounts/project.json index f5e4d70783..7f6363fc6e 100644 --- a/src/Microsoft.PowerShell.LocalAccounts/project.json +++ b/src/Microsoft.PowerShell.LocalAccounts/project.json @@ -45,7 +45,7 @@ "define": [ "CORECLR" ] }, "dependencies": { - "System.Net.NameResolution": "4.3.0-preview1-24530-04" + "System.Net.NameResolution": "4.3.0" } }, "net451": { diff --git a/src/Microsoft.PowerShell.SDK/project.json b/src/Microsoft.PowerShell.SDK/project.json index c36b2d2c6b..1a12e6f8bd 100644 --- a/src/Microsoft.PowerShell.SDK/project.json +++ b/src/Microsoft.PowerShell.SDK/project.json @@ -17,88 +17,88 @@ "imports": ["dnxcore50", "portable-net45+win8"], "dependencies": { "Microsoft.NETCore.Portable.Compatibility": "1.0.3-beta-24514-00", - "Microsoft.CSharp": "4.3.0-preview1-24530-04", - "Microsoft.VisualBasic": "10.1.0-preview1-24530-04", - "Microsoft.Win32.Registry" : "4.3.0-preview1-24530-04", - "Microsoft.Win32.Registry.AccessControl" : "4.3.0-preview1-24530-04", - "NETStandard.Library": "1.6.1-preview1-24530-04", - "System.Collections.Immutable" : "1.3.0-preview1-24530-04", - "System.Collections.NonGeneric" : "4.3.0-preview1-24530-04", - "System.Collections.Specialized" : "4.3.0-preview1-24530-04", - "System.ComponentModel" : "4.3.0-preview1-24530-04", - "System.ComponentModel.Annotations" : "4.3.0-preview1-24530-04", - "System.ComponentModel.EventBasedAsync" : "4.3.0-preview1-24530-04", - "System.ComponentModel.Primitives" : "4.3.0-preview1-24530-04", - "System.ComponentModel.TypeConverter" : "4.3.0-preview1-24530-04", - "System.Data.Common" : "4.3.0-preview1-24530-04", - "System.Data.SqlClient" : "4.3.0-preview1-24530-04", - "System.Diagnostics.Contracts" : "4.3.0-preview1-24530-04", - "System.Diagnostics.DiagnosticSource" : "4.3.0-preview1-24530-04", - "System.Diagnostics.FileVersionInfo" : "4.3.0-preview1-24530-04", - "System.Diagnostics.Process" : "4.3.0-preview1-24530-04", - "System.Diagnostics.StackTrace" : "4.3.0-preview1-24530-04", - "System.Diagnostics.TextWriterTraceListener" : "4.3.0-preview1-24530-04", - "System.Diagnostics.TraceSource" : "4.3.0-preview1-24530-04", - "System.Dynamic.Runtime" : "4.3.0-preview1-24530-04", - "System.Globalization.Extensions" : "4.3.0-preview1-24530-04", - "System.IO.FileSystem.AccessControl" : "4.3.0-preview1-24530-04", - "System.IO.FileSystem.DriveInfo" : "4.3.0-preview1-24530-04", - "System.IO.FileSystem.Watcher" : "4.3.0-preview1-24530-04", - "System.IO.MemoryMappedFiles" : "4.3.0-preview1-24530-04", - "System.IO.Packaging" : "4.3.0-preview1-24530-04", - "System.IO.Pipes" : "4.3.0-preview1-24530-04", - "System.IO.UnmanagedMemoryStream" : "4.3.0-preview1-24530-04", - "System.Linq.Parallel" : "4.3.0-preview1-24530-04", - "System.Linq.Queryable" : "4.3.0-preview1-24530-04", - "System.Net.Http.WinHttpHandler" : "4.3.0-preview1-24530-04", - "System.Net.NameResolution" : "4.3.0-preview1-24530-04", - "System.Net.NetworkInformation" : "4.3.0-preview1-24530-04", - "System.Net.Ping" : "4.3.0-preview1-24530-04", - "System.Net.Requests" : "4.3.0-preview1-24530-04", - "System.Net.Security" : "4.3.0-preview1-24530-04", - "System.Net.WebHeaderCollection" : "4.3.0-preview1-24530-04", - "System.Net.WebSockets" : "4.3.0-preview1-24530-04", - "System.Net.WebSockets.Client" : "4.3.0-preview1-24530-04", - "System.Numerics.Vectors" : "4.3.0-preview1-24530-04", - "System.Reflection.DispatchProxy" : "4.3.0-preview1-24530-04", - "System.Reflection.Emit" : "4.3.0-preview1-24530-04", - "System.Reflection.Emit.ILGeneration" : "4.3.0-preview1-24530-04", - "System.Reflection.Emit.Lightweight" : "4.3.0-preview1-24530-04", - "System.Reflection.Metadata" : "1.4.1-preview1-24530-04", - "System.Reflection.TypeExtensions" : "4.3.0-preview1-24530-04", - "System.Resources.Reader" : "4.3.0-preview1-24530-04", - "System.Runtime.CompilerServices.VisualC" : "4.3.0-preview1-24530-04", - "System.Runtime.Serialization.Json" : "4.3.0-preview1-24530-04", - "System.Runtime.Serialization.Primitives" : "4.3.0-preview1-24530-04", - "System.Runtime.Serialization.Xml" : "4.3.0-preview1-24530-04", - "System.Security.AccessControl" : "4.3.0-preview1-24530-04", - "System.Security.Claims" : "4.3.0-preview1-24530-04", - "System.Security.Cryptography.Cng" : "4.3.0-preview1-24530-04", - "System.Security.Cryptography.Csp" : "4.3.0-preview1-24530-04", - "System.Security.Cryptography.Pkcs" : "4.3.0-preview1-24530-04", - "System.Security.Principal" : "4.3.0-preview1-24530-04", - "System.Security.Principal.Windows" : "4.3.0-preview1-24530-04", - "System.Security.SecureString" : "4.3.0-preview1-24530-04", - "System.ServiceModel.Duplex" : "4.3.0-preview1-24611-01", - "System.ServiceModel.Http" : "4.3.0-preview1-24611-01", - "System.ServiceModel.NetTcp" : "4.3.0-preview1-24611-01", - "System.ServiceModel.Primitives" : "4.3.0-preview1-24611-01", - "System.ServiceModel.Security" : "4.3.0-preview1-24611-01", - "System.ServiceProcess.ServiceController" : "4.3.0-preview1-24530-04", - "System.Text.Encoding.CodePages" : "4.3.0-preview1-24530-04", - "System.Text.Encodings.Web" : "4.3.0-preview1-24530-04", - "System.Threading.AccessControl" : "4.3.0-preview1-24530-04", - "System.Threading.Overlapped" : "4.3.0-preview1-24530-04", - "System.Threading.Tasks.Dataflow" : "4.7.0-preview1-24530-04", - "System.Threading.Tasks.Parallel" : "4.3.0-preview1-24530-04", - "System.Threading.Thread" : "4.3.0-preview1-24530-04", - "System.Threading.ThreadPool" : "4.3.0-preview1-24530-04", - "System.Xml.XmlDocument" : "4.3.0-preview1-24530-04", - "System.Xml.XmlSerializer" : "4.3.0-preview1-24530-04", - "System.Xml.XPath" : "4.3.0-preview1-24530-04", - "System.Xml.XPath.XDocument" : "4.3.0-preview1-24530-04", - "System.Xml.XPath.XmlDocument" : "4.3.0-preview1-24530-04", - "System.Private.ServiceModel": "4.3.0-preview1-24611-01" + "Microsoft.CSharp": "4.3.0", + "Microsoft.VisualBasic": "10.1.0", + "Microsoft.Win32.Registry" : "4.3.0", + "Microsoft.Win32.Registry.AccessControl" : "4.3.0", + "NETStandard.Library": "1.6.1", + "System.Collections.Immutable" : "1.3.0", + "System.Collections.NonGeneric" : "4.3.0", + "System.Collections.Specialized" : "4.3.0", + "System.ComponentModel" : "4.3.0", + "System.ComponentModel.Annotations" : "4.3.0", + "System.ComponentModel.EventBasedAsync" : "4.3.0", + "System.ComponentModel.Primitives" : "4.3.0", + "System.ComponentModel.TypeConverter" : "4.3.0", + "System.Data.Common" : "4.3.0", + "System.Data.SqlClient" : "4.3.0", + "System.Diagnostics.Contracts" : "4.3.0", + "System.Diagnostics.DiagnosticSource" : "4.3.0", + "System.Diagnostics.FileVersionInfo" : "4.3.0", + "System.Diagnostics.Process" : "4.3.0", + "System.Diagnostics.StackTrace" : "4.3.0", + "System.Diagnostics.TextWriterTraceListener" : "4.3.0", + "System.Diagnostics.TraceSource" : "4.3.0", + "System.Dynamic.Runtime" : "4.3.0", + "System.Globalization.Extensions" : "4.3.0", + "System.IO.FileSystem.AccessControl" : "4.3.0", + "System.IO.FileSystem.DriveInfo" : "4.3.0", + "System.IO.FileSystem.Watcher" : "4.3.0", + "System.IO.MemoryMappedFiles" : "4.3.0", + "System.IO.Packaging" : "4.3.0", + "System.IO.Pipes" : "4.3.0", + "System.IO.UnmanagedMemoryStream" : "4.3.0", + "System.Linq.Parallel" : "4.3.0", + "System.Linq.Queryable" : "4.3.0", + "System.Net.Http.WinHttpHandler" : "4.3.0", + "System.Net.NameResolution" : "4.3.0", + "System.Net.NetworkInformation" : "4.3.0", + "System.Net.Ping" : "4.3.0", + "System.Net.Requests" : "4.3.0", + "System.Net.Security" : "4.3.0", + "System.Net.WebHeaderCollection" : "4.3.0", + "System.Net.WebSockets" : "4.3.0", + "System.Net.WebSockets.Client" : "4.3.0", + "System.Numerics.Vectors" : "4.3.0", + "System.Reflection.DispatchProxy" : "4.3.0", + "System.Reflection.Emit" : "4.3.0", + "System.Reflection.Emit.ILGeneration" : "4.3.0", + "System.Reflection.Emit.Lightweight" : "4.3.0", + "System.Reflection.Metadata" : "1.4.1", + "System.Reflection.TypeExtensions" : "4.3.0", + "System.Resources.Reader" : "4.3.0", + "System.Runtime.CompilerServices.VisualC" : "4.3.0", + "System.Runtime.Serialization.Json" : "4.3.0", + "System.Runtime.Serialization.Primitives" : "4.3.0", + "System.Runtime.Serialization.Xml" : "4.3.0", + "System.Security.AccessControl" : "4.3.0", + "System.Security.Claims" : "4.3.0", + "System.Security.Cryptography.Cng" : "4.3.0", + "System.Security.Cryptography.Csp" : "4.3.0", + "System.Security.Cryptography.Pkcs" : "4.3.0", + "System.Security.Principal" : "4.3.0", + "System.Security.Principal.Windows" : "4.3.0", + "System.Security.SecureString" : "4.3.0", + "System.ServiceModel.Duplex" : "4.3.0", + "System.ServiceModel.Http" : "4.3.0", + "System.ServiceModel.NetTcp" : "4.3.0", + "System.ServiceModel.Primitives" : "4.3.0", + "System.ServiceModel.Security" : "4.3.0", + "System.ServiceProcess.ServiceController" : "4.3.0", + "System.Text.Encoding.CodePages" : "4.3.0", + "System.Text.Encodings.Web" : "4.3.0", + "System.Threading.AccessControl" : "4.3.0", + "System.Threading.Overlapped" : "4.3.0", + "System.Threading.Tasks.Dataflow" : "4.7.0", + "System.Threading.Tasks.Parallel" : "4.3.0", + "System.Threading.Thread" : "4.3.0", + "System.Threading.ThreadPool" : "4.3.0", + "System.Xml.XmlDocument" : "4.3.0", + "System.Xml.XmlSerializer" : "4.3.0", + "System.Xml.XPath" : "4.3.0", + "System.Xml.XPath.XDocument" : "4.3.0", + "System.Xml.XPath.XmlDocument" : "4.3.0", + "System.Private.ServiceModel": "4.3.0" } } } diff --git a/src/Microsoft.WSMan.Runtime/project.json b/src/Microsoft.WSMan.Runtime/project.json index 1962375044..e34450a678 100644 --- a/src/Microsoft.WSMan.Runtime/project.json +++ b/src/Microsoft.WSMan.Runtime/project.json @@ -40,7 +40,7 @@ "define": [ "CORECLR" ] }, "dependencies": { - "NETStandard.Library": "1.6.1-preview1-24530-04" + "NETStandard.Library": "1.6.1" } }, "net451": { diff --git a/src/ResGen/project.json b/src/ResGen/project.json index 7c0603a8e3..695a6b2ac3 100644 --- a/src/ResGen/project.json +++ b/src/ResGen/project.json @@ -8,10 +8,10 @@ }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { - "Microsoft.NETCore.App": "1.1.0-preview1-001100-00", - "System.Xml.XDocument": "4.3.0-preview1-24530-04" + "Microsoft.NETCore.App": "1.1.0", + "System.Xml.XDocument": "4.3.0" } } }, diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index 16adb1db15..904f2496f7 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -157,38 +157,38 @@ "Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "6.0.0-*", "Microsoft.PowerShell.CoreCLR.Eventing": "6.0.0-*", - "Microsoft.CSharp": "4.3.0-preview1-24530-04", - "Microsoft.Win32.Registry.AccessControl": "4.3.0-preview1-24530-04", + "Microsoft.CSharp": "4.3.0", + "Microsoft.Win32.Registry.AccessControl": "4.3.0", "Newtonsoft.Json": "9.0.1", - "System.Collections.Specialized": "4.3.0-preview1-24530-04", - "System.Collections.NonGeneric": "4.3.0-preview1-24530-04", - "System.ComponentModel.EventBasedAsync": "4.3.0-preview1-24530-04", - "System.ComponentModel.TypeConverter": "4.3.0-preview1-24530-04", - "System.Data.Common": "4.3.0-preview1-24530-04", - "System.Diagnostics.Contracts": "4.3.0-preview1-24530-04", - "System.Diagnostics.FileVersionInfo": "4.3.0-preview1-24530-04", - "System.Diagnostics.Process": "4.3.0-preview1-24530-04", - "System.Diagnostics.StackTrace": "4.3.0-preview1-24530-04", - "System.Diagnostics.TraceSource": "4.3.0-preview1-24530-04", - "System.Dynamic.Runtime": "4.3.0-preview1-24530-04", - "System.IO.FileSystem.AccessControl": "4.3.0-preview1-24530-04", - "System.IO.FileSystem.DriveInfo": "4.3.0-preview1-24530-04", - "System.IO.FileSystem.Watcher": "4.3.0-preview1-24530-04", - "System.IO.Pipes": "4.3.0-preview1-24530-04", - "System.IO.Compression.ZipFile": "4.3.0-preview1-24530-04", - "System.Linq.Expressions": "4.3.0-preview1-24530-04", - "System.Net.Http": "4.3.0-preview1-24530-04", - "System.Net.NetworkInformation": "4.3.0-preview1-24530-04", - "System.Reflection.Emit": "4.3.0-preview1-24530-04", - "System.Reflection.Emit.Lightweight": "4.3.0-preview1-24530-04", - "System.Security.AccessControl": "4.3.0-preview1-24530-04", - "System.Security.Cryptography.Algorithms": "4.3.0-preview1-24530-04", - "System.Security.Cryptography.X509Certificates": "4.3.0-preview1-24530-04", - "System.Threading.Thread": "4.3.0-preview1-24530-04", - "System.Threading.Tasks.Parallel": "4.3.0-preview1-24530-04", - "System.Xml.XPath.XmlDocument": "4.3.0-preview1-24530-04", - "System.Xml.XmlDocument": "4.3.0-preview1-24530-04", - "System.Xml.XmlSerializer": "4.3.0-preview1-24530-04" + "System.Collections.Specialized": "4.3.0", + "System.Collections.NonGeneric": "4.3.0", + "System.ComponentModel.EventBasedAsync": "4.3.0", + "System.ComponentModel.TypeConverter": "4.3.0", + "System.Data.Common": "4.3.0", + "System.Diagnostics.Contracts": "4.3.0", + "System.Diagnostics.FileVersionInfo": "4.3.0", + "System.Diagnostics.Process": "4.3.0", + "System.Diagnostics.StackTrace": "4.3.0", + "System.Diagnostics.TraceSource": "4.3.0", + "System.Dynamic.Runtime": "4.3.0", + "System.IO.FileSystem.AccessControl": "4.3.0", + "System.IO.FileSystem.DriveInfo": "4.3.0", + "System.IO.FileSystem.Watcher": "4.3.0", + "System.IO.Pipes": "4.3.0", + "System.IO.Compression.ZipFile": "4.3.0", + "System.Linq.Expressions": "4.3.0", + "System.Net.Http": "4.3.0", + "System.Net.NetworkInformation": "4.3.0", + "System.Reflection.Emit": "4.3.0", + "System.Reflection.Emit.Lightweight": "4.3.0", + "System.Security.AccessControl": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Threading.Thread": "4.3.0", + "System.Threading.Tasks.Parallel": "4.3.0", + "System.Xml.XPath.XmlDocument": "4.3.0", + "System.Xml.XmlDocument": "4.3.0", + "System.Xml.XmlSerializer": "4.3.0" } }, "net451": { diff --git a/src/TypeCatalogGen/project.json b/src/TypeCatalogGen/project.json index 1d5a81e3b0..c5fb126cb1 100644 --- a/src/TypeCatalogGen/project.json +++ b/src/TypeCatalogGen/project.json @@ -32,11 +32,11 @@ }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { - "Microsoft.NETCore.App": "1.1.0-preview1-001100-00", - "System.Reflection.Metadata": "1.4.1-preview1-24530-04", - "System.Collections.Immutable": "1.3.0-preview1-24530-04" + "Microsoft.NETCore.App": "1.1.0", + "System.Reflection.Metadata": "1.4.1", + "System.Collections.Immutable": "1.3.0" } } }, diff --git a/src/TypeCatalogParser/Main.cs b/src/TypeCatalogParser/Main.cs index 91ec7e9be4..3e7f07baec 100644 --- a/src/TypeCatalogParser/Main.cs +++ b/src/TypeCatalogParser/Main.cs @@ -34,7 +34,7 @@ namespace TypeCatalogParser // Get the real reference assemblies from y in x.CompileTimeAssemblies where y.Path.EndsWith(".dll") // Construct the path to the assemblies - select $"{context.PackagesDirectory}/{x.Name.ToLower()}/{x.Version}/{y.Path};"); + select $"{context.PackagesDirectory}/{x.Name}/{x.Version}/{y.Path};"); Console.WriteLine($"List of reference assemblies written to {outputPath}"); } diff --git a/src/TypeCatalogParser/project.json b/src/TypeCatalogParser/project.json index 29457283a9..3c26f16fd7 100644 --- a/src/TypeCatalogParser/project.json +++ b/src/TypeCatalogParser/project.json @@ -5,9 +5,9 @@ }, "dependencies": { - "Microsoft.NETCore.App": "1.1.0-preview1-001100-00", - "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-003121", - "Microsoft.DotNet.Cli.Utils": "1.0.0-preview2-003121" + "Microsoft.NETCore.App": "1.1.0", + "Microsoft.DotNet.ProjectModel": "1.0.0-rc3-1-003177", + "Microsoft.DotNet.Cli.Utils": "1.0.0-preview3-004056" }, "configurations": { @@ -35,7 +35,7 @@ }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": [ "dnxcore50", "portable-net45+win8" ] } }, diff --git a/src/powershell-unix/project.json b/src/powershell-unix/project.json index fc391f583a..2b09001e51 100644 --- a/src/powershell-unix/project.json +++ b/src/powershell-unix/project.json @@ -85,13 +85,13 @@ }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": [ "dnxcore50", "portable-net45+win8" ], "buildOptions": { "define": [ "CORECLR" ] }, "dependencies": { - "Microsoft.NETCore.App": "1.1.0-preview1-001100-00" + "Microsoft.NETCore.App": "1.1.0" } } }, diff --git a/src/powershell-win-core/project.json b/src/powershell-win-core/project.json index d4aabb8d48..52746787f4 100644 --- a/src/powershell-win-core/project.json +++ b/src/powershell-win-core/project.json @@ -89,13 +89,13 @@ }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": [ "dnxcore50", "portable-net45+win8" ], "buildOptions": { "define": [ "CORECLR" ] }, "dependencies": { - "Microsoft.NETCore.App": "1.1.0-preview1-001100-00" + "Microsoft.NETCore.App": "1.1.0" } } }, diff --git a/test/PSReadLine/project.json b/test/PSReadLine/project.json index d94ea85dff..7e9acb4e06 100644 --- a/test/PSReadLine/project.json +++ b/test/PSReadLine/project.json @@ -9,14 +9,14 @@ }, "dependencies": { - "Microsoft.PowerShell.PSReadLine": "1.0.0-*" + "Microsoft.PowerShell.PSReadLine": "6.0.0-*" }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { - "Microsoft.NETCore.App": "1.1.0-preview1-001100-00" + "Microsoft.NETCore.App": "1.1.0" } } }, diff --git a/test/csharp/project.json b/test/csharp/project.json index b3e25f66a3..9dead4604c 100644 --- a/test/csharp/project.json +++ b/test/csharp/project.json @@ -14,10 +14,10 @@ }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "imports": [ "dnxcore50", "portable-net45+win8" ], "dependencies": { - "xunit": "2.2.0-beta3-build3402", + "xunit": "2.2.0-beta4-build3444", "dotnet-test-xunit": "2.2.0-preview2-build1029" } } diff --git a/test/tools/CreateChildProcess/project.json b/test/tools/CreateChildProcess/project.json index c998c1e8a8..156487aaa4 100644 --- a/test/tools/CreateChildProcess/project.json +++ b/test/tools/CreateChildProcess/project.json @@ -8,9 +8,9 @@ }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { - "Microsoft.NETCore.App": "1.1.0-preview1-001100-00" + "Microsoft.NETCore.App": "1.1.0" } } }, diff --git a/test/tools/EchoArgs/project.json b/test/tools/EchoArgs/project.json index e86d4d49a3..cf4de148d4 100644 --- a/test/tools/EchoArgs/project.json +++ b/test/tools/EchoArgs/project.json @@ -8,9 +8,9 @@ }, "frameworks": { - "netcoreapp1.0": { + "netcoreapp1.1": { "dependencies": { - "Microsoft.NETCore.App": "1.1.0-preview1-001100-00" + "Microsoft.NETCore.App": "1.1.0" } } },