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 #1128 from PowerShell/andschwa/nano-bits

Browse Source 
Downgrade .NET Core packages to Nano's build rc2-24027
This commit is contained in:
Andy Schwartzmeyer
2016-06-16 16:23:41 -07:00
committed by GitHub
parent b4fe8c4935 ef79e12245
commit a5d11a6000
24 changed files with 92 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/cmdlet-example/project.json
+2 -2
View File
@@ -11,8 +11,8 @@
"netstandard1.3": {
"imports": [ "net40" ],
"dependencies": {
"Microsoft.NETCore": "5.0.1-rc2-24103",
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-24103"
"Microsoft.NETCore": "5.0.1-rc2-24027",
"Microsoft.NETCore.Portable.Compatibility": "1.0.1-rc2-24027"
}
}
}
src/Microsoft.PowerShell.Commands.Diagnostics/AssemblyInfo.cs
-4
View File
@@ -7,7 +7,3 @@ using System.Resources;
[assembly:AssemblyCulture("")]
[assembly:NeutralResourcesLanguage("en-US")]
#if !CORECLR
[assembly:AssemblyKeyFileAttribute(@"..\signing\visualstudiopublic.snk")]
[assembly:AssemblyDelaySignAttribute(true)]
#endif
src/Microsoft.PowerShell.Commands.Diagnostics/project.json
+4 -1
View File
@@ -6,6 +6,9 @@
"sevoroby"
],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true
},
"dependencies": {
@@ -39,4 +42,4 @@
"net451": {
}
}
}
}
src/Microsoft.PowerShell.Commands.Management/AssemblyInfo.cs
-5
View File
@@ -6,8 +6,3 @@ using System.Resources;
[assembly:AssemblyCulture("")]
[assembly:NeutralResourcesLanguage("en-US")]
#if !CORECLR
[assembly:AssemblyKeyFileAttribute(@"..\signing\visualstudiopublic.snk")]
[assembly:AssemblyDelaySignAttribute(true)]
#endif
src/Microsoft.PowerShell.Commands.Management/project.json
+5 -2
View File
@@ -4,6 +4,9 @@
"authors": [ "garretts", "andschwa" ],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true,
"allowUnsafe": true
},
@@ -42,8 +45,8 @@
}
},
"dependencies": {
"System.ServiceProcess.ServiceController": "4.1.0-rc2-24103",
"System.Net.NameResolution": "4.0.0-rc2-24103"
"System.ServiceProcess.ServiceController": "4.1.0-rc2-24027",
"System.Net.NameResolution": "4.0.0-rc2-24027"
}
},
"net451": {
src/Microsoft.PowerShell.Commands.Utility/AssemblyInfo.cs
-5
View File
@@ -6,8 +6,3 @@ using System.Resources;
[assembly:AssemblyCulture("")]
[assembly:NeutralResourcesLanguage("en-US")]
#if !CORECLR
[assembly:AssemblyKeyFileAttribute(@"..\signing\visualstudiopublic.snk")]
[assembly:AssemblyDelaySignAttribute(true)]
#endif
src/Microsoft.PowerShell.Commands.Utility/project.json
+4 -1
View File
@@ -4,6 +4,9 @@
"authors": [ "garretts", "andschwa" ],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true,
"allowUnsafe": true
},
@@ -60,7 +63,7 @@
"dependencies": {
"Microsoft.CodeAnalysis.CSharp": "1.1.1",
"Newtonsoft.Json": "8.0.2",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-24103"
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-24027"
}
},
"net451": {
src/Microsoft.PowerShell.ConsoleHost/AssemblyInfo.cs
+2 -3
View File
@@ -7,10 +7,11 @@ using System.Runtime.ConstrainedExecution;
using System.Security.Permissions;
#endif
[assembly:InternalsVisibleTo("powershell-tests,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
#if CORECLR
[assembly:AssemblyCulture("")]
[assembly:NeutralResourcesLanguage("en-US")]
[assembly:InternalsVisibleTo("powershell-tests")]
#else
[assembly:AssemblyConfiguration("")]
[assembly:AssemblyInformationalVersionAttribute (@"10.0.10011.16384")]
@@ -20,8 +21,6 @@ using System.Security.Permissions;
[assembly:System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5")]
[assembly:System.Reflection.AssemblyFileVersion("10.0.10011.16384")]
[assembly:AssemblyKeyFileAttribute(@"..\signing\visualstudiopublic.snk")]
[assembly:System.Reflection.AssemblyDelaySign(true)]
#endif
[assembly:System.Runtime.InteropServices.ComVisible(false)]
src/Microsoft.PowerShell.ConsoleHost/project.json
+5 -2
View File
@@ -5,6 +5,9 @@
"authors": [ "sevoroby", "andschwa" ],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true,
"allowUnsafe": true,
"copyToOutput": {
@@ -42,8 +45,8 @@
},
"dependencies": {
"Newtonsoft.Json": "8.0.2",
"System.Xml.XDocument": "4.0.11-rc2-24103",
"System.IO.MemoryMappedFiles": "4.0.0-rc2-24103"
"System.Xml.XDocument": "4.0.11-rc2-24027",
"System.IO.MemoryMappedFiles": "4.0.0-rc2-24027"
}
},
"net451": {
src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/AssemblyInfo.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Runtime.CompilerServices;
using System.Reflection;
[assembly:InternalsVisibleTo("System.Management.Automation")]
[assembly:InternalsVisibleTo("System.Management.Automation,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:AssemblyFileVersionAttribute("1.0.0.0")]
[assembly:AssemblyVersion("1.0.0.0")]
src/Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/project.json
+5 -2
View File
@@ -4,6 +4,9 @@
"authors": [ "andschwa" ],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true
},
@@ -22,8 +25,8 @@
"define": [ "CORECLR" ]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24103",
"System.Runtime.Loader": "4.0.0-rc2-24103"
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Runtime.Loader": "4.0.0-rc2-24027"
}
}
}
src/Microsoft.PowerShell.CoreCLR.Eventing/AssemblyInfo.cs
+1 -1
View File
@@ -1,5 +1,5 @@
using System.Runtime.CompilerServices;
using System.Reflection;
[assembly:InternalsVisibleTo("System.Management.Automation")]
[assembly:InternalsVisibleTo("System.Management.Automation,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:AssemblyFileVersionAttribute("1.0.0.0")]
[assembly:AssemblyVersion("1.0.0.0")]
src/Microsoft.PowerShell.CoreCLR.Eventing/project.json
+6 -3
View File
@@ -4,6 +4,9 @@
"authors": [ "sevoroby" ],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true,
"allowUnsafe": true
},
@@ -15,9 +18,9 @@
"define": [ "CORECLR" ]
},
"dependencies": {
"System.Security.Principal": "4.0.1-rc2-24103",
"System.Security.Principal.Windows": "4.0.0-rc2-24103",
"System.Diagnostics.TraceSource": "4.0.0-rc2-24103",
"System.Security.Principal": "4.0.1-rc2-24027",
"System.Security.Principal.Windows": "4.0.0-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Security.SecureString": "4.0.0-*"
}
}
src/Microsoft.PowerShell.LocalAccounts/project.json
+4 -1
View File
@@ -4,6 +4,9 @@
"authors": [ "OPS" ],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true
},
@@ -18,7 +21,7 @@
"define": [ "CORECLR" ]
},
"dependencies": {
"System.Net.NameResolution": "4.0.0-rc2-24103"
"System.Net.NameResolution": "4.0.0-rc2-24027"
}
},
"net451": {
src/Microsoft.PowerShell.PSReadLine/project.json
+3
View File
@@ -4,6 +4,9 @@
"authors": [ "andschwa" ],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true
},
src/Microsoft.PowerShell.Security/AssemblyInfo.cs
-5
View File
@@ -6,8 +6,3 @@ using System.Resources;
[assembly:AssemblyCulture("")]
[assembly:NeutralResourcesLanguage("en-US")]
#if !CORECLR
[assembly:AssemblyKeyFileAttribute(@"..\signing\visualstudiopublic.snk")]
[assembly:AssemblyDelaySignAttribute(true)]
#endif
src/Microsoft.PowerShell.Security/project.json
+3
View File
@@ -4,6 +4,9 @@
"authors": [ "garretts", "andschwa" ],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true,
"allowUnsafe": true
},
src/System.Management.Automation/AssemblyInfo.cs
+1 -16
View File
@@ -8,16 +8,7 @@ using System.Resources;
[assembly:AssemblyCulture("")]
[assembly:NeutralResourcesLanguage("en-US")]
#if CORECLR
[assembly:InternalsVisibleTo("Microsoft.PowerShell.Commands.Management")]
[assembly:InternalsVisibleTo("Microsoft.PowerShell.Commands.Utility")]
[assembly:InternalsVisibleTo("Microsoft.PowerShell.Security")]
[assembly:InternalsVisibleTo("Microsoft.PowerShell.CoreCLR.AssemblyLoadContext")]
[assembly:InternalsVisibleTo("Microsoft.PowerShell.ConsoleHost")]
[assembly:InternalsVisibleTo("powershell-tests")]
#else
[assembly:InternalsVisibleTo("powershell-tests,PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo("Microsoft.Test.Management.Automation.GPowershell.Analyzers,PublicKey=00240000048000009400000006020000002400005253413100040000010001003f8c902c8fe7ac83af7401b14c1bd103973b26dfafb2b77eda478a2539b979b56ce47f36336741b4ec52bbc51fecd51ba23810cec47070f3e29a2261a2d1d08e4b2b4b457beaa91460055f78cc89f21cd028377af0cc5e6c04699b6856a1e49d5fad3ef16d3c3d6010f40df0a7d6cc2ee11744b5cfb42e0f19a52b8a29dc31b0")]
@@ -35,11 +26,6 @@ using System.Resources;
[assembly: InternalsVisibleTo(@"Microsoft.PowerShell.Editor"+@",PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly: InternalsVisibleTo(@"powershell_ise"+@",PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
[assembly:AssemblyKeyFileAttribute(@"..\signing\visualstudiopublic.snk")]
[assembly:AssemblyDelaySignAttribute(true)]
#endif
namespace System.Management.Automation
{
internal class NTVerpVars
@@ -51,4 +37,3 @@ namespace System.Management.Automation
internal const int PACKAGEBUILD_QFE = 814;
}
}
src/System.Management.Automation/project.json
+33 -30
View File
@@ -4,6 +4,9 @@
"authors": [ "garretts", "andschwa" ],
"buildOptions": {
"keyFile": "../signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true,
"allowUnsafe": true
},
@@ -129,36 +132,36 @@
"Microsoft.PowerShell.CoreCLR.AssemblyLoadContext": "1.0.0-*",
"Microsoft.PowerShell.CoreCLR.Eventing": "1.0.0-*",
"Microsoft.CSharp": "4.0.1-rc2-24103",
"Microsoft.Win32.Registry.AccessControl": "4.0.0-rc2-24103",
"System.Collections.Specialized": "4.0.1-rc2-24103",
"System.Collections.NonGeneric": "4.0.1-rc2-24103",
"System.ComponentModel.EventBasedAsync": "4.0.11-rc2-24103",
"System.ComponentModel.TypeConverter": "4.0.1-rc2-24103",
"System.Data.Common": "4.0.1-rc2-24103",
"System.Diagnostics.Contracts": "4.0.1-rc2-24103",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24103",
"System.Diagnostics.Process": "4.1.0-rc2-24103",
"System.Diagnostics.StackTrace": "4.0.1-rc2-24103",
"System.Diagnostics.TraceSource": "4.0.0-rc2-24103",
"System.Dynamic.Runtime": "4.0.11-rc2-24103",
"System.IO.FileSystem.AccessControl": "4.0.0-rc2-24103",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc2-24103",
"System.IO.FileSystem.Watcher": "4.0.0-rc2-24103",
"System.IO.Pipes": "4.0.0-rc2-24103",
"System.Linq.Expressions": "4.0.11-rc2-24103",
"System.Net.Http": "4.0.1-rc2-24103",
"System.Net.NetworkInformation": "4.1.0-rc2-24103",
"System.Reflection.Emit": "4.0.1-rc2-24103",
"System.Reflection.Emit.Lightweight": "4.0.1-rc2-24103",
"System.Security.AccessControl": "4.0.0-rc2-24103",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24103",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc2-24103",
"System.Threading.Thread": "4.0.0-rc2-24103",
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24103",
"System.Xml.XPath.XmlDocument": "4.0.1-rc2-24103",
"System.Xml.XmlDocument": "4.0.1-rc2-24103",
"System.Xml.XmlSerializer": "4.0.11-rc2-24103"
"Microsoft.CSharp": "4.0.1-rc2-24027",
"Microsoft.Win32.Registry.AccessControl": "4.0.0-rc2-24027",
"System.Collections.Specialized": "4.0.1-rc2-24027",
"System.Collections.NonGeneric": "4.0.1-rc2-24027",
"System.ComponentModel.EventBasedAsync": "4.0.11-rc2-24027",
"System.ComponentModel.TypeConverter": "4.0.1-rc2-24027",
"System.Data.Common": "4.0.1-rc2-24027",
"System.Diagnostics.Contracts": "4.0.1-rc2-24027",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Diagnostics.StackTrace": "4.0.1-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.IO.FileSystem.AccessControl": "4.0.0-rc2-24027",
"System.IO.FileSystem.DriveInfo": "4.0.0-rc2-24027",
"System.IO.FileSystem.Watcher": "4.0.0-rc2-24027",
"System.IO.Pipes": "4.0.0-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Net.Http": "4.0.1-rc2-24027",
"System.Net.NetworkInformation": "4.1.0-rc2-24027",
"System.Reflection.Emit": "4.0.1-rc2-24027",
"System.Reflection.Emit.Lightweight": "4.0.1-rc2-24027",
"System.Security.AccessControl": "4.0.0-rc2-24027",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc2-24027",
"System.Threading.Thread": "4.0.0-rc2-24027",
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
"System.Xml.XPath.XmlDocument": "4.0.1-rc2-24027",
"System.Xml.XmlDocument": "4.0.1-rc2-24027",
"System.Xml.XmlSerializer": "4.0.11-rc2-24027"
}
},
"net451": {
src/System.Security.SecureString/key.snk
BIN
View File
Binary file not shown.
src/System.Security.SecureString/project.json
+4 -1
View File
@@ -5,6 +5,9 @@
"authors": [ "garretts" ],
"buildOptions": {
"keyFile": "key.snk",
"delaySign": true,
"publicSign": false,
"warningsAsErrors": true,
"allowUnsafe": true
},
@@ -12,7 +15,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24103"
"NETStandard.Library": "1.5.0-rc2-24027"
},
"imports": [ "dnxcore50" ]
}
src/powershell/project.json
+2 -2
View File
@@ -40,7 +40,7 @@
"define": [ "CORECLR" ]
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc2-3002668"
"Microsoft.NETCore.App": "1.0.0-rc2-3002526"
}
}
},
@@ -48,7 +48,7 @@
"runtimes": {
"ubuntu.14.04-x64": { },
"debian.8-x64": { },
"centos.7.1-x64": { },
"centos.7-x64": { },
"win7-x64": { },
"win81-x64": { },
"win10-x64": { },
src/windows-build
+1 -1
Submodule src/windows-build updated: e9a0d30927...0f47c9600d
test/csharp/project.json
+6
View File
@@ -4,6 +4,12 @@
"description": "PowerShell On Linux xUnit Tests",
"authors": [ "andschwa" ],
"buildOptions": {
"keyFile": "../../src/signing/visualstudiopublic.snk",
"delaySign": true,
"publicSign": false
},
"dependencies": {
"powershell": "1.0.0-*"
},