admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1637 from PowerShell/dongbo/ops-remoting

Browse Source 
Make the assembly version of AssemblyLoadContext.dll to be 3.0.0.0, so that the ALC.dll from OPS can work with existing native hosts in NanoServer
This commit is contained in:
Dongbo Wang
2016-08-04 12:17:46 -07:00
committed by GitHub
parent 1d1ec240ca 43bda97c98
commit 98ae3e7f1e
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/AssemblyInfo.cs
+2 -3
View File
@@ -1,6 +1,5 @@
using System.Runtime.CompilerServices;
using System.Reflection;
[assembly: InternalsVisibleTo("System.Management.Automation,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo("powershell,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersionAttribute("3.0.0.0")]
[assembly: AssemblyVersion("3.0.0.0")]
src/System.Management.Automation/engine/PSVersionInfo.cs
-5
View File
@@ -45,11 +45,6 @@ namespace System.Management.Automation
/// <summary>
/// A constant to track current PowerShell Edition
/// </summary>
/// <remarks>
/// Desktop -- "full" PowerShell that runs on Server and Desktop SKUs. Contains all features.
/// Core -- Covers Nano Server and IoT SKUs since they are identical from a built-in feature and CLR perspective.
/// Linux -- All PS on Linux flavors. This may need to be subdivided based on compatibility between distros.
/// </remarks>
#if !CORECLR
internal const string PSEditionValue = "WindowsPowerShell";
#else
src/powershell-native/nativemsh/pwrshcommon/pwrshcommon.cpp
+3 -2
View File
@@ -738,6 +738,7 @@ namespace NativeMsh
"System.Numerics",
"System.Numerics.Vectors",
"System.ObjectModel",
"System.Private.CoreLib",
"System.Private.DataContractSerialization",
"System.Private.ServiceModel",
"System.Private.Uri",
@@ -750,14 +751,13 @@ namespace NativeMsh
"System.Reflection.Metadata",
"System.Reflection.Primitives",
"System.Reflection.TypeExtensions",
"System.Resources.ReaderWriter",
"System.Resources.Reader",
"System.Resources.ResourceManager",
"System.Runtime.CompilerServices.VisualC",
"System.Runtime",
"System.Runtime.Extensions",
"System.Runtime.Handles",
"System.Runtime.InteropServices",
"System.Runtime.InteropServices.PInvoke",
"System.Runtime.InteropServices.RuntimeInformation",
"System.Runtime.Loader",
"System.Runtime.Numerics",
@@ -772,6 +772,7 @@ namespace NativeMsh
"System.Security.Cryptography.Csp",
"System.Security.Cryptography.Encoding",
"System.Security.Cryptography.OpenSsl",
"System.Security.Cryptography.Pkcs",
"System.Security.Cryptography.Primitives",
"System.Security.Cryptography.X509Certificates",
"System.Security.Principal",