Skip to content

Commit 80cf3a3

Browse files
authored
Fix main for p2 for the arcade issue and darc issue (#746)
1 parent f80ab34 commit 80cf3a3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
77
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
88
</Dependency>
9-
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.2" Version="11.0.0-preview.2.26159.112">
9+
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-11.0.100-preview.2" Version="11.0.100-preview.2.26159.112">
1010
<Uri>https://github.com/dotnet/dotnet</Uri>
1111
<Sha>17d11de66cf75b962995c81dd1235fae9aa5ece0</Sha>
1212
</Dependency>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<XamarinTvOSWorkloadManifestVersion>$(MicrosoftNETSdktvOSManifest110100preview2PackageVersion)</XamarinTvOSWorkloadManifestVersion>
6161
</PropertyGroup>
6262
<PropertyGroup Label="MonoWorkloads">
63-
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>11.0.0-preview.2.26159.112</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>
63+
<MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>11.0.100-preview.2.26159.112</MicrosoftNETWorkloadMonoToolChainCurrentManifest110100preview2PackageVersion>
6464
<MicrosoftNETSdkPackageVersion>11.0.100-preview.2.26159.112</MicrosoftNETSdkPackageVersion>
6565
<!-- Workloads from dotnet/sdk use MicrosoftNETSdkPackageVersion as the manifests are now built from the dotnet/sdk repo -->
6666
<MonoWorkloadManifestVersion>$(MicrosoftNETWorkloadMonoToolchainCurrentManifest110100preview2PackageVersion)</MonoWorkloadManifestVersion>

eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ steps:
7373
# YAML expansion, and Windows vs. Linux/Mac uses different service connections. However,
7474
# we can avoid including the MB install step if not enabled at all. This avoids a bunch of
7575
# extra pipeline authorizations, since most pipelines do not sign on non-Windows.
76-
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
76+
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml
7777
parameters:
7878
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
7979
microbuildTaskInputs:
@@ -95,7 +95,7 @@ steps:
9595
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test'))
9696

9797
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}:
98-
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self
98+
- template: /eng/common/core-templates/steps/install-microbuild-impl.yml
9999
parameters:
100100
enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }}
101101
microbuildTaskInputs:

0 commit comments

Comments
 (0)