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

Commit cd64805

Browse files
author
N. Taylor Mullen
committed
Convert MVC to CSproj.
- Allow >= RC3 CLI's to build and run MVC. - Added extra sln's so they could be opened in VS. Currently VS' project system can't currently handle Mvc.sln. - Worked around several dotnet migration issues. They are listed in the re-attempted migration section here: #5482 - One large feature bit that couldn't be worked around was the functional tests running on desktop; it represented several known vstest issues. Removed desktop running of functional tests. - Skipped an ActionContextAccessor test due to a vstest appdomain problem.
1 parent 1777f7b commit cd64805

File tree

217 files changed

+4383
-4648
lines changed

Some content is hidden

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

217 files changed

+4383
-4648
lines changed

‎Mvc.NoFun.sln

Lines changed: 603 additions & 477 deletions
Large diffs are not rendered by default.

‎Mvc.OnlyFun.sln

Lines changed: 800 additions & 0 deletions
Large diffs are not rendered by default.

‎Mvc.sln

Lines changed: 1018 additions & 752 deletions
Large diffs are not rendered by default.

‎NuGet.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<configuration>
33
<packageSources>
44
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
5+
<add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
56
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
67
</packageSources>
78
</configuration>

‎appveyor.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ build_script:
1010
- build.cmd --quiet verify
1111
clone_depth: 1
1212
test: off
13-
deploy: off
13+
deploy: off
14+
# Required for dotnet-test to work
15+
os: Visual Studio 2015

‎build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ cd $PSScriptRoot
3333
$repoFolder = $PSScriptRoot
3434
$env:REPO_FOLDER = $repoFolder
3535

36-
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
36+
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
3737
if ($env:KOREBUILD_ZIP)
3838
{
3939
$koreBuildZip=$env:KOREBUILD_ZIP

‎build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33
cd $repoFolder
44

5-
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
5+
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
66
if [ ! -z $KOREBUILD_ZIP ]; then
77
koreBuildZip=$KOREBUILD_ZIP
88
fi

‎tools/Key.snk renamed to ‎build/Key.snk

File renamed without changes.

‎build/common.props

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<Project ToolsVersion="15.0">
2+
3+
<Import Project="..\version.props" />
4+
5+
<PropertyGroup>
6+
<Product>Microsoft ASP.NET Core MVC</Product>
7+
<RepositoryUrl>https://github.com/aspnet/Mvc</RepositoryUrl>
8+
<RepositoryType>git</RepositoryType>
9+
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Key.snk</AssemblyOriginatorKeyFile>
10+
<SignAssembly>true</SignAssembly>
11+
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
12+
<NetCoreAppImplicitPackageVersion>1.2.0-*</NetCoreAppImplicitPackageVersion>
13+
<NetStandardImplicitPackageVersion>1.6.2-*</NetStandardImplicitPackageVersion>
14+
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
15+
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.1-*" PrivateAssets="All" />
19+
</ItemGroup>
20+
21+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)'=='.NETFramework' AND '$(OutputType)'=='library'">
22+
<PackageReference Include="NETStandard.Library" Version="$(NetStandardImplicitPackageVersion)" />
23+
</ItemGroup>
24+
25+
</Project>

‎global.json

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

‎makefile.shade

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
2+
var VERSION='0.1'
3+
var FULL_VERSION='0.1'
4+
use-standard-lifecycle
5+
k-standard-goals
6+
7+
#restore-nuget-packages target='initialize'
8+
exec program='${Path.Combine(Directory.GetCurrentDirectory(), ".build", "nuget.exe")}' commandline='restore Mvc.sln'

‎samples/MvcSandbox/MvcSandbox.csproj

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
3+
<Import Project="..\..\build\common.props" />
4+
5+
<PropertyGroup>
6+
<TargetFrameworks>net451;netcoreapp1.1</TargetFrameworks>
7+
<RuntimeIdentifiers>win7-x64;win7-x86;osx.10.10-x64;osx.10.11-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;centos.7-x64;rhel.7.2-x64;debian.8-x64;fedora.23-x64;opensuse.13.2-x64</RuntimeIdentifiers>
8+
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net451' ">win7-x86</RuntimeIdentifier>
9+
<PreserveCompilationContext>true</PreserveCompilationContext>
10+
<OutputType>Exe</OutputType>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<Content Update="Views\**\*;web.config;wwwroot">
15+
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
16+
</Content>
17+
</ItemGroup>
18+
19+
<ItemGroup>
20+
<ProjectReference Include="..\..\src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj" />
21+
</ItemGroup>
22+
23+
<ItemGroup>
24+
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.2.0-*" />
25+
<PackageReference Include="Microsoft.AspNetCore.Razor" Version="1.2.0-*" />
26+
<PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="1.2.0-*" />
27+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.2.0-*" />
28+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.2.0-*" />
29+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.2.0-*" />
30+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.2.0-*" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.2.0-*" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.2.0-*" />
33+
</ItemGroup>
34+
35+
<ItemGroup>
36+
<DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0-msbuild3-final" />
37+
</ItemGroup>
38+
39+
</Project>

‎samples/MvcSandbox/MvcSandbox.xproj

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

‎samples/MvcSandbox/project.json

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

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyActionContext.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyActionContext.cs

File renamed without changes.

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyActionDescriptor.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyActionDescriptor.cs

File renamed without changes.

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyActionResult.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyActionResult.cs

File renamed without changes.

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyHttpContext.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyHttpContext.cs

File renamed without changes.

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyRouteData.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyRouteData.cs

File renamed without changes.

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyView.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyView.cs

File renamed without changes.

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyViewComponentContext.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyViewComponentContext.cs

File renamed without changes.

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyViewComponentResult.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyViewComponentResult.cs

File renamed without changes.

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyViewContext.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/IProxyViewContext.cs

File renamed without changes.

‎test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/TestDiagnosticListener.cs renamed to ‎shared/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.Sources/TestDiagnosticListener.cs

File renamed without changes.

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<Import Project="..\..\build\common.props" />
4+
5+
<PropertyGroup>
6+
<Description>ASP.NET Core MVC abstractions and interfaces for action invocation and dispatching, authorization, action filters, formatters, model binding, routing, validation, and more.
7+
Commonly used types:
8+
Microsoft.AspNetCore.Mvc.IActionResult</Description>
9+
<TargetFrameworks>net451;netstandard1.3</TargetFrameworks>
10+
<NoWarn>$(NoWarn);CS1591</NoWarn>
11+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
12+
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="1.2.0-*" />
17+
<PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="1.2.0-*">
18+
<PrivateAssets>All</PrivateAssets>
19+
</PackageReference>
20+
<PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Version="1.2.0-*">
21+
<PrivateAssets>All</PrivateAssets>
22+
</PackageReference>
23+
<PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" Version="1.2.0-*">
24+
<PrivateAssets>All</PrivateAssets>
25+
</PackageReference>
26+
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*">
27+
<PrivateAssets>All</PrivateAssets>
28+
</PackageReference>
29+
<PackageReference Include="Microsoft.Net.Http.Headers" Version="1.2.0-*" />
30+
<PackageReference Include="NETStandard.Library" Version="1.6.2-*" />
31+
</ItemGroup>
32+
33+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
34+
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.4.0-*" />
35+
</ItemGroup>
36+
37+
</Project>

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

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

‎src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,8 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Reflection;
5-
using System.Resources;
65
using System.Runtime.CompilerServices;
76

87
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Mvc.Abstractions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
98
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
10-
[assembly: AssemblyMetadata("Serviceable", "True")]
11-
[assembly: NeutralResourcesLanguage("en-us")]
12-
[assembly: AssemblyCompany("Microsoft Corporation.")]
13-
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
14-
[assembly: AssemblyProduct("Microsoft ASP.NET Core")]
9+
[assembly: AssemblyMetadata("Serviceable", "True")]

‎src/Microsoft.AspNetCore.Mvc.Abstractions/project.json

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

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<Import Project="..\..\build\common.props" />
4+
5+
<PropertyGroup>
6+
<Description>ASP.NET Core MVC API explorer functionality for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.</Description>
7+
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
8+
<NoWarn>$(NoWarn);CS1591</NoWarn>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
11+
</PropertyGroup>
12+
13+
<ItemGroup>
14+
<ProjectReference Include="..\Microsoft.AspNetCore.Mvc.Core\Microsoft.AspNetCore.Mvc.Core.csproj" />
15+
</ItemGroup>
16+
17+
<ItemGroup>
18+
<PackageReference Include="Microsoft.Extensions.ClosedGenericMatcher.Sources" Version="1.2.0-*">
19+
<PrivateAssets>All</PrivateAssets>
20+
</PackageReference>
21+
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="1.2.0-*">
22+
<PrivateAssets>All</PrivateAssets>
23+
</PackageReference>
24+
</ItemGroup>
25+
26+
</Project>

‎src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.xproj

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

‎src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Reflection;
5-
using System.Resources;
65
using System.Runtime.CompilerServices;
76

87
[assembly: AssemblyMetadata("Serviceable", "True")]
9-
[assembly: NeutralResourcesLanguage("en-us")]
10-
[assembly: AssemblyCompany("Microsoft Corporation.")]
11-
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
12-
[assembly: AssemblyProduct("Microsoft ASP.NET Core")]
138
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.IApiDescriptionProvider))]
149
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescription))]
1510
[assembly: TypeForwardedTo(typeof(Microsoft.AspNetCore.Mvc.ApiExplorer.ApiDescriptionProviderContext))]

0 commit comments

Comments
 (0)