huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-08-21 18:39:13 -07:00
parent 27a9991f21 f703a288dd
commit ee6f94dfd5
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
korebuild.json
View File

@ -5,7 +5,7 @@
"visualstudio": { "visualstudio": {
"required": false, "required": false,
"includePrerelease": true, "includePrerelease": true,
"versionRange": "[15.0.26730.03, 15.9)", "versionRange": "[15.0.26730.03, 16.0)",
"requiredWorkloads": [ "requiredWorkloads": [
"Microsoft.VisualStudio.Component.VSSDK" "Microsoft.VisualStudio.Component.VSSDK"
] ]

1
tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
View File

@ -29,6 +29,7 @@
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets> <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
</PropertyGroup> </PropertyGroup>
<Import Project="..\..\version.props" /> <Import Project="..\..\version.props" />
<Import Project="..\..\build\sources.props" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>