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

Merge pull request #3351 from dotnet/preview2

Browse source 
Updating CoreSetup to rc3-004373
This commit is contained in:
Eric Erhardt 2016-06-02 15:47:00 -05:00
commit 0577337cdc
123 changed files with 145 additions and 129 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-rc3-004363"
"version": "1.0.0-rc3-004373"
}
},
"imports": [

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

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

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

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363",
"Microsoft.NETCore.App": "1.0.0-rc3-004373",
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
}
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
}
}
},

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

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363",
"Microsoft.NETCore.App": "1.0.0-rc3-004373",
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
}
}
}

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-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
}
}
},

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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
}
}
}

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

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

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

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

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

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

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

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

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363",
"Microsoft.NETCore.App": "1.0.0-rc3-004373",
"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-rc3-004363",
"Microsoft.NETCore.App": "1.0.0-rc3-004373",
"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-rc3-004363",
"version": "1.0.0-rc3-004373",
"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-rc3-004363",
"version": "1.0.0-rc3-004373",
"type": "platform"
}
},

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

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

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

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

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
}
}
}

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

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

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

@ -5,7 +5,7 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363",
"Microsoft.NETCore.App": "1.0.0-rc3-004373",
"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-rc3-004363",
"Microsoft.NETCore.App": "1.0.0-rc3-004373",
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"DependencyContextValidator": "1.0.0-*"
},

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

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

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

@ -11,7 +11,7 @@
},
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"Microsoft.NETCore.App": "1.0.0-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363",
"Microsoft.NETCore.App": "1.0.0-rc3-004373",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221"
},
"tools": {

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

@ -11,7 +11,7 @@
},
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"Microsoft.NETCore.App": "1.0.0-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
}
},
"imports": [

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

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

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
}
},
"frameworks": {

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

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

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

@ -6,7 +6,7 @@
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
}
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
}
},
"frameworks": {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -7,7 +7,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
},

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

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

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

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

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

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

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-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"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-rc3-004363",
"version": "1.0.0-rc3-004373",
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"frameworks": {
"netcoreapp1.0": {}

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

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

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"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-rc3-004363",
"Microsoft.NETCore.App": "1.0.0-rc3-004373",
"SharedContentA": "1.0.0-*"
},
"frameworks": {

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

@ -7,7 +7,7 @@
}
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"frameworks": {
"netcoreapp1.0": {}

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

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

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

@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
}
},
"net451": {

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

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

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

@ -4,7 +4,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
}
},
"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-rc3-004363",
"version": "1.0.0-rc3-004373",
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"frameworks": {
"netcoreapp1.0": {}

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

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

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

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

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

@ -5,7 +5,7 @@
"xmlDoc": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
},
"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-rc3-004363"
"Microsoft.NETCore.App": "1.0.0-rc3-004373"
}
},
"net451": {

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

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

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

@ -7,8 +7,8 @@ namespace Microsoft.DotNet.Cli.Build
{
public class CliDependencyVersions
{
public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004363";
public static readonly string SharedHostVersion = "1.0.1-rc3-004363-00";
public static readonly string SharedFrameworkVersion = "1.0.0-rc3-004373";
public static readonly string SharedHostVersion = "1.0.1-rc3-004373-00";
public static readonly string SharedFrameworkChannel = "preview";
public static readonly string SharedHostChannel = "preview";

4
build_projects/update-dependencies/Config.cs
View file

@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Scripts
/// The following Environment Variables can optionally be specified:
///
/// COREFX_VERSION_URL - The Url to get the current CoreFx package versions. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/release/1.0.0/Latest_Packages.txt")
/// CORESETUP_VERSION_URL - The Url to get the current dotnet/core-setup package versions. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/master/Latest_Packages.txt")
/// CORESETUP_VERSION_URL - The Url to get the current dotnet/core-setup package versions. (ex. "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/release/1.0.0/Latest_Packages.txt")
/// GITHUB_ORIGIN_OWNER - The owner of the GitHub fork to push the commit and create the PR from. (ex. "dotnet-bot")
/// GITHUB_UPSTREAM_OWNER - The owner of the GitHub base repo to create the PR to. (ex. "dotnet")
/// GITHUB_PROJECT - The repo name under the ORIGIN and UPSTREAM owners. (ex. "cli")
@ -35,7 +35,7 @@ namespace Microsoft.DotNet.Scripts
private Lazy<string> _password = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_PASSWORD"));
private Lazy<string> _coreFxVersionUrl = new Lazy<string>(() => GetEnvironmentVariable("COREFX_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/corefx/release/1.0.0/Latest_Packages.txt"));
private Lazy<string> _coreSetupVersionUrl = new Lazy<string>(() => GetEnvironmentVariable("CORESETUP_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/master/Latest_Packages.txt"));
private Lazy<string> _coreSetupVersionUrl = new Lazy<string>(() => GetEnvironmentVariable("CORESETUP_VERSION_URL", "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/core-setup/release/1.0.0/Latest_Packages.txt"));
private Lazy<string> _gitHubOriginOwner;
private Lazy<string> _gitHubUpstreamOwner = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_UPSTREAM_OWNER", "dotnet"));
private Lazy<string> _gitHubProject = new Lazy<string>(() => GetEnvironmentVariable("GITHUB_PROJECT", "cli"));

24
build_projects/update-dependencies/UpdateFilesTargets.cs
View file

@ -139,19 +139,33 @@ namespace Microsoft.DotNet.Scripts
{
if (id == packageInfo.Id)
{
string oldVersion;
if (dependencyProperty.Value is JObject)
{
dependencyProperty.Value["version"] = packageInfo.Version.ToNormalizedString();
oldVersion = (string)dependencyProperty.Value["version"];
}
else
{
dependencyProperty.Value = packageInfo.Version.ToNormalizedString();
oldVersion = (string)dependencyProperty.Value;
}
// mark the DependencyInfo as updated so we can tell which dependencies were updated
dependencyInfo.IsUpdated = true;
string newVersion = packageInfo.Version.ToNormalizedString();
if (oldVersion != newVersion)
{
if (dependencyProperty.Value is JObject)
{
dependencyProperty.Value["version"] = newVersion;
}
else
{
dependencyProperty.Value = newVersion;
}
return true;
// mark the DependencyInfo as updated so we can tell which dependencies were updated
dependencyInfo.IsUpdated = true;
return true;
}
}
}
}

4
build_projects/update-dependencies/update-dependencies.ps1
View file

@ -17,6 +17,8 @@ if($Help)
exit 0
}
$Architecture='x64'
$RepoRoot = "$PSScriptRoot\..\.."
$AppPath = "$PSScriptRoot"
@ -28,7 +30,7 @@ if (!$env:DOTNET_INSTALL_DIR)
# Install a stage 0
Write-Host "Installing .NET Core CLI Stage 0"
& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Architecture x64
& "$RepoRoot\scripts\obtain\dotnet-install.ps1" -Architecture $Architecture
if($LASTEXITCODE -ne 0) { throw "Failed to install stage0" }
# Put the stage0 on the path

2
src/compilers/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160525-03",
"Microsoft.Net.Compilers.netcore": "1.3.0-beta1-20160525-03",

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

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

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

@ -9,7 +9,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
}
},
"imports": "dnxcore50"

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

@ -27,7 +27,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
}
},
"imports": [

2
src/dotnet/project.json
View file

@ -43,7 +43,7 @@
},
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"System.Diagnostics.TraceSource": "4.0.0-rc3-24131-00",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24131-00",

2
test/ArgumentForwardingTests/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00",
"Microsoft.DotNet.ProjectModel": {

2
test/ArgumentsReflector/project.json
View file

@ -11,7 +11,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
}
},
"frameworks": {

2
test/EndToEnd/project.json
View file

@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00",
"Microsoft.DotNet.ProjectModel": {

2
test/Kestrel.Tests/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00",
"Microsoft.DotNet.Tools.Tests.Utilities": {

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

@ -16,7 +16,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004363"
"version": "1.0.0-rc3-004373"
},
"System.Diagnostics.TraceSource": "4.0.0-rc3-24131-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24131-00",

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