mirror of
https://github.com/aphrody-labs/PowerShell.git
synced 2026-10-17 04:36:39 +00:00
Merge pull request #950 from PowerShell/andschwa/dsc
Use nuget package for MI.dll, MMI.Native.dll and MMI.Native.Unmanaged.dll
This commit is contained in:
commit
8718d9f6a8
7 files changed
+13
-1669
No files matched your search
@@ -66,6 +66,13 @@ function Start-PSBuild {
|
||||
}
|
||||
}
|
||||
|
||||
if ($IsWindows) {
|
||||
# use custom package store - this value is also defined in nuget.config under config/repositoryPath
|
||||
# dotnet restore uses this value as the target for installing the assemblies for referenced nuget packages.
|
||||
# dotnet build does not currently consume the config value but will consume env:NUGET_PACKAGES to resolve these dependencies
|
||||
$env:NUGET_PACKAGES="$PSScriptRoot\Packages"
|
||||
}
|
||||
|
||||
# verify we have all tools in place to do the build
|
||||
$precheck = precheck 'dotnet' "Build dependency 'dotnet' not found in PATH! See: https://dotnet.github.io/getting-started/"
|
||||
if ($FullCLR) {
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<config>
|
||||
<!-- install packages to a custom path -->
|
||||
<add key="repositoryPath" value="Packages"/>
|
||||
</config>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="CI Builds (dotnet-core)" value="https://www.myget.org/F/dotnet-core/api/v3/index.json" />
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
using System.Runtime.CompilerServices;
|
||||
[assembly:InternalsVisibleTo("Microsoft.Management.Infrastructure")]
|
||||
|
||||
-1644
File diff suppressed because it is too large.
Load diff
@@ -1,20 +0,0 @@
|
||||
{
|
||||
"name": "Microsoft.Management.Infrastructure.Native",
|
||||
"version": "1.0.0-*",
|
||||
"description": "Stub to satisfy PowerShell compilation",
|
||||
"authors": [ "garretts", "andschwa" ],
|
||||
|
||||
"frameworks": {
|
||||
"netstandard1.5": {
|
||||
"imports": [ "dnxcore50" ],
|
||||
"compilationOptions": {
|
||||
"warningsAsErrors": true
|
||||
},
|
||||
"dependencies": {
|
||||
"System.Security.SecureString": "1.0.0-*"
|
||||
}
|
||||
},
|
||||
"net451": {
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,7 @@
|
||||
},
|
||||
|
||||
"dependencies": {
|
||||
"Microsoft.Management.Infrastructure.Native": "1.0.0-*"
|
||||
"Microsoft.Management.Infrastructure.Native": "1.0.0-rc3"
|
||||
},
|
||||
|
||||
"frameworks": {
|
||||
|
||||
+1
-1
Submodule src/windows-build updated: 19c170b36c...674541f744.
Reference in new issue
Block a user