Skip to content
This repository was archived by the owner on Dec 14, 2018. It is now read-only.

Commit d407a37

Browse files
dougbudougbu
committed
PR comments
- re-enable .NET Framework run of the functional tests - disable shadow copying - add support for `/p:GenerateBaselines=true` for functional and Razor.Host tests - remove aspnet/KoreBuild#182 workaround; bug fixed - separate `GetCSharpTypeName_ReturnsCorrectTypeNames_ForOutParameter()` test - remove `Microsoft.DotNet.InternalAbstractions` and `System.Xml.XmlDocument` dependencies - stop floating `$(CoreFxVersion)` and Microsoft.Extensions.DependencyModel dependencies - remove `$(RuntimeIdentifier)` settings - move a few property settings to the top of a .csproj - remove all web.config files nit: remove some trailing whitespace in .csproj files
1 parent 36ba0e5 commit d407a37

File tree

74 files changed

+54
-312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+54
-312
lines changed

‎build/repo.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project>
22
<ItemGroup>
33
<ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.AspNetCore.Mvc.TestCommon\*.csproj" />
4-
<!-- Exclude with and without extra slash in case DefaultItems.targets is fixed. -->
5-
<ExcludeSolutions Include="$(RepositoryRoot)\Mvc.*Fun.sln" />
64
<ExcludeSolutions Include="$(RepositoryRoot)Mvc.*Fun.sln" />
75
</ItemGroup>
86
</Project>

‎samples/MvcSandbox/MvcSandbox.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<PropertyGroup>
66
<TargetFrameworks>net452;netcoreapp1.1</TargetFrameworks>
77
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp1.1</TargetFrameworks>
8-
<RuntimeIdentifier Condition=" '$(TargetFramework)' != 'netcoreapp1.1' ">win7-x64</RuntimeIdentifier>
98
</PropertyGroup>
109

1110
<ItemGroup>

‎samples/MvcSandbox/web.config

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ Microsoft.AspNetCore.Mvc.IActionResult</Description>
2222
</ItemGroup>
2323

2424
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
25-
<PackageReference Include="Microsoft.CSharp" Version="$(CoreFxVersion)-*" />
26-
<PackageReference Include="System.ComponentModel.TypeConverter" Version="$(CoreFxVersion)-*" />
25+
<PackageReference Include="Microsoft.CSharp" Version="$(CoreFxVersion)" />
26+
<PackageReference Include="System.ComponentModel.TypeConverter" Version="$(CoreFxVersion)" />
2727
</ItemGroup>
2828

2929
</Project>

‎src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ Microsoft.AspNetCore.Mvc.RouteAttribute</Description>
2828
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.2.0-*" />
2929
<PackageReference Include="Microsoft.AspNetCore.Routing.DecisionTree.Sources" Version="1.2.0-*" PrivateAssets="All" />
3030
<PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="1.2.0-*" PrivateAssets="All" />
31-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0-*" />
31+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="1.1.0" />
3232
<PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="1.2.0-*" />
3333
<PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="1.2.0-*" PrivateAssets="All" />
3434
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.2.0-*" />
3535
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.2.0-*" />
3636
<PackageReference Include="Microsoft.Extensions.PropertyActivator.Sources" Version="1.2.0-*" PrivateAssets="All" />
3737
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
3838
<PackageReference Include="Microsoft.Extensions.SecurityHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
39-
<PackageReference Include="System.Buffers" Version="$(CoreFxVersion)-*" />
40-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(CoreFxVersion)-*" />
39+
<PackageReference Include="System.Buffers" Version="$(CoreFxVersion)" />
40+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(CoreFxVersion)" />
4141
</ItemGroup>
4242

4343
</Project>

‎src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<Import Project="..\..\build\common.props" />
43

54
<PropertyGroup>
@@ -16,7 +15,6 @@
1615
<PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="1.2.0-*" PrivateAssets="All" />
1716
<PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="1.2.0-*" PrivateAssets="All" />
1817
<PackageReference Include="Microsoft.Extensions.Localization" Version="1.2.0-*" />
19-
<PackageReference Include="System.ComponentModel.Annotations" Version="$(CoreFxVersion)-*" />
18+
<PackageReference Include="System.ComponentModel.Annotations" Version="$(CoreFxVersion)" />
2019
</ItemGroup>
21-
2220
</Project>

‎src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<Import Project="..\..\build\common.props" />
43

54
<PropertyGroup>
@@ -16,5 +15,4 @@
1615
<PackageReference Include="Microsoft.AspNetCore.JsonPatch" Version="1.2.0-*" />
1716
<PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="1.2.0-*" PrivateAssets="All" />
1817
</ItemGroup>
19-
2018
</Project>

‎src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<Import Project="..\..\build\common.props" />
43

54
<PropertyGroup>
@@ -15,8 +14,7 @@
1514

1615
<PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="1.2.0-*" PrivateAssets="All" />
1716
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
18-
<PackageReference Include="System.Runtime.Serialization.Xml" Version="$(CoreFxVersion)-*" />
19-
<PackageReference Include="System.Xml.XmlSerializer" Version="$(CoreFxVersion)-*" />
17+
<PackageReference Include="System.Runtime.Serialization.Xml" Version="$(CoreFxVersion)" />
18+
<PackageReference Include="System.Xml.XmlSerializer" Version="$(CoreFxVersion)" />
2019
</ItemGroup>
21-
2220
</Project>

‎src/Microsoft.AspNetCore.Mvc.Razor.Host/Microsoft.AspNetCore.Mvc.Razor.Host.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
21-
<PackageReference Include="System.ComponentModel.TypeConverter" Version="$(CoreFxVersion)-*" />
21+
<PackageReference Include="System.ComponentModel.TypeConverter" Version="$(CoreFxVersion)" />
2222
</ItemGroup>
2323

2424
</Project>

‎src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</ItemGroup>
2626

2727
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
28-
<PackageReference Include="System.Runtime.Loader" Version="$(CoreFxVersion)-*" />
28+
<PackageReference Include="System.Runtime.Loader" Version="$(CoreFxVersion)" />
2929
</ItemGroup>
3030

3131
</Project>

‎src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<Import Project="..\..\build\common.props" />
43

54
<PropertyGroup>
@@ -25,5 +24,4 @@
2524
<PackageReference Include="Microsoft.Extensions.Primitives" Version="1.2.0-*" />
2625
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
2726
</ItemGroup>
28-
2927
</Project>

‎src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ Microsoft.AspNetCore.Mvc.ViewComponent</Description>
3131
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
3232
<PackageReference Include="Microsoft.Extensions.WebEncoders" Version="1.2.0-*" />
3333
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
34-
<PackageReference Include="System.Buffers" Version="$(CoreFxVersion)-*" />
35-
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(CoreFxVersion)-*" />
34+
<PackageReference Include="System.Buffers" Version="$(CoreFxVersion)" />
35+
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(CoreFxVersion)" />
3636
</ItemGroup>
3737

3838
</Project>

‎src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ System.Web.Http.ApiController</Description>
2020
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.2" />
2121
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.2.0-*" />
2222
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*" PrivateAssets="All" />
23-
<PackageReference Include="System.Runtime.Serialization.Xml" Version="$(CoreFxVersion)-*" />
24-
<PackageReference Include="System.Xml.XmlSerializer" Version="$(CoreFxVersion)-*" />
23+
<PackageReference Include="System.Runtime.Serialization.Xml" Version="$(CoreFxVersion)" />
24+
<PackageReference Include="System.Xml.XmlSerializer" Version="$(CoreFxVersion)" />
2525
</ItemGroup>
2626

2727
</Project>

‎test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
1111

1212
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
13-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
1413
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
1514
<PackageReference Include="Moq" Version="4.6.36-*" />
1615
<PackageReference Include="xunit" Version="2.2.0-*" />

‎test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
1111
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
1212

13-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
1413
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
1514
<PackageReference Include="xunit" Version="2.2.0-*" />
1615
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
@@ -19,5 +18,4 @@
1918
<ItemGroup>
2019
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
2120
</ItemGroup>
22-
2321
</Project>

‎test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.2.0-*" />
2020
<PackageReference Include="Microsoft.AspNetCore.ResponseCaching" Version="1.0.0-*" />
21-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
2221
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.2.0-*" />
2322
<PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="1.2.0-*" />
2423
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.2.0-*" />
@@ -28,12 +27,7 @@
2827
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />
2928
</ItemGroup>
3029

31-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.1' ">
32-
<PackageReference Include="System.Xml.XmlDocument" Version="$(CoreFxVersion)-*" />
33-
</ItemGroup>
34-
3530
<ItemGroup>
3631
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
3732
</ItemGroup>
38-
3933
</Project>

‎test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
1212

1313
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.2.0-*" />
14-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
1514
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.2.0-*" />
1615
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" />
1716
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
@@ -22,5 +21,5 @@
2221
<ItemGroup>
2322
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
2423
</ItemGroup>
25-
24+
2625
</Project>

‎test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<ItemGroup>
1111
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
1212

13-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
1413
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.2.0-*" />
1514
<PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="1.2.0-*" PrivateAssets="All" />
1615
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" />

‎test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj

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

33
<Import Project="..\..\build\common.props" />
4-
4+
55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
77
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp1.1</TargetFrameworks>
@@ -12,7 +12,6 @@
1212

1313
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.2.0-*" />
1414
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
15-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
1615
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.2.0-*" />
1716
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" />
1817
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
@@ -23,5 +22,5 @@
2322
<ItemGroup>
2423
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
2524
</ItemGroup>
26-
25+
2726
</Project>

‎test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
1212

1313
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.2.0-*" />
14-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
1514
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
1615
<PackageReference Include="xunit" Version="2.2.0-*" />
1716
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0-*" />

‎test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<Import Project="..\..\build\common.props" />
43

54
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp1.1;</TargetFrameworks>
7-
<DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES;FUNCTIONAL_TESTS</DefineConstants>
5+
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
6+
<DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
7+
<DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
8+
<DefineConstants>$(DefineConstants);FUNCTIONAL_TESTS</DefineConstants>
89
<PackageTargetFallback>$(PackageTargetFallback);portable-net451+win8</PackageTargetFallback>
910
</PropertyGroup>
1011

1112
<ItemGroup>
1213
<EmbeddedResource Include="compiler\resources\**\*" />
1314
<Compile Include="..\Microsoft.AspNetCore.Mvc.Formatters.Xml.Test\XmlAssert.cs" />
15+
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
1416
</ItemGroup>
1517

1618
<ItemGroup>
@@ -40,7 +42,6 @@
4042
<PackageReference Include="Microsoft.AspNetCore.ChunkingCookieManager.Sources" Version="1.2.0-*" PrivateAssets="All" />
4143
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="1.2.0-*" />
4244
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="1.2.0-*" />
43-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
4445
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.2.0-*" />
4546
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" />
4647
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
@@ -52,7 +53,7 @@
5253
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
5354
</ItemGroup>
5455

55-
<!--
56+
<!--
5657
Our functional tests utilize DependencyContext.Load which looks next to a dll for a deps.json. For each of our test
5758
applications they need to have their corresponding deps.json placed next to their .dll in order to work.
5859
-->

‎test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"shadowCopy": false
3+
}

‎test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
1313

1414
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.2.0-*" />
15-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
1615
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.2.0-*" />
1716
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
1817
<PackageReference Include="xunit" Version="2.2.0-*" />

‎test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
1212

1313
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
14-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
1514
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
1615
<PackageReference Include="Moq" Version="4.6.36-*" />
1716
<PackageReference Include="xunit" Version="2.2.0-*" />

‎test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/Microsoft.AspNetCore.Mvc.Razor.Host.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<PropertyGroup>
66
<TargetFrameworks>netcoreapp1.1;net452</TargetFrameworks>
77
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netcoreapp1.1</TargetFrameworks>
8+
<DefineConstants Condition="'$(GenerateBaselines)'=='true'">$(DefineConstants);GENERATE_BASELINES</DefineConstants>
89
<DefineConstants>$(DefineConstants);__RemoveThisBitTo__GENERATE_BASELINES</DefineConstants>
910
<DefaultItemExcludes>$(DefaultItemExcludes);TestFiles\**</DefaultItemExcludes>
1011
</PropertyGroup>
@@ -18,7 +19,6 @@
1819
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
1920

2021
<PackageReference Include="Microsoft.AspNetCore.Testing" Version="1.2.0-*" />
21-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />
2323
<PackageReference Include="Moq" Version="4.6.36-*" />
2424
<PackageReference Include="xunit" Version="2.2.0-*" />

‎test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ViewComponentTagHelperDescriptorFactoryTest.cs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ public static TheoryData TypeData
6868
"System.Collections.Generic.Dictionary<global::System.String[], global::System.Collections.Generic.List<global::System.String>>" },
6969
{ typeof(Dictionary<string, List<string[,]>>),
7070
"System.Collections.Generic.Dictionary<global::System.String, global::System.Collections.Generic.List<global::System.String[,]>>" },
71-
{ null, "System.Collections.Generic.List<global::System.Char*[]>" },
7271
{ refParamType, "System.String[]" },
7372
{ typeof(NonGeneric.Nested1<bool, string>.Nested2),
7473
"Microsoft.AspNetCore.Mvc.Razor.Test.Internal.ViewComponentTagHelperDescriptorFactoryTest.NonGeneric.Nested1<global::System.Boolean, global::System.String>.Nested2" },
@@ -85,13 +84,22 @@ public static TheoryData TypeData
8584
[Theory]
8685
[MemberData(nameof(TypeData))]
8786
public void GetCSharpTypeName_ReturnsCorrectTypeNames(Type type, string expected)
87+
{
88+
// Act
89+
var typeName = ViewComponentTagHelperDescriptorFactory.GetCSharpTypeName(type);
90+
91+
// Assert
92+
Assert.Equal(expected, typeName);
93+
}
94+
95+
// Separated from GetCSharpTypeName_ReturnsCorrectTypeNames to work around problems serializing and
96+
// deserializing this ref type.
97+
[Fact]
98+
public void GetCSharpTypeName_ReturnsCorrectTypeNames_ForOutParameter()
8899
{
89100
// Arrange
90-
// Work around problems serializing / deserializing this ref type.
91-
if (type == null)
92-
{
93-
type = typeof(ViewComponentTagHelperDescriptorFactoryTest).GetMethod("MethodWithOutParam").GetParameters().First().ParameterType;
94-
}
101+
var type = typeof(ViewComponentTagHelperDescriptorFactoryTest).GetMethod("MethodWithOutParam").GetParameters().First().ParameterType;
102+
var expected = "System.Collections.Generic.List<global::System.Char*[]>";
95103

96104
// Act
97105
var typeName = ViewComponentTagHelperDescriptorFactory.GetCSharpTypeName(type);

‎test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj

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

2121
<PackageReference Include="Microsoft.AspNetCore.Http" Version="1.2.0-*" />
2222
<PackageReference Include="Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources" Version="1.2.0-*" PrivateAssets="All" />
23-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
2423
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.2.0-*" />
2524
<PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="1.2.0-*" />
2625
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" />

‎test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc.RazorPages\Microsoft.AspNetCore.Mvc.RazorPages.csproj" />
1212
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.TestCommon\Microsoft.AspNetCore.Mvc.TestCommon.csproj" />
1313

14-
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="1.0.0" />
1514
<PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="1.2.0-*" />
1615
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.2.0-*" />
1716
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-*" />

0 commit comments

Comments
 (0)