Skip to content

Commit f7b594e

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into darc-release/9.0.3xx-5b2adbf3-fda2-46c5-a996-73d5a890479e
2 parents c0d1164 + 75a7016 commit f7b594e

File tree

5 files changed

+22
-28
lines changed

5 files changed

+22
-28
lines changed

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<add key="darc-pub-dotnet-templating-bbcd6b0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bbcd6b04/nuget/v3/index.json" />
3838
<add key="darc-pub-dotnet-templating-bbcd6b0-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bbcd6b04-2/nuget/v3/index.json" />
3939
<add key="darc-pub-dotnet-templating-bbcd6b0-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-bbcd6b04-1/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-69726ce" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-69726ce0/nuget/v3/index.json" />
4041
<!-- End: Package sources from dotnet-templating -->
4142
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4243
<!-- 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,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.301">
4+
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.302">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>bbcd6b04b6aea3d3023ae0d5b65535ca0506b352</Sha>
6+
<Sha>69726ce02bdfdfafec8e99ed3f19a7519b1413be</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.301-servicing.25268.7">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.302-servicing.25304.8">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>bbcd6b04b6aea3d3023ae0d5b65535ca0506b352</Sha>
10+
<Sha>69726ce02bdfdfafec8e99ed3f19a7519b1413be</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
1313
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.300-preview.25209.5">
@@ -597,14 +597,14 @@
597597
<Uri>https://github.com/dotnet/arcade-services</Uri>
598598
<Sha>47e3672c762970073e4282bd563233da86bcca3e</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25266.2">
600+
<Dependency Name="Microsoft.DotNet.ScenarioTests.SdkTemplateTests" Version="9.0.0-preview.25269.1">
601601
<Uri>https://github.com/dotnet/scenario-tests</Uri>
602-
<Sha>a11e0d6f227feb7d0e2b619b48556d041237e59c</Sha>
602+
<Sha>5c769be3733c4ffa543fc7e7ec5fadd4fa8f8c9e</Sha>
603603
</Dependency>
604604
<!-- Intermediate is necessary for source build. -->
605-
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25266.2">
605+
<Dependency Name="Microsoft.SourceBuild.Intermediate.scenario-tests" Version="9.0.0-preview.25269.1">
606606
<Uri>https://github.com/dotnet/scenario-tests</Uri>
607-
<Sha>a11e0d6f227feb7d0e2b619b48556d041237e59c</Sha>
607+
<Sha>5c769be3733c4ffa543fc7e7ec5fadd4fa8f8c9e</Sha>
608608
<SourceBuild RepoName="scenario-tests" ManagedOnly="true" />
609609
</Dependency>
610610
<!--

‎eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>3</VersionSDKMinor>
9-
<VersionFeature>01</VersionFeature>
9+
<VersionFeature>02</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -189,13 +189,13 @@
189189
</PropertyGroup>
190190
<PropertyGroup>
191191
<!-- Dependencies from https://github.com/dotnet/templating -->
192-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.301</MicrosoftTemplateEngineAbstractionsPackageVersion>
192+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.302</MicrosoftTemplateEngineAbstractionsPackageVersion>
193193
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
194194
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
195195
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
196196
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
197197
<!-- test dependencies -->
198-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.301-servicing.25268.7</MicrosoftTemplateEngineMocksPackageVersion>
198+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.302-servicing.25304.8</MicrosoftTemplateEngineMocksPackageVersion>
199199
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
200200
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
201201
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -263,7 +263,7 @@
263263
<PropertyGroup Label="Infrastructure and test only dependencies">
264264
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
265265
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
266-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25266.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
266+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.25269.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
267267
</PropertyGroup>
268268
<PropertyGroup Label="Manually updated">
269269
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

‎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)

‎src/SourceBuild/content/eng/pipelines/pr.yml renamed to ‎src/SourceBuild/content/eng/pipelines/sb-pr.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
1-
# This yml is used by these PR pipelines and triggers:
2-
# NOTE: the triggers are defined in the Azure DevOps UI as they are too complex
3-
#
4-
# - dotnet-source-build (public)
5-
# https://dev.azure.com/dnceng-public/public/_build?definitionId=240
6-
# - PR: ultralite build
7-
# - CI: release/* only, every batched commit, full build
8-
# - Schedule: main only, full build
9-
#
10-
# - dotnet-unified-build (public)
11-
# https://dev.azure.com/dnceng-public/public/_build?definitionId=278
12-
# - PR: lite build
13-
# - CI: release/* only, every batched commit, full build
14-
# - Schedule: main only, full build
15-
#
1+
# This is the non-1ES PR pipeline for dotnet/dotnet
2+
# https://dev.azure.com/dnceng-public/public/_build?definitionId=240
3+
trigger: none
4+
pr:
5+
branches:
6+
include:
7+
- release/9.0.3xx
8+
- internal/release/9.0.3xx
169

1710
variables:
1811
# enable source-only build for pipelines that contain the -source-build string

0 commit comments

Comments
 (0)