Skip to content

Don't require latest runtime patch for Blazor DevServer #56123

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
merged 2 commits into from
Jun 10, 2024
Merged

Don't require latest runtime patch for Blazor DevServer #56123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dee53f6
Don't require latest runtime patch for Blazor DevServer
halter73 Jun 7, 2024
29bbd9e
Delete outdated MicrosoftAspNetCoreAppVersion
halter73 Jun 7, 2024
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
1 change: 0 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,6 @@
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
<XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
<MicrosoftDataSqlClientVersion>4.0.5</MicrosoftDataSqlClientVersion>
<MicrosoftAspNetCoreAppVersion>6.0.0-preview.3.21167.1</MicrosoftAspNetCoreAppVersion>
<MicrosoftOpenApiVersion>1.6.13</MicrosoftOpenApiVersion>
<MicrosoftOpenApiReadersVersion>1.6.13</MicrosoftOpenApiReadersVersion>
<!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
Expand Down
2 changes: 1 addition & 1 deletion ...ts/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<Target Name="_CreateRuntimeConfig" BeforeTargets="CoreBuild">
<PropertyGroup>
<_RuntimeConfigProperties>
SharedFxVersion=$(SharedFxVersion);
AspNetCoreMajorMinorVersion=$(AspNetCoreMajorMinorVersion);
</_RuntimeConfigProperties>

<_RuntimeConfigPath>$(OutputPath)blazor-devserver.runtimeconfig.json</_RuntimeConfigPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"tfm": "net9.0",
"framework": {
"name": "Microsoft.AspNetCore.App",
"version": "${SharedFxVersion}"
"version": "${AspNetCoreMajorMinorVersion}.0"
},
"rollForwardOnNoCandidateFx": 2
}
Expand Down
5 changes: 0 additions & 5 deletions src/Middleware/ConcurrencyLimiter/sample/ConcurrencyLimiterSample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,4 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
</ItemGroup>

<!-- Benchmarks server uses shared Fx but needs refs to OOB packages. -->
<ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
<PackageReference Include="Microsoft.AspNetCore.ConcurrencyLimiter" Version="$(MicrosoftAspNetCoreAppVersion)" />
</ItemGroup>
</Project>
7 changes: 0 additions & 7 deletions src/Mvc/perf/benchmarkapps/BasicApi/BasicApi.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,4 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.Extensions.Configuration.CommandLine" />
</ItemGroup>

<!-- These references are used when building on the Benchmarks Server. -->
<ItemGroup Condition="'$(BenchmarksTargetFramework)' != ''">
<!-- Special-case the JwtBearer package because assembly no longer ships in Microsoft.AspNetCore.App. -->
<!-- Cannot use <Reference> because it's unsupported when building an isolated project. -->
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCoreAppVersion)" />
</ItemGroup>
</Project>
6 changes: 0 additions & 6 deletions src/ProjectTemplates/GenerateContent.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,6 @@

<!-- Use for incremental builds. When versions or dependencies of templates change, this file is updated and causes a re-build. -->
<_GenerateContentPropertiesHashFile>$(IntermediateOutputPath)$(MSBuildProjectName).content.g.cache</_GenerateContentPropertiesHashFile>

<!-- The version of the shared framework. This is used in tests to ensure they run against the shared framework version we just built. -->
<GeneratedContentProperties>
$(GeneratedContentProperties);
MicrosoftAspNetCoreAppVersion=$(SharedFxVersion);
</GeneratedContentProperties>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 0 additions & 2 deletions src/SiteExtensions/Sdk/SiteExtension.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);
HostingStartupVersion=%(_HostingStartupPackageReference.Version);
RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);
MicrosoftAspNetCoreAppVersion=$(SharedFxVersion);
UseAppHost=false;
NoBuild=false;
RestoreAdditionalProjectSources=$(_RsRestoreSources)" />
Expand All @@ -97,7 +96,6 @@
HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);
HostingStartupVersion=%(_HostingStartupPackageReference.Version);
RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);
MicrosoftAspNetCoreAppVersion=$(SharedFxVersion);
UseAppHost=false;
NoBuild=false;
IncludeMainProjectInDepsFile=false" />
Expand Down
Loading