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

Merge pull request #4119 from dotnet/preview2-upgrade

Browse source 
Upgrade Corefx and coreclr references
This commit is contained in:
Sridhar Periyasamy 2016-08-31 15:35:37 -07:00 committed by GitHub
commit 635cf40e58
140 changed files with 193 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json
View file

@ -11,7 +11,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
},
"imports": [

2
TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": {
"target": "project"

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

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"Microsoft.NETCore.App": "1.0.1",
"EmptyLibrary": "1.0.0-*"
},
"frameworks": {

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

@ -3,7 +3,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
}
},
"dnx451": {}

2
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"Newtonsoft.Json": "8.0.3"
}

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

@ -3,7 +3,7 @@
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
}
}
},

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

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"Microsoft.NETCore.App": "1.0.1",
"Microsoft.Web.Administration": "7.0.0"
},
"frameworks": {

2
TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestPackages/ToolWithOutputName/project.json
View file

@ -9,7 +9,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
}

2
TestAssets/TestPackages/dotnet-dependency-context-test/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"Microsoft.Extensions.DependencyModel": {
"target": "project"

2
TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
View file

@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"Microsoft.DotNet.Cli.Utils": {
"target": "project"

2
TestAssets/TestPackages/dotnet-desktop-and-portable/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},

2
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestPackages/dotnet-portable/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
}

2
TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json
View file

@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
}

2
TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
}

2
TestAssets/TestProjects/AppWithBomGlobalJson/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"version": "1.0.1",
"type": "platform"
}
},

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"Microsoft.NETCore.App": "1.0.1",
"dotnet-hello": {
"version": "1.0.0",
"target": "package"

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"Microsoft.NETCore.App": "1.0.1",
"dotnet-hello": {
"version": "1.0.0",
"target": "package"

2
TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"version": "1.0.1",
"type": "platform"
},
"xunit.core": "2.1.0",

2
TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json
View file

@ -8,7 +8,7 @@
"target": "package"
},
"Microsoft.NETCore.App": {
"version": "1.0.0",
"version": "1.0.1",
"type": "platform"
}
},

2
TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
}

2
TestAssets/TestProjects/DependencyContextFromTool/project.json
View file

@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
}

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

@ -5,7 +5,7 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"Microsoft.NETCore.App": "1.0.1",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"Microsoft.NETCore.App": "1.0.1",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {

2
TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json
View file

@ -7,7 +7,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"DependencyContextValidator": "1.0.0-*"
},

2
TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"DependencyContextValidator": "1.0.0-*"
},

2
TestAssets/TestProjects/EndToEndTestApp/project.json
View file

@ -14,7 +14,7 @@
}
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"packOptions": {
"files": {

2
TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json
View file

@ -11,7 +11,7 @@
},
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509",
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"tools": {
"dotnet-compile-fsc": {

2
TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
View file

@ -14,7 +14,7 @@
"version": "1.0.0-*",
"target": "project"
},
"Microsoft.NETCore.App": "1.0.0",
"Microsoft.NETCore.App": "1.0.1",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509"
},
"tools": {

2
TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json
View file

@ -11,7 +11,7 @@
},
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509",
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"tools": {
"dotnet-compile-fsc": {

2
TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json
View file

@ -18,7 +18,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
},
"imports": [

2
TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json
View file

@ -16,7 +16,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"imports": [
"dnxcore50",

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/PerformanceTestProjects/SingleTargetApp/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
},
"frameworks": {

2
TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json
View file

@ -9,7 +9,7 @@
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
},
"frameworks": {

2
TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json
View file

@ -6,7 +6,7 @@
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
},
"frameworks": {

2
TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
},
"frameworks": {

4
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetApp/project.json
View file

@ -9,14 +9,14 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},
"netstandard1.6": {
"dependencies": {
"NETStandard.Library": "1.6.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2"
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.4"
}
}
},

4
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP0/project.json
View file

@ -13,14 +13,14 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},
"netstandard1.6": {
"dependencies": {
"NETStandard.Library": "1.6.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2"
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.4"
}
}
},

2
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP1/project.json
View file

@ -10,7 +10,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},

2
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraph/TwoTargetP2/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},

4
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP0/project.json
View file

@ -13,14 +13,14 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},
"netstandard1.6": {
"dependencies": {
"NETStandard.Library": "1.6.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2"
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.4"
}
}
},

2
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP1/project.json
View file

@ -13,7 +13,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},

2
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP2/project.json
View file

@ -13,7 +13,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},

2
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP3/project.json
View file

@ -10,7 +10,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},

2
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP4/project.json
View file

@ -13,7 +13,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},

2
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP5/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},

2
TestAssets/TestProjects/PerformanceTestProjects/TwoTargetGraphLarge/TwoTargetLargeP6/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
},

2
TestAssets/TestProjects/PortableTests/PortableApp/project.json
View file

@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
}

2
TestAssets/TestProjects/PortableTests/PortableAppCompilationContext/project.json
View file

@ -11,7 +11,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
}
}

2
TestAssets/TestProjects/PortableTests/PortableAppWithNative/project.json
View file

@ -7,7 +7,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Libuv": "1.9.0-rc2-20896"

2
TestAssets/TestProjects/PortableTests/StandaloneApp/project.json
View file

@ -5,7 +5,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
}
}
},

2
TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
View file

@ -15,7 +15,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"System.Linq.Expressions": "4.1.0",
"System.Runtime.Serialization.Primitives": "4.1.1"

2
TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"System.Linq.Expressions": "4.1.0",
"System.Runtime.Serialization.Primitives": "4.1.1",

2
TestAssets/TestProjects/ResourcesTests/TestApp/project.json
View file

@ -7,7 +7,7 @@
"Microsoft.Data.OData": "5.6.4",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"TestLibraryWithResources": {
"target": "project"

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

@ -7,7 +7,7 @@
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"version": "1.0.1",
"type": "platform"
}
}

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

@ -6,7 +6,7 @@
},
"dependencies": {
"TestLibrary": "1.0.0-*",
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/TestAppSimple/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/TestAppWithBuildDependency/App/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"LibraryWithBuildDependency": {
"target": "project"

2
TestAssets/TestProjects/TestAppWithBuildDependency/LibraryWithBuildDependency/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"Microsoft.Net.Compilers": {
"type": "build",

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

@ -5,7 +5,7 @@
"outputName": "AppWithContentPackage"
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"Microsoft.NETCore.App": "1.0.1",
"SharedContentA": "1.0.0-*"
},
"frameworks": {

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

@ -7,7 +7,7 @@
}
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -9,7 +9,7 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/TestAppWithResourceDeps/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0",
"Microsoft.NETCore.App": "1.0.1",
"Microsoft.CSharp": "4.0.1",
"System.Dynamic.Runtime": "4.0.11",
"System.Reflection.Metadata": "1.3.0",

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -9,7 +9,7 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/TestAppWithUnicodéPath/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -9,7 +9,7 @@
"target": "project",
"version": "1.0.0-*"
},
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -13,7 +13,7 @@
"net451": {},
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"imports": "portable-net45+win8"
}

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

@ -5,7 +5,7 @@
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
}
},
"net451": {

2
TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json
View file

@ -5,7 +5,7 @@
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
}
},
"netcore50": {

2
TestAssets/TestProjects/TestMscorlibReference/project.json
View file

@ -4,7 +4,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
}
},
"net451": {

2
TestAssets/TestProjects/TestProjectContextBuildAllDedupe/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"version": "1.0.1",
"type": "platform"
}
},

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

@ -6,7 +6,7 @@
"dependencies": {
"L11": "1.0.0-*",
"L12": "1.0.0-*",
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

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

@ -5,7 +5,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
},
"frameworks": {
"netcoreapp1.0": {}

2
TestAssets/TestProjects/TestSystemCoreReference/project.json
View file

@ -4,7 +4,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
}
},
"net451": {

2
TestAssets/TestProjects/TestSystemReference/project.json
View file

@ -4,7 +4,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0"
"Microsoft.NETCore.App": "1.0.1"
}
},
"net451": {

2
build_projects/dotnet-cli-build/CliDependencyVersions.cs
View file

@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class CliDependencyVersions
{
public static readonly string SharedFrameworkVersion = "1.0.0";
public static readonly string SharedFrameworkVersion = "1.0.1";
public static readonly string SharedHostVersion = "1.0.1";
public static readonly string HostFxrVersion = "1.0.1";

2
build_projects/dotnet-cli-build/DebTargets.cs
View file

@ -55,7 +55,7 @@ namespace Microsoft.DotNet.Cli.Build
"-i", sdkPublishRoot,
"-o", debFile,
"-p", packageName,
"-b", Monikers.CLISdkBrandName,
"-b", Monikers.GetCLISdkBrandName(c),
"-m", manPagesDir,
"--framework-debian-package-name", sharedFxDebianPackageName,
"--framework-nuget-name", Monikers.SharedFrameworkName,

4
build_projects/dotnet-cli-build/MsiTargets.cs
View file

@ -118,7 +118,7 @@ namespace Microsoft.DotNet.Cli.Build
{
var cliSdkRoot = c.BuildContext.Get<string>("CLISDKRoot");
var upgradeCode = Utils.GenerateGuidFromName(SdkMsi).ToString().ToUpper();
var cliSdkBrandName = $"'{Monikers.CLISdkBrandName}'";
var cliSdkBrandName = $"'{Monikers.GetCLISdkBrandName(c)}'";
Cmd("powershell", "-NoProfile", "-NoLogo",
Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatemsi.ps1"),
@ -133,7 +133,7 @@ namespace Microsoft.DotNet.Cli.Build
public static BuildTargetResult GenerateCliSdkBundle(BuildTargetContext c)
{
var upgradeCode = Utils.GenerateGuidFromName(SdkBundle).ToString().ToUpper();
var cliSdkBrandName = $"'{Monikers.CLISdkBrandName}'";
var cliSdkBrandName = $"'{Monikers.GetCLISdkBrandName(c)}'";
Cmd("powershell", "-NoProfile", "-NoLogo",
Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"),

2
build_projects/dotnet-cli-build/PkgTargets.cs
View file

@ -82,7 +82,7 @@ namespace Microsoft.DotNet.Cli.Build
.Replace("{HostFxrComponentId}", HostFxrComponentId)
.Replace("{CLISdkComponentId}", CLISdkComponentId)
.Replace("{CLISdkNugetVersion}", CLISdkNugetVersion)
.Replace("{CLISdkBrandName}", Monikers.CLISdkBrandName)
.Replace("{CLISdkBrandName}", Monikers.GetCLISdkBrandName(c))
.Replace("{SharedFxBrandName}", Monikers.SharedFxBrandName)
.Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName)
.Replace("{HostFxrBrandName}", Monikers.HostFxrBrandName);

2
build_projects/dotnet-cli-build/project.json
View file

@ -6,7 +6,7 @@
},
"dependencies": {
"NETStandard.Library": "1.6.0",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.4",
"Microsoft.CSharp": "4.0.1",
"System.Dynamic.Runtime": "4.0.11",
"System.Reflection.Metadata": "1.3.0",

4
build_projects/shared-build-targets-utils/DependencyVersions.cs
View file

@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class DependencyVersions
{
public static readonly string CoreCLRVersion = "1.0.2";
public static readonly string JitVersion = "1.0.2";
public static readonly string CoreCLRVersion = "1.0.4";
public static readonly string JitVersion = "1.0.4";
}
}

11
build_projects/shared-build-targets-utils/Utils/Monikers.cs
View file

@ -10,11 +10,18 @@ namespace Microsoft.DotNet.Cli.Build
public class Monikers
{
public const string SharedFrameworkName = "Microsoft.NETCore.App";
public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 - SDK Preview 2";
public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 - Runtime";
public const string SharedFxBrandName = "Microsoft .NET Core 1.0.1 - Runtime";
public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 - Host";
public const string HostFxrBrandName = "Microsoft .NET Core 1.0.0 - Host FX Resolver";
private const string CLISdkBrandName = "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 2-{COMMIT_COUNT_STRING}";
public static string GetCLISdkBrandName(BuildTargetContext c)
{
string commitCountString = c.BuildContext.Get<BuildVersion>("BuildVersion").CommitCountString;
return CLISdkBrandName.Replace("{COMMIT_COUNT_STRING}", commitCountString);
}
public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
{
string rid = RuntimeEnvironment.GetRuntimeIdentifier();

2
build_projects/update-dependencies/project.json
View file

@ -7,7 +7,7 @@
"dependencies": {
"NETStandard.Library": "1.6.0",
"Microsoft.CSharp": "4.0.1",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.2",
"Microsoft.NETCore.Runtime.CoreCLR": "1.0.4",
"System.Runtime.Serialization.Primitives": "4.1.1",
"Microsoft.DotNet.Cli.Build.Framework": {
"target": "project"

2
packaging/windows/clisdk/bundle.thm
View file

@ -2,7 +2,7 @@
<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010">
<Window Width="620" Height="418" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window>
<Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
<Font Id="1" Height="-24" Weight="900" Foreground="FFFFFF" Background="682079">Segoe UI</Font>
<Font Id="1" Height="-22" Weight="900" Foreground="FFFFFF" Background="682079">Segoe UI</Font>
<Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font>
<Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font>
<Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font>

2
src/compilers/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
},
"Microsoft.CodeAnalysis.CSharp": "1.3.0",
"Microsoft.Net.Compilers.netcore": "1.3.0",

2
src/dotnet-archive/project.json
View file

@ -14,7 +14,7 @@
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
},
"frameworks": {

2
src/dotnet-compile-fsc/project.json
View file

@ -24,7 +24,7 @@
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
},
"frameworks": {

2
src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template
View file

@ -10,7 +10,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0"
"version": "1.0.1"
}
},
"imports": "dnxcore50"

15
src/dotnet/commands/dotnet-new/CSharp_Web/project.json.template
View file

@ -3,22 +3,23 @@
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0",
"version": "1.0.1",
"type": "platform"
},
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
"Microsoft.AspNetCore.Diagnostics": "1.0.0",
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0",
"Microsoft.AspNetCore.Mvc": "1.0.0",
"Microsoft.AspNetCore.Mvc": "1.0.1",
"Microsoft.AspNetCore.Razor.Tools": {
"version": "1.0.0-preview2-final",
"type": "build"
},
"Microsoft.AspNetCore.Routing": "1.0.1",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.1",
"Microsoft.AspNetCore.StaticFiles": "1.0.0",
"Microsoft.EntityFrameworkCore.Sqlite": "1.0.0",
"Microsoft.EntityFrameworkCore.Sqlite": "1.0.1",
"Microsoft.EntityFrameworkCore.Tools": {
"version": "1.0.0-preview2-final",
"type": "build"
@ -31,11 +32,11 @@
"Microsoft.Extensions.Logging.Debug": "1.0.0",
"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
"Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
"version": "1.0.0-preview2-final",
"version": "1.0.0-preview2-update1",
"type": "build"
},
"Microsoft.VisualStudio.Web.CodeGenerators.Mvc": {
"version": "1.0.0-preview2-final",
"version": "1.0.0-preview2-update1",
"type": "build"
}
},
@ -94,7 +95,7 @@
"publishOptions": {
"include": [
"wwwroot",
"Views",
"**/*.cshtml",
"appsettings.json",
"web.config"
]

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