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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,12 +9,12 @@
],
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

8
TestAssets/FSharpTestProjects/TestApp/project.json
View file

@ -9,13 +9,13 @@
],
"dependencies": {
"TestLibrary": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23811",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.0.0-rc2-23901",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

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

@ -9,12 +9,12 @@
],
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/FSharpTestProjects/TestLibrary/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"compilerName": "fsc",
"compileFiles": [
@ -10,8 +10,8 @@
"Helper.fs"
],
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json
View file

@ -1,9 +1,11 @@
{
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"EmptyLibrary": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

5
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json
View file

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

7
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json
View file

@ -2,9 +2,10 @@
"version": "1.0.0-*",
"dependencies": { },
"frameworks": {
"dnxcore50": {
"dependencies":{
"NETStandard.Library": "1.0.0-rc2-23811"
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23901"
}
}
}

5
TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json
View file

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

6
TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json
View file

@ -1,11 +1,11 @@
{
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"Microsoft.Web.Administration": "7.0.0"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/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/TestPackages/dotnet-hello/v2/dotnet-hello/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/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"

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

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

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

@ -8,10 +8,13 @@
"frameworks": {
"net451": { },
"dnxcore50": {
"imports" : "portable-net45+wp80+win8",
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+wp80+win8"
],
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"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": {

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

@ -8,10 +8,12 @@
"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"
}
}
}

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

@ -5,10 +5,12 @@
"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"
}
}
}

8
scripts/Microsoft.DotNet.Cli.Build.Framework/project.json
View file

@ -2,12 +2,14 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"System.Diagnostics.Process": "4.1.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.Diagnostics.Process": "4.1.0-rc2-23901",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537"
},
"frameworks": {
"dnxcore50": { }
"netstandard1.3": {
"imports": "dnxcore50"
}
}
}

2
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class CompileTargets
{
public static readonly string CoreCLRVersion = "1.0.1-rc2-23811";
public static readonly string CoreCLRVersion = "1.0.2-rc2-23901";
public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003";
public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;

2
scripts/dotnet-cli-build/PublishTargets.cs
View file

@ -32,7 +32,7 @@ namespace Microsoft.DotNet.Cli.Build
{
{ "RID", PlatformServices.Default.Runtime.GetRuntimeIdentifier() },
{ "OSNAME", PlatformServices.Default.Runtime.OperatingSystem },
{ "TFM", "dnxcore50" },
{ "TFM", "netstandardapp1.5" },
{ "OutputDir", Dirs.Output },
{ "Stage1Dir", Dirs.Stage1 },
{ "Stage1CompilationDir", Dirs.Stage1Compilation },

2
scripts/dotnet-cli-build/TestTargets.cs
View file

@ -132,7 +132,7 @@ namespace Microsoft.DotNet.Cli.Build
foreach (var project in projects)
{
c.Info($"Building: {project}");
dotnet.Build("--framework", "dnxcore50")
dotnet.Build("--framework", "netstandardapp1.5")
.WorkingDirectory(Path.GetDirectoryName(project))
.Execute()
.EnsureSuccessful();

8
scripts/dotnet-cli-build/project.json
View file

@ -6,13 +6,15 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23901",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

2
scripts/run-build.ps1
View file

@ -78,7 +78,7 @@ popd
# Publish the builder
Write-Host "Compiling Build Scripts..."
dotnet publish "$PSScriptRoot\dotnet-cli-build" -o "$PSScriptRoot/dotnet-cli-build/bin" --framework dnxcore50
dotnet publish "$PSScriptRoot\dotnet-cli-build" -o "$PSScriptRoot/dotnet-cli-build/bin" --framework netstandardapp1.5
if($LASTEXITCODE -ne 0) { throw "Failed to compile build scripts" }
# Run the builder

2
scripts/run-build.sh
View file

@ -104,7 +104,7 @@ echo "Restoring Build Script projects..."
# Build the builder
echo "Compiling Build Scripts..."
dotnet publish "$DIR/dotnet-cli-build" -o "$DIR/dotnet-cli-build/bin" --framework dnxcore50
dotnet publish "$DIR/dotnet-cli-build" -o "$DIR/dotnet-cli-build/bin" --framework netstandardapp1.5
# Run the builder
echo "Invoking Build Scripts..."

2
src/Microsoft.DotNet.Cli.Utils/CommandResolver.cs
View file

@ -121,7 +121,7 @@ namespace Microsoft.DotNet.Cli.Utils
public static CommandSpec ResolveFromProjectTools(string commandName, IEnumerable<string> args)
{
var context = GetProjectContext(FrameworkConstants.CommonFrameworks.DnxCore50);
var context = GetProjectContext(FrameworkConstants.CommonFrameworks.NetStandardApp15);
if (context == null)
{

6
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -16,10 +16,10 @@
}
}
},
"dnxcore50": {
"imports": "portable-net45+win8",
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
}
}
}

9
src/Microsoft.DotNet.Compiler.Common/project.json
View file

@ -4,7 +4,7 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.CommandLine": "0.1.0-e160119-1",
"Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160202-02",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
@ -12,8 +12,11 @@
"Microsoft.DotNet.Files": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandard1.3": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},
"scripts": {}

8
src/Microsoft.DotNet.Files/project.json
View file

@ -5,15 +5,15 @@
},
"description": "Abstraction to interact with the file system and file paths.",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"System.Linq.Expressions": "4.0.11-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.Linq.Expressions": "4.0.11-rc2-23901",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandard1.3": {
"imports": "dnxcore50"
}
},
"scripts": {}

7
src/Microsoft.DotNet.InternalAbstractions/project.json
View file

@ -14,11 +14,12 @@
},
"frameworks": {
"net451": { },
"dotnet5.4": {
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"System.Runtime": "4.0.21-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
}
}
},
},
"scripts": {
}

8
src/Microsoft.DotNet.ProjectModel.Loader/project.json
View file

@ -4,13 +4,13 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"System.Runtime.Loader": "4.0.0-rc2-23811"
"System.Runtime.Loader": "4.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandard1.3": {
"imports": "dnxcore50"
}
}
}

9
src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
View file

@ -4,14 +4,17 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandard1.3": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
}
}

18
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -5,7 +5,7 @@
},
"description": "Types to model a .NET Project",
"dependencies": {
"System.Reflection.Metadata": "1.2.0-rc2-23811",
"System.Reflection.Metadata": "1.2.0-rc2-23901",
"NuGet.Packaging": "3.4.0-beta-632",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",
"Microsoft.Extensions.JsonParser.Sources": {
@ -32,15 +32,15 @@
}
}
},
"dnxcore50": {
"imports": "portable-net45+win8",
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"System.Dynamic.Runtime": "4.0.11-rc2-23811",
"System.Runtime.Loader": "4.0.0-rc2-23811",
"System.Security.Cryptography.Algorithms": "4.0.0-rc2-23811",
"Microsoft.CSharp": "4.0.1-rc2-23811",
"System.Xml.XDocument": "4.0.11-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901",
"System.Dynamic.Runtime": "4.0.11-rc2-23901",
"System.Runtime.Loader": "4.0.0-rc2-23901",
"System.Security.Cryptography.Algorithms": "4.0.0-rc2-23901",
"Microsoft.CSharp": "4.0.1-rc2-23901",
"System.Xml.XDocument": "4.0.11-rc2-23901"
}
}
}

6
src/Microsoft.DotNet.TestFramework/project.json
View file

@ -11,11 +11,11 @@
"licenseUrl": "",
"dependencies": {
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandard1.3": {
"imports": "dnxcore50"
}
}
}

25
src/Microsoft.Extensions.DependencyModel/project.json
View file

@ -20,25 +20,14 @@
},
"frameworks": {
"net451": {},
"dotnet5.4": {
"imports": "portable-net451+win8",
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"System.IO.FileSystem": "4.0.1-rc2-23811",
"System.Linq": "4.0.1-rc2-23811",
"System.Runtime": "4.0.21-rc2-23811",
"System.Reflection": "4.1.0-rc2-23811",
"System.Dynamic.Runtime": "4.0.11-rc2-23811"
}
},
"dnxcore50": {
"imports": "portable-net45+win8",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23811",
"System.IO.FileSystem": "4.0.1-rc2-23811",
"System.Linq": "4.0.1-rc2-23811",
"System.Runtime": "4.0.21-rc2-23811",
"System.Reflection": "4.1.0-rc2-23811",
"System.Dynamic.Runtime": "4.0.11-rc2-23811"
"System.IO.FileSystem": "4.0.1-rc2-23901",
"System.Linq": "4.0.1-rc2-23901",
"System.Runtime": "4.0.21-rc2-23901",
"System.Reflection": "4.1.0-rc2-23901",
"System.Dynamic.Runtime": "4.0.11-rc2-23901"
}
}
},

10
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -16,12 +16,12 @@
},
"frameworks": {
"net451": {},
"dnxcore50": {
"imports": "portable-net45+win8",
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"System.Resources.ResourceManager": "4.0.1-rc2-23811",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901",
"System.Resources.ResourceManager": "4.0.1-rc2-23901",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23901"
}
}
},

2
src/dotnet/Program.cs
View file

@ -123,7 +123,7 @@ namespace Microsoft.DotNet.Cli
return builtIn(appArgs.ToArray());
}
return Command.Create("dotnet-" + command, appArgs, FrameworkConstants.CommonFrameworks.DnxCore50)
return Command.Create("dotnet-" + command, appArgs, FrameworkConstants.CommonFrameworks.NetStandardApp15)
.ForwardStdErr()
.ForwardStdOut()
.Execute()

6
src/dotnet/commands/dotnet-compile-native/appdep/project.json
View file

@ -4,10 +4,12 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"Microsoft.DotNet.AppDep":"1.0.6-prerelease-00003"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

6
src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template
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
src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template
View file

@ -11,10 +11,12 @@
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.0.0-rc2-23811"
"NETStandard.Library": "1.0.0-rc2-23901"
},
"frameworks": {
"dnxcore50": { }
"netstandardapp1.5": {
"imports": "dnxcore50"
}
}
}

2
src/dotnet/commands/dotnet-publish/PublishCommand.cs
View file

@ -75,7 +75,7 @@ namespace Microsoft.DotNet.Tools.Publish
}
/// <summary>
/// Publish the project for given 'framework (ex - dnxcore50)' and 'runtimeID (ex - win7-x64)'
/// Publish the project for given 'framework (ex - netstandardapp1.5)' and 'runtimeID (ex - win7-x64)'
/// </summary>
/// <param name="context">project that is to be published</param>
/// <param name="baseOutputPath">Location of published files</param>

6
src/dotnet/commands/dotnet-restore/Program.cs
View file

@ -150,7 +150,7 @@ namespace Microsoft.DotNet.Tools.Restore
private static void CreateDepsInPackageCache(LibraryRange toolLibrary, string projectPath)
{
var context = ProjectContext.Create(projectPath,
FrameworkConstants.CommonFrameworks.DnxCore50, new[] { DefaultRid });
FrameworkConstants.CommonFrameworks.NetStandardApp15, new[] { DefaultRid });
var toolDescription = context.LibraryManager.GetLibraries()
.Select(l => l as PackageDescription)
@ -179,7 +179,7 @@ namespace Microsoft.DotNet.Tools.Restore
Console.WriteLine($"Restoring Tool '{tooldep.Name}' for '{projectPath}' in '{tempPath}'");
File.WriteAllText(projectPath, GenerateProjectJsonContents(new[] {"dnxcore50"}, tooldep));
File.WriteAllText(projectPath, GenerateProjectJsonContents(new[] {"netstandardapp1.5"}, tooldep));
return NuGet3.Restore(new [] { $"{projectPath}", "--runtime", $"{DefaultRid}"}.Concat(args), quiet) == 0;
}
@ -193,7 +193,7 @@ namespace Microsoft.DotNet.Tools.Restore
sb.AppendLine(" \"frameworks\": {");
foreach (var framework in frameworks)
{
var importsStatement = "\"imports\": \"portable-net452+win81\"";
var importsStatement = "\"imports\": [ \"dnxcore50\", \"portable-net452+win81\" ]";
sb.AppendLine($" \"{framework}\": {{ {importsStatement} }}");
}

35
src/dotnet/project.json
View file

@ -48,23 +48,28 @@
"type": "build"
},
"Microsoft.Extensions.Testing.Abstractions": "1.0.0-*",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23811",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23811",
"System.Reflection.Metadata": "1.3.0-beta-23811",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23811",
"System.Diagnostics.TraceSource": "4.0.0-rc2-23811",
"System.Linq.Expressions": "4.0.11-rc2-23811",
"System.Xml.XDocument": "4.0.11-rc2-23811",
"System.Resources.ReaderWriter": "4.0.0-rc2-23811",
"System.Net.Sockets": "4.1.0-rc2-23811",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23811",
"System.Threading.ThreadPool": "4.0.10-rc2-23811",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23811"
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23901",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23901",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.Reflection.Metadata": "1.3.0-beta-23901",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23901",
"System.Diagnostics.TraceSource": "4.0.0-rc2-23901",
"System.Linq.Expressions": "4.0.11-rc2-23901",
"System.Xml.XDocument": "4.0.11-rc2-23901",
"System.Resources.ReaderWriter": "4.0.0-rc2-23901",
"System.Net.Sockets": "4.1.0-rc2-23901",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23901",
"System.Threading.ThreadPool": "4.0.10-rc2-23901",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23901",
"System.Private.DataContractSerialization": "4.1.0-rc2-23901"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},
"scripts": {

12
test/ArgumentForwardingTests/project.json
View file

@ -5,7 +5,8 @@
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
@ -16,12 +17,15 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},
"testRunner": "xunit",
"scripts": { "precompile": "dotnet build ../ArgumentsReflector/project.json --framework dnxcore50 --output %compile:RuntimeOutputDir%" }
"scripts": { "precompile": "dotnet build ../ArgumentsReflector/project.json --framework netstandardapp1.5 --output %compile:RuntimeOutputDir%" }
}

6
test/ArgumentsReflector/project.json
View file

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

10
test/EndToEnd/project.json
View file

@ -5,7 +5,8 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
@ -17,8 +18,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},

2
test/Microsoft.DotNet.Cli.Utils.Tests/StreamForwarderTests.cs
View file

@ -139,7 +139,7 @@ namespace StreamForwarderTests
buildCommand.Execute();
var buildOutputExe = "OutputStandardOutputAndError" + Constants.ExeSuffix;
var buildOutputPath = Path.Combine(binTestProjectPath, "bin/Debug/dnxcore50", buildOutputExe);
var buildOutputPath = Path.Combine(binTestProjectPath, "bin/Debug/netstandardapp1.5", buildOutputExe);
return buildOutputPath;
}

10
test/Microsoft.DotNet.Cli.Utils.Tests/project.json
View file

@ -5,7 +5,8 @@
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23811",
"NETStandard.Library" : "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
@ -17,8 +18,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},

10
test/Microsoft.DotNet.Compiler.Common.Tests/project.json
View file

@ -2,7 +2,8 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.ProjectModel": { "target": "project" },
@ -13,8 +14,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},

4
test/Microsoft.DotNet.ProjectModel.Tests/PackageDependencyProviderTests.cs
View file

@ -29,8 +29,8 @@ namespace Microsoft.DotNet.ProjectModel.Tests
target.CompileTimeAssemblies.Add("lib/dotnet/_._");
target.NativeLibraries.Add("runtimes/any/native/Microsoft.CSharp.CurrentVersion.targets");
var p1 = provider.GetDescription(NuGetFramework.Parse("dnxcore50"), package, target);
var p2 = provider.GetDescription(NuGetFramework.Parse("dnxcore50"), package, target);
var p1 = provider.GetDescription(NuGetFramework.Parse("netstandardapp1.5"), package, target);
var p2 = provider.GetDescription(NuGetFramework.Parse("netstandardapp1.5"), package, target);
Assert.True(p1.Compatible);
Assert.True(p2.Compatible);

10
test/Microsoft.DotNet.ProjectModel.Tests/project.json
View file

@ -1,15 +1,19 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-dev-79755-47"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},
"content": [

4
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
View file

@ -93,14 +93,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public AndConstraint<CommandResultAssertions> HaveSkippedProjectCompilation(string skippedProject)
{
_commandResult.StdOut.Should().Contain($"Project {skippedProject} (DNXCore,Version=v5.0) was previously compiled. Skipping compilation.");
_commandResult.StdOut.Should().Contain($"Project {skippedProject} (.NETStandardApp,Version=v1.5) was previously compiled. Skipping compilation.");
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> HaveCompiledProject(string compiledProject)
{
_commandResult.StdOut.Should().Contain($"Project {compiledProject} (DNXCore,Version=v5.0) will be compiled");
_commandResult.StdOut.Should().Contain($"Project {compiledProject} (.NETStandardApp,Version=v1.5) will be compiled");
return new AndConstraint<CommandResultAssertions>(this);
}

2
test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs
View file

@ -17,7 +17,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
/// </summary>
public abstract class TestBase : IDisposable
{
protected const string DefaultFramework = "dnxcore50";
protected const string DefaultFramework = "netstandardapp1.5";
private TempRoot _temp;
private static TestAssetsManager s_testsAssetsMgr;
private static string s_repoRoot;

15
test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
View file

@ -5,8 +5,9 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"System.Collections.Immutable": "1.2.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.Collections.Immutable": "1.2.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"FluentAssertions": "4.0.0",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-dev-79755-47",
@ -21,9 +22,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
}
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},
}

10
test/Microsoft.Extensions.DependencyModel.Tests/project.json
View file

@ -5,7 +5,8 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"FluentAssertions": "4.0.0",
@ -15,8 +16,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},

2
test/ScriptExecutorTests/ScriptExecutorTests.cs
View file

@ -25,7 +25,7 @@ namespace Microsoft.DotNet.Cli.Utils.ScriptExecutorTests
var sourceTestProjectPath = Path.Combine(s_testProjectRoot, "TestApp");
binTestProjectPath = _root.CopyDirectory(sourceTestProjectPath).Path;
project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("dnxcore50")).ProjectFile;
project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("netstandardapp1.5")).ProjectFile;
}
[Fact]

9
test/ScriptExecutorTests/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
@ -13,8 +13,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},

2
test/dotnet-build.Tests/BuildOutputTests.cs
View file

@ -134,7 +134,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
// [InlineData("net20", false, true)]
// [InlineData("net40", true, true)]
// [InlineData("net461", true, true)]
[InlineData("dnxcore50", true, false)]
[InlineData("netstandardapp1.5", true, false)]
public void MultipleFrameworks_ShouldHaveValidTargetFrameworkAttribute(string frameworkName, bool shouldHaveTargetFrameworkAttribute, bool windowsOnly)
{
var framework = NuGetFramework.Parse(frameworkName);

4
test/dotnet-build.Tests/IncrementalTestBase.cs
View file

@ -66,7 +66,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
protected CommandResult BuildProject(string projectFile, bool noDependencies = false, bool noIncremental = false, bool expectBuildFailure = false)
{
var buildCommand = new BuildCommand(projectFile, output: GetOutputDir(), framework: "dnxcore50", noIncremental: noIncremental, noDependencies : noDependencies);
var buildCommand = new BuildCommand(projectFile, output: GetOutputDir(), framework: "netstandardapp1.5", noIncremental: noIncremental, noDependencies : noDependencies);
var result = buildCommand.ExecuteWithCapturedOutput();
if (!expectBuildFailure)
@ -120,7 +120,7 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
protected string GetCompilationOutputPath()
{
var executablePath = Path.Combine(GetBinRoot(), "Debug", "dnxcore50");
var executablePath = Path.Combine(GetBinRoot(), "Debug", "netstandardapp1.5");
return executablePath;
}

10
test/dotnet-build.Tests/project.json
View file

@ -2,7 +2,8 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": {
@ -14,8 +15,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net451+win8"
]
}
},

10
test/dotnet-compile.Tests/project.json
View file

@ -2,7 +2,8 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": {
@ -14,8 +15,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net451+win8"
]
}
},

2
test/dotnet-compile.UnitTests/GivenACompilationDriver.cs
View file

@ -36,7 +36,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
_contexts = new List<ProjectContext>
{
ProjectContext.Create(_projectJson, NuGetFramework.Parse("dnxcore50"))
ProjectContext.Create(_projectJson, NuGetFramework.Parse("netstandardapp1.5"))
};
_args = new CompilerCommandApp("dotnet compile", ".NET Compiler", "Compiler for the .NET Platform");

14
test/dotnet-compile.UnitTests/GivenThatICareAboutScriptVariablesFromAManagedCompiler.cs
View file

@ -28,14 +28,14 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
public void It_passes_a_FullTargetFramework_variable_to_the_pre_compile_scripts()
{
_fixture.PreCompileScriptVariables.Should().ContainKey("compile:FullTargetFramework");
_fixture.PreCompileScriptVariables["compile:FullTargetFramework"].Should().Be("dnxcore,Version=v5.0");
_fixture.PreCompileScriptVariables["compile:FullTargetFramework"].Should().Be(".NETStandardApp,Version=v1.5");
}
[Fact]
public void It_passes_a_TargetFramework_variable_to_the_pre_compile_scripts()
{
_fixture.PreCompileScriptVariables.Should().ContainKey("compile:TargetFramework");
_fixture.PreCompileScriptVariables["compile:TargetFramework"].Should().Be("dnxcore50");
_fixture.PreCompileScriptVariables["compile:TargetFramework"].Should().Be("netstandardapp1.5");
}
[Fact]
@ -80,14 +80,14 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
public void It_passes_a_FullTargetFramework_variable_to_the_post_compile_scripts()
{
_fixture.PostCompileScriptVariables.Should().ContainKey("compile:FullTargetFramework");
_fixture.PostCompileScriptVariables["compile:FullTargetFramework"].Should().Be("dnxcore,Version=v5.0");
_fixture.PostCompileScriptVariables["compile:FullTargetFramework"].Should().Be(".NETStandardApp,Version=v1.5");
}
[Fact]
public void It_passes_a_TargetFramework_variable_to_the_post_compile_scripts()
{
_fixture.PostCompileScriptVariables.Should().ContainKey("compile:TargetFramework");
_fixture.PostCompileScriptVariables["compile:TargetFramework"].Should().Be("dnxcore50");
_fixture.PostCompileScriptVariables["compile:TargetFramework"].Should().Be("netstandardapp1.5");
}
[Fact]
@ -151,7 +151,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
TestAssetPath,
"bin",
ConfigValue,
"dnxcore50");
"netstandardapp1.5");
public string RuntimeOutputDir { get; private set; }
@ -161,7 +161,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
TestAssetPath,
"obj",
ConfigValue,
"dnxcore50",
"netstandardapp1.5",
"dotnet-compile.rsp");
public Dictionary<string, string> PreCompileScriptVariables { get; private set; }
@ -218,7 +218,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
rids.Add(rid);
}
var context = ProjectContext.Create(projectJson, new NuGetFramework("dnxcore", new Version(5, 0)), rids);
var context = ProjectContext.Create(projectJson, new NuGetFramework(".NETStandardApp", new Version(1, 5)), rids);
managedCompiler.Compile(context, _args);
RuntimeOutputDir = Path.Combine(OutputPath, rid);

10
test/dotnet-compile.UnitTests/project.json
View file

@ -2,7 +2,8 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.Cli.Utils": {
"target": "project"
@ -18,8 +19,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net451+win8"
]
}
},

2
test/dotnet-pack.Tests/PackTests.cs
View file

@ -92,7 +92,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
File.Exists(outputPackage).Should().BeTrue(outputPackage);
var zip = ZipFile.Open(outputPackage, ZipArchiveMode.Read);
zip.Entries.Should().Contain(e => e.FullName == "lib/dnxcore50/TestLibraryWithConfiguration.dll");
zip.Entries.Should().Contain(e => e.FullName == "lib/netstandardapp1.5/TestLibraryWithConfiguration.dll");
}
private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir)

11
test/dotnet-pack.Tests/project.json
View file

@ -2,8 +2,8 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23901",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": {
@ -15,8 +15,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net451+win8"
]
}
},

2
test/dotnet-projectmodel-server.Tests/DthTests.cs
View file

@ -66,7 +66,7 @@ namespace Microsoft.DotNet.ProjectModel.Server.Tests
.AssertJArrayCount(2)
.Select(f => f["ShortName"].Value<string>());
Assert.Contains("dnxcore50", frameworkShortNames);
Assert.Contains("netstandardapp1.5", frameworkShortNames);
Assert.Contains("dnx451", frameworkShortNames);
}
}

7
test/dotnet-projectmodel-server.Tests/project.json
View file

@ -7,8 +7,11 @@
"dotnet-test-xunit": "1.0.0-dev-79755-47"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},
"testRunner": "xunit"

6
test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs
View file

@ -30,12 +30,12 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
return new[]
{
new object[] { "1", "", "", "", "" },
new object[] { "2", "dnxcore50", "", "", "" },
new object[] { "2", "netstandardapp1.5", "", "", "" },
new object[] { "3", "", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier(), "", "" },
new object[] { "4", "", "", "Release", "" },
new object[] { "5", "", "", "", "some/dir"},
new object[] { "6", "", "", "", "some/dir/with spaces" },
new object[] { "7", "dnxcore50", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier(), "Debug", "some/dir" },
new object[] { "7", "netstandardapp1.5", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier(), "Debug", "some/dir" },
};
}
}
@ -131,7 +131,7 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
publishCommand.GetOutputDirectory().Should().HaveFile("Newtonsoft.Json.dll");
publishCommand.GetOutputDirectory().Delete(true);
publishCommand = new PublishCommand(lesserTestProject, "dnxcore50", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier());
publishCommand = new PublishCommand(lesserTestProject, "netstandardapp1.5", PlatformServices.Default.Runtime.GetLegacyRestoreRuntimeIdentifier());
publishCommand.Execute().Should().Pass();
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll");

10
test/dotnet-publish.Tests/project.json
View file

@ -2,7 +2,8 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23811",
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression": "4.1.0-rc2-23901",
"Microsoft.DotNet.TestFramework": "1.0.0-*",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
@ -16,8 +17,11 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},

Some files were not shown because too many files have changed in this diff Show more