Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -159,33 +159,33 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25509.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25531.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25509.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25531.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25509.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25531.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25509.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25531.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25509.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25531.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25509.1">
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25531.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25509.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25531.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
<MicrosoftDeveloperControlPlanewindowsamd64Version>0.18.12</MicrosoftDeveloperControlPlanewindowsamd64Version>
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.18.12</MicrosoftDeveloperControlPlanewindowsarm64Version>
<!-- Other -->
<MicrosoftDotNetRemoteExecutorVersion>11.0.0-beta.25509.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.25509.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>11.0.0-beta.25509.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetRemoteExecutorVersion>11.0.0-beta.25531.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.25531.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>11.0.0-beta.25531.1</MicrosoftDotNetBuildTasksArchivesVersion>
<!-- dotnet/extensions -->
<MicrosoftExtensionsAIVersion>9.10.1</MicrosoftExtensionsAIVersion>
<MicrosoftExtensionsAIPreviewVersion>9.10.0-preview.1.25513.3</MicrosoftExtensionsAIPreviewVersion>
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