Skip to content

Commit 3641ee5

Browse files
MiYanniMiYanni
authored
Merge pull request #572 from dotnet/darc-main-804464f6-6aea-4b88-8288-1dbec1d591ef
2 parents c115c43 + 2113789 commit 3641ee5

File tree

9 files changed

+32
-23
lines changed

9 files changed

+32
-23
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.107">
5+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
6+
<Sha>145a4df71b88cc2e88a4facaab145e21558a902c</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.107">
10+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
11+
<Sha>145a4df71b88cc2e88a4facaab145e21558a902c</Sha>
1212
</Dependency>
1313
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-10.0.100-rc.2" Version="36.0.0-rc.2.331">
1414
<Uri>https://github.com/dotnet/android</Uri>
@@ -34,15 +34,15 @@
3434
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-maui</Uri>
3535
<Sha>069f29330bb13355e34fd6d38f05e207ac1551c5</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.107">
38+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
39+
<Sha>145a4df71b88cc2e88a4facaab145e21558a902c</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.2">
44+
<Uri>https://github.com/dotnet/arcade</Uri>
45+
<Sha>a4c9a07d978c070ef5c19d2ec9f811d6a5b20914</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.107</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.107</MicrosoftNETCoreAppRefPackageVersion>
64+
<MicrosoftNETSdkPackageVersion>10.0.100-rc.2.25476.107</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/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/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

‎eng/common/sdk-task.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ show_usage() {
1010

1111
echo "Advanced settings:"
1212
echo " --excludeCIBinarylog Don't output binary log (short: -nobl)"
13-
echo " --noWarnAsError Do not warn as error
13+
echo " --noWarnAsError Do not warn as error"
1414
echo ""
1515
echo "Command line arguments not listed above are passed thru to msbuild."
1616
}

‎global.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.7.25372.107",
3+
"version": "10.0.100-rc.1.25451.107",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "10.0.100-preview.7.25372.107"
8+
"dotnet": "10.0.100-rc.1.25451.107"
99
},
1010
"msbuild-sdks": {
1111
"Microsoft.Build.NoTargets": "3.7.0",
12-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25451.107",
12+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25476.2",
1313
"Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174"
1414
}
1515
}

0 commit comments

Comments
 (0)