huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Undo hardcoded Razor.Design in templates

This commit is contained in:
Ryan Nowak 2018-09-22 16:16:56 -07:00
parent 5459107832
commit 86b532cd47
9 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/dependencies.props
View File

@ -13,7 +13,8 @@
<MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
<MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
<SignalRPackageVersion>1.0.0</SignalRPackageVersion>
<TemplateBlazorPackageVersion>0.6.0-preview1-20180807.1</TemplateBlazorPackageVersion>
<TemplateBlazorPackageVersion>0.6.0-preview1-20180921.2</TemplateBlazorPackageVersion>
<TemplateRazorDesignPackageVersion>2.1.2</TemplateRazorDesignPackageVersion>
<RazorPackageVersion>2.1.0</RazorPackageVersion>
</PropertyGroup>

2
src/Microsoft.AspNetCore.Blazor.Build/targets/RazorCompilation.targets
View File

@ -213,7 +213,7 @@
<!-- Include the temp assembly as a reference so we can discover components from the app.-->
<ItemGroup>
<_BlazorReferencePathWithRefAssemblies Include="@(ReferencePathWithRefAssemblies)" />
<_BlazorReferencePathWithRefAssemblies Include="%(_BlazorTempAssembly.FullPath)" />
<_BlazorReferencePathWithRefAssemblies Include="%(_BlazorTempAssembly.FullPath)" Condition="Exists('%(_BlazorTempAssembly.FullPath)')" />
</ItemGroup>
<ItemGroup>

1
src/Microsoft.AspNetCore.Blazor.Templates/SetPackageProperties.targets
View File

@ -21,6 +21,7 @@
<GeneratedContentProperties>
IncludeCustomRestoreSources=$(IncludeCustomRestoreSourcesValue);
TemplateBlazorVersion=$(PackageVersion);
TemplateRazorDesignPackageVersion=$(TemplateRazorDesignPackageVersion);
</GeneratedContentProperties>
</PropertyGroup>
</Target>

3
src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj
View File

@ -12,9 +12,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="$(TemplateBlazorPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
<!-- Temporary workaround until we have a version of these packages that has the right Razor reference -->
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" />
</ItemGroup>
<ItemGroup>

1
src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Server/BlazorHosted-CSharp.Server.csproj
View File

@ -11,6 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="$(TemplateBlazorPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Design" Version="$(TemplateRazorDesignPackageVersion)" />
</ItemGroup>
<ItemGroup>

4
src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj
View File

@ -21,10 +21,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="$(TemplateBlazorPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
<!-- Temporary workaround until we have a version of these packages that has the right Razor reference -->
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" />
</ItemGroup>
</Project>

4
src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.App/BlazorServerSide-CSharp.App.csproj
View File

@ -15,10 +15,6 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="$(TemplateBlazorPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
<!-- Temporary workaround until we have a version of these packages that has the right Razor reference -->
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" />
</ItemGroup>
</Project>

2
src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorServerSide-CSharp/BlazorServerSide-CSharp.Server/BlazorServerSide-CSharp.Server.csproj
View File

@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="$(TemplateBlazorPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="$(TemplateRazorDesignPackageVersion)" />
</ItemGroup>
<ItemGroup>

3
src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj
View File

@ -14,9 +14,6 @@
<PackageReference Include="Microsoft.AspNetCore.Blazor.Browser" Version="$(TemplateBlazorPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
<!-- Temporary workaround until we have a version of these packages that has the right Razor reference -->
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.1.2" />
<DotNetCliToolReference Include="Microsoft.AspNetCore.Blazor.Cli" Version="$(TemplateBlazorPackageVersion)" />
</ItemGroup>