Skip to content

Fix main for p2 for the arcade issue and darc issue #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcpopMSFT merged 1 commit into from
Mar 10, 2026
Merged

Fix main for p2 for the arcade issue and darc issue #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.2" Version="11.0.0-preview.2.26159.112">
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.2" Version="11.0.100-preview.2.26159.112">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
</Dependency>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest110100preview2PackageVersion)</XamarinTvOSWorkloadManifestVersion>
</PropertyGroup>
<PropertyGroup Label="MonoWorkloads">
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>11.0.0-preview.2.26159.112</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>11.0.100-preview.2.26159.112</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>
<MicrosoftNETSdkPackageVersion>11.0.100-preview.2.26159.112</MicrosoftNETSdkPackageVersion>
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview2PackageVersion)</MonoWorkloadManifestVersion>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/steps/install-microbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ steps:
# YAML expansion, and Windows vs. Linux/Mac uses different service connections. However,
# we can avoid including the MB install step if not enabled at all. This avoids a bunch of
# extra pipeline authorizations, since most pipelines do not sign on non-Windows.
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml
parameters:
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
microbuildTaskInputs:
Expand All @@ -95,7 +95,7 @@ steps:
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))

- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}:
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml
parameters:
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
microbuildTaskInputs:
Expand Down