From 7f60921094b53dcf26ef08fa6d4d9a37a8289092 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 7 Mar 2016 22:04:23 -0800 Subject: [PATCH 1/2] Target `net451` instead of `dnx451` for FulLCLR --- build.FullCLR.ps1 | 2 +- src/Microsoft.Management.Infrastructure.Native/project.json | 2 +- src/Microsoft.Management.Infrastructure/project.json | 2 +- src/Microsoft.PowerShell.Commands.Management/project.json | 2 +- src/Microsoft.PowerShell.Commands.Utility/project.json | 2 +- src/Microsoft.PowerShell.ConsoleHost/project.json | 2 +- src/Microsoft.PowerShell.Security/project.json | 2 +- src/System.Management.Automation/project.json | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.FullCLR.ps1 b/build.FullCLR.ps1 index 5621a9817..2647fedaa 100644 --- a/build.FullCLR.ps1 +++ b/build.FullCLR.ps1 @@ -50,7 +50,7 @@ try # Publish PowerShell cd src\Microsoft.PowerShell.ConsoleHost - dotnet publish --framework dnx451 --output $BINFULL + dotnet publish --framework net451 --output $BINFULL mkdir $build -ErrorAction SilentlyContinue cd $build diff --git a/src/Microsoft.Management.Infrastructure.Native/project.json b/src/Microsoft.Management.Infrastructure.Native/project.json index 6b5e9fc6b..edc1244b5 100644 --- a/src/Microsoft.Management.Infrastructure.Native/project.json +++ b/src/Microsoft.Management.Infrastructure.Native/project.json @@ -15,7 +15,7 @@ "System.Security.SecureString": "1.0.0-*" } }, - "dnx451": { + "net451": { } } } diff --git a/src/Microsoft.Management.Infrastructure/project.json b/src/Microsoft.Management.Infrastructure/project.json index 9b89d61d7..88b42d795 100644 --- a/src/Microsoft.Management.Infrastructure/project.json +++ b/src/Microsoft.Management.Infrastructure/project.json @@ -23,7 +23,7 @@ "System.Threading.ThreadPool": "4.0.10-rc3-23907" } }, - "dnx451": { + "net451": { } }, diff --git a/src/Microsoft.PowerShell.Commands.Management/project.json b/src/Microsoft.PowerShell.Commands.Management/project.json index 6b384e62b..b1284e39b 100644 --- a/src/Microsoft.PowerShell.Commands.Management/project.json +++ b/src/Microsoft.PowerShell.Commands.Management/project.json @@ -23,7 +23,7 @@ "System.Net.NameResolution": "4.0.0-rc3-23907" } }, - "dnx451": { + "net451": { "frameworkAssemblies": { "System.ServiceProcess": "", "System.Windows.Forms": "", diff --git a/src/Microsoft.PowerShell.Commands.Utility/project.json b/src/Microsoft.PowerShell.Commands.Utility/project.json index aba0fb0b1..fd63216e4 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/project.json +++ b/src/Microsoft.PowerShell.Commands.Utility/project.json @@ -31,7 +31,7 @@ "Newtonsoft.Json": "8.0.2" } }, - "dnx451": { + "net451": { "frameworkAssemblies": { "System.Drawing": "", "System.Web": "", diff --git a/src/Microsoft.PowerShell.ConsoleHost/project.json b/src/Microsoft.PowerShell.ConsoleHost/project.json index 1621db42d..9d234dd92 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/project.json +++ b/src/Microsoft.PowerShell.ConsoleHost/project.json @@ -15,7 +15,7 @@ }, "frameworks": { - "dnx451": { + "net451": { } }, diff --git a/src/Microsoft.PowerShell.Security/project.json b/src/Microsoft.PowerShell.Security/project.json index 28a9afadb..0b9e6a682 100644 --- a/src/Microsoft.PowerShell.Security/project.json +++ b/src/Microsoft.PowerShell.Security/project.json @@ -19,7 +19,7 @@ "define": [ "CORECLR" ] } }, - "dnx451": { + "net451": { } }, diff --git a/src/System.Management.Automation/project.json b/src/System.Management.Automation/project.json index 784385da8..427134bde 100644 --- a/src/System.Management.Automation/project.json +++ b/src/System.Management.Automation/project.json @@ -62,7 +62,7 @@ "System.Xml.XmlSerializer": "4.0.11-rc3-23907" } }, - "dnx451": { + "net451": { "frameworkAssemblies": { "System.Runtime": "", "System.Xml": "", From 7148cfc42701361ef2d04559fe47f2656933cb22 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Wed, 9 Mar 2016 14:26:19 -0800 Subject: [PATCH 2/2] Print dotnet --version on AppVeyor --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index 0c0378b22..5ae781855 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,6 +23,7 @@ install: build_script: - ps: | $env:Path += ";$env:LocalAppData\Microsoft\dotnet\cli\bin" + dotnet --version Import-Module .\PowerShellGitHubDev.psm1 Start-PSBuild - ps: .\build.fullCLR.ps1