Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7743e07
Backflow from https://github.com/dotnet/dotnet / d9ea74c build 287957
dotnet-maestro[bot] Oct 21, 2025
ebea40c
Merge main into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
dotnet-maestro[bot] Oct 21, 2025
ae4d053
Update dependencies from https://github.com/dotnet/dotnet build 287957
dotnet-maestro[bot] Oct 21, 2025
8cd52d2
Update dependencies from https://github.com/dotnet/dotnet build 288041
dotnet-maestro[bot] Oct 22, 2025
3857c56
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
SimonZhao888 Oct 22, 2025
3343043
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
SimonZhao888 Oct 24, 2025
20d67c7
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
SimonZhao888 Oct 27, 2025
5adc118
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
SimonZhao888 Oct 28, 2025
2dab934
Pin System.Memory to the correct version
nagilson Oct 28, 2025
bbdcaa3
Use VersionOverride, not Version
nagilson Oct 28, 2025
9410b47
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
SimonZhao888 Oct 29, 2025
c19ddf1
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
DonnaChen888 Oct 30, 2025
67dc836
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
SimonZhao888 Oct 31, 2025
f3fe435
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
SimonZhao888 Nov 3, 2025
420a191
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-2…
DonnaChen888 Nov 4, 2025
6b57623
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
DonnaChen888 Nov 4, 2025
e6e9c41
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
DonnaChen888 Nov 5, 2025
e9f5cf9
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
nagilson Nov 5, 2025
3a99e91
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
DonnaChen888 Nov 11, 2025
d4ae2b3
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
DonnaChen888 Nov 12, 2025
d9ce657
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
DonnaChen888 Nov 13, 2025
ef199bd
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
DonnaChen888 Nov 13, 2025
c7453a8
Initial plan
Copilot Nov 17, 2025
3d785e8
Replace :: with @ in template package version separators
Copilot Nov 17, 2025
f88dc2b
Update test code to use @ separator instead of ::
Copilot Nov 17, 2025
dc69651
Fix template package version separator in test baselines and assertio…
marcpopMSFT Nov 17, 2025
0a89b16
Merge branch 'main' into darc-main-25319f2a-bdb3-4d70-a139-7a9acdfbdcce
DonnaChen888 Nov 18, 2025
91496aa
Remove duplicate NuGet package properties from Version.Details.props …
Copilot Nov 18, 2025
187eb00
Add missing properties in Version.Details.props
dsplaisted Nov 19, 2025
0e6c6a7
Move properties in Version.Details.props to where they belong
ViktorHofer Nov 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
235 changes: 122 additions & 113 deletions eng/Version.Details.props

Large diffs are not rendered by default.

454 changes: 227 additions & 227 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes.

Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent -->
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.8</MicrosoftBuildMinimumVersion>
<MicrosoftBuildMinimumVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">17.14.28</MicrosoftBuildMinimumVersion>
<MinimumVSVersion>18.0</MinimumVSVersion>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -127,7 +127,7 @@
</PropertyGroup>
<PropertyGroup Label="Manually updated">
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
<MicrosoftBuildLocatorPackageVersion>1.8.1</MicrosoftBuildLocatorPackageVersion>
<MicrosoftBuildLocatorPackageVersion>1.10.2</MicrosoftBuildLocatorPackageVersion>
<MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>4.0.1</MicrosoftCodeAnalysisCSharpAnalyzerPinnedVersionPackageVersion>
</PropertyGroup>
<!-- Get .NET Framework reference assemblies from NuGet packages -->
Expand Down
6 changes: 2 additions & 4 deletions eng/common/SetupNugetSources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,8 @@ EnableInternalPackageSource() {
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
if [ "$?" == "0" ]; then
echo "Enabling internal source '$PackageSourceName'."
# Remove the disabled entry
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"

# Add the source name to PackageSources for credential handling
PackageSources+=("$PackageSourceName")
Expand Down
24 changes: 18 additions & 6 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ jobs:
fetchDepth: 3
clean: true

- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
- ${{ if eq(parameters.publishingVersion, 3) }}:
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
- ${{ if eq(parameters.publishingVersion, 3) }}:
- task: DownloadPipelineArtifact@2
displayName: Download Asset Manifests
inputs:
Expand All @@ -117,9 +117,16 @@ jobs:
flattenFolders: true
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- task: NuGetAuthenticate@1

# Populate internal runtime variables.
- template: /eng/common/templates/steps/enable-internal-sources.yml
parameters:
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)

- template: /eng/common/templates/steps/enable-internal-runtimes.yml

- task: AzureCLI@2
displayName: Publish Build Assets
inputs:
Expand All @@ -132,9 +139,12 @@ jobs:
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
/p:MaestroApiEndpoint=https://maestro.dot.net
/p:OfficialBuildId=$(OfficialBuildId)
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)

condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}

- task: powershell@2
displayName: Create ReleaseConfigs Artifact
inputs:
Expand Down Expand Up @@ -162,7 +172,7 @@ jobs:
artifactName: AssetManifests
displayName: 'Publish Merged Manifest'
retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs
sbomEnabled: false # we don't need SBOM for logs

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
parameters:
Expand Down Expand Up @@ -195,9 +205,11 @@ jobs:
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
-runtimeSourceFeed https://ci.dot.net/internal
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)

- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
- template: /eng/common/core-templates/steps/publish-logs.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
JobLabel: 'Publish_Artifacts_Logs'
JobLabel: 'Publish_Artifacts_Logs'
Loading
Loading