Skip to content

Commit 0985fab

Browse files
author
Jason Zhai
committed
Merge branch 'release/8.0.3xx' of https://github.com/dotnet/sdk into darc-release/8.0.3xx-7fcd7a06-b653-466e-a262-a7cf56a810ac
2 parents 0e597e1 + 63438a4 commit 0985fab

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<add key="darc-pub-dotnet-templating-99e2f2e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-99e2f2e1-3/nuget/v3/index.json" />
2828
<add key="darc-pub-dotnet-templating-99e2f2e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-99e2f2e1-2/nuget/v3/index.json" />
2929
<add key="darc-pub-dotnet-templating-99e2f2e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-99e2f2e1-1/nuget/v3/index.json" />
30+
<add key="darc-pub-dotnet-templating-6af4b92" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-6af4b921/nuget/v3/index.json" />
3031
<!-- End: Package sources from dotnet-templating -->
3132
<!-- Begin: Package sources from dotnet-windowsdesktop -->
3233
<!-- End: Package sources from dotnet-windowsdesktop -->

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.314">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.315">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>99e2f2e1cbdc89187f45851e09adeb4d3a7483fa</Sha>
6+
<Sha>6af4b92156dae4b43b081d9e080908dd9cdfeb35</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.314-servicing.25266.2">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="8.0.315-servicing.25304.1">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>99e2f2e1cbdc89187f45851e09adeb4d3a7483fa</Sha>
10+
<Sha>6af4b92156dae4b43b081d9e080908dd9cdfeb35</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.314-servicing.25266.2">
12+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="8.0.315-servicing.25304.1">
1313
<Uri>https://github.com/dotnet/templating</Uri>
14-
<Sha>99e2f2e1cbdc89187f45851e09adeb4d3a7483fa</Sha>
14+
<Sha>6af4b92156dae4b43b081d9e080908dd9cdfeb35</Sha>
1515
<SourceBuild RepoName="templating" ManagedOnly="true" />
1616
</Dependency>
1717
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.16">
@@ -354,9 +354,9 @@
354354
<Sha>16bcad1c13be082bd52ce178896d1119a73081a9</Sha>
355355
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
356356
</Dependency>
357-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25210.2">
357+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25269.2">
358358
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
359-
<Sha>6ae07097c0f03eb59c8a581faaedcc3f2e4cc42c</Sha>
359+
<Sha>cee2d057118e3ad3c58a72a23271ad88b87d4d4d</Sha>
360360
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
361361
</Dependency>
362362
<Dependency Name="Microsoft.Deployment.DotNet.Releases" Version="2.0.0-rtm.1.25064.1">

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212
<!-- Repo Version Information -->
1313
<PropertyGroup>
14-
<VersionPrefix>8.0.314</VersionPrefix>
14+
<VersionPrefix>8.0.315</VersionPrefix>
1515
<WorkloadsFeatureBand>8.0.300</WorkloadsFeatureBand>
1616
<!-- Enable to remove prerelease label. -->
1717
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
@@ -141,13 +141,13 @@
141141
</PropertyGroup>
142142
<PropertyGroup>
143143
<!-- Dependencies from https://github.com/dotnet/templating -->
144-
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.314</MicrosoftTemplateEngineAbstractionsPackageVersion>
144+
<MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.315</MicrosoftTemplateEngineAbstractionsPackageVersion>
145145
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
146146
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
147147
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
148148
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
149149
<!-- test dependencies -->
150-
<MicrosoftTemplateEngineMocksPackageVersion>8.0.314-servicing.25266.2</MicrosoftTemplateEngineMocksPackageVersion>
150+
<MicrosoftTemplateEngineMocksPackageVersion>8.0.315-servicing.25304.1</MicrosoftTemplateEngineMocksPackageVersion>
151151
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
152152
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
153153
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>

src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ private static void DisplayResultsForPack(
190190
.ThenBy(d => d.TemplateGroupInfo.Name, StringComparer.CurrentCultureIgnoreCase))
191191
.DefineColumn(r => r.TemplateGroupInfo.Name, out object? nameColumn, LocalizableStrings.ColumnNameTemplateName, showAlways: true, shrinkIfNeeded: true, minWidth: 15)
192192
.DefineColumn(r => r.TemplateGroupInfo.ShortNames, LocalizableStrings.ColumnNameShortName, showAlways: true)
193-
.DefineColumn(r => r.TemplateGroupInfo.Author, LocalizableStrings.ColumnNameAuthor, TabularOutputSettings.ColumnNames.Author, defaultColumn: false, shrinkIfNeeded: true, minWidth: 10)
193+
.DefineColumn(r => r.TemplateGroupInfo.Author, LocalizableStrings.ColumnNameAuthor, TabularOutputSettings.ColumnNames.Author, defaultColumn: false, shrinkIfNeeded: true, minWidth: 12)
194194
.DefineColumn(r => r.TemplateGroupInfo.Languages, LocalizableStrings.ColumnNameLanguage, TabularOutputSettings.ColumnNames.Language, defaultColumn: true)
195195
.DefineColumn(r => r.TemplateGroupInfo.Type, LocalizableStrings.ColumnNameType, TabularOutputSettings.ColumnNames.Type, defaultColumn: false)
196196
.DefineColumn(r => r.TemplateGroupInfo.Classifications, LocalizableStrings.ColumnNameTags, TabularOutputSettings.ColumnNames.Tags, defaultColumn: false, shrinkIfNeeded: true, minWidth: 10)

0 commit comments

Comments
 (0)