Skip to content

Commit 97c47c3

Browse files
committed
Move $(DefaultNetCoreTargetFramework) to eng/Versions.props
- avoid repeating value in AfterSolutionBuild.targets and Directory.Build.props files
1 parent 0d704ff commit 97c47c3

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

Directory.Build.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,6 @@
8787
<NuspecBasePath>$(MSBuildProjectDirectory)</NuspecBasePath>
8888

8989
<IncludeSymbols>true</IncludeSymbols>
90-
91-
<!--
92-
Also update the DefaultNetCoreTargetFramework defined at src/Razor/test/testassets/Directory.Build.props and
93-
the packages referenced in Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj when this changes.
94-
-->
95-
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
9690
<DefaultNetFxTargetFramework>net461</DefaultNetFxTargetFramework>
9791
</PropertyGroup>
9892

eng/Versions.props

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<AspNetCoreModuleVersionRevision>$(AspNetCorePatchVersion)</AspNetCoreModuleVersionRevision>
4242
<!-- This is used for error checking to ensure generated code and baselines are up to date when we increment the patch. -->
4343
<PreviousAspNetCoreReleaseVersion Condition=" '$(AspNetCorePatchVersion)' != '0' ">$(AspNetCoreMajorMinorVersion).$([MSBuild]::Subtract($(AspNetCorePatchVersion), 1))</PreviousAspNetCoreReleaseVersion>
44+
<!--
45+
Update the packages referenced in Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj when this changes.
46+
-->
47+
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
4448
</PropertyGroup>
4549
<PropertyGroup Label="Arcade settings">
4650
<!-- Opt-in to Arcade tools for building VSIX projects. -->

src/Components/WebAssembly/Sdk/testassets/Directory.Build.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<!-- Do not resolve Reference ItemGroup since it has a different semantic meaning in Razor test apps -->
1313
<EnableCustomReferenceResolution>false</EnableCustomReferenceResolution>
1414

15-
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
16-
1715
<RepoRoot Condition="'$(RepoRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, 'AspNetCore.sln'))\</RepoRoot>
1816

1917
<RazorSdkCurrentVersionProps>$(RepoRoot)src\Razor\Microsoft.NET.Sdk.Razor\src\build\netstandard2.0\Sdk.Razor.CurrentVersion.props</RazorSdkCurrentVersionProps>

src/Razor/test/testassets/Directory.Build.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
<!-- Do not resolve Reference ItemGroup since it has a different semantic meaning in Razor test apps -->
1313
<EnableCustomReferenceResolution>false</EnableCustomReferenceResolution>
1414

15-
<DefaultNetCoreTargetFramework>net5.0</DefaultNetCoreTargetFramework>
16-
1715
<RepoRoot Condition="'$(BuildingTestAppsIndependently)' == 'true' AND '$(RepoRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, 'global.json'))\</RepoRoot>
1816
<RazorSdkArtifactsDirectory>$(RepoRoot)artifacts\bin\Microsoft.NET.Sdk.Razor\</RazorSdkArtifactsDirectory>
1917
<BlazorWebAssemblyJSPath>$(MSBuildThisFileDirectory)blazor.webassembly.js</BlazorWebAssemblyJSPath>

0 commit comments

Comments
 (0)