mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

make 'platform' flag dependent upon CLI bitness

Browse source 
this will make net451 deployment work for x86 apps
This commit is contained in:
Andrew Stanton-Nurse 2016-04-11 15:56:44 -07:00
parent f2bf60d06f
commit a48596ff23
15 changed files with 94 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json
View file

@ -1,7 +1,8 @@
{
"version": "1.0.0-*",
"dependencies": {
"PackageWithFakeNativeDep": "1.0.0-*"
"PackageWithFakeNativeDep": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24008"
},
"compilationOptions": {
"emitEntryPoint": true

3
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json
View file

@ -3,7 +3,8 @@
"dependencies": {
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254"
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24008"
},
"compilationOptions": {
"emitEntryPoint": true

0
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/.noautobuild Normal file
View file

19
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json Normal file
View file

@ -0,0 +1,19 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24008"
},
"compilationOptions": {
"platform": "anycpu32bitpreferred",
"emitEntryPoint": true
},
"compile": [
"../src/*.cs"
],
"frameworks": {
"net451": { }
}
}

4
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json
View file

@ -3,7 +3,8 @@
"dependencies": {
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254"
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24008"
},
"compilationOptions": {
"emitEntryPoint": true
@ -15,6 +16,7 @@
"net451": { }
},
"runtimes": {
"win7-x86": {},
"win7-x64": {},
"osx.10.11-x64": {}
}