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

Move to CoreFX build rc2-23901

Browse source 
Update .exe's project.json Target Framework from dnxcore50 to netstandardapp1.5.
Update .dll's project.json Target Framework from dnxcore50 to netstandard1.3.

Adding workaround for DataContractSerialization to src\dotnet\project.json to fix crossgen issue.
Build 23901 has a dependency issue that doesn't allow the runtime.any.System.Private.DataContractSerialization
package to be restored. When we move to a new build of CoreFX we should take this workaround out.
This commit is contained in:
Eric Erhardt 2016-03-01 17:35:32 -06:00
parent 78dbbfc83d
commit 6468b14e1d
105 changed files with 457 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

14
test/dotnet-compile.UnitTests/GivenThatICareAboutScriptVariablesFromAManagedCompiler.cs
View file

@ -28,14 +28,14 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
public void It_passes_a_FullTargetFramework_variable_to_the_pre_compile_scripts()
{
_fixture.PreCompileScriptVariables.Should().ContainKey("compile:FullTargetFramework");
_fixture.PreCompileScriptVariables["compile:FullTargetFramework"].Should().Be("dnxcore,Version=v5.0");
_fixture.PreCompileScriptVariables["compile:FullTargetFramework"].Should().Be(".NETStandardApp,Version=v1.5");
}
[Fact]
public void It_passes_a_TargetFramework_variable_to_the_pre_compile_scripts()
{
_fixture.PreCompileScriptVariables.Should().ContainKey("compile:TargetFramework");
_fixture.PreCompileScriptVariables["compile:TargetFramework"].Should().Be("dnxcore50");
_fixture.PreCompileScriptVariables["compile:TargetFramework"].Should().Be("netstandardapp1.5");
}
[Fact]
@ -80,14 +80,14 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
public void It_passes_a_FullTargetFramework_variable_to_the_post_compile_scripts()
{
_fixture.PostCompileScriptVariables.Should().ContainKey("compile:FullTargetFramework");
_fixture.PostCompileScriptVariables["compile:FullTargetFramework"].Should().Be("dnxcore,Version=v5.0");
_fixture.PostCompileScriptVariables["compile:FullTargetFramework"].Should().Be(".NETStandardApp,Version=v1.5");
}
[Fact]
public void It_passes_a_TargetFramework_variable_to_the_post_compile_scripts()
{
_fixture.PostCompileScriptVariables.Should().ContainKey("compile:TargetFramework");
_fixture.PostCompileScriptVariables["compile:TargetFramework"].Should().Be("dnxcore50");
_fixture.PostCompileScriptVariables["compile:TargetFramework"].Should().Be("netstandardapp1.5");
}
[Fact]
@ -151,7 +151,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
TestAssetPath,
"bin",
ConfigValue,
"dnxcore50");
"netstandardapp1.5");
public string RuntimeOutputDir { get; private set; }
@ -161,7 +161,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
TestAssetPath,
"obj",
ConfigValue,
"dnxcore50",
"netstandardapp1.5",
"dotnet-compile.rsp");
public Dictionary<string, string> PreCompileScriptVariables { get; private set; }
@ -218,7 +218,7 @@ namespace Microsoft.DotNet.Tools.Compiler.Tests
rids.Add(rid);
}
var context = ProjectContext.Create(projectJson, new NuGetFramework("dnxcore", new Version(5, 0)), rids);
var context = ProjectContext.Create(projectJson, new NuGetFramework(".NETStandardApp", new Version(1, 5)), rids);
managedCompiler.Compile(context, _args);
RuntimeOutputDir = Path.Combine(OutputPath, rid);