Skip to content

Commit d19562d

Browse files
[main] Source code updates from dotnet/dotnet (#1479)
[main] Source code updates from dotnet/dotnet
1 parent 0de06bc commit d19562d

File tree

7 files changed

+27
-10
lines changed

7 files changed

+27
-10
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
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25462.117</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.0-rc.2.25462.117</SystemCommandLinePackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25479.115</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.0-rtm.25479.115</SystemCommandLinePackageVersion>
1111
<!-- dotnet/msbuild dependencies -->
1212
<MicrosoftBuildPackageVersion>17.11.31</MicrosoftBuildPackageVersion>
1313
<MicrosoftBuildTasksCorePackageVersion>17.11.31</MicrosoftBuildTasksCorePackageVersion>

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="ee760c42a6df115208fe2262d358be6d4003e55f" BarId="283077" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="e72b5bbe719d747036ce9c36582a205df9f1c361" BarId="285185" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0-rc.2.25462.117">
5+
<Dependency Name="System.CommandLine" Version="2.0.0-rtm.25479.115">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
7+
<Sha>e72b5bbe719d747036ce9c36582a205df9f1c361</Sha>
88
</Dependency>
99
</ProductDependencies>
1010
<ToolsetDependencies>
11-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25462.117">
11+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25479.115">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>ee760c42a6df115208fe2262d358be6d4003e55f</Sha>
13+
<Sha>e72b5bbe719d747036ce9c36582a205df9f1c361</Sha>
1414
</Dependency>
1515
<!-- Dependencies required for source build to lift to the previously-source-built version. -->
1616
<Dependency Name="Microsoft.Build" Version="17.11.31">

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/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/post-build/nuget-verification.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
[CmdletBinding(PositionalBinding = $false)]
3131
param(
3232
[string]$NuGetExePath,
33-
[string]$PackageSource = "https://api.nuget.org/v3/index.json",
33+
[string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json",
3434
[string]$DownloadPath,
3535
[Parameter(ValueFromRemainingArguments = $true)]
3636
[string[]]$args

es-metadata.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
schemaVersion: 0.0.1
2+
isProduction: true
3+
accountableOwners:
4+
service: c8aedd2a-1f14-4660-83e2-c74a9417c3cc
5+
routing:
6+
defaultAreaPath:
7+
org: devdiv
8+
path: DevDiv\NET Developer Experience\Debugger and Interactive

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"dotnet": "10.0.100-rc.1.25451.107"
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25462.117",
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.115",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

0 commit comments

Comments
 (0)