Skip to content

Commit 22a50b6

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/dotnet build 288041 (dotnet#1440)
Updated Dependencies: Microsoft.Build, Microsoft.Build.Utilities.Core (Version 18.1.0-preview-25520-104 -> 18.1.0-preview-25521-106) Microsoft.DotNet.Arcade.Sdk (Version 11.0.0-beta.25520.104 -> 11.0.0-beta.25521.106) Microsoft.DotNet.GenAPI.Task (Version 10.0.100-rc.2.25520.104 -> 10.0.100-rc.2.25521.106) Microsoft.NETCore.ILAsm, Microsoft.NETCore.ILDAsm (Version 10.0.0-rc.1.25520.104 -> 10.0.0-rc.1.25521.106) Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 92566a4 commit 22a50b6

File tree

9 files changed

+281
-260
lines changed

9 files changed

+281
-260
lines changed

‎eng/Version.Details.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftBuildPackageVersion>18.1.0-preview-25520-104</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25520-104</MicrosoftBuildUtilitiesCorePackageVersion>
11-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25520.104</MicrosoftDotNetArcadeSdkPackageVersion>
12-
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.2.25520.104</MicrosoftDotNetGenAPITaskPackageVersion>
13-
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25520.104</MicrosoftNETCoreILAsmPackageVersion>
14-
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25520.104</MicrosoftNETCoreILDAsmPackageVersion>
9+
<MicrosoftBuildPackageVersion>18.1.0-preview-25521-106</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25521-106</MicrosoftBuildUtilitiesCorePackageVersion>
11+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25521.106</MicrosoftDotNetArcadeSdkPackageVersion>
12+
<MicrosoftDotNetGenAPITaskPackageVersion>10.0.100-rc.2.25521.106</MicrosoftDotNetGenAPITaskPackageVersion>
13+
<MicrosoftNETCoreILAsmPackageVersion>10.0.0-rc.1.25521.106</MicrosoftNETCoreILAsmPackageVersion>
14+
<MicrosoftNETCoreILDAsmPackageVersion>10.0.0-rc.1.25521.106</MicrosoftNETCoreILDAsmPackageVersion>
1515
</PropertyGroup>
1616
<!--Property group for alternate package version names-->
1717
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="1bdc5cdcf4cf408e00aa3c60f58520083bf2474f" BarId="287856" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="source-build-reference-packages" Sha="ce8b0d8b87e180c6c044ee5828bd4fffab60951d" BarId="288041" />
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25520-104">
5+
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25521-106">
66
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
7+
<Sha>ce8b0d8b87e180c6c044ee5828bd4fffab60951d</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25520-104">
9+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25521-106">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
11+
<Sha>ce8b0d8b87e180c6c044ee5828bd4fffab60951d</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25520.104">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25521.106">
1414
<Uri>https://github.com/dotnet/dotnet</Uri>
15-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
15+
<Sha>ce8b0d8b87e180c6c044ee5828bd4fffab60951d</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.2.25520.104">
17+
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-rc.2.25521.106">
1818
<Uri>https://github.com/dotnet/dotnet</Uri>
19-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
19+
<Sha>ce8b0d8b87e180c6c044ee5828bd4fffab60951d</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25520.104">
21+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="10.0.0-rc.1.25521.106">
2222
<Uri>https://github.com/dotnet/dotnet</Uri>
23-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
23+
<Sha>ce8b0d8b87e180c6c044ee5828bd4fffab60951d</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25520.104">
25+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="10.0.0-rc.1.25521.106">
2626
<Uri>https://github.com/dotnet/dotnet</Uri>
27-
<Sha>1bdc5cdcf4cf408e00aa3c60f58520083bf2474f</Sha>
27+
<Sha>ce8b0d8b87e180c6c044ee5828bd4fffab60951d</Sha>
2828
</Dependency>
2929
</ToolsetDependencies>
3030
</Dependencies>

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ EnableInternalPackageSource() {
6666
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
6767
if [ "$?" == "0" ]; then
6868
echo "Enabling internal source '$PackageSourceName'."
69-
# Remove the disabled entry
70-
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
71-
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
72-
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
69+
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
70+
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
7371

7472
# Add the source name to PackageSources for credential handling
7573
PackageSources+=("$PackageSourceName")

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ jobs:
9191
fetchDepth: 3
9292
clean: true
9393

94-
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95-
- ${{ if eq(parameters.publishingVersion, 3) }}:
94+
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95+
- ${{ if eq(parameters.publishingVersion, 3) }}:
9696
- task: DownloadPipelineArtifact@2
9797
displayName: Download Asset Manifests
9898
inputs:
@@ -117,9 +117,16 @@ jobs:
117117
flattenFolders: true
118118
condition: ${{ parameters.condition }}
119119
continueOnError: ${{ parameters.continueOnError }}
120-
120+
121121
- task: NuGetAuthenticate@1
122122

123+
# Populate internal runtime variables.
124+
- template: /eng/common/templates/steps/enable-internal-sources.yml
125+
parameters:
126+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
127+
128+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
129+
123130
- task: AzureCLI@2
124131
displayName: Publish Build Assets
125132
inputs:
@@ -132,9 +139,12 @@ jobs:
132139
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133140
/p:MaestroApiEndpoint=https://maestro.dot.net
134141
/p:OfficialBuildId=$(OfficialBuildId)
142+
-runtimeSourceFeed https://ci.dot.net/internal
143+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
144+
135145
condition: ${{ parameters.condition }}
136146
continueOnError: ${{ parameters.continueOnError }}
137-
147+
138148
- task: powershell@2
139149
displayName: Create ReleaseConfigs Artifact
140150
inputs:
@@ -162,7 +172,7 @@ jobs:
162172
artifactName: AssetManifests
163173
displayName: 'Publish Merged Manifest'
164174
retryCountOnTaskFailure: 10 # for any logs being locked
165-
sbomEnabled: false # we don't need SBOM for logs
175+
sbomEnabled: false # we don't need SBOM for logs
166176

167177
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
168178
parameters:
@@ -195,9 +205,11 @@ jobs:
195205
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
196206
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
197207
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
208+
-runtimeSourceFeed https://ci.dot.net/internal
209+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
198210
199211
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
200212
- template: /eng/common/core-templates/steps/publish-logs.yml
201213
parameters:
202214
is1ESPipeline: ${{ parameters.is1ESPipeline }}
203-
JobLabel: 'Publish_Artifacts_Logs'
215+
JobLabel: 'Publish_Artifacts_Logs'

0 commit comments

Comments
 (0)