Skip to content
This repository has been archived by the owner on Apr 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #3384 from eerhardt/UpdateDependencies20160604063234
Browse files Browse the repository at this point in the history 
Updating CoreFx, CoreSetup to rc3-24204-00, rc3-004400 respectively
  • Loading branch information
@eerhardt
eerhardt committed Jun 5, 2016
2 parents 06da2ee + 3e77d1a commit 512287e
Show file tree
Hide file tree
Showing 165 changed files with 265 additions and 265 deletions.
2 changes: 1 addition & 1 deletion TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
}
},
"imports": [
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"PackageWithFakeNativeDep": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00"
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00"
},
"buildOptions": {
"emitEntryPoint": true
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24201-00"
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24204-00"
},
"buildOptions": {
"emitEntryPoint": true
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00"
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00"
},
"buildOptions": {
"emitEntryPoint": true,
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00"
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00"
},
"buildOptions": {
"platform": "anycpu32bitpreferred",
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24201-00"
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24204-00"
},
"buildOptions": {
"emitEntryPoint": true,
Expand Down
4 changes: 2 additions & 2 deletions TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"dotnet-desktop-and-portable": "1.0.0-*"
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24201-00"
"NETStandard.Library": "1.6.0-rc3-24204-00"
},
"imports": [
"portable-net45+win8",
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
},
"ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": {
"target": "project"
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397",
"Microsoft.NETCore.App": "1.0.0-rc3-004400",
"EmptyLibrary": "1.0.0-*"
},
"frameworks": {
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
}
},
"dnx451": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24201-00"
"NETStandard.Library": "1.6.0-rc3-24204-00"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
},
"Newtonsoft.Json": "8.0.3"
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netcoreapp1.0": {
"imports": "dnxcore50",
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397",
"Microsoft.NETCore.App": "1.0.0-rc3-004400",
"Microsoft.Web.Administration": "7.0.0"
},
"frameworks": {
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
},
"frameworks": {
"netcoreapp1.0": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestPackages/ToolWithOutputName/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestPackages/dotnet-dependency-context-test/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
},
"Microsoft.Extensions.DependencyModel": {
"target": "project"
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
},
"Microsoft.DotNet.Cli.Utils": {
"target": "project"
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestPackages/dotnet-desktop-and-portable/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
},
"frameworks": {
"netcoreapp1.0": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
},
"frameworks": {
"netcoreapp1.0": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestPackages/dotnet-portable/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithBomGlobalJson/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
},
"frameworks": {
"netcoreapp1.0": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithDependencyOnToolWithOutputName/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc3-004397",
"version": "1.0.0-rc3-004400",
"type": "platform"
}
},
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397",
"Microsoft.NETCore.App": "1.0.0-rc3-004400",
"dotnet-hello": {
"version": "1.0.0",
"target": "package"
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithDirectDependency/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397",
"Microsoft.NETCore.App": "1.0.0-rc3-004400",
"dotnet-hello": {
"version": "1.0.0",
"target": "package"
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc3-004397",
"version": "1.0.0-rc3-004400",
"type": "platform"
},
"xunit.core": "2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"target": "package"
},
"Microsoft.NETCore.App": {
"version": "1.0.0-rc3-004397",
"version": "1.0.0-rc3-004400",
"type": "platform"
}
},
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
},
"frameworks": {
"netcoreapp1.0": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/AppWithToolDependency/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
},
"frameworks": {
"netcoreapp1.0": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/CompileFail/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
},
"frameworks": {
"netcoreapp1.0": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/DependencyContextFromTool/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/DependencyContextValidator/DependencyContextValidator/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"netstandard1.6": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.6.0-rc3-24201-00"
"NETStandard.Library": "1.6.0-rc3-24204-00"
}
},
"net451": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"preserveCompilationContext": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397",
"Microsoft.NETCore.App": "1.0.0-rc3-004400",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397",
"Microsoft.NETCore.App": "1.0.0-rc3-004400",
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/DependencyContextValidator/TestAppFullClr/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"DependencyContextValidator": "1.0.0-*",
"System.Diagnostics.Process": {
"version": "4.1.0-rc3-24201-00",
"version": "4.1.0-rc3-24204-00",
"type": "build"
}
},
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
},
"DependencyContextValidator": "1.0.0-*"
},
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-004397"
"version": "1.0.0-rc3-004400"
},
"DependencyContextValidator": "1.0.0-*"
},
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": "1.0.0",
"dependencies": {
"TestLibrary": "1.0.0",
"System.IO.Compression": "4.1.0-rc3-24201-00"
"System.IO.Compression": "4.1.0-rc3-24204-00"
},
"frameworks": {
"net461": {}
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/EndToEndTestApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
}
},
"dependencies": {
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
},
"packOptions": {
"files": {
Expand Down
2 changes: 1 addition & 1 deletion TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"Microsoft.NETCore.App": "1.0.0-rc3-004397"
"Microsoft.NETCore.App": "1.0.0-rc3-004400"
},
"tools": {
"dotnet-compile-fsc": {
Expand Down

0 comments on commit 512287e

Please sign in to comment.