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

[master] Update dependencies from dotnet/templating (#6811)

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

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

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

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

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

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

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

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

* Change the test accordingly

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

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: William Li <wul@microsoft.com>
This commit is contained in:
dotnet-maestro[bot] 2020-03-20 12:34:30 +00:00 committed by GitHub
parent 35962621c2
commit 280735abb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -71,9 +71,9 @@
<Uri>https://github.com/dotnet/test-templates</Uri>
<Sha>e8e924b5937e75ab3049d57cb5fb196ea2e3332c</Sha>
</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.3.20169.1">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>f15388ee6e45a8923fba0f54f55154aee991fb84</Sha>
<Sha>c3f88f3471bb22c489784faf5a84e44263f4f994</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.3.20160.12">
<Uri>https://github.com/dotnet/sdk</Uri>

2
eng/Versions.props
View file

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

2
test/EndToEnd/GivenSelfContainedAppsRollForward.cs
View file

@ -157,7 +157,7 @@ namespace EndToEnd
.Element(ns + "TargetFramework")
.Value;
SupportedNetCoreAppVersions.Versions.Select(v => $"netcoreapp{v}")
SupportedNetCoreAppVersions.TargetFrameworkShortFolderVersion
.Should().Contain(targetFramework, $"the {nameof(SupportedNetCoreAppVersions)}.{nameof(SupportedNetCoreAppVersions.Versions)} property should include the default version " +
"of .NET Core created by \"dotnet new\"");
}

21
test/EndToEnd/SupportedNetCoreAppVersions.cs
View file

@ -28,7 +28,26 @@ namespace EndToEnd
}
}
public static IEnumerable<string> TargetFrameworkShortFolderVersion
{
get
{
var targetFrameworkShortFolderVersion = new List<string>();
foreach (var v in Versions)
{
if (Version.Parse(v).Major >= 5)
{
targetFrameworkShortFolderVersion.Add($"net{v}");
}
else
{
targetFrameworkShortFolderVersion.Add($"netcoreapp{v}");
}
}
return targetFrameworkShortFolderVersion;
}
}
}
public class SupportedAspNetCoreVersions : IEnumerable<object[]>