Skip to content

Commit 48442fd

Browse files
mythzmythz
committed
fix mvc refs
1 parent c065843 commit 48442fd

File tree

2 files changed

+7
-22
lines changed

2 files changed

+7
-22
lines changed

‎src/ServiceStack.Mvc/ServiceStack.Mvc.Source.csproj‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
<PropertyGroup>
33
<PackageId>ServiceStack.Mvc</PackageId>
44
<AssemblyName>ServiceStack.Mvc</AssemblyName>
5-
<TargetFrameworks>net472;net6.0</TargetFrameworks>
5+
<TargetFramework>net6.0</TargetFramework>
6+
<!-- <TargetFrameworks>net472;net6.0</TargetFrameworks>-->
67
<Title>MVC Adapters for integrating with ServiceStack webservices</Title>
78
<PackageDescription>
89
MVC Adapter classes to provide tight integration and re-usable functionality between ServiceStack and MVC.
@@ -26,31 +27,23 @@
2627
<ProjectReference Include="..\ServiceStack\ServiceStack.Source.csproj" />
2728
</ItemGroup>
2829

29-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net472' ">
30-
<ProjectReference Include="..\ServiceStack.NetFramework\ServiceStack.NetFramework.Source.csproj" />
30+
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
31+
<ProjectReference Include="..\ServiceStack.NetFramework\ServiceStack.NetFramework.csproj" />
3132
<Reference Include="System.Web" />
3233
<Reference Include="System.Xml" />
3334
<Reference Include="System.Data" />
3435
<Reference Include="System.ServiceModel" />
3536
<Reference Include="System.Configuration" />
3637
<Reference Include="System.ComponentModel.DataAnnotations" />
37-
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
38-
</ItemGroup>
39-
40-
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
4138
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
39+
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
4240
</ItemGroup>
4341

4442
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
45-
</ItemGroup>
46-
47-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
4843
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
49-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core " Version="2.2.5" />
44+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />
5045
</ItemGroup>
5146

5247
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
53-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
54-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core " Version="2.2.5" />
5548
</ItemGroup>
5649
</Project>

‎src/ServiceStack.Mvc/ServiceStack.Mvc.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,15 @@
3636
<Reference Include="System.ServiceModel" />
3737
<Reference Include="System.Configuration" />
3838
<Reference Include="System.ComponentModel.DataAnnotations" />
39-
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
40-
</ItemGroup>
41-
42-
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
4339
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
40+
<PackageReference Include="Microsoft.AspNet.Mvc" Version="5.2.7" />
4441
</ItemGroup>
4542

4643
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
4744
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
4845
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />
4946
</ItemGroup>
5047

51-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
52-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
53-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core " Version="2.2.5" />
54-
</ItemGroup>
55-
5648
<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
5749
</ItemGroup>
5850
</Project>

0 commit comments

Comments
 (0)