diff --git a/.travis.yml b/.travis.yml index b4c9115da6a..b8b43593e5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ after_success: # CACHE_VERSION is not used for anything other than invalidating the cache. env: global: - - CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300-rc1-2 + - CACHE_VERSION=netcoreapp.2.1-sdk.2.1.300 - POWERSHELL_TELEMETRY_OPTOUT=1 # timeout uploading cache after 6 minutes (360 seconds) diff --git a/appveyor.yml b/appveyor.yml index 84d2f9114af..9c79aa54c1e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2017 -# cache version - netcoreapp.2.1-sdk.2.1.300-rc1 +# cache version - netcoreapp.2.1-sdk.2.1.300 cache: - '%LocalAppData%\Microsoft\dotnet -> appveyor.yml' - '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml' diff --git a/assets/files.wxs b/assets/files.wxs index 03afdac2dd8..0a144236261 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -4,6 +4,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -140,7 +191,7 @@ - + @@ -437,7 +488,7 @@ - + @@ -1836,6 +1887,23 @@ + + + + + + + + + + + + + + + + + diff --git a/global.json b/global.json index 42356097675..d65e3d5d314 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.1.300-rc1-008673" + "version": "2.1.300" } } diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj index 9589f3a801e..ccb3c17da7f 100644 --- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj +++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj @@ -57,7 +57,7 @@ - + diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index 8a79920c556..593e84dceb6 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -67,7 +67,7 @@ - + diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj index fa8f0376cc9..19270a8f589 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index 6a3964fb602..f8152d1a4ee 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -16,21 +16,22 @@ - + - - - - + + + + - - - - - - + + + + + + + diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj index 5a1d2de3c66..0e93428f72c 100644 --- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj +++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj index f6b91799015..8d7ff2cfd87 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -9,14 +9,14 @@ - + - - - - - - + + + + + + diff --git a/src/powershell-native/nativemsh/pwrshcommon/pwrshcommon.cpp b/src/powershell-native/nativemsh/pwrshcommon/pwrshcommon.cpp index d39b8cdd31c..aa6dcdd4d99 100644 --- a/src/powershell-native/nativemsh/pwrshcommon/pwrshcommon.cpp +++ b/src/powershell-native/nativemsh/pwrshcommon/pwrshcommon.cpp @@ -669,9 +669,10 @@ namespace NativeMsh static PCSTR trustedAssemblies[] = { "Microsoft.ApplicationInsights", - "Microsoft.CodeAnalysis", "Microsoft.CodeAnalysis.CSharp", + "Microsoft.CodeAnalysis", "Microsoft.CSharp", + "Microsoft.DiaSymReader.Native.amd64", "Microsoft.Management.Infrastructure", "Microsoft.Management.Infrastructure.CimCmdlets", "Microsoft.Management.Infrastructure.Native", @@ -680,7 +681,6 @@ namespace NativeMsh "Microsoft.PowerShell.Commands.Utility", "Microsoft.PowerShell.ConsoleHost", "Microsoft.PowerShell.CoreCLR.Eventing", - "Microsoft.PowerShell.LocalAccounts", "Microsoft.PowerShell.PSReadLine", "Microsoft.PowerShell.SDK", "Microsoft.PowerShell.Security", @@ -688,46 +688,60 @@ namespace NativeMsh "Microsoft.Win32.Primitives", "Microsoft.Win32.Registry", "Microsoft.Win32.Registry.AccessControl", + "Microsoft.Win32.SystemEvents", "Microsoft.WSMan.Management", "Microsoft.WSMan.Runtime", "mscorlib", "netstandard", "Newtonsoft.Json", + "NJsonSchema", + "PowerShell.Core.Instrumentation", "System", "System.AppContext", "System.Buffers", + "System.CodeDom", "System.Collections", "System.Collections.Concurrent", "System.Collections.Immutable", "System.Collections.NonGeneric", "System.Collections.Specialized", - "System.Configuration", - "System.ComponentModel", "System.ComponentModel.Annotations", + "System.ComponentModel.Composition", "System.ComponentModel.DataAnnotations", + "System.ComponentModel", "System.ComponentModel.EventBasedAsync", "System.ComponentModel.Primitives", "System.ComponentModel.TypeConverter", + "System.Configuration", + "System.Configuration.ConfigurationManager", "System.Console", "System.Core", "System.Data", "System.Data.Common", + "System.Data.DataSetExtensions", + "System.Data.Odbc", "System.Data.SqlClient", "System.Diagnostics.Contracts", "System.Diagnostics.Debug", "System.Diagnostics.DiagnosticSource", + "System.Diagnostics.EventLog", "System.Diagnostics.FileVersionInfo", + "System.Diagnostics.PerformanceCounter", "System.Diagnostics.Process", "System.Diagnostics.StackTrace", "System.Diagnostics.TextWriterTraceListener", "System.Diagnostics.Tools", "System.Diagnostics.TraceSource", "System.Diagnostics.Tracing", + "System.DirectoryServices", + "System.DirectoryServices.AccountManagement", + "System.DirectoryServices.Protocols", "System.Drawing", + "System.Drawing.Common", "System.Drawing.Primitives", "System.Dynamic.Runtime", - "System.Globalization", "System.Globalization.Calendars", + "System.Globalization", "System.Globalization.Extensions", "System.IO", "System.IO.Compression", @@ -744,11 +758,13 @@ namespace NativeMsh "System.IO.Packaging", "System.IO.Pipes", "System.IO.Pipes.AccessControl", + "System.IO.Ports", "System.IO.UnmanagedMemoryStream", "System.Linq", "System.Linq.Expressions", "System.Linq.Parallel", "System.Linq.Queryable", + "System.Management", "System.Management.Automation", "System.Memory", "System.Net", @@ -791,6 +807,8 @@ namespace NativeMsh "System.Resources.ResourceManager", "System.Resources.Writer", "System.Runtime", + "System.Runtime.Caching", + "System.Runtime.CompilerServices.Unsafe", "System.Runtime.CompilerServices.VisualC", "System.Runtime.Extensions", "System.Runtime.Handles", @@ -804,7 +822,6 @@ namespace NativeMsh "System.Runtime.Serialization.Json", "System.Runtime.Serialization.Primitives", "System.Runtime.Serialization.Xml", - "System.Security", "System.Security.AccessControl", "System.Security.Claims", "System.Security.Cryptography.Algorithms", @@ -814,16 +831,21 @@ namespace NativeMsh "System.Security.Cryptography.OpenSsl", "System.Security.Cryptography.Pkcs", "System.Security.Cryptography.Primitives", + "System.Security.Cryptography.ProtectedData", "System.Security.Cryptography.X509Certificates", + "System.Security.Cryptography.Xml", + "System.Security", "System.Security.Permissions", "System.Security.Principal", "System.Security.Principal.Windows", "System.Security.SecureString", + "System.ServiceModel", "System.ServiceModel.Duplex", "System.ServiceModel.Http", "System.ServiceModel.NetTcp", "System.ServiceModel.Primitives", "System.ServiceModel.Security", + "System.ServiceModel.Syndication", "System.ServiceModel.Web", "System.ServiceProcess", "System.ServiceProcess.ServiceController", @@ -835,8 +857,8 @@ namespace NativeMsh "System.Threading", "System.Threading.AccessControl", "System.Threading.Overlapped", - "System.Threading.Tasks", "System.Threading.Tasks.Dataflow", + "System.Threading.Tasks", "System.Threading.Tasks.Extensions", "System.Threading.Tasks.Parallel", "System.Threading.Thread", diff --git a/test/csharp/csharp.tests.csproj b/test/csharp/csharp.tests.csproj index d719d5b8213..ab0a532883b 100644 --- a/test/csharp/csharp.tests.csproj +++ b/test/csharp/csharp.tests.csproj @@ -21,10 +21,10 @@ - + + - - + diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj index 3222505844e..52a464b3693 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -7,7 +7,7 @@ - + diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index fd4efda2fef..2d0308052c3 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -1409,12 +1409,12 @@ function New-UnifiedNugetPackage 'Microsoft.PowerShell.Commands.Management' { $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Security'), [tuple]::Create('version', $PackageVersion))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceProcess.ServiceController'), [tuple]::Create('version', '4.4.1'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceProcess.ServiceController'), [tuple]::Create('version', '4.5.0'))) > $null } 'Microsoft.PowerShell.Commands.Utility' { $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.CodeAnalysis.CSharp'), [tuple]::Create('version', '2.6.1'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.CodeAnalysis.CSharp'), [tuple]::Create('version', '2.7.0'))) > $null } 'Microsoft.PowerShell.ConsoleHost' { @@ -1423,7 +1423,7 @@ function New-UnifiedNugetPackage } 'Microsoft.PowerShell.CoreCLR.Eventing' { - $deps.Add([tuple]::Create( [tuple]::Create('id', 'System.Security.Principal.Windows'), [tuple]::Create('version', '4.4.1'))) > $null + $deps.Add([tuple]::Create( [tuple]::Create('id', 'System.Security.Principal.Windows'), [tuple]::Create('version', '4.5.0'))) > $null } 'Microsoft.PowerShell.SDK' { @@ -1432,17 +1432,17 @@ function New-UnifiedNugetPackage $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.ConsoleHost'), [tuple]::Create('version', $PackageVersion))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Security'), [tuple]::Create('version', $PackageVersion))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Data.SqlClient'), [tuple]::Create('version', '4.4.2'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.IO.Packaging'), [tuple]::Create('version', '4.4.1'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Net.Http.WinHttpHandler'), [tuple]::Create('version', '4.4.0'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Duplex'), [tuple]::Create('version', '4.4.1'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Http'), [tuple]::Create('version', '4.4.1'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.NetTcp'), [tuple]::Create('version', '4.4.1'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Primitives'), [tuple]::Create('version', '4.4.1'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Security'), [tuple]::Create('version', '4.4.1'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Text.Encodings.Web'), [tuple]::Create('version', '4.4.0'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Threading.AccessControl'), [tuple]::Create('version', '4.4.0'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Private.ServiceModel'), [tuple]::Create('version', '4.4.1'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Data.SqlClient'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.IO.Packaging'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Net.Http.WinHttpHandler'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Duplex'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Http'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.NetTcp'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Primitives'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceModel.Security'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Text.Encodings.Web'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Threading.AccessControl'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Private.ServiceModel'), [tuple]::Create('version', '4.5.0'))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.NETCore.Windows.ApiSets'), [tuple]::Create('version', '1.0.1'))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.WSMan.Management'), [tuple]::Create('version', $PackageVersion))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.Commands.Diagnostics'), [tuple]::Create('version', $PackageVersion))) > $null @@ -1455,7 +1455,7 @@ function New-UnifiedNugetPackage 'Microsoft.WSMan.Management' { $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Management.Automation'), [tuple]::Create('version', $PackageVersion))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.WSMan.Runtime'), [tuple]::Create('version', $PackageVersion))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceProcess.ServiceController'), [tuple]::Create('version', '4.4.1'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.ServiceProcess.ServiceController'), [tuple]::Create('version', '4.5.0'))) > $null } 'Microsoft.WSMan.Runtime' { @@ -1464,13 +1464,13 @@ function New-UnifiedNugetPackage 'System.Management.Automation' { $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.PowerShell.CoreCLR.Eventing'), [tuple]::Create('version', $PackageVersion))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.Win32.Registry.AccessControl'), [tuple]::Create('version', '4.4.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.Win32.Registry.AccessControl'), [tuple]::Create('version', '4.5.0'))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'Newtonsoft.Json'), [tuple]::Create('version', '10.0.3'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.IO.FileSystem.AccessControl'), [tuple]::Create('version', '4.4.0'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.AccessControl'), [tuple]::Create('version', '4.4.1'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.Cryptography.Pkcs'), [tuple]::Create('version', '4.4.0'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.Permissions'), [tuple]::Create('version', '4.4.1'))) > $null - $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Text.Encoding.CodePages'), [tuple]::Create('version', '4.4.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.IO.FileSystem.AccessControl'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.AccessControl'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.Cryptography.Pkcs'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Security.Permissions'), [tuple]::Create('version', '4.5.0'))) > $null + $deps.Add([tuple]::Create([tuple]::Create('id', 'System.Text.Encoding.CodePages'), [tuple]::Create('version', '4.3.0'))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'Microsoft.Management.Infrastructure'), [tuple]::Create('version', '1.0.0-alpha08'))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'PowerShell.Core.Instrumentation'), [tuple]::Create('version', '6.0.0-RC2'))) > $null $deps.Add([tuple]::Create([tuple]::Create('id', 'libpsl'), [tuple]::Create('version', '6.0.0-rc'))) > $null