Skip to content

Commit a3990b7

Browse files
authored
Don't require latest runtime patch for Blazor DevServer (#56123)
1 parent f7d5104 commit a3990b7

File tree

7 files changed

+2
-23
lines changed

7 files changed

+2
-23
lines changed

eng/Versions.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@
334334
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
335335
<XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
336336
<MicrosoftDataSqlClientVersion>4.0.5</MicrosoftDataSqlClientVersion>
337-
<MicrosoftAspNetCoreAppVersion>6.0.0-preview.3.21167.1</MicrosoftAspNetCoreAppVersion>
338337
<MicrosoftOpenApiVersion>1.6.13</MicrosoftOpenApiVersion>
339338
<MicrosoftOpenApiReadersVersion>1.6.13</MicrosoftOpenApiReadersVersion>
340339
<!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->

src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<Target Name="_CreateRuntimeConfig" BeforeTargets="CoreBuild">
3838
<PropertyGroup>
3939
<_RuntimeConfigProperties>
40-
SharedFxVersion=$(SharedFxVersion);
40+
AspNetCoreMajorMinorVersion=$(AspNetCoreMajorMinorVersion);
4141
</_RuntimeConfigProperties>
4242

4343
<_RuntimeConfigPath>$(OutputPath)blazor-devserver.runtimeconfig.json</_RuntimeConfigPath>

src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"tfm": "net9.0",
44
"framework": {
55
"name": "Microsoft.AspNetCore.App",
6-
"version": "${SharedFxVersion}"
6+
"version": "${AspNetCoreMajorMinorVersion}.0"
77
},
88
"rollForwardOnNoCandidateFx": 2
99
}

src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,4 @@
99
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
1010
<Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
1111
</ItemGroup>
12-
13-
<!-- Benchmarks server uses shared Fx but needs refs to OOB packages. -->
14-
<ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
15-
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="$(MicrosoftAspNetCoreAppVersion)" />
16-
</ItemGroup>
1712
</Project>

src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,4 @@
3030
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
3131
<Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
3232
</ItemGroup>
33-
34-
<!-- These references are used when building on the Benchmarks Server. -->
35-
<ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
36-
<!-- Special-case the JwtBearer package because assembly no longer ships in Microsoft.AspNetCore.App. -->
37-
<!-- Cannot use <Reference> because it's unsupported when building an isolated project. -->
38-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAppVersion)" />
39-
</ItemGroup>
4033
</Project>

src/ProjectTemplates/GenerateContent.targets

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44

55
<!-- Use for incremental builds. When versions or dependencies of templates change, this file is updated and causes a re-build. -->
66
<_GenerateContentPropertiesHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).content.g.cache</_GenerateContentPropertiesHashFile>
7-
8-
<!-- The version of the shared framework. This is used in tests to ensure they run against the shared framework version we just built. -->
9-
<GeneratedContentProperties>
10-
$(GeneratedContentProperties);
11-
MicrosoftAspNetCoreAppVersion=$(SharedFxVersion);
12-
</GeneratedContentProperties>
137
</PropertyGroup>
148

159
<ItemGroup>

src/SiteExtensions/Sdk/SiteExtension.targets

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);
8686
HostingStartupVersion=%(_HostingStartupPackageReference.Version);
8787
RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);
88-
MicrosoftAspNetCoreAppVersion=$(SharedFxVersion);
8988
UseAppHost=false;
9089
NoBuild=false;
9190
RestoreAdditionalProjectSources=$(_RsRestoreSources)" />
@@ -97,7 +96,6 @@
9796
HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);
9897
HostingStartupVersion=%(_HostingStartupPackageReference.Version);
9998
RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);
100-
MicrosoftAspNetCoreAppVersion=$(SharedFxVersion);
10199
UseAppHost=false;
102100
NoBuild=false;
103101
IncludeMainProjectInDepsFile=false" />

0 commit comments

Comments
 (0)