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

Merge pull request #3215 from eerhardt/netcore-rc3

Browse source 
Upgrade to CoreFX rc3
This commit is contained in:
Livar 2016-05-24 10:33:59 -07:00
commit fe7b519722
113 changed files with 702 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/ArgumentForwardingTests/project.json
View file

@ -8,7 +8,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
@ -33,4 +33,4 @@
"scripts": {
"precompile": "dotnet publish ../ArgumentsReflector/project.json --framework netcoreapp1.0 --runtime %compile:RuntimeIdentifier% --output %compile:RuntimeOutputDir%"
}
}
}

4
test/EndToEnd/project.json
View file

@ -8,7 +8,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
@ -31,4 +31,4 @@
}
},
"testRunner": "xunit"
}
}

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

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

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

@ -18,8 +18,8 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"NuGet.Versioning": "3.5.0-rc-1285",
"NuGet.Packaging": "3.5.0-rc-1285",
"NuGet.Frameworks": "3.5.0-rc-1285",
@ -56,4 +56,4 @@
"../../TestAssets/TestProjects/AppWithToolDependency/**/*"
]
}
}
}

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

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

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

@ -13,7 +13,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
@ -37,4 +37,4 @@
"../../TestAssets/TestProjects/TestAppWithLibrary/**"
]
}
}
}

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

@ -8,15 +8,9 @@
"FluentAssertions": "4.0.0",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"Microsoft.DotNet.TestFramework": {
"target": "project"
},
"Microsoft.DotNet.Cli.Utils": {
"target": "project"
},
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
"Microsoft.DotNet.TestFramework": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.InternalAbstractions": {
"target": "project"
}

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

@ -9,7 +9,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
@ -30,4 +30,4 @@
}
},
"testRunner": "xunit"
}
}

2
test/Performance/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},

2
test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json
View file

@ -8,7 +8,7 @@
"Microsoft.Extensions.Testing.Abstractions": {
"target": "project"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

4
test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json
View file

@ -8,8 +8,8 @@
"Microsoft.Extensions.Testing.Abstractions": {
"target": "project"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"System.Diagnostics.Process": "4.1.0-rc3-24123-01",
"TestAppWithPortablePdbs": {
"target": "project"
},

4
test/TestingAbstractions/TestAppWithFullPdbs/project.json
View file

@ -4,9 +4,9 @@
"debugType": "full"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}
}
}
}

4
test/TestingAbstractions/TestAppWithPortablePdbs/project.json
View file

@ -4,9 +4,9 @@
"debugType": "portable"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}
}
}
}

2
test/binding-redirects.Tests/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
}

4
test/crossgen.Tests/crossgen.Tests.cs
View file

@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tests
/// </summary>
public class CrossgenTests : TestBase
{
[Fact]
[Fact(Skip="https://github.com/dotnet/cli/issues/3059")]
public void CLI_SDK_assemblies_must_be_crossgened()
{
string dotnetDir = FindDotnetDirInPath();
@ -27,7 +27,7 @@ namespace Microsoft.DotNet.Tests
CheckDirectoryIsCrossgened(cliPath);
}
[Fact]
[Fact(Skip="https://github.com/dotnet/cli/issues/3059")]
public void Shared_Fx_assemblies_must_be_crossgened()
{
string dotnetDir = FindDotnetDirInPath();

3
test/dotnet-build.Tests/BuildOutputTests.cs
View file

@ -347,7 +347,8 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
buildResult.Should().Fail();
buildResult.StdErr.Should().Contain("Expected coreclr library not found in package graph. Please try running dotnet restore again.");
buildResult.StdErr.Should().Contain("Can not find runtime target for framework '.NETCoreApp,Version=v1.0' compatible with one of the target runtimes");
buildResult.StdErr.Should().Contain("The project has not been restored or restore failed - run `dotnet restore`");
}
private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir)

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

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

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

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
@ -46,4 +46,4 @@
]
}
}
}
}

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

@ -23,7 +23,7 @@
"target": "project"
},
"Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-24027",
"version": "4.0.0-rc3-24123-01",
"exclude": "Compile"
},
"Microsoft.DotNet.ProjectModel": {
@ -49,4 +49,4 @@
"../../TestAssets/TestProjects/TestAppWithLibrary/**/*"
]
}
}
}

6
test/dotnet-pack.Tests/project.json
View file

@ -5,8 +5,8 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.IO.Compression.ZipFile": "4.0.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"System.IO.Compression.ZipFile": "4.0.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
@ -37,4 +37,4 @@
]
}
}
}
}

4
test/dotnet-projectmodel-server.Tests/project.json
View file

@ -8,7 +8,7 @@
"target": "project"
},
"Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-24027",
"version": "4.0.0-rc3-24123-01",
"exclude": "Compile"
},
"Microsoft.DotNet.Tools.Tests.Utilities": {
@ -19,7 +19,7 @@
},
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"System.Net.NameResolution": "4.0.0-rc2-24027"
"System.Net.NameResolution": "4.0.0-rc3-24123-01"
},
"frameworks": {
"netcoreapp1.0": {

16
test/dotnet-publish.Tests/PublishTests.cs
View file

@ -193,20 +193,14 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
}
[Fact]
public void PublishedLibraryShouldOutputDependenciesAndNoHost()
public void PublishedLibraryWithoutRIDShouldFail()
{
TestInstance instance = TestAssetsManager.CreateTestInstance(Path.Combine("TestAppWithLibrary"))
.WithLockFiles();
var testProject = _getProjectJson(instance.TestRoot, "TestLibrary");
var publishCommand = new PublishCommand(testProject);
publishCommand.Execute().Should().Pass();
publishCommand.GetOutputDirectory().Should().NotHaveFile("TestLibrary.exe");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibrary.dll");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibrary.pdb");
// dependencies should also be copied
publishCommand.GetOutputDirectory().Should().HaveFile("System.Runtime.dll");
publishCommand.Execute().Should().Fail();
}
[WindowsOnlyFact()]
@ -221,16 +215,16 @@ namespace Microsoft.DotNet.Tools.Publish.Tests
var publishCommand = new PublishCommand(lesserTestProject, "net451");
publishCommand.Execute().Should().Pass();
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.exe");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.pdb");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll.config");
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.exe.config");
publishCommand.GetOutputDirectory().Should().NotHaveFile("TestLibraryLesser.deps.json");
// dependencies should also be copied
publishCommand.GetOutputDirectory().Should().HaveFile("Newtonsoft.Json.dll");
publishCommand.GetOutputDirectory().Delete(true);
publishCommand = new PublishCommand(lesserTestProject, "netstandard1.5", RuntimeEnvironmentRidExtensions.GetLegacyRestoreRuntimeIdentifier());
publishCommand = new PublishCommand(lesserTestProject, "netcoreapp1.0", RuntimeEnvironmentRidExtensions.GetLegacyRestoreRuntimeIdentifier());
publishCommand.Execute().Should().Pass();
publishCommand.GetOutputDirectory().Should().HaveFile("TestLibraryLesser.dll");

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

@ -5,15 +5,17 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"Microsoft.DotNet.TestFramework": { "target": "project" },
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.TestFramework": {
"target": "project"
},
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
"xunit": "2.1.0",
"xunit.netcore.extensions": "1.0.0-prerelease-00206",
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027"
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24123-01"
},
"frameworks": {
"netcoreapp1.0": {

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

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
@ -37,4 +37,4 @@
]
}
}
}
}

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

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

2
test/dotnet-run.UnitTests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"dotnet": {
"target": "project"
},

8
test/dotnet-test.Tests/project.json
View file

@ -15,9 +15,9 @@
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
"System.Net.NameResolution": "4.0.0-rc2-24027",
"System.Net.Sockets": "4.1.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Net.NameResolution": "4.0.0-rc3-24123-01",
"System.Net.Sockets": "4.1.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24"
},
@ -44,4 +44,4 @@
]
}
}
}
}

4
test/dotnet-test.UnitTests/project.json
View file

@ -10,7 +10,7 @@
"target": "project"
},
"Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-24027",
"version": "4.0.0-rc3-24123-01",
"exclude": "Compile"
},
"xunit": "2.1.0",
@ -40,4 +40,4 @@
]
}
}
}
}

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

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
@ -56,4 +56,4 @@
]
}
}
}
}