Skip to content

Commit 134850b

Browse files
authored
Update rzc to ne5.0 (#25111)
1 parent 0960a7a commit 134850b

File tree

3 files changed

+5
-12
lines changed

3 files changed

+5
-12
lines changed

src/Razor/Microsoft.AspNetCore.Razor.Tools/src/rzc.csproj

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,7 @@
22

33
<PropertyGroup>
44
<Description>Razor is a markup syntax for adding server-side logic to web pages. This assembly contains infrastructure supporting Razor MSBuild integration.</Description>
5-
6-
<!--
7-
This is intentionally targeting netcoreapp3.0. This allows using the Microsoft.NET.Sdk.Razor package without having to solve diamond dependency problems in AspNetCore.
8-
We use a runtimeconfig.json.template to allow roll forwards.
9-
In addition, the SDK stamps an exact version of the shared fx to use in all runtimeconfig.json that are contained in the SDK.
10-
See the discussion here: https://github.com/dotnet/aspnetcore-internal/issues/3201#issuecomment-539631557
11-
-->
12-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
136
<OutputType>Exe</OutputType>
147
<AssemblyName>rzc</AssemblyName>
158

src/Razor/Microsoft.NET.Sdk.Razor/src/Microsoft.NET.Sdk.Razor.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,19 +67,19 @@
6767
</PropertyGroup>
6868

6969
<ItemGroup>
70-
<RazorToolsOutput Include="$(ArtifactsBinDir)rzc\$(Configuration)\netcoreapp3.0\publish\**\*.*" />
70+
<RazorToolsOutput Include="$(ArtifactsBinDir)rzc\$(Configuration)\$(DefaultNetCoreTargetFramework)\publish\**\*.*" />
7171
<MvcRazorExtensionOutput Include="$(ArtifactsBinDir)Microsoft.AspNetCore.Mvc.Razor.Extensions\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll" />
7272
</ItemGroup>
7373

7474
<Error
75-
Text="rzc outputs were not found in $(ArtifactsBinDir)rzc\$(Configuration)\netcoreapp3.0\publish"
75+
Text="rzc outputs were not found in $(ArtifactsBinDir)rzc\$(Configuration)\$(DefaultNetCoreTargetFramework)\publish"
7676
Condition="'@(RazorToolsOutput->Count())' == '0'" />
7777

7878
<Error
7979
Text="Mvc extensions outputs were not found in $(ArtifactsBinDir)Microsoft.AspNetCore.Mvc.Razor.Extensions\$(Configuration)\netstandard2.0"
8080
Condition="'@(MvcRazorExtensionOutput->Count())' == '0'" />
8181

82-
<Copy SourceFiles="@(RazorToolsOutput)" DestinationFolder="$(SdkOutputPath)tools\netcoreapp3.0\" SkipUnchangedFiles="true" Retries="$(_Retries)" ContinueOnError="$(_ContinueOnError)" />
82+
<Copy SourceFiles="@(RazorToolsOutput)" DestinationFolder="$(SdkOutputPath)tools\" SkipUnchangedFiles="true" Retries="$(_Retries)" ContinueOnError="$(_ContinueOnError)" />
8383
<Copy SourceFiles="@(MvcRazorExtensionOutput)" DestinationFolder="$(SdkOutputPath)extensions\mvc-3-0\" SkipUnchangedFiles="true" Retries="$(_Retries)" ContinueOnError="$(_ContinueOnError)">
8484
<Output TaskParameter="CopiedFiles" ItemName="FileWrites" />
8585
</Copy>

src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Copyright (c) .NET Foundation. All rights reserved.
3333
<_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net5.0</_RazorSdkTasksTFM>
3434
<_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net46</_RazorSdkTasksTFM>
3535
<RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
36-
<_RazorSdkToolAssembly>$(RazorSdkDirectoryRoot)tools\netcoreapp3.0\rzc.dll</_RazorSdkToolAssembly>
36+
<_RazorSdkToolAssembly>$(RazorSdkDirectoryRoot)tools\rzc.dll</_RazorSdkToolAssembly>
3737
</PropertyGroup>
3838

3939
<!-- Resolve the RazorLangVersion based on values imported or TFM. -->

0 commit comments

Comments
 (0)