Skip to content

[main] Update dependencies from dotnet/runtime #3865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Sep 14, 2021
Merged

[main] Update dependencies from dotnet/runtime #3865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0220b2d
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Sep 4, 2021
207e981
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Sep 5, 2021
cf28d2a
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Sep 6, 2021
f0f5632
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Sep 7, 2021
28c449f
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Sep 9, 2021
64f4201
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Sep 10, 2021
e378e21
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Sep 11, 2021
097c8c2
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Sep 12, 2021
908b9e3
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Sep 13, 2021
6f590cb
Update ubuntu agent version
bekir-ozturk Sep 13, 2021
74c9647
Listed template types should be ordered on CLI
bekir-ozturk Sep 13, 2021
eb66816
Pin down language order in CLI output
bekir-ozturk Sep 13, 2021
53d5031
Pin down language order in CLI output
bekir-ozturk Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ variables:
- name: _InternalRuntimeDownloadArgs
value: ''

resources:
containers:
- container: LinuxContainer
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-0cd4667-20170319080304

stages:
- stage: build
displayName: Build
Expand Down Expand Up @@ -156,8 +151,8 @@ stages:
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
- job: Linux
pool:
name: Hosted Ubuntu 1604
container: LinuxContainer
name: NetCorePublic-Pool
queue: BuildPool.Ubuntu.1804.Amd64.Open
strategy:
matrix:
debug_configuration:
Expand Down
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,33 @@
<Sha>def2e2c6dc5064319250e2868a041a3dc07f9579</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21453.1">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-alpha.1.21463.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
<Sha>0becd27f728f9e1eeb2a168789418ad4191ade99</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21453.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-alpha.1.21463.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
<Sha>0becd27f728f9e1eeb2a168789418ad4191ade99</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21453.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-alpha.1.21463.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
<Sha>0becd27f728f9e1eeb2a168789418ad4191ade99</Sha>
</Dependency>
<Dependency Name="System.CommandLine" Version="2.0.0-beta1.21417.2">
<Uri>https://github.com/dotnet/command-line-api</Uri>
<Sha>bd9c63c9e74681617fccf2e371cd90f00d01cef7</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="7.0.0-alpha.1.21453.1">
<Dependency Name="Microsoft.Extensions.Logging" Version="7.0.0-alpha.1.21463.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
<Sha>0becd27f728f9e1eeb2a168789418ad4191ade99</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0-alpha.1.21453.1">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0-alpha.1.21463.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
<Sha>0becd27f728f9e1eeb2a168789418ad4191ade99</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-alpha.1.21453.1">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="7.0.0-alpha.1.21463.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>19eba6bcbb1f9b9482c4e01c250cf412a91e882a</Sha>
<Sha>0becd27f728f9e1eeb2a168789418ad4191ade99</Sha>
</Dependency>
<Dependency Name="NuGet.Credentials" Version="6.0.0-preview.4.221">
<Uri>https://github.com/nuget/nuget.client</Uri>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
<NuGetConfigurationPackageVersion>6.0.0-preview.4.221</NuGetConfigurationPackageVersion>
<NuGetProtocolPackageVersion>6.0.0-preview.4.221</NuGetProtocolPackageVersion>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21453.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21453.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21453.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>7.0.0-alpha.1.21453.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>7.0.0-alpha.1.21453.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>7.0.0-alpha.1.21453.1</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-alpha.1.21463.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-alpha.1.21463.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-alpha.1.21463.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>7.0.0-alpha.1.21463.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>7.0.0-alpha.1.21463.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>7.0.0-alpha.1.21463.1</MicrosoftExtensionsLoggingConsolePackageVersion>
<!-- Dependencies from https://github.com/dotnet/clicommandlineparser -->
<MicrosoftDotNetCliCommandLinePackageVersion>1.0.0-preview.19208.1</MicrosoftDotNetCliCommandLinePackageVersion>
<VSRedistCommonNetCoreToolsetx64PackageVersion>7.0.100-alpha.1.21451.23</VSRedistCommonNetCoreToolsetx64PackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.TemplateEngine.Cli/HelpAndUsage/TemplateDetailsDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ private static void ShowTemplateDetailHeaders(IEnumerable<ITemplateInfo> templat

if (languages != null && languages.Any())
{
Reporter.Output.WriteLine($"{preferredTemplate.Name} ({string.Join(", ", languages)})");
Reporter.Output.WriteLine($"{preferredTemplate.Name} ({string.Join(", ", languages.OrderBy(t => t, StringComparer.OrdinalIgnoreCase))})");
}
else
{
Expand Down
7 changes: 5 additions & 2 deletions src/Microsoft.TemplateEngine.Cli/HelpAndUsage/TemplateInformationCoordinator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,9 @@ private static void DisplayHintForOtherLanguages(INewCommandInput commandInput,

string? preferredLanguage =
resolutionResult.UnambiguousTemplateGroupMatchInfo
.TemplatesWithMatchingParametersForPreferredLanguage.First().GetLanguage();
.TemplatesWithMatchingParametersForPreferredLanguage
Copy link
Member

@vlada-shubina vlada-shubina Sep 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not needed. TemplatesWithMatchingParametersForPreferredLanguage should have same language

.OrderBy(t => t.GetLanguage(), StringComparer.OrdinalIgnoreCase)
.First().GetLanguage();

List<string> supportedLanguages = new List<string>();
foreach (string? language in resolutionResult.UnambiguousTemplateGroup.Languages)
Expand All @@ -367,7 +369,8 @@ private static void DisplayHintForOtherLanguages(INewCommandInput commandInput,
}
if (supportedLanguages.Any())
{
string supportedLanguagesStr = string.Join(", ", supportedLanguages.OrderBy(s => s, StringComparer.OrdinalIgnoreCase));
supportedLanguages.Sort(StringComparer.OrdinalIgnoreCase);
string supportedLanguagesStr = string.Join(", ", supportedLanguages);
Reporter.Output.WriteLine(string.Format(LocalizableStrings.TemplateInformationCoordinator_TemplateHelp_Info_HelpForOtherLanguagesHint, supportedLanguagesStr));
Reporter.Output.WriteCommand(
commandInput.HelpCommandExample(resolutionResult.UnambiguousTemplateGroup.ShortNames[0], supportedLanguages.First()));
Expand Down
3 changes: 2 additions & 1 deletion src/Microsoft.TemplateEngine.Cli/TableOutput/TemplateGroupDisplay.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ private static string GetTypesToDisplay(IEnumerable<ITemplateInfo> templateGroup
templates
.Select(template => template.GetTemplateType())
.Where(type => !string.IsNullOrWhiteSpace(type))
.Distinct(StringComparer.OrdinalIgnoreCase)));
.Distinct(StringComparer.OrdinalIgnoreCase)
.OrderBy(type => type, StringComparer.OrdinalIgnoreCase)));
}
return string.Join(environment.NewLine, typesGroups);
}
Expand Down