Skip to content

Commit 65fb6e1

Browse files
faddivfaddiv
committed
Use MSBuild.Sdk.Extras to create correct intellisense support for netcoreapp3
1 parent d228efd commit 65fb6e1

File tree

4 files changed

+82
-41
lines changed

4 files changed

+82
-41
lines changed

‎FluentAssertions.AspNetCore.Mvc.sln

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4C33565
1616
EndProject
1717
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc", "src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj", "{EA71D220-089E-4CB1-B187-D9BB4DFD8624}"
1818
EndProject
19+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Ref", "src\FluentAssertions.AspNetCore.Mvc.Ref\FluentAssertions.AspNetCore.Mvc.Ref.csproj", "{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}"
20+
EndProject
1921
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Tests", "tests\FluentAssertions.AspNetCore.Mvc.Tests\FluentAssertions.AspNetCore.Mvc.Tests.csproj", "{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}"
2022
EndProject
2123
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.AspNetCore.Mvc.Sample.Tests", "samples\FluentAssertions.AspNetCore.Mvc.Sample.Tests\FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj", "{BCFB2639-D0CC-4E81-B431-8CB37F66480F}"
@@ -44,6 +46,18 @@ Global
4446
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Mixed Platforms.Build.0 = Release|Any CPU
4547
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.ActiveCfg = Release|Any CPU
4648
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.Build.0 = Release|Any CPU
49+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
52+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
53+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Debug|x86.ActiveCfg = Debug|Any CPU
54+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Debug|x86.Build.0 = Debug|Any CPU
55+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Release|Any CPU.Build.0 = Release|Any CPU
57+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
58+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
59+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Release|x86.ActiveCfg = Release|Any CPU
60+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF}.Release|x86.Build.0 = Release|Any CPU
4761
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4862
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Any CPU.Build.0 = Debug|Any CPU
4963
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -86,6 +100,7 @@ Global
86100
EndGlobalSection
87101
GlobalSection(NestedProjects) = preSolution
88102
{EA71D220-089E-4CB1-B187-D9BB4DFD8624} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
103+
{BA15EEA1-7305-42D3-A60E-3BDEC8CBECAF} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
89104
{A4962D4A-A99A-4F96-8F76-C5A2F1D06577} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
90105
{BCFB2639-D0CC-4E81-B431-8CB37F66480F} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
91106
{263F58EE-CF19-4974-AEBB-2A0E6C3F9054} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}

‎global.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"msbuild-sdks": {
3+
"MSBuild.Sdk.Extras": "2.0.54"
4+
}
5+
}

‎src/FluentAssertions.AspNetCore.Mvc.Ref/FluentAssertions.AspNetCore.Mvc.Ref.csproj

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project Sdk="MSBuild.Sdk.Extras">
2+
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<PackageReference Include="FluentAssertions" Version="5.0.0" />
9+
</ItemGroup>
10+
11+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
12+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
13+
</ItemGroup>
14+
15+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
16+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<Compile Include="..\FluentAssertions.AspNetCore.Mvc\*.cs" Exclude="..\FluentAssertions.AspNetCore.Mvc\obj\*.cs" />
21+
</ItemGroup>
22+
</Project>

‎src/FluentAssertions.AspNetCore.Mvc/FluentAssertions.AspNetCore.Mvc.csproj

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,51 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<Description>Fluent Assertions extensions for ASP.NET Core MVC.</Description>
55
<Copyright>Copyright 2018</Copyright>
66
<AssemblyTitle>Fluent Assertions extensions for ASP.NET Core MVC</AssemblyTitle>
7-
<Title>Fluent Assertions for ASP.NET Core MVC</Title>
8-
<VersionPrefix>2.4.0</VersionPrefix>
9-
<Authors>Casey Burns;Kevin Kuszyk</Authors>
10-
<TargetFrameworks>netstandard2.0;netcoreapp2.1;netcoreapp3.0</TargetFrameworks>
11-
<AssemblyName>FluentAssertions.AspNetCore.Mvc</AssemblyName>
12-
<PackageId>FluentAssertions.AspNetCore.Mvc</PackageId>
13-
<PackageTags>TDD;TDD;Fluent;Mvc;AspNetMvc;aspnetcore;aspnetcoremvc</PackageTags>
14-
<PackageReleaseNotes>See https://github.com/fluentassertions/fluentassertions.aspnetcore.mvc/releases </PackageReleaseNotes>
15-
<PackageProjectUrl>https://github.com/fluentassertions/fluentassertions.aspnetcore.mvc</PackageProjectUrl>
16-
<PackageLicenseUrl>https://github.com/fluentassertions/fluentassertions.aspnetcore.mvc/blob/master/license.txt</PackageLicenseUrl>
17-
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
18-
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
19-
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
20-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
21-
<OutputType>Library</OutputType>
22-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\FluentAssertions.AspNetCore.Mvc.xml</DocumentationFile>
23-
</PropertyGroup>
24-
25-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
26-
<OutputPath>bin\Debug\netstandard2.0\</OutputPath>
27-
</PropertyGroup>
28-
29-
<ItemGroup>
30-
<PackageReference Include="FluentAssertions" Version="5.0.0" />
31-
</ItemGroup>
32-
33-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netcoreapp2.1'">
34-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
38-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
39-
</ItemGroup>
40-
41-
<ItemGroup>
42-
<Compile Update="FailureMessages.Designer.cs">
43-
<DesignTime>True</DesignTime>
44-
<AutoGen>True</AutoGen>
45-
<DependentUpon>FailureMessages.resx</DependentUpon>
46-
</Compile>
7+
<Title>Fluent Assertions for ASP.NET Core MVC</Title>
8+
<VersionPrefix>2.5.0</VersionPrefix>
9+
<Authors>Casey Burns;Kevin Kuszyk</Authors>
10+
<TargetFrameworks>netstandard2.0;netcoreapp3.0</TargetFrameworks>
11+
<AssemblyName>FluentAssertions.AspNetCore.Mvc</AssemblyName>
12+
<PackageId>FluentAssertions.AspNetCore.Mvc</PackageId>
13+
<PackageTags>TDD;TDD;Fluent;Mvc;AspNetMvc;aspnetcore;aspnetcoremvc</PackageTags>
14+
<PackageReleaseNotes>See https://github.com/fluentassertions/fluentassertions.aspnetcore.mvc/releases </PackageReleaseNotes>
15+
<PackageProjectUrl>https://github.com/fluentassertions/fluentassertions.aspnetcore.mvc</PackageProjectUrl>
16+
<PackageLicenseUrl>https://github.com/fluentassertions/fluentassertions.aspnetcore.mvc/blob/master/license.txt</PackageLicenseUrl>
17+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
18+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
19+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
20+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
21+
<OutputType>Library</OutputType>
22+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\FluentAssertions.AspNetCore.Mvc.xml</DocumentationFile>
23+
<OutputPath>bin\$(Configuration)\$(TargetFramework)\</OutputPath>
24+
</PropertyGroup>
25+
26+
<ItemGroup>
27+
<PackageReference Include="FluentAssertions" Version="5.0.0" />
28+
</ItemGroup>
29+
30+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
31+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.0" />
32+
</ItemGroup>
33+
34+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
35+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
36+
</ItemGroup>
37+
38+
<ItemGroup>
39+
40+
<ReferenceAssemblyProjectReference Include="..\FluentAssertions.AspNetCore.Mvc.Ref\FluentAssertions.AspNetCore.Mvc.Ref.csproj" />
4741
</ItemGroup>
4842

4943
<ItemGroup>
44+
<Compile Update="FailureMessages.Designer.cs">
45+
<DesignTime>True</DesignTime>
46+
<AutoGen>True</AutoGen>
47+
<DependentUpon>FailureMessages.resx</DependentUpon>
48+
</Compile>
5049
<EmbeddedResource Update="FailureMessages.resx">
5150
<Generator>ResXFileCodeGenerator</Generator>
5251
<LastGenOutput>FailureMessages.Designer.cs</LastGenOutput>

0 commit comments

Comments
 (0)