diff --git a/NuGet.config b/NuGet.config
index 84b2454cf740..1c4c9e3a5cb9 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -24,52 +24,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -96,36 +63,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e0a9e262626d..1417cecbbf5f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -143,74 +143,74 @@
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
ed74665e773dd1ebea3289c5662d71c590305932
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
-
+
https://github.com/nuget/nuget.client
- 95a470a557091cdbdc9f68a178b60bd19329942c
+ 42bfb4554167e1d2fc2b950728d9bd8164f806c1
https://github.com/microsoft/vstest
@@ -589,34 +589,34 @@
-
+
https://github.com/dotnet/arcade
- ac63dcf2791c32bf2102fd2b5ebb46479bd48a83
+ 0d52a8b262d35fa2fde84e398cb2e791b8454bd2
-
+
https://github.com/dotnet/arcade
- ac63dcf2791c32bf2102fd2b5ebb46479bd48a83
+ 0d52a8b262d35fa2fde84e398cb2e791b8454bd2
-
+
https://github.com/dotnet/arcade
- ac63dcf2791c32bf2102fd2b5ebb46479bd48a83
+ 0d52a8b262d35fa2fde84e398cb2e791b8454bd2
-
+
https://github.com/dotnet/arcade
- ac63dcf2791c32bf2102fd2b5ebb46479bd48a83
+ 0d52a8b262d35fa2fde84e398cb2e791b8454bd2
-
+
https://github.com/dotnet/arcade
- ac63dcf2791c32bf2102fd2b5ebb46479bd48a83
+ 0d52a8b262d35fa2fde84e398cb2e791b8454bd2
-
+
https://github.com/dotnet/arcade
- ac63dcf2791c32bf2102fd2b5ebb46479bd48a83
+ 0d52a8b262d35fa2fde84e398cb2e791b8454bd2
-
+
https://github.com/dotnet/arcade
- ac63dcf2791c32bf2102fd2b5ebb46479bd48a83
+ 0d52a8b262d35fa2fde84e398cb2e791b8454bd2
diff --git a/eng/Versions.props b/eng/Versions.props
index 86a541ecbe10..02d71561ba9f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -6,7 +6,7 @@
9
0
1
- 07
+ 08
@@ -137,18 +137,18 @@
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
- 6.12.4-rc.1
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
+ 6.12.4-rc.9
@@ -270,10 +270,10 @@
- 9.0.0-beta.25263.2
- 9.0.0-beta.25263.2
- 9.0.0-beta.25263.2
- 9.0.0-beta.25263.2
+ 9.0.0-beta.25302.2
+ 9.0.0-beta.25302.2
+ 9.0.0-beta.25302.2
+ 9.0.0-beta.25302.2
diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml
index 454fd75c7aff..a8c0bd3b9214 100644
--- a/eng/common/core-templates/post-build/post-build.yml
+++ b/eng/common/core-templates/post-build/post-build.yml
@@ -44,6 +44,11 @@ parameters:
displayName: Publish installers and checksums
type: boolean
default: true
+
+ - name: requireDefaultChannels
+ displayName: Fail the build if there are no default channel(s) registrations for the current build
+ type: boolean
+ default: false
- name: SDLValidationParameters
type: object
@@ -312,5 +317,6 @@ stages:
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
-AzdoToken '$(System.AccessToken)'
-WaitPublishingFinish true
+ -RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 90b58e32a87b..a261517ef906 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -5,7 +5,8 @@ param(
[Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
- [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
+ [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
+ [Parameter(Mandatory=$false)][string] $RequireDefaultChannels
)
try {
@@ -33,6 +34,10 @@ try {
if ("false" -eq $WaitPublishingFinish) {
$optionalParams.Add("--no-wait") | Out-Null
}
+
+ if ("true" -eq $RequireDefaultChannels) {
+ $optionalParams.Add("--default-channels-required") | Out-Null
+ }
& $darc add-build-to-channel `
--id $buildId `
diff --git a/global.json b/global.json
index 0ed73aeaa54e..87632bddbf94 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "9.0.105",
+ "dotnet": "9.0.106",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
"cmake": "latest"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25263.2",
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
}
diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs
index b800dc2ce44c..76516ac3c2b0 100644
--- a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs
+++ b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs
@@ -190,7 +190,7 @@ private static void DisplayResultsForPack(
.ThenBy(d => d.TemplateGroupInfo.Name, StringComparer.CurrentCultureIgnoreCase))
.DefineColumn(r => r.TemplateGroupInfo.Name, out object? nameColumn, LocalizableStrings.ColumnNameTemplateName, showAlways: true, shrinkIfNeeded: true, minWidth: 15)
.DefineColumn(r => r.TemplateGroupInfo.ShortNames, LocalizableStrings.ColumnNameShortName, showAlways: true)
- .DefineColumn(r => r.TemplateGroupInfo.Author, LocalizableStrings.ColumnNameAuthor, TabularOutputSettings.ColumnNames.Author, defaultColumn: false, shrinkIfNeeded: true, minWidth: 10)
+ .DefineColumn(r => r.TemplateGroupInfo.Author, LocalizableStrings.ColumnNameAuthor, TabularOutputSettings.ColumnNames.Author, defaultColumn: false, shrinkIfNeeded: true, minWidth: 12)
.DefineColumn(r => r.TemplateGroupInfo.Languages, LocalizableStrings.ColumnNameLanguage, TabularOutputSettings.ColumnNames.Language, defaultColumn: true)
.DefineColumn(r => r.TemplateGroupInfo.Type, LocalizableStrings.ColumnNameType, TabularOutputSettings.ColumnNames.Type, defaultColumn: false)
.DefineColumn(r => r.TemplateGroupInfo.Classifications, LocalizableStrings.ColumnNameTags, TabularOutputSettings.ColumnNames.Tags, defaultColumn: false, shrinkIfNeeded: true, minWidth: 10)
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
index 28e2abbaf298..4fd987b841a3 100644
--- a/src/SourceBuild/content/eng/Versions.props
+++ b/src/SourceBuild/content/eng/Versions.props
@@ -28,7 +28,7 @@
2.0.0-beta4.24126.1
- 17.8.3
+ 17.8.29
8.0.0
8.0.0