Upgrade Corefx and coreclr references

Microsoft.NetCore.App 1.0.0 => 1.0.1
Microsoft.NETCore.Runtime.CoreCLR 1.0.2 => 1.0.4
CLI Branding "Microsoft .NET Core 1.0.0 - SDK Preview" => "Microsoft .NET Core 1.0.1 - SDK 1.0.0 Preview 2-003122"

List of changes
- all project.jsons
- dotnet new templates
- and build projects files
   - shared-build-targets-utils\DependencyVersions.cs
   - CliDependencyVersions.cs
This commit is contained in:
Sridhar Periyasamy 2016-08-30 09:52:35 -07:00
parent 1e9d529bc5
commit 8fcfc2af05
134 changed files with 147 additions and 140 deletions

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -7,7 +7,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
public class CliDependencyVersions 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 SharedHostVersion = "1.0.1";
public static readonly string HostFxrVersion = "1.0.1"; public static readonly string HostFxrVersion = "1.0.1";

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -10,11 +10,18 @@ namespace Microsoft.DotNet.Cli.Build
public class Monikers public class Monikers
{ {
public const string SharedFrameworkName = "Microsoft.NETCore.App"; 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.1 - Runtime";
public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 - Runtime";
public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 - Host"; public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 - Host";
public const string HostFxrBrandName = "Microsoft .NET Core 1.0.0 - Host FX Resolver"; 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) public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
{ {
string rid = RuntimeEnvironment.GetRuntimeIdentifier(); string rid = RuntimeEnvironment.GetRuntimeIdentifier();

View file

@ -7,7 +7,7 @@
"dependencies": { "dependencies": {
"NETStandard.Library": "1.6.0", "NETStandard.Library": "1.6.0",
"Microsoft.CSharp": "4.0.1", "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", "System.Runtime.Serialization.Primitives": "4.1.1",
"Microsoft.DotNet.Cli.Build.Framework": { "Microsoft.DotNet.Cli.Build.Framework": {
"target": "project" "target": "project"

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

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