Skip to content

Commit ce9f3d4

Browse files
committed
Move the temp pre-release fix for blazor apps to teh Blazor.PackageVersions.props file.
1 parent 260829b commit ce9f3d4

2 files changed

Lines changed: 22 additions & 19 deletions

File tree

src/scenarios/blazorlocalized/src/BlazorLocalized/BlazorLocalized.csproj

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,28 +10,9 @@
1010

1111
<Import Project="$(BuildCommonPath)\Blazor.PackageVersions.props" />
1212

13-
<!-- Workaround: Explicit Microsoft.Extensions pre-release versions for net10.0.
14-
The WebAssembly SDK depends on Microsoft.Extensions packages with version >=10.0.0.
15-
Only pre-release (rtm/rc) builds are presently available in internal feeds; since
16-
NuGet treats pre-release < stable, transitive resolution fails. We force a floating
17-
pre-release selection via explicit PackageReferences conditioned on net10.0. -->
18-
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))">
19-
<ExtensionsVersion>10.0.0-*</ExtensionsVersion>
20-
</PropertyGroup>
21-
2213
<ItemGroup>
2314
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(AspNetCoreVersion)" />
2415
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(AspNetCoreVersion)" />
2516
<ProjectReference Include="..\BlazorLocalized.ClassLibrary\BlazorLocalized.ClassLibrary.csproj" />
26-
<!-- Explicit extensions packages (conditional) -->
27-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
29-
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
30-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
31-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
32-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
33-
<PackageReference Include="Microsoft.Extensions.Options" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
34-
<PackageReference Include="Microsoft.Extensions.Primitives" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
35-
<PackageReference Include="Microsoft.Extensions.Diagnostics" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
3617
</ItemGroup>
3718
</Project>

src/scenarios/build-common/Blazor.PackageVersions.props

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,26 @@
2626
<BlazorVersion Condition="'$(BlazorVersion)' == ''">6.0.0-preview*</BlazorVersion>
2727
<SystemNetHttpJsonVersion Condition="'$(SystemNetHttpJsonVersion)' == ''">6.0.0-preview*</SystemNetHttpJsonVersion>
2828
</PropertyGroup>
29+
30+
<!-- Workaround: Explicit Microsoft.Extensions pre-release versions for net10.0.
31+
The WebAssembly SDK depends on Microsoft.Extensions packages with version >=10.0.0.
32+
Only pre-release (rtm/rc) builds are presently available in internal feeds; since
33+
NuGet treats pre-release < stable, transitive resolution fails. We force a floating
34+
pre-release selection via explicit PackageReferences conditioned on net10.0. -->
35+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))">
36+
<ExtensionsVersion>10.0.0-*</ExtensionsVersion>
37+
</PropertyGroup>
38+
39+
<ItemGroup>
40+
<!-- Explicit extensions packages (conditional) -->
41+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
42+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
43+
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
44+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
45+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
46+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
47+
<PackageReference Include="Microsoft.Extensions.Options" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
48+
<PackageReference Include="Microsoft.Extensions.Primitives" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
49+
<PackageReference Include="Microsoft.Extensions.Diagnostics" Version="$(ExtensionsVersion)" Condition="'$(TargetFramework)' == 'net10.0' or $(TargetFrameworks.Contains('net10.0'))" />
50+
</ItemGroup>
2951
</Project>

0 commit comments

Comments
 (0)