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
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26207.106">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100-preview.4" Version="11.0.100-preview.4.26224.122">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a8b33e7593686eaee701cd124daaabff2311634f</Sha>
<Sha>48bd87d899e187fe0e4e2b81a7b4a65a37845213</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.3" Version="11.0.100-preview.3.26207.106">
<Dependency Name="Microsoft.NET.Workload.Mono.Toolchain.Current.Manifest-11.0.100-preview.4" Version="11.0.100-preview.4.26224.122">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a8b33e7593686eaee701cd124daaabff2311634f</Sha>
<Sha>48bd87d899e187fe0e4e2b81a7b4a65a37845213</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-11.0.100-preview.3" Version="36.99.0-preview.3.10">
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-11.0.100-preview.4" Version="36.99.0-preview.4.137">
<Uri>https://github.com/dotnet/android</Uri>
<Sha>00489087dbe2e91cfd1b4302530c0c528d32efbb</Sha>
<Sha>e8fb4bc8f779fd0d27c5c0ed04637a5dd25c083b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-11.0.100-preview.3" Version="26.2.11588-net11-p3">
<Dependency Name="Microsoft.NET.Sdk.iOS.Manifest-11.0.100-preview.4" Version="26.4.11511-net11-p4">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>1aedd2b6964f4b238f72b19526ff2913997c14b4</Sha>
<Sha>16dad2059bd25ff2227e06de186abc31dd0dfe73</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-11.0.100-preview.3" Version="26.2.11588-net11-p3">
<Dependency Name="Microsoft.NET.Sdk.tvOS.Manifest-11.0.100-preview.4" Version="26.4.11511-net11-p4">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>1aedd2b6964f4b238f72b19526ff2913997c14b4</Sha>
<Sha>16dad2059bd25ff2227e06de186abc31dd0dfe73</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-11.0.100-preview.3" Version="26.2.11588-net11-p3">
<Dependency Name="Microsoft.NET.Sdk.MacCatalyst.Manifest-11.0.100-preview.4" Version="26.4.11511-net11-p4">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>1aedd2b6964f4b238f72b19526ff2913997c14b4</Sha>
<Sha>16dad2059bd25ff2227e06de186abc31dd0dfe73</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-11.0.100-preview.3" Version="26.2.11588-net11-p3">
<Dependency Name="Microsoft.NET.Sdk.macOS.Manifest-11.0.100-preview.4" Version="26.4.11511-net11-p4">
<Uri>https://github.com/dotnet/macios</Uri>
<Sha>1aedd2b6964f4b238f72b19526ff2913997c14b4</Sha>
<Sha>16dad2059bd25ff2227e06de186abc31dd0dfe73</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Maui.Manifest-11.0.100-preview.3" Version="11.0.0-preview.3.26203.7">
<Dependency Name="Microsoft.NET.Sdk.Maui.Manifest-11.0.100-preview.4" Version="11.0.0-preview.4.26230.3">
<Uri>https://github.com/dotnet/maui</Uri>
<Sha>427de00dafc56858515c9347ed35c717be88eb6d</Sha>
<Sha>26c19713f4a5e9339ace623782bbbd2c4617cd7d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26207.106">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26224.122">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>a8b33e7593686eaee701cd124daaabff2311634f</Sha>
<Sha>48bd87d899e187fe0e4e2b81a7b4a65a37845213</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
38 changes: 19 additions & 19 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<!-- Enable to remove prerelease label. -->
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">3</PreReleaseVersionIteration>
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">4</PreReleaseVersionIteration>
</PropertyGroup>
<PropertyGroup>
<VersionPrefix>$(VersionMajor).$(VersionSDKMinor)$(VersionFeature).$(VersionPatch)</VersionPrefix>
Expand Down Expand Up @@ -39,31 +39,31 @@
</PropertyGroup>
<PropertyGroup Label="EmscriptenWorkloads">
<!-- Workloads from dotnet/sdk -->
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26207.106</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview3PackageVersion)</EmscriptenWorkloadManifestVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26224.122</MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion>
<EmscriptenWorkloadManifestVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100preview4PackageVersion)</EmscriptenWorkloadManifestVersion>
<!-- emsdk workload prerelease version band must match the emsdk feature band -->
<EmscriptenWorkloadFeatureBand>11.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</EmscriptenWorkloadFeatureBand>
</PropertyGroup>
<PropertyGroup Label="MauiWorkloads">
<MauiFeatureBand>11.0.100-preview.3</MauiFeatureBand>
<MicrosoftNETSdkAndroidManifest110100preview3PackageVersion>36.99.0-preview.3.10</MicrosoftNETSdkAndroidManifest110100preview3PackageVersion>
<MicrosoftNETSdkiOSManifest110100preview3PackageVersion>26.2.11588-net11-p3</MicrosoftNETSdkiOSManifest110100preview3PackageVersion>
<MicrosoftNETSdktvOSManifest110100preview3PackageVersion>26.2.11588-net11-p3</MicrosoftNETSdktvOSManifest110100preview3PackageVersion>
<MicrosoftNETSdkMacCatalystManifest110100preview3PackageVersion>26.2.11588-net11-p3</MicrosoftNETSdkMacCatalystManifest110100preview3PackageVersion>
<MicrosoftNETSdkmacOSManifest110100preview3PackageVersion>26.2.11588-net11-p3</MicrosoftNETSdkmacOSManifest110100preview3PackageVersion>
<MicrosoftNETSdkMauiManifest110100preview3PackageVersion>11.0.0-preview.3.26203.7</MicrosoftNETSdkMauiManifest110100preview3PackageVersion>
<MauiWorkloadManifestVersion>$(MicrosoftNETSdkMauiManifest110100preview3PackageVersion)</MauiWorkloadManifestVersion>
<XamarinAndroidWorkloadManifestVersion>$(MicrosoftNETSdkAndroidManifest110100preview3PackageVersion)</XamarinAndroidWorkloadManifestVersion>
<XamarinIOSWorkloadManifestVersion>$(MicrosoftNETSdkiOSManifest110100preview3PackageVersion)</XamarinIOSWorkloadManifestVersion>
<XamarinMacCatalystWorkloadManifestVersion>$(MicrosoftNETSdkMacCatalystManifest110100preview3PackageVersion)</XamarinMacCatalystWorkloadManifestVersion>
<XamarinMacOSWorkloadManifestVersion>$(MicrosoftNETSdkmacOSManifest110100preview3PackageVersion)</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest110100preview3PackageVersion)</XamarinTvOSWorkloadManifestVersion>
<MauiFeatureBand>11.0.100-preview.4</MauiFeatureBand>
<MicrosoftNETSdkAndroidManifest110100preview4PackageVersion>36.99.0-preview.4.137</MicrosoftNETSdkAndroidManifest110100preview4PackageVersion>
<MicrosoftNETSdkiOSManifest110100preview4PackageVersion>26.4.11511-net11-p4</MicrosoftNETSdkiOSManifest110100preview4PackageVersion>
<MicrosoftNETSdktvOSManifest110100preview4PackageVersion>26.4.11511-net11-p4</MicrosoftNETSdktvOSManifest110100preview4PackageVersion>
<MicrosoftNETSdkMacCatalystManifest110100preview4PackageVersion>26.4.11511-net11-p4</MicrosoftNETSdkMacCatalystManifest110100preview4PackageVersion>
<MicrosoftNETSdkmacOSManifest110100preview4PackageVersion>26.4.11511-net11-p4</MicrosoftNETSdkmacOSManifest110100preview4PackageVersion>
<MicrosoftNETSdkMauiManifest110100preview4PackageVersion>11.0.0-preview.4.26230.3</MicrosoftNETSdkMauiManifest110100preview4PackageVersion>
<MauiWorkloadManifestVersion>$(MicrosoftNETSdkMauiManifest110100preview4PackageVersion)</MauiWorkloadManifestVersion>
<XamarinAndroidWorkloadManifestVersion>$(MicrosoftNETSdkAndroidManifest110100preview4PackageVersion)</XamarinAndroidWorkloadManifestVersion>
<XamarinIOSWorkloadManifestVersion>$(MicrosoftNETSdkiOSManifest110100preview4PackageVersion)</XamarinIOSWorkloadManifestVersion>
<XamarinMacCatalystWorkloadManifestVersion>$(MicrosoftNETSdkMacCatalystManifest110100preview4PackageVersion)</XamarinMacCatalystWorkloadManifestVersion>
<XamarinMacOSWorkloadManifestVersion>$(MicrosoftNETSdkmacOSManifest110100preview4PackageVersion)</XamarinMacOSWorkloadManifestVersion>
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest110100preview4PackageVersion)</XamarinTvOSWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup Label="MonoWorkloads">
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>11.0.100-preview.3.26207.106</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview3PackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.3.26166.114</MicrosoftNETSdkPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>11.0.100-preview.4.26224.122</MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.4.26166.114</MicrosoftNETSdkPackageVersion>
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview3PackageVersion)</MonoWorkloadManifestVersion>
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview4PackageVersion)</MonoWorkloadManifestVersion>
<!-- mono workload prerelease version band must match the runtime feature band -->
<MonoWorkloadFeatureBand>11.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))</MonoWorkloadFeatureBand>
</PropertyGroup>
Expand Down
5 changes: 1 addition & 4 deletions eng/common/core-templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ parameters:
enablePublishBuildArtifacts: false
enablePublishBuildAssets: false
enablePublishTestResults: false
enablePublishing: false
enableBuildRetry: false
mergeTestResults: false
testRunTitle: ''
testResultsFormat: ''
name: ''
componentGovernanceSteps: []
preSteps: []
artifactPublishSteps: []
runAsPublic: false
Expand Down Expand Up @@ -152,9 +152,6 @@ jobs:
- ${{ each step in parameters.steps }}:
- ${{ step }}

- ${{ each step in parameters.componentGovernanceSteps }}:
- ${{ step }}

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
parameters:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/job/onelocbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ jobs:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: windows.vs2026.amd64
os: windows

steps:
Expand Down
16 changes: 9 additions & 7 deletions eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ jobs:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
name: AzurePipelines-EO
image: 1ESPT-Windows2022
image: 1ESPT-Windows2025
demands: Cmd
os: windows
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2022.amd64
image: windows.vs2026.amd64
os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down Expand Up @@ -172,17 +172,18 @@ jobs:
targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
artifactName: AssetManifests
displayName: 'Publish Merged Manifest'
retryCountOnTaskFailure: 10 # for any logs being locked
sbomEnabled: false # we don't need SBOM for logs
retryCountOnTaskFailure: 10 # for any files being locked
isProduction: false # just metadata for publishing

- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
args:
displayName: Publish ReleaseConfigs Artifact
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
publishLocation: Container
targetPath: '$(Build.StagingDirectory)/ReleaseConfigs'
artifactName: ReleaseConfigs
retryCountOnTaskFailure: 10 # for any files being locked
isProduction: false # just metadata for publishing

- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
Expand Down Expand Up @@ -218,4 +219,5 @@ jobs:
- template: /eng/common/core-templates/steps/publish-logs.yml
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
StageLabel: 'BuildAssetRegistry'
JobLabel: 'Publish_Artifacts_Logs'
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/renovate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:
condition: succeededOrFailed()
targetPath: $(Build.ArtifactStagingDirectory)
artifactName: $(Agent.JobName)_Logs_Attempt$(System.JobAttempt)
sbomEnabled: false
isProduction: false # logs are non-production artifacts

steps:
- checkout: self
Expand Down
5 changes: 5 additions & 0 deletions eng/common/core-templates/jobs/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ parameters:

artifacts: {}
is1ESPipeline: ''

# Publishing version w/default.
publishingVersion: 3

repositoryAlias: self
officialBuildId: ''

Expand Down Expand Up @@ -102,6 +106,7 @@ jobs:
parameters:
is1ESPipeline: ${{ parameters.is1ESPipeline }}
continueOnError: ${{ parameters.continueOnError }}
publishingVersion: ${{ parameters.publishingVersion }}
dependsOn:
- ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}:
- ${{ each job in parameters.publishBuildAssetsDependsOn }}:
Expand Down
2 changes: 0 additions & 2 deletions eng/common/core-templates/post-build/common-variables.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ variables:
- name: MaestroApiVersion
value: "2020-02-20"

- name: SourceLinkCLIVersion
value: 3.0.0
- name: SymbolToolVersion
value: 1.0.1
- name: BinlogToolVersion
Expand Down
Loading