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

Merge branch 'release/2.1.3xx-MSRC' into release/2.1.3xx

Browse source 
* release/2.1.3xx-MSRC:
  Updates asp.net versions to match prodcon
  Change the implicit asp.net core version for FDD apps to be pinned as 2.1.1.
  Update expected versions to 2.1.2
  Disable NewProjectRestoresCorrectPackageVersion "console" test for now.
  Update the version for 'microsoft.netcore.app' to "2.1.1*"
  Pass "PB_AssetRootUrl" explictly on the MSBuild call; we are looking for Microsoft.NETCore.App "2.1.0" or "2.1.1*"
  Merged PR 126122: Fix alpine file ownership issues with newer docker
  Fix mismatch of dotnet-watch with package variable name
  Set package versions for bundled aspnet tools separately from the metapackage version
  Split the version of Microsoft.AspNetCore.DeveloperCertificates.XPlat into a separate variable
  Fixup myget feed for aspnetcore
  Upgrade to aspnetcore 2.1.1-rtm-30818 and react to file name change
  Updated Version.props
This commit is contained in:
Peter Huene 2018-07-10 10:43:47 -07:00
commit 6c411e824b
No known key found for this signature in database
GPG key ID: E1D265D820213D6A
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/EndToEnd/GivenAspNetAppsResolveImplicitVersions.cs
View file

@ -16,8 +16,10 @@ namespace EndToEnd
{
private const string AspNetTestProject = "TestWebAppSimple";
private const string PinnedAspNetCoreImplicitVersion = "2.1.1";
[Fact]
public void PortablePublishWithLatestTFMUsesBundledAspNetCoreAppVersion()
public void PortablePublishWithLatestTFMUsesPinnedDownAspNetCoreAppVersion()
{
var _testInstance = TestAssets.Get(AspNetTestProject)
.CreateInstance(identifier: LatestSupportedAspNetCoreAppVersion)
@ -48,10 +50,7 @@ namespace EndToEnd
var restoredVersion = GetAspNetCoreAppVersion(assetsFile, portable: true);
restoredVersion.Should().NotBeNull();
var bundledVersionPath = Path.Combine(projectDirectory, ".BundledAspNetCoreVersion");
var bundledVersion = File.ReadAllText(bundledVersionPath).Trim();
restoredVersion.ToNormalizedString().Should().BeEquivalentTo(bundledVersion,
restoredVersion.ToNormalizedString().Should().BeEquivalentTo(PinnedAspNetCoreImplicitVersion,
"The bundled aspnetcore versions set in Microsoft.NETCoreSdk.BundledVersions.props should be idenitical to the versions set in DependencyVersions.props." +
"Please update MSBuildExtensions.targets in this repo so these versions match.");
}

2
test/Microsoft.DotNet.Cli.Utils.Tests/GivenAProjectToolsCommandResolver.cs
View file

@ -304,7 +304,7 @@ namespace Microsoft.DotNet.Tests
result.Should().NotBeNull();
result.Args.Should().Contain("--fx-version 2.1.1");
result.Args.Should().Contain("--fx-version 2.1.2");
}
[Fact]

2
test/dotnet-new.Tests/GivenThatIWantANewApp.cs
View file

@ -106,7 +106,7 @@ namespace Microsoft.DotNet.New.Tests
var sharedFxDir = dotnetDir
.GetDirectory("shared", "Microsoft.NETCore.App")
.EnumerateDirectories()
.Single(d => d.Name.StartsWith("2.1.1"));
.Single(d => d.Name.StartsWith("2.1.2"));
if (packageName == "microsoft.netcore.app")
{