Skip to content

Commit c2e8e32

Browse files
committed
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/templating into merge/release/9.0.1xx-to-release/9.0.2xx
2 parents 9f77965 + 978233e commit c2e8e32

File tree

3 files changed

+17
-6
lines changed

3 files changed

+17
-6
lines changed

Diff for: eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Dependencies>
33
<ProductDependencies>
44
<!-- Intermediate is necessary for source build. -->
5-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24575.1">
5+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="9.0.0-alpha.1.24515.2">
66
<Uri>https://github.com/dotnet/source-build-externals</Uri>
7-
<Sha>ab469606a3e6b026dcac301e2dab96117c94faeb</Sha>
7+
<Sha>659bf534d9fbf673493b821be99df12032277549</Sha>
88
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
99
</Dependency>
1010
<!-- Intermediate is necessary for source build. -->

Diff for: eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<PropertyGroup>
3-
<VersionPrefix>9.0.105</VersionPrefix>
3+
<VersionPrefix>9.0.203</VersionPrefix>
44
<!-- When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages -->
55
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
66
<DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
77
<!-- Calculate prerelease label -->
8-
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">rtm</PreReleaseVersionLabel>
8+
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' != 'true'">preview</PreReleaseVersionLabel>
99
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and $(VersionPrefix.EndsWith('00'))">rtm</PreReleaseVersionLabel>
1010
<PreReleaseVersionLabel Condition="'$(StabilizePackageVersion)' == 'true' and !$(VersionPrefix.EndsWith('00'))">servicing</PreReleaseVersionLabel>
1111
<PreReleaseVersionIteration Condition="'$(StabilizePackageVersion)' != 'true'">

Diff for: src/Microsoft.TemplateEngine.Edge/Constraints/WorkloadConstraintFactory.cs

+13-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ namespace Microsoft.TemplateEngine.Edge.Constraints
1111
{
1212
public sealed class WorkloadConstraintFactory : ITemplateConstraintFactory
1313
{
14+
private static readonly SemaphoreSlim Mutex = new(1);
15+
1416
Guid IIdentifiedComponent.Id { get; } = Guid.Parse("{F8BA5B13-7BD6-47C8-838C-66626526817B}");
1517

1618
string ITemplateConstraintFactory.Type => "workload";
@@ -97,8 +99,17 @@ private static IEnumerable<string> ParseArgs(string? args)
9799
}
98100

99101
token.ThrowIfCancellationRequested();
100-
IEnumerable<WorkloadInfo> currentProviderWorkloads = await providers[0].GetInstalledWorkloadsAsync(token).ConfigureAwait(false);
101-
workloads = currentProviderWorkloads.ToList();
102+
103+
await Mutex.WaitAsync(token).ConfigureAwait(false);
104+
try
105+
{
106+
IEnumerable<WorkloadInfo> currentProviderWorkloads = await providers[0].GetInstalledWorkloadsAsync(token).ConfigureAwait(false);
107+
workloads = currentProviderWorkloads.ToList();
108+
}
109+
finally
110+
{
111+
Mutex.Release();
112+
}
102113

103114
if (workloads.Select(w => w.Id).HasDuplicates(StringComparer.InvariantCultureIgnoreCase))
104115
{

0 commit comments

Comments
 (0)