Skip to content

Commit 9fe8275

Browse files
marcpopMSFTmarcpopMSFT
authored
Merge branch 'release/9.0.1xx' into darc-release/9.0.1xx-4f058e92-0806-45b7-9409-f812ae64a185
2 parents d8a50e5 + 3f1d7f7 commit 9fe8275

File tree

7 files changed

+82
-71
lines changed

7 files changed

+82
-71
lines changed

‎eng/Version.Details.xml

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -143,74 +143,74 @@
143143
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
144144
<Sha>ed74665e773dd1ebea3289c5662d71c590305932</Sha>
145145
</Dependency>
146-
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.12.4-rc.1">
146+
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.12.4-rc.9">
147147
<Uri>https://github.com/nuget/nuget.client</Uri>
148-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
148+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
149149
</Dependency>
150-
<Dependency Name="NuGet.Build.Tasks" Version="6.12.4-rc.1">
150+
<Dependency Name="NuGet.Build.Tasks" Version="6.12.4-rc.9">
151151
<Uri>https://github.com/nuget/nuget.client</Uri>
152-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
152+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
153153
<SourceBuildTarball RepoName="nuget-client" ManagedOnly="true" />
154154
</Dependency>
155-
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.12.4-rc.1">
155+
<Dependency Name="NuGet.Build.Tasks.Console" Version="6.12.4-rc.9">
156156
<Uri>https://github.com/nuget/nuget.client</Uri>
157-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
157+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
158158
</Dependency>
159-
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.12.4-rc.1">
159+
<Dependency Name="NuGet.Build.Tasks.Pack" Version="6.12.4-rc.9">
160160
<Uri>https://github.com/nuget/nuget.client</Uri>
161-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
161+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
162162
</Dependency>
163-
<Dependency Name="NuGet.Commands" Version="6.12.4-rc.1">
163+
<Dependency Name="NuGet.Commands" Version="6.12.4-rc.9">
164164
<Uri>https://github.com/nuget/nuget.client</Uri>
165-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
165+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
166166
</Dependency>
167-
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.12.4-rc.1">
167+
<Dependency Name="NuGet.CommandLine.XPlat" Version="6.12.4-rc.9">
168168
<Uri>https://github.com/nuget/nuget.client</Uri>
169-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
169+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
170170
</Dependency>
171-
<Dependency Name="NuGet.Common" Version="6.12.4-rc.1">
171+
<Dependency Name="NuGet.Common" Version="6.12.4-rc.9">
172172
<Uri>https://github.com/nuget/nuget.client</Uri>
173-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
173+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
174174
</Dependency>
175-
<Dependency Name="NuGet.Configuration" Version="6.12.4-rc.1">
175+
<Dependency Name="NuGet.Configuration" Version="6.12.4-rc.9">
176176
<Uri>https://github.com/nuget/nuget.client</Uri>
177-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
177+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
178178
</Dependency>
179-
<Dependency Name="NuGet.Credentials" Version="6.12.4-rc.1">
179+
<Dependency Name="NuGet.Credentials" Version="6.12.4-rc.9">
180180
<Uri>https://github.com/nuget/nuget.client</Uri>
181-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
181+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
182182
</Dependency>
183-
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.12.4-rc.1">
183+
<Dependency Name="NuGet.DependencyResolver.Core" Version="6.12.4-rc.9">
184184
<Uri>https://github.com/nuget/nuget.client</Uri>
185-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
185+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
186186
</Dependency>
187-
<Dependency Name="NuGet.Frameworks" Version="6.12.4-rc.1">
187+
<Dependency Name="NuGet.Frameworks" Version="6.12.4-rc.9">
188188
<Uri>https://github.com/nuget/nuget.client</Uri>
189-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
189+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
190190
</Dependency>
191-
<Dependency Name="NuGet.LibraryModel" Version="6.12.4-rc.1">
191+
<Dependency Name="NuGet.LibraryModel" Version="6.12.4-rc.9">
192192
<Uri>https://github.com/nuget/nuget.client</Uri>
193-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
193+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
194194
</Dependency>
195-
<Dependency Name="NuGet.ProjectModel" Version="6.12.4-rc.1">
195+
<Dependency Name="NuGet.ProjectModel" Version="6.12.4-rc.9">
196196
<Uri>https://github.com/nuget/nuget.client</Uri>
197-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
197+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
198198
</Dependency>
199-
<Dependency Name="NuGet.Protocol" Version="6.12.4-rc.1">
199+
<Dependency Name="NuGet.Protocol" Version="6.12.4-rc.9">
200200
<Uri>https://github.com/nuget/nuget.client</Uri>
201-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
201+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
202202
</Dependency>
203-
<Dependency Name="NuGet.Packaging" Version="6.12.4-rc.1">
203+
<Dependency Name="NuGet.Packaging" Version="6.12.4-rc.9">
204204
<Uri>https://github.com/nuget/nuget.client</Uri>
205-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
205+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
206206
</Dependency>
207-
<Dependency Name="NuGet.Versioning" Version="6.12.4-rc.1">
207+
<Dependency Name="NuGet.Versioning" Version="6.12.4-rc.9">
208208
<Uri>https://github.com/nuget/nuget.client</Uri>
209-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
209+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
210210
</Dependency>
211-
<Dependency Name="NuGet.Localization" Version="6.12.4-rc.1">
211+
<Dependency Name="NuGet.Localization" Version="6.12.4-rc.9">
212212
<Uri>https://github.com/nuget/nuget.client</Uri>
213-
<Sha>95a470a557091cdbdc9f68a178b60bd19329942c</Sha>
213+
<Sha>42bfb4554167e1d2fc2b950728d9bd8164f806c1</Sha>
214214
</Dependency>
215215
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.12.0-release-24508-01">
216216
<Uri>https://github.com/microsoft/vstest</Uri>
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25263.2">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
594+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25263.2">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25302.2">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
598+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25263.2">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25302.2">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
602+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25263.2">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25302.2">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
606+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25263.2">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25302.2">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
610+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25263.2">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25302.2">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
614+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25263.2">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25302.2">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
619+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.5">

‎eng/Versions.props

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>1</VersionSDKMinor>
9-
<VersionFeature>07</VersionFeature>
9+
<VersionFeature>08</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. -->
@@ -137,18 +137,18 @@
137137
</PropertyGroup>
138138
<PropertyGroup>
139139
<!-- Dependencies from https://github.com/nuget/nuget.client -->
140-
<NuGetBuildTasksPackageVersion>6.12.4-rc.1</NuGetBuildTasksPackageVersion>
141-
<NuGetBuildTasksConsolePackageVersion>6.12.4-rc.1</NuGetBuildTasksConsolePackageVersion>
142-
<NuGetLocalizationPackageVersion>6.12.4-rc.1</NuGetLocalizationPackageVersion>
143-
<NuGetBuildTasksPackPackageVersion>6.12.4-rc.1</NuGetBuildTasksPackPackageVersion>
144-
<NuGetCommandLineXPlatPackageVersion>6.12.4-rc.1</NuGetCommandLineXPlatPackageVersion>
145-
<NuGetProjectModelPackageVersion>6.12.4-rc.1</NuGetProjectModelPackageVersion>
146-
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.4-rc.1</MicrosoftBuildNuGetSdkResolverPackageVersion>
147-
<NuGetCommonPackageVersion>6.12.4-rc.1</NuGetCommonPackageVersion>
148-
<NuGetConfigurationPackageVersion>6.12.4-rc.1</NuGetConfigurationPackageVersion>
149-
<NuGetFrameworksPackageVersion>6.12.4-rc.1</NuGetFrameworksPackageVersion>
150-
<NuGetPackagingPackageVersion>6.12.4-rc.1</NuGetPackagingPackageVersion>
151-
<NuGetVersioningPackageVersion>6.12.4-rc.1</NuGetVersioningPackageVersion>
140+
<NuGetBuildTasksPackageVersion>6.12.4-rc.9</NuGetBuildTasksPackageVersion>
141+
<NuGetBuildTasksConsolePackageVersion>6.12.4-rc.9</NuGetBuildTasksConsolePackageVersion>
142+
<NuGetLocalizationPackageVersion>6.12.4-rc.9</NuGetLocalizationPackageVersion>
143+
<NuGetBuildTasksPackPackageVersion>6.12.4-rc.9</NuGetBuildTasksPackPackageVersion>
144+
<NuGetCommandLineXPlatPackageVersion>6.12.4-rc.9</NuGetCommandLineXPlatPackageVersion>
145+
<NuGetProjectModelPackageVersion>6.12.4-rc.9</NuGetProjectModelPackageVersion>
146+
<MicrosoftBuildNuGetSdkResolverPackageVersion>6.12.4-rc.9</MicrosoftBuildNuGetSdkResolverPackageVersion>
147+
<NuGetCommonPackageVersion>6.12.4-rc.9</NuGetCommonPackageVersion>
148+
<NuGetConfigurationPackageVersion>6.12.4-rc.9</NuGetConfigurationPackageVersion>
149+
<NuGetFrameworksPackageVersion>6.12.4-rc.9</NuGetFrameworksPackageVersion>
150+
<NuGetPackagingPackageVersion>6.12.4-rc.9</NuGetPackagingPackageVersion>
151+
<NuGetVersioningPackageVersion>6.12.4-rc.9</NuGetVersioningPackageVersion>
152152
</PropertyGroup>
153153
<PropertyGroup>
154154
<!-- Dependencies from https://github.com/Microsoft/vstest -->
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25263.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25263.2</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25263.2</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25263.2</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25302.2</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25302.2</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25302.2</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/core-templates/post-build/post-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ parameters:
4444
displayName: Publish installers and checksums
4545
type: boolean
4646
default: true
47+
48+
- name: requireDefaultChannels
49+
displayName: Fail the build if there are no default channel(s) registrations for the current build
50+
type: boolean
51+
default: false
4752

4853
- name: SDLValidationParameters
4954
type: object
@@ -312,5 +317,6 @@ stages:
312317
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
313318
-AzdoToken '$(System.AccessToken)'
314319
-WaitPublishingFinish true
320+
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
315321
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
316322
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

‎eng/common/post-build/publish-using-darc.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ param(
55
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
66
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
77
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
8-
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
8+
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
9+
[Parameter(Mandatory=$false)][string] $RequireDefaultChannels
910
)
1011

1112
try {
@@ -33,6 +34,10 @@ try {
3334
if ("false" -eq $WaitPublishingFinish) {
3435
$optionalParams.Add("--no-wait") | Out-Null
3536
}
37+
38+
if ("true" -eq $RequireDefaultChannels) {
39+
$optionalParams.Add("--default-channels-required") | Out-Null
40+
}
3641

3742
& $darc add-build-to-channel `
3843
--id $buildId `

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.105",
3+
"dotnet": "9.0.106",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25263.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎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/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->
31-
<MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
31+
<MicrosoftBuildVersion>17.8.29</MicrosoftBuildVersion>
3232
<!-- runtime dependencies -->
3333
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
3434
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0</MicrosoftExtensionsLoggingConsoleVersion>

0 commit comments

Comments
 (0)