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

Merge branch 'release/2.0.0' into merge_release_200_into_master

Browse source 
* release/2.0.0:
  Fixing tests to look for 1.1.2.
  Updating the backwards compatible runtime to 1.1.2.
  Updating the SDK to one that carries updated versions of the implicit 1.0 versions.
  Update to SetupCrossgen 92 - Coherence 24937
  Update to SetupCrossgen 86 - Coherence 24920
  Fix date on package version
  Update templates to 222
  Update SetupCrossgen to build 82
  Update SetupCrossgen to build 80
  Update SetupCrossgen to build 77
This commit is contained in:
Livar Cunha 2017-05-09 20:51:32 -07:00
commit b51920d212
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/BackwardsCompatibilityRuntimes.props
View file

@ -1,7 +1,7 @@
<Project>
<PropertyGroup Condition=" '$(IncludeSharedFrameworksForBackwardsCompatibilityTests)' == 'true' ">
<BackwardsCompatibility110CoreSetupChannel>release/1.1.0</BackwardsCompatibility110CoreSetupChannel>
<BackwardsCompatibility110SharedFrameworkVersion>1.1.1</BackwardsCompatibility110SharedFrameworkVersion>
<BackwardsCompatibility110SharedFrameworkVersion>1.1.2</BackwardsCompatibility110SharedFrameworkVersion>
<BackwardsCompatibility110SharedHostVersion>1.1.0</BackwardsCompatibility110SharedHostVersion>
<BackwardsCompatibility110HostFxrVersion>1.1.0</BackwardsCompatibility110HostFxrVersion>

8
build/DependencyVersions.props
View file

@ -12,14 +12,14 @@
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>
<HostFxrVersion>$(CLI_SharedFrameworkVersion)</HostFxrVersion>
<TemplateEngineVersion>1.0.0-beta2-20170503-217</TemplateEngineVersion>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170504-221</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170504-221</TemplateEngineTemplate2_0Version>
<TemplateEngineTemplateVersion>1.0.0-beta2-20170505-222</TemplateEngineTemplateVersion>
<TemplateEngineTemplate2_0Version>1.0.0-beta2-20170505-222</TemplateEngineTemplate2_0Version>
<PlatformAbstractionsVersion>2.0.0-preview2-002093</PlatformAbstractionsVersion>
<DependencyModelVersion>2.0.0-preview2-002093</DependencyModelVersion>
<CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
<CliMigrateVersion>1.2.1-alpha-002130</CliMigrateVersion>
<AspNetCoreRuntimeVersion>2.0.0-preview1-65</AspNetCoreRuntimeVersion>
<AspNetCoreRuntimeVersion>2.0.0-preview1-92</AspNetCoreRuntimeVersion>
<!-- This should either be timestamped or notimestamp as appropriate -->
<AspNetCoreRuntimePackageFlavor>notimestamp</AspNetCoreRuntimePackageFlavor>

4
test/dotnet.Tests/PackagedCommandTests.cs
View file

@ -162,7 +162,7 @@ namespace Microsoft.DotNet.Tests
.Execute(toolPrefersCLIRuntime ? "portable-v1-prefercli" : "portable-v1");
result.Should().Pass()
.And.HaveStdOutContaining("I'm running on shared framework version 1.1.1!");
.And.HaveStdOutContaining("I'm running on shared framework version 1.1.2!");
}
@ -215,7 +215,7 @@ namespace Microsoft.DotNet.Tests
.Execute("portable-v1");
result.Should().Pass()
.And.HaveStdOutContaining("I'm running on shared framework version 1.1.1!");
.And.HaveStdOutContaining("I'm running on shared framework version 1.1.2!");
}
[Fact]