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

Move to CoreFX build rc2-23901

Browse source 
Update .exe's project.json Target Framework from dnxcore50 to netstandardapp1.5.
Update .dll's project.json Target Framework from dnxcore50 to netstandard1.3.

Adding workaround for DataContractSerialization to src\dotnet\project.json to fix crossgen issue.
Build 23901 has a dependency issue that doesn't allow the runtime.any.System.Private.DataContractSerialization
package to be restored. When we move to a new build of CoreFX we should take this workaround out.
This commit is contained in:
Eric Erhardt 2016-03-01 17:35:32 -06:00
parent 78dbbfc83d
commit 6468b14e1d
105 changed files with 457 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
View file

@ -5,12 +5,14 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"dotnet-hello": { "version": "1.0.0", "target": "package" }
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
},
"testRunner": "must-be-specified-to-generate-deps",

6
TestAssets/TestProjects/AppWithDirectDependency/project.json
View file

@ -7,11 +7,13 @@
"testRunner": "must-be-specified-to-generate-deps",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"dotnet-hello": {"version": "1.0.0", "target": "package"}
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/AppWithToolDependency/project.json
View file

@ -5,11 +5,13 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
},
"tools": {

6
TestAssets/TestProjects/CompileFail/project.json
View file

@ -5,10 +5,12 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"Microsoft.Extensions.DependencyModel": {
"target": "project",
"version": "1.0.0-*"
@ -9,6 +9,8 @@
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
View file

@ -6,11 +6,13 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

8
TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
View file

@ -1,15 +1,17 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true,
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/OutputStandardOutputAndError/project.json
View file

@ -5,10 +5,12 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23728"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

7
TestAssets/TestProjects/RunTestsApps/TestAppMultiTarget/project.json
View file

@ -5,10 +5,11 @@
},
"frameworks": {
"dnxcore50": {
"netstandardapp1.5": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
},
"NETStandard.Library": "1.0.0-rc2-23901"
}
},
"net451": { }
}

6
TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
View file

@ -8,10 +8,12 @@
"dependencies": {
"TestLibrary": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json
View file

@ -6,10 +6,12 @@
"additionalArguments": [ "-highentropyva+" ]
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestAppWithArgs/project.json
View file

@ -5,10 +5,12 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestAppWithContentPackage/project.json
View file

@ -5,10 +5,12 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"SharedContentA": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestAppWithContents/project.json
View file

@ -5,12 +5,14 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"content": "testcontentfile.txt",
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
View file

@ -8,10 +8,12 @@
"dependencies": {
"TestLibrary": { "target":"project", "version":"1.0.0-*" },
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

4
TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json
View file

@ -10,6 +10,8 @@
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestAppWithScripts/project.json
View file

@ -5,11 +5,13 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
},
"scripts": {

6
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
View file

@ -8,11 +8,13 @@
"dependencies": {
"TestLibrary": { "target":"project", "version":"1.0.0-*" },
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
},
"scripts": {

6
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json
View file

@ -6,10 +6,12 @@
"additionalArguments": [ "-highentropyva+" ]
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

8
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
View file

@ -7,10 +7,12 @@
"dependencies": {
"TestLibraryWithAppDependency": { "target":"project", "version":"1.0.0-*" },
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
},
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json
View file

@ -3,10 +3,12 @@
"dependencies": {
"TestApp": { "target":"project", "version":"1.0.0-*" },
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
View file

@ -8,10 +8,12 @@
"dependencies": {
"TestLibrary": { "target":"project", "version":"1.0.0-*" },
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

3
TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestLibrary/project.json
View file

@ -1,6 +1,7 @@
{
"frameworks": {
"dnxcore50": {
"netstandardapp1.5": {
"imports": "dnxcore50",
"bin": {
"assembly": "bin\\{configuration}\\dnxcore50\\TestLibrary.dll",
"pdb": "bin\\{configuration}\\dnxcore50\\TestLibrary.pdb"

11
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json
View file

@ -7,10 +7,13 @@
"frameworks": {
"net451": { },
"dnxcore50": {
"imports" : "portable-net45+wp80+win8",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+wp80+win8"
],
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23901"
}
}
}

11
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json
View file

@ -8,10 +8,13 @@
"frameworks": {
"net451": { },
"dnxcore50": {
"imports" : "portable-net45+wp80+win8",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+wp80+win8"
],
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23901"
}
}
}

6
TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json
View file

@ -5,11 +5,13 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" }
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestLibraryWithConfiguration/project.json
View file

@ -6,7 +6,7 @@
"additionalArguments": [ "-highentropyva+" ]
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"configurations": {
"Test": {
@ -14,6 +14,8 @@
}
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

5
TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json
View file

@ -11,9 +11,10 @@
"net35": { },
"net40": { },
"net461": { },
"dnxcore50": {
"netstandardapp1.5": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
}
}
}

5
TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json
View file

@ -2,9 +2,10 @@
"version": "1.0.0",
"dependencies": { },
"frameworks": {
"dnxcore50": {
"netstandardapp1.5": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
}
},
"dnx451": {

8
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
View file

@ -7,11 +7,13 @@
"dependencies": {
"L11": "1.0.0-*",
"L12": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

10
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
View file

@ -2,13 +2,15 @@
"version": "1.0.0-*",
"dependencies": {
"L12": "1.0.0-*",
"L21": "1.0.0-*",
"L12": "1.0.0-*",
"L21": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
View file

@ -4,10 +4,12 @@
"dependencies": {
"L22": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
View file

@ -2,10 +2,12 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
View file

@ -2,10 +2,12 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
View file

@ -5,10 +5,12 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestProjectWithResource/project.json
View file

@ -5,10 +5,12 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
View file

@ -6,10 +6,12 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}