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

[release/5.0.1xx-preview2] Update dependencies from dotnet/templating (#6819)

Browse source 
* Update dependencies from https://github.com/dotnet/templating build 20200314.2

- Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.2.20164.2

* Update dependencies from https://github.com/dotnet/templating build 20200314.4

- Microsoft.DotNet.Common.ItemTemplates - 5.0.0-preview.2.20164.4

* Update template tests

* Concat net tfms instead of replacing

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2020-03-15 13:14:26 +00:00 committed by GitHub
parent b5bccca3f5
commit e99dc08b36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -79,9 +79,9 @@
<Uri>https://github.com/dotnet/test-templates</Uri> <Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>e8e924b5937e75ab3049d57cb5fb196ea2e3332c</Sha> <Sha>e8e924b5937e75ab3049d57cb5fb196ea2e3332c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-preview.2.20151.1"> <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="5.0.0-preview.2.20164.4">
<Uri>https://github.com/dotnet/templating</Uri> <Uri>https://github.com/dotnet/templating</Uri>
<Sha>f15388ee6e45a8923fba0f54f55154aee991fb84</Sha> <Sha>bd8fc17967503221519906c76546192e14fcdfa8</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.2.20162.8"> <Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.2.20162.8">
<Uri>https://github.com/dotnet/sdk</Uri> <Uri>https://github.com/dotnet/sdk</Uri>

2
eng/Versions.props
View file

@ -25,7 +25,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating --> <!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-preview.2.20151.1</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>5.0.0-preview.2.20164.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates --> <!-- Dependency from https://github.com/dotnet/test-templates -->

10
test/EndToEnd/GivenSelfContainedAppsRollForward.cs
View file

@ -1,9 +1,6 @@
using System; using System;
using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Xml.Linq; using System.Xml.Linq;
using FluentAssertions; using FluentAssertions;
using Microsoft.DotNet.TestFramework; using Microsoft.DotNet.TestFramework;
@ -157,7 +154,7 @@ namespace EndToEnd
.Element(ns + "TargetFramework") .Element(ns + "TargetFramework")
.Value; .Value;
SupportedNetCoreAppVersions.Versions.Select(v => $"netcoreapp{v}") TargetFrameworkHelper.GetNetAppTargetFrameworks(SupportedNetCoreAppVersions.Versions)
.Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " + .Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " +
"of .NET Core created by \"dotnet new\""); "of .NET Core created by \"dotnet new\"");
} }
@ -184,12 +181,9 @@ namespace EndToEnd
.Element(ns + "TargetFramework") .Element(ns + "TargetFramework")
.Value; .Value;
SupportedAspNetCoreVersions.Versions.Select(v => $"netcoreapp{v}") TargetFrameworkHelper.GetNetAppTargetFrameworks(SupportedAspNetCoreVersions.Versions)
.Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreVersions)} should include the default version " + .Should().Contain(targetFramework, $"the {nameof(SupportedAspNetCoreVersions)} should include the default version " +
"of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\""); "of Microsoft.AspNetCore.App used by the templates created by \"dotnet new web\"");
} }
} }
} }

57
test/EndToEnd/SupportedNetCoreAppVersions.cs
View file

@ -2,33 +2,34 @@
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Xunit;
namespace EndToEnd namespace EndToEnd
{ {
public static class TargetFrameworkHelper
{
private static Version _firstNetAppVersion = new Version(5, 0);
public static IEnumerable<string> GetNetAppTargetFrameworks(IEnumerable<string> versions) =>
versions.Select(v => $"netcoreapp{v}")
// Add netX.X tfms starting with 5.0
.Concat(versions.Where(v => Version.Parse(v) >= _firstNetAppVersion).Select(v => $"net{v}"));
}
public class SupportedNetCoreAppVersions : IEnumerable<object[]> public class SupportedNetCoreAppVersions : IEnumerable<object[]>
{ {
public IEnumerator<object[]> GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator(); public IEnumerator<object[]> GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
public static IEnumerable<string> Versions public static IEnumerable<string> Versions => new[]
{ {
get "1.0",
{ "1.1",
return new[] "2.0",
{ "2.1",
"1.0", "2.2",
"1.1", "3.0",
"2.0", "3.1",
"2.1", "5.0"
"2.2", };
"3.0",
"3.1",
"5.0"
};
}
}
} }
public class SupportedAspNetCoreVersions : IEnumerable<object[]> public class SupportedAspNetCoreVersions : IEnumerable<object[]>
@ -36,13 +37,8 @@ namespace EndToEnd
public IEnumerator<object[]> GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator(); public IEnumerator<object[]> GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
public static IEnumerable<string> Versions public static IEnumerable<string> Versions =>
{ SupportedNetCoreAppVersions.Versions.Except(new List<string>() { "1.0", "1.1", "2.0" });
get
{
return SupportedNetCoreAppVersions.Versions.Except(new List<string>() { "1.0", "1.1", "2.0" });
}
}
} }
public class SupportedAspNetCoreAllVersions : IEnumerable<object[]> public class SupportedAspNetCoreAllVersions : IEnumerable<object[]>
@ -50,12 +46,7 @@ namespace EndToEnd
public IEnumerator<object[]> GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator(); public IEnumerator<object[]> GetEnumerator() => Versions.Select(version => new object[] { version }).GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => GetEnumerator(); IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
public static IEnumerable<string> Versions public static IEnumerable<string> Versions =>
{ SupportedAspNetCoreVersions.Versions.Where(v => new Version(v).Major < 3);
get
{
return SupportedAspNetCoreVersions.Versions.Where(v => new Version(v).Major < 3);
}
}
} }
} }