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

Merged branch feature/msbuild into piotrpMSFT/branchmerge

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-08-26 22:39:40 -07:00
commit ab1797cb29
6 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,7 @@
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.DotNet.Core.Sdk": "1.0.0-alpha-20160811-3", "Microsoft.DotNet.Core.Sdk": "1.0.0-alpha-20160822-4",
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"version": "1.0.0", "version": "1.0.0",
"type": "platform" "type": "platform"

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

@ -21,8 +21,8 @@
"System.Xml.XmlSerializer": "4.0.11", "System.Xml.XmlSerializer": "4.0.11",
"WindowsAzure.Storage": "6.2.2-preview", "WindowsAzure.Storage": "6.2.2-preview",
"NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.1", "NuGet.CommandLine.XPlat": "3.6.0-beta.1.msbuild.1",
"Microsoft.Build.Framework": "0.1.0-preview-00029-160805", "Microsoft.Build.Framework": "0.1.0-preview-00032-160824",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805", "Microsoft.Build.Utilities.Core": "0.1.0-preview-00032-160824",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919" "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
}, },
"frameworks": { "frameworks": {

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

@ -3,7 +3,7 @@
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"dependencies": { "dependencies": {
"Microsoft.DotNet.Core.Sdk": "1.0.0-alpha-20160811-3", "Microsoft.DotNet.Core.Sdk": "1.0.0-alpha-20160822-4",
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"type": "platform", "type": "platform",
"version": "1.0.0" "version": "1.0.0"

4
src/dotnet/project.json
View file

@ -62,8 +62,8 @@
"exclude": "compile" "exclude": "compile"
}, },
"Microsoft.Build": "0.1.0-preview-00029-160805", "Microsoft.Build": "0.1.0-preview-00032-160824",
"Microsoft.Build.Framework": "0.1.0-preview-00029-160805", "Microsoft.Build.Framework": "0.1.0-preview-00032-160824",
"Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919" "Microsoft.DotNet.PlatformAbstractions": "1.0.1-beta-000919"
}, },

13
src/redist/project.json
View file

@ -13,12 +13,13 @@
"tool_nuget": "1.0.0-featmsbuild-*", "tool_nuget": "1.0.0-featmsbuild-*",
"tool_msbuild": "1.0.0-featmsbuild-*", "tool_msbuild": "1.0.0-featmsbuild-*",
"MSBuild": "0.1.0-preview-00029-160805", "MSBuild": "0.1.0-preview-00032-160824",
"Microsoft.Build.Framework": "0.1.0-preview-00029-160805", "Microsoft.Build.Framework": "0.1.0-preview-00032-160824",
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805", "Microsoft.Build.Tasks.Core": "0.1.0-preview-00032-160824",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805", "Microsoft.Build.Utilities.Core": "0.1.0-preview-00032-160824",
"Microsoft.Build.Targets": "0.1.0-preview-00029-160805", "Microsoft.Build.Targets": "0.1.0-preview-00032-160824",
"Microsoft.Build": "0.1.0-preview-00029-160805", "Microsoft.Build": "0.1.0-preview-00032-160824",
"System.Runtime.Serialization.Xml": "4.1.0",
"NuGet.Build.Tasks": "3.6.0-beta.1.msbuild.1" "NuGet.Build.Tasks": "3.6.0-beta.1.msbuild.1"
}, },
"frameworks": { "frameworks": {

12
src/tool_msbuild/project.json
View file

@ -8,12 +8,12 @@
"type": "platform", "type": "platform",
"version": "1.0.0" "version": "1.0.0"
}, },
"MSBuild": "0.1.0-preview-00029-160805", "MSBuild": "0.1.0-preview-00032-160824",
"Microsoft.Build.Framework": "0.1.0-preview-00029-160805", "Microsoft.Build.Framework": "0.1.0-preview-00032-160824",
"Microsoft.Build.Tasks.Core": "0.1.0-preview-00029-160805", "Microsoft.Build.Tasks.Core": "0.1.0-preview-00032-160824",
"Microsoft.Build.Utilities.Core": "0.1.0-preview-00029-160805", "Microsoft.Build.Utilities.Core": "0.1.0-preview-00032-160824",
"Microsoft.Build.Targets": "0.1.0-preview-00029-160805", "Microsoft.Build.Targets": "0.1.0-preview-00032-160824",
"Microsoft.Build": "0.1.0-preview-00029-160805", "Microsoft.Build": "0.1.0-preview-00032-160824",
"Microsoft.Net.Compilers.netcore": "1.3.0", "Microsoft.Net.Compilers.netcore": "1.3.0",
"Microsoft.Net.Compilers.Targets.NetCore": "0.1.5-dev", "Microsoft.Net.Compilers.Targets.NetCore": "0.1.5-dev",
"Microsoft.Cci": "4.0.0-rc3-24128-00", "Microsoft.Cci": "4.0.0-rc3-24128-00",