Skip to content

Commit a1b9d99

Browse files
dotnet-sb-botdotnet-maestro[bot]ViktorHofer
authored
.NET Source-Build 10.0.101 December 2025 Updates (#3767)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
1 parent be9f275 commit a1b9d99

File tree

9 files changed

+59
-30
lines changed

9 files changed

+59
-30
lines changed

‎eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- _git/dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25523.111</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildManifestPackageVersion>10.0.0-beta.25523.111</MicrosoftDotNetBuildManifestPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25569.105</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildManifestPackageVersion>10.0.0-beta.25569.105</MicrosoftDotNetBuildManifestPackageVersion>
1111
</PropertyGroup>
1212
<!--Property group for alternate package version names-->
1313
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25523.111">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25569.105">
66
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
7-
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
7+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.DotNet.Build.Manifest" Version="10.0.0-beta.25523.111">
9+
<Dependency Name="Microsoft.DotNet.Build.Manifest" Version="10.0.0-beta.25569.105">
1010
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
11-
<Sha>b0f34d51fccc69fd334253924abd8d6853fad7aa</Sha>
11+
<Sha>fad253f51b461736dfd3cd9c15977bb7493becef</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.25578.3" SkipProperty="True">
1414
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
<Project>
2-
1+
<Project>
32
<Import Project="Version.Details.props" />
4-
53
<PropertyGroup>
64
<VersionSDKMinor>1</VersionSDKMinor>
75
<VersionPrefix>10.0.$(VersionSDKMinor)00</VersionPrefix>
86
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
97
<PreReleaseVersionIteration></PreReleaseVersionIteration>
10-
118
<!--
129
Allowed values: 'repodefault', 'unstable', 'preview', 'release'
1310
'repodefault' uses the repo branding defaults.
@@ -16,11 +13,9 @@
1613
'release' produces assets without a branding suffix.
1714
-->
1815
<RepoDotNetFinalVersionKind>release</RepoDotNetFinalVersionKind>
19-
2016
<!-- Arcade features -->
2117
<UseVSTestRunner>true</UseVSTestRunner>
2218
</PropertyGroup>
23-
2419
<PropertyGroup>
2520
<!--
2621
Building .NET from source depends on several archives, depending on the branch's current
@@ -39,8 +34,8 @@
3934
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
4035
are not necessary, and this property is removed from the file.
4136
-->
42-
<PrivateSourceBuiltSdkVersion>10.0.100-rtm.25523.111</PrivateSourceBuiltSdkVersion>
43-
<PrivateSourceBuiltArtifactsVersion>10.0.100-rtm.25523.111</PrivateSourceBuiltArtifactsVersion>
37+
<PrivateSourceBuiltSdkVersion>10.0.101-servicing.25569.105</PrivateSourceBuiltSdkVersion>
38+
<PrivateSourceBuiltArtifactsVersion>10.0.101-servicing.25569.105</PrivateSourceBuiltArtifactsVersion>
4439
<!-- command-line-api dependencies -->
4540
<SystemCommandLineVersion>2.0.0-beta5.25208.1</SystemCommandLineVersion>
4641
<!-- msbuild dependencies -->
@@ -56,5 +51,4 @@
5651
<NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
5752
<OctokitVersion>10.0.0</OctokitVersion>
5853
</PropertyGroup>
59-
60-
</Project>
54+
</Project>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
2-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
3-
# disabled internal Maestro (darc-int*) feeds.
2+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
3+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
4+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
45
#
56
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
67
#
@@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
173174
}
174175
}
175176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
179+
if ($dotnetEngSource -ne $null) {
180+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
181+
}
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
185+
if ($dotnetToolsSource -ne $null) {
186+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
187+
}
188+
176189
$doc.Save($filename)

‎eng/common/SetupNugetSources.sh‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
#!/usr/bin/env bash
22

33
# This script adds internal feeds required to build commits that depend on internal package sources. For instance,
4-
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
5-
# disabled internal Maestro (darc-int*) feeds.
4+
# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
5+
# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
6+
# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
67
#
78
# Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
89
#
@@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
173174
fi
174175
done
175176

177+
# Check for dotnet-eng and add dotnet-eng-internal if present
178+
grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
179+
if [ "$?" == "0" ]; then
180+
AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
181+
fi
182+
183+
# Check for dotnet-tools and add dotnet-tools-internal if present
184+
grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
185+
if [ "$?" == "0" ]; then
186+
AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
187+
fi
188+
176189
# I want things split line by line
177190
PrevIFS=$IFS
178191
IFS=$'\n'

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,11 @@ jobs:
180180
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
181181
is1ESPipeline: ${{ parameters.is1ESPipeline }}
182182

183+
# Darc is targeting 8.0, so make sure it's installed
184+
- task: UseDotNet@2
185+
inputs:
186+
version: 8.0.x
187+
183188
- task: AzureCLI@2
184189
displayName: Publish Using Darc
185190
inputs:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,11 @@ stages:
307307

308308
- task: NuGetAuthenticate@1
309309

310+
# Darc is targeting 8.0, so make sure it's installed
311+
- task: UseDotNet@2
312+
inputs:
313+
version: 8.0.x
314+
310315
- task: AzureCLI@2
311316
displayName: Publish Using Darc
312317
inputs:

‎eng/common/core-templates/steps/install-microbuild.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,22 @@ parameters:
1111
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
1212
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
1313
microbuildUseESRP: true
14-
# Location of the MicroBuild output folder
15-
# NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly.
16-
microBuildOutputFolder: '$(Build.SourcesDirectory)'
1714

1815
continueOnError: false
1916

2017
steps:
2118
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
2219
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
23-
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
20+
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
2421
- task: UseDotNet@2
2522
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
2623
inputs:
2724
packageType: sdk
2825
version: 8.0.x
29-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
30-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
26+
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
27+
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
28+
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
29+
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
3130
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3231

3332
- script: |
@@ -65,7 +64,7 @@ steps:
6564
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
6665
env:
6766
TeamName: $(_TeamName)
68-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
67+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
6968
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
7069
continueOnError: ${{ parameters.continueOnError }}
7170
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
@@ -85,7 +84,7 @@ steps:
8584
ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc
8685
env:
8786
TeamName: $(_TeamName)
88-
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}
87+
MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild
8988
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
9089
continueOnError: ${{ parameters.continueOnError }}
9190
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real'))

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100"
3+
"dotnet": "10.0.101"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25523.111"
8+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25569.105"
99
}
1010
}

0 commit comments

Comments
 (0)