Skip to content

Commit 1dee56d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet build 20250926.2
On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25451.107 -> To Version 10.0.0-beta.25476.102 Microsoft.NET.Sdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport From Version 10.0.100-rc.1.25451.107 -> To Version 10.0.100-rc.2.25476.102 Microsoft.NETCore.App.Ref From Version 10.0.0-rc.1.25451.107 -> To Version 10.0.0-rc.2.25476.102
1 parent e4b7647 commit 1dee56d

36 files changed

+59
-50
lines changed

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.100-rc.1.25451.107">
5-
<Uri>https://github.com/dotnet/dotnet</Uri>
6-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
4+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport" Version="10.0.100-rc.2.25476.102">
5+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
6+
<Sha>06ccb96768c3d1f8b0aeefc68414b9497e82aecf</Sha>
77
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25451.107">
10-
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
9+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.2.25476.102">
10+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
11+
<Sha>06ccb96768c3d1f8b0aeefc68414b9497e82aecf</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100-rc.2" Version="36.0.0-rc.1.285">
1414
<Uri>https://github.com/dotnet/android</Uri>
@@ -34,15 +34,15 @@
3434
<Uri>https://github.com/dotnet/maui</Uri>
3535
<Sha>5872a2c8cca71edd4803aa0530081bc753ed9e60</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.1.25451.107">
38-
<Uri>https://github.com/dotnet/dotnet</Uri>
39-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
37+
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.2.25476.102">
38+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
39+
<Sha>06ccb96768c3d1f8b0aeefc68414b9497e82aecf</Sha>
4040
</Dependency>
4141
</ProductDependencies>
4242
<ToolsetDependencies>
43-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25451.107">
44-
<Uri>https://github.com/dotnet/dotnet</Uri>
45-
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
43+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25476.102">
44+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
45+
<Sha>06ccb96768c3d1f8b0aeefc68414b9497e82aecf</Sha>
4646
<SourceBuild RepoName="arcade" ManagedOnly="true" />
4747
</Dependency>
4848
</ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup Label="EmscriptenWorkloads">
4141
<!-- Workloads from dotnet/sdk -->
42-
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.100-rc.1.25451.107</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
42+
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>10.0.100-rc.2.25476.102</MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion>
4343
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion)</EmscriptenWorkloadManifestVersion>
4444
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
4545
<EmscriptenWorkloadFeatureBand>10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
@@ -60,8 +60,8 @@
6060
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest100100rc2PackageVersion)</XamarinTvOSWorkloadManifestVersion>
6161
</PropertyGroup>
6262
<PropertyGroup Label="MonoWorkloads">
63-
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25451.107</MicrosoftNETCoreAppRefPackageVersion>
64-
<MicrosoftNETSdkPackageVersion>10.0.100-rc.1.25451.107</MicrosoftNETSdkPackageVersion>
63+
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.2.25476.102</MicrosoftNETCoreAppRefPackageVersion>
64+
<MicrosoftNETSdkPackageVersion>10.0.100-rc.2.25476.102</MicrosoftNETSdkPackageVersion>
6565
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
6666
<MonoWorkloadManifestVersion>$(MicrosoftNETSdkPackageVersion)</MonoWorkloadManifestVersion>
6767
<!-- mono workload prerelease version band must match the runtime feature band -->

‎eng/common/PSScriptAnalyzerSettings.psd1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
'PSStandardDSCFunctionsInResource',
99
'PSUseIdenticalMandatoryParametersForDSC',
1010
'PSUseIdenticalParametersForDSC')
11-
}
11+
}

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) {
157157
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
158158
}
159159

160-
$dotnetVersions = @('5','6','7','8','9')
160+
$dotnetVersions = @('5','6','7','8','9','10')
161161

162162
foreach ($dotnetVersion in $dotnetVersions) {
163163
$feedPrefix = "dotnet" + $dotnetVersion;

‎eng/common/SetupNugetSources.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then
9999
PackageSources+=('dotnet3.1-internal-transport')
100100
fi
101101

102-
DotNetVersions=('5' '6' '7' '8' '9')
102+
DotNetVersions=('5' '6' '7' '8' '9' '10')
103103

104104
for DotNetVersion in ${DotNetVersions[@]} ; do
105105
FeedPrefix="dotnet${DotNetVersion}";

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ parameters:
4040

4141
repositoryAlias: self
4242

43+
officialBuildId: ''
44+
4345
jobs:
4446
- job: Asset_Registry_Publish
4547

@@ -62,6 +64,11 @@ jobs:
6264
value: false
6365
# unconditional - needed for logs publishing (redactor tool version)
6466
- template: /eng/common/core-templates/post-build/common-variables.yml
67+
- name: OfficialBuildId
68+
${{ if ne(parameters.officialBuildId, '') }}:
69+
value: ${{ parameters.officialBuildId }}
70+
${{ else }}:
71+
value: $(Build.BuildNumber)
6572

6673
pool:
6774
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
@@ -124,7 +131,7 @@ jobs:
124131
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
125132
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
126133
/p:MaestroApiEndpoint=https://maestro.dot.net
127-
/p:OfficialBuildId=$(Build.BuildNumber)
134+
/p:OfficialBuildId=$(OfficialBuildId)
128135
condition: ${{ parameters.condition }}
129136
continueOnError: ${{ parameters.continueOnError }}
130137

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ jobs:
4141

4242
- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml
4343
parameters:
44-
binLogPath: ${{ parameters.binLogPath }}
44+
binLogPath: ${{ parameters.binLogPath }}

‎eng/common/core-templates/jobs/jobs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ parameters:
4444
artifacts: {}
4545
is1ESPipeline: ''
4646
repositoryAlias: self
47+
officialBuildId: ''
4748

4849
# Internal resources (telemetry, microbuild) can only be accessed from non-public projects,
4950
# and some (Microbuild) should only be applied to non-PR cases for internal builds.
@@ -116,3 +117,4 @@ jobs:
116117
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
117118
signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }}
118119
repositoryAlias: ${{ parameters.repositoryAlias }}
120+
officialBuildId: ${{ parameters.officialBuildId }}

‎eng/common/core-templates/steps/enable-internal-runtimes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ steps:
2929
storageAccount: dotnetbuilds
3030
container: internal
3131
permissions: rl
32-
is1ESPipeline: ${{ parameters.is1ESPipeline }}
32+
is1ESPipeline: ${{ parameters.is1ESPipeline }}

‎eng/common/core-templates/steps/get-federated-access-token.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ steps:
3939
exit 1
4040
}
4141
Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value"
42-
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"
42+
Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken"

0 commit comments

Comments
 (0)