Skip to content

Commit

Permalink
version names corrected
Browse files Browse the repository at this point in the history
  • Loading branch information
nm-a committed Nov 13, 2020
1 parent 3b98bd7 commit db6f3f6
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 58 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<PreserveCompilationContext>true</PreserveCompilationContext>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.3" />
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.1.14" />
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.1.14" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
Expand Down
2 changes: 1 addition & 1 deletion src/RazorLight.Precompile/RazorLight.Precompile.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
18 changes: 17 additions & 1 deletion src/RazorLight/RazorLight.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -18,6 +18,22 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.CodeAnalysis.Razor" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[2.1.0,3)" />
<PackageReference Include="Microsoft.Extensions.Primitives" Version="[2.1.0,3)" />
<PackageReference Include="System.Buffers" Version="4.5.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="[3.0.3,3.1)" />
Expand Down
104 changes: 52 additions & 52 deletions tests/RazorLight.Tests/RazorLight.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<PreserveCompilationContext>true</PreserveCompilationContext>
<DefineConstants>$(DefineConstants);SOME_TEST_DEFINE</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0;netcoreapp3.1;net5.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<PreserveCompilationContext>true</PreserveCompilationContext>
<DefineConstants>$(DefineConstants);SOME_TEST_DEFINE</DefineConstants>
</PropertyGroup>

<PropertyGroup>
<MdTargetDir>$(SolutionDir)</MdTargetDir>
</PropertyGroup>
<PropertyGroup>
<MdTargetDir>$(SolutionDir)</MdTargetDir>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>false</Optimize>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>false</Optimize>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<None Remove="Assets\Embedded\*.cshtml" />
<EmbeddedResource Include="Assets\Embedded\*.cshtml" />
</ItemGroup>
<ItemGroup>
<None Remove="Assets\Embedded\*.cshtml" />
<EmbeddedResource Include="Assets\Embedded\*.cshtml" />
</ItemGroup>

<ItemGroup>
<None Update="Assets\Files\*.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Update="Assets\Files\*.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="MarkdownSnippets.MsBuild" Version="19.0.1" />
<PackageReference Include="Moq" Version="4.7.99" />
<PackageReference Include="Pose" Version="1.2.1" />
<PackageReference Include="Verify.Xunit" Version="5.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MarkdownSnippets.MsBuild" Version="19.0.1" />
<PackageReference Include="Moq" Version="4.7.99" />
<PackageReference Include="Pose" Version="1.2.1" />
<PackageReference Include="Verify.Xunit" Version="5.0.2" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.0.3" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.3" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="2.1.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.5" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.5" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\RazorLight\RazorLight.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\RazorLight\RazorLight.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="Assets\Files\Subfolder\Empty.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Update="Assets\Files\Subfolder\Empty.cshtml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>


</Project>

0 comments on commit db6f3f6

Please sign in to comment.