Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to VS2017 RC.3 #387

Merged
merged 3 commits into from
Jan 20, 2017
Merged

Upgrade to VS2017 RC.3 #387

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef736be
Upgrade to VS2017 RC.3
Jan 20, 2017
fbfa1d5
Update test strings with project templates
Jan 20, 2017
e598bba
Re-add embedded resource globs that are not included by default
Jan 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<clear />
<add key="dotnet-cli" value="https://dotnet.myget.org/F/dotnet-cli/api/v3/index.json" />
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="AspNetCore" value="https://dotnet.myget.org/F/aspnetcore-ci-dev/api/v3/index.json" />
<add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
3 changes: 1 addition & 2 deletions Scaffolding.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26116.0
VisualStudioVersion = 15.0.26118.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A4057ACF-27F0-4724-963B-44548B6BC4E9}"
EndProject
Expand All @@ -21,7 +21,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
build.sh = build.sh
CONTRIBUTING.md = CONTRIBUTING.md
dir = dir
global.json = global.json
LICENSE.txt = LICENSE.txt
makefile.shade = makefile.shade
NuGet.config = NuGet.config
Expand Down
3 changes: 2 additions & 1 deletion build/common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RepositoryUrl>https://github.com/aspnet/scaffolding</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<VersionSuffix Condition="'$(VersionSuffix)'!='' AND '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
</PropertyGroup>

<!-- Sign Options -->
Expand All @@ -14,6 +15,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.0-*" PrivateAssets="All" />
<PackageReference Include="Internal.AspNetCore.Sdk" Version="1.0.1-*" PrivateAssets="All" />
</ItemGroup>
</Project>
3 changes: 0 additions & 3 deletions global.json
View file
Open in desktop

This file was deleted.

14 changes: 1 addition & 13 deletions ...isualStudio.Web.CodeGeneration.Core/Microsoft.VisualStudio.Web.CodeGeneration.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,13 @@
<Description>Contains the core infrastructure used by ASP.NET Core Code Generators.</Description>
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Core</AssemblyName>
<PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What references are disabled due to this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NETStandard.Library. It's not currently building with this as a package reference. We will didn't start doing this until the 1.1 train.

</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Templating\Microsoft.VisualStudio.Web.CodeGeneration.Templating.csproj" />
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Utils\Microsoft.VisualStudio.Web.CodeGeneration.Utils.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
Expand Down
28 changes: 2 additions & 26 deletions ...lStudio.Web.CodeGeneration.Design/Microsoft.VisualStudio.Web.CodeGeneration.Design.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<Description>Code Generation tool for ASP.NET Core. Contains the dotnet-aspnet-codegenerator command used for generating controllers and views. </Description>
<Description>Code Generation tool for ASP.NET Core. Contains the dotnet-aspnet-codegenerator command used for generating controllers and views.</Description>
<TargetFrameworks>net451;netcoreapp1.0</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AssemblyName>dotnet-aspnet-codegenerator-design</AssemblyName>
Expand All @@ -10,35 +10,11 @@
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
<PackageId>Microsoft.VisualStudio.Web.CodeGeneration.Design</PackageId>
<RuntimeIdentifier Condition=" '$(TargetFramework)' != 'netcoreapp1.0' ">win7-x86</RuntimeIdentifier>
<NetCoreAppImplicitPackageVersion>1.0.0</NetCoreAppImplicitPackageVersion>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGenerators.Mvc\Microsoft.VisualStudio.Web.CodeGenerators.Mvc.csproj" />
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration\Microsoft.VisualStudio.Web.CodeGeneration.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Core\Microsoft.VisualStudio.Web.CodeGeneration.Core.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Templating\Microsoft.VisualStudio.Web.CodeGeneration.Templating.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Utils\Microsoft.VisualStudio.Web.CodeGeneration.Utils.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
</ItemGroup>

</Project>
17 changes: 1 addition & 16 deletions ....EntityFrameworkCore/Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,13 @@
<Description>Contains Entity Framework Core Services used by ASP.NET Core Code Generators.</Description>
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore</AssemblyName>
<PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50;portable-net45+win8</PackageTargetFallback>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Core\Microsoft.VisualStudio.Web.CodeGeneration.Core.csproj" />
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Templating\Microsoft.VisualStudio.Web.CodeGeneration.Templating.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Utils\Microsoft.VisualStudio.Web.CodeGeneration.Utils.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="1.0.1" />
Expand Down
12 changes: 3 additions & 9 deletions ...tudio.Web.CodeGeneration.Msbuild/Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,11 @@
<Description>MSBuild task (EvaluateProjectInfoForCodeGeneration) used by Microsoft.VisualStudio.Web.CodeGeneration.Tools</Description>
<TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Msbuild</AssemblyName>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" Exclude="bin\**;obj\**" />
<Compile Include="..\Shared\General\**\*.cs" Exclude="bin\**;obj\**" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Shared\General\**\*.cs" />
<Compile Include="..\Microsoft.Extensions.ProjectModel.Abstractions.Sources\**\*.cs" />
<EmbeddedResource Include="..\Microsoft.Extensions.ProjectModel.Abstractions.Sources\**\*.resx" />
</ItemGroup>
Expand All @@ -24,6 +18,6 @@
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.1.0-preview-000458-02" />
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.0-preview-000458-02" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NuGet.Frameworks" Version="3.5.0-rc1-final" />
<PackageReference Include="NuGet.Frameworks" Version="3.5.0" />
</ItemGroup>
</Project>
11 changes: 1 addition & 10 deletions ...Web.CodeGeneration.Templating/Microsoft.VisualStudio.Web.CodeGeneration.Templating.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,13 @@
<Description>Contains Razor based templating host used by ASP.NET Core Code Generators.</Description>
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Templating</AssemblyName>
<PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dotnet5.6;dnxcore50;portable-net45+win8</PackageTargetFallback>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Utils\Microsoft.VisualStudio.Web.CodeGeneration.Utils.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Razor" Version="1.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.0" />
</ItemGroup>
Expand Down
43 changes: 27 additions & 16 deletions ...ualStudio.Web.CodeGeneration.Tools/Microsoft.VisualStudio.Web.CodeGeneration.Tools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,13 @@
<PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
<PackageId>Microsoft.VisualStudio.Web.CodeGeneration.Tools</PackageId>
<PackageType>DotnetCliTool</PackageType>
<NetCoreAppImplicitPackageVersion>1.0.0</NetCoreAppImplicitPackageVersion>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" Exclude="bin\**;obj\**" />
<Compile Include="..\Shared\**\*.cs" Exclude="bin\**;obj\**" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Shared\**\*.cs" />
<Compile Include="..\Microsoft.Extensions.ProjectModel.Abstractions.Sources\**\*.cs" />
<Compile Include="..\Microsoft.Extensions.ProjectModel.MsBuild.Sources\**\*.cs;" />
<Compile Include="..\Microsoft.Extensions.ProjectModel.MsBuild.Sources\**\*.cs" />
</ItemGroup>

<ItemGroup>
Expand All @@ -33,10 +28,6 @@
<PackageReference Include="NuGet.Frameworks" Version="3.5.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
<PackageReference Include="Microsoft.NETCore.App" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild\Target\build\Microsoft.VisualStudio.Web.CodeGeneration.Tools.targets" Pack="true"
PackagePath="build\netstandard1.0\Microsoft.VisualStudio.Web.CodeGeneration.Tools.targets" />
Expand All @@ -46,11 +37,31 @@
PackagePath="toolassets\netcoreapp1.0\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" />
<None Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild\bin\$(Configuration)\net46\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" Pack="true"
PackagePath="toolassets\net46\Microsoft.VisualStudio.Web.CodeGeneration.Msbuild.dll" />
<None Include="bin\$(Configuration)\netcoreapp1.0\dotnet-aspnet-codegenerator.deps.json" Pack="true"
PackagePath="lib\netcoreapp1.0\" />
<None Include="bin\$(Configuration)\netcoreapp1.0\dotnet-aspnet-codegenerator.runtimeconfig.json" Pack="true"
PackagePath="lib\netcoreapp1.0\" />


<None Include="prefercliruntime" Pack="true"
PackagePath="prefercliruntime" />
</ItemGroup>

<!-- workaround https://github.com/NuGet/Home/issues/4321

When fixed, replace with this instead
<None Include="$(ProjectRuntimeConfigFilePath)" Pack="true" PackagePath="lib\$(TargetFramework)\" />
-->
<PropertyGroup>
<DefaultItemExcludes>$(DefaultItemExcludes);lib\**\*</DefaultItemExcludes>
</PropertyGroup>
<Target Name="PackRuntimeConfigurationFile"
DependsOnTargets="GenerateBuildRuntimeConfigurationFiles"
BeforeTargets="_GetPackageFiles">
<Copy SourceFiles="$(ProjectRuntimeConfigFilePath)" DestinationFolder="lib\netcoreapp1.0\" />
<ItemGroup>
<_PackageFiles Include="lib\netcoreapp1.0\*.json" BuildAction="None" PackagePath="%(Identity)" />
</ItemGroup>
</Target>
<Target Name="CleanupTempRuntimeConfigurationFile"
AfterTargets="Pack">
<RemoveDir Directories="lib\" />
</Target>
<!-- end workaround -->
</Project>
12 changes: 3 additions & 9 deletions ...ualStudio.Web.CodeGeneration.Utils/Microsoft.VisualStudio.Web.CodeGeneration.Utils.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,13 @@
<Description>Contains utilities used by ASP.NET Core Code Generation packages.</Description>
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration.Utils</AssemblyName>
<PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" Exclude="bin\**;obj\**" />
<Compile Include="..\Shared\General\**\*.cs" Exclude="bin\**;obj\**" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\Shared\General\**\*.cs" />
<Compile Include="..\Microsoft.Extensions.ProjectModel.Abstractions.Sources\**\*.cs" />
<EmbeddedResource Include="..\Microsoft.Extensions.ProjectModel.Abstractions.Sources\**\*.resx" />
</ItemGroup>
Expand All @@ -25,7 +19,7 @@
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="1.3.0" />
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
<PackageReference Include="NuGet.Frameworks" Version="3.5.0-rc1-final" />
<PackageReference Include="NuGet.Frameworks" Version="3.5.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
Expand Down
20 changes: 1 addition & 19 deletions ...icrosoft.VisualStudio.Web.CodeGeneration/Microsoft.VisualStudio.Web.CodeGeneration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,13 @@
<Description>Contains the CodeGenCommand that finds the appropriate code generator and invokes it from project dependencies.</Description>
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGeneration</AssemblyName>
<PackageTags>aspnetcore;codegenerator;scaffolding;visualstudioweb</PackageTags>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Core\Microsoft.VisualStudio.Web.CodeGeneration.Core.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Templating\Microsoft.VisualStudio.Web.CodeGeneration.Templating.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Utils\Microsoft.VisualStudio.Web.CodeGeneration.Utils.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.0.0" />
</ItemGroup>
Expand Down
21 changes: 2 additions & 19 deletions ....VisualStudio.Web.CodeGenerators.Mvc/Microsoft.VisualStudio.Web.CodeGenerators.Mvc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,16 @@
<Description>Code Generators for ASP.NET Core MVC. Contains code generators for MVC Controllers and Views.</Description>
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AssemblyName>Microsoft.VisualStudio.Web.CodeGenerators.Mvc</AssemblyName>
<PackageTags>aspnetcore;aspnetcoremvc;codegenerator;scaffolding;visualstudioweb</PackageTags>
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);portable-net45+win8</PackageTargetFallback>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move this to build/common.props? or does this conflict with the
<NetCoreAppImplicitPackageVersion>1.0.0</NetCoreAppImplicitPackageVersion>

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, it will disable the implicit package reference, regardless of NetCoreAppImplicitPackageVersion's existence

</PropertyGroup>

<ItemGroup>
<Compile Include="**\*.cs" />
<EmbeddedResource Include="**\*.resx" />
<EmbeddedResource Include="compiler\resources\**\*" />
<None Pack="true" Include="Templates\**\*" PackagePath="Templates\" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration\Microsoft.VisualStudio.Web.CodeGeneration.csproj" />
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Core\Microsoft.VisualStudio.Web.CodeGeneration.Core.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Templating\Microsoft.VisualStudio.Web.CodeGeneration.Templating.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
<ProjectReference Include="..\Microsoft.VisualStudio.Web.CodeGeneration.Utils\Microsoft.VisualStudio.Web.CodeGeneration.Utils.csproj">
<FromP2P>true</FromP2P>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Pack="true" Include="Templates\**\*" PackagePath="Templates\" />
</ItemGroup>
</Project>
Loading