Skip to content

Commit 9e89a69

Browse files
committed
Update RazorCompilation.targets for new SDK
1 parent 4424594 commit 9e89a69

File tree

7 files changed

+36
-426
lines changed

7 files changed

+36
-426
lines changed

src/Components/blazor/samples/HostedInAspNet.Server/HostedInAspNet.Server.csproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
6+
<!--
7+
This is a workaround that's needed because Microsoft.AspNetCore.App includes the OLD Razor.Design
8+
package and MSBuild support. We don't want those features to be used with the new SDK. Basically
9+
combining netcoreapp3.0 and and Razor.Design will result in duplicate assembly attributes.
10+
11+
See: https://github.com/aspnet/AspNetCore/issues/6182
12+
13+
This workaround can be removed when this project is converted to the shared framework.
14+
-->
15+
<GenerateProvideApplicationPartFactoryAttribute>false</GenerateProvideApplicationPartFactoryAttribute>
516
</PropertyGroup>
617

718
<ItemGroup>

src/Components/blazor/samples/MonoSanity/MonoSanity.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
9-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
109
</ItemGroup>
1110

1211
<ItemGroup>

src/Components/samples/ComponentsApp.Server/ComponentsApp.Server.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
<ItemGroup>
88
<PackageReference Include="Microsoft.AspNetCore" Version="$(AspNetCorePackageVersion)" />
9-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(MicrosoftAspNetCoreRazorDesignPackageVersion)" />
109
</ItemGroup>
1110

1211
<ItemGroup>

src/Components/src/Microsoft.AspNetCore.Components.Build/Microsoft.AspNetCore.Components.Build.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55
<Description>Build mechanism for ASP.NET Core Components.</Description>
66
<OutputType>Exe</OutputType>
77
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -60,7 +60,7 @@
6060
repositorycommit=$(RepositoryCommit);</NuspecProperties>
6161
</PropertyGroup>
6262
<ItemGroup>
63-
<_TargetFramework Include="$(TargetFrameworks)" />
63+
<_TargetFramework Include="$(TargetFramework)" />
6464
</ItemGroup>
6565
<MSBuild Projects="$(MSBuildProjectFullPath)" Targets="Publish" Properties="TargetFramework=%(_TargetFramework.Identity)" />
6666
</Target>

0 commit comments

Comments
 (0)