Skip to content

Commit e0798b9

Browse files
dotnet-maestro[bot]SimonZhao888nagilsonDonnaChen888Copilot
authored
[main] Source code updates from dotnet/dotnet (#51402)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: SimonZhao888 <[email protected]> Co-authored-by: Noah Gilson <[email protected]> Co-authored-by: DonnaChen888 <[email protected]> Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: marcpopMSFT <[email protected]> Co-authored-by: Marc Paine <[email protected]> Co-authored-by: jonathanpeppers <[email protected]> Co-authored-by: Daniel Plaisted <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>
1 parent e432a8c commit e0798b9

21 files changed

+672
-643
lines changed

eng/Version.Details.props

Lines changed: 122 additions & 113 deletions
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 227 additions & 227 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.
114114
115115
Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
116-
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.8</MicrosoftBuildMinimumVersion>
116+
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.28</MicrosoftBuildMinimumVersion>
117117
<MinimumVSVersion>18.0</MinimumVSVersion>
118118
</PropertyGroup>
119119
<PropertyGroup>
@@ -127,7 +127,7 @@
127127
</PropertyGroup>
128128
<PropertyGroup Label="Manually updated">
129129
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
130-
<MicrosoftBuildLocatorPackageVersion>1.8.1</MicrosoftBuildLocatorPackageVersion>
130+
<MicrosoftBuildLocatorPackageVersion>1.10.2</MicrosoftBuildLocatorPackageVersion>
131131
<MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>4.0.1</MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>
132132
</PropertyGroup>
133133
<!-- Get .NET Framework reference assemblies from NuGet packages -->

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)