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

Merge pull request #1865 from eerhardt/RemoveWorkarounds

Browse source 
Removing project.json dependency workarounds that were needed for CoreFX 23901 build.
This commit is contained in:
Eric Erhardt 2016-03-15 13:58:21 -05:00
commit 3714cc25e9
17 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/dotnet-cli-build/project.json
View file

@ -6,9 +6,6 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23911",
"System.Security.Cryptography.Algorithms": "4.0.0-rc2-23911",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*", "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"WindowsAzure.Storage": "6.2.2-preview", "WindowsAzure.Storage": "6.2.2-preview",
"System.Reflection.Metadata": "1.2.0" "System.Reflection.Metadata": "1.2.0"

1
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -21,7 +21,6 @@
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.Resources.ResourceManager": "4.0.1-rc2-23911", "System.Resources.ResourceManager": "4.0.1-rc2-23911",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23911",
"System.Reflection.TypeExtensions": "4.1.0-rc2-23911" "System.Reflection.TypeExtensions": "4.1.0-rc2-23911"
} }
} }

3
src/dotnet/project.json
View file

@ -54,10 +54,7 @@
"System.Xml.XDocument": "4.0.11-rc2-23911", "System.Xml.XDocument": "4.0.11-rc2-23911",
"System.Resources.ReaderWriter": "4.0.0-rc2-23911", "System.Resources.ReaderWriter": "4.0.0-rc2-23911",
"System.Net.Sockets": "4.1.0-rc2-23911", "System.Net.Sockets": "4.1.0-rc2-23911",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23911",
"System.Threading.ThreadPool": "4.0.10-rc2-23911", "System.Threading.ThreadPool": "4.0.10-rc2-23911",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23911",
"System.Private.DataContractSerialization": "4.1.0-rc2-23911",
"Microsoft.Win32.Registry": { "Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-23911", "version": "4.0.0-rc2-23911",
"exclude": "Compile" "exclude": "Compile"

1
test/ArgumentForwardingTests/project.json
View file

@ -5,7 +5,6 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },

1
test/EndToEnd/project.json
View file

@ -5,7 +5,6 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },

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

@ -5,7 +5,6 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },

1
test/Microsoft.DotNet.Compiler.Common.Tests/project.json
View file

@ -2,7 +2,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

1
test/Microsoft.DotNet.ProjectModel.Tests/project.json
View file

@ -2,7 +2,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },

1
test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
View file

@ -7,7 +7,6 @@
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.Collections.Immutable": "1.2.0-rc2-23911", "System.Collections.Immutable": "1.2.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"FluentAssertions": "4.0.0", "FluentAssertions": "4.0.0",
"xunit": "2.1.0", "xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-dev-91790-12", "dotnet-test-xunit": "1.0.0-dev-91790-12",

1
test/Microsoft.Extensions.DependencyModel.Tests/project.json
View file

@ -6,7 +6,6 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

1
test/dotnet-build.Tests/project.json
View file

@ -2,7 +2,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

1
test/dotnet-compile.Tests/project.json
View file

@ -2,7 +2,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

1
test/dotnet-compile.UnitTests/project.json
View file

@ -2,7 +2,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"target": "project" "target": "project"
}, },

1
test/dotnet-publish.Tests/project.json
View file

@ -2,7 +2,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.TestFramework": "1.0.0-*", "Microsoft.DotNet.TestFramework": "1.0.0-*",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"

1
test/dotnet-resgen.Tests/project.json
View file

@ -2,7 +2,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

1
test/dotnet-run.Tests/project.json
View file

@ -2,7 +2,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },

1
test/dotnet.Tests/project.json
View file

@ -2,7 +2,6 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911", "NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression": "4.1.0-rc2-23911",
"Microsoft.DotNet.Tools.Tests.Utilities": { "Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project" "target": "project"
}, },