Merge branch 'release/2.2'

This commit is contained in:
Justin Kotalik 2018-10-31 21:04:25 -07:00
commit 868dc32c97
3 changed files with 12 additions and 0 deletions

3
.gitmodules vendored
View File

@ -154,3 +154,6 @@
path = modules/Templating
url = https://github.com/aspnet/Templating.git
branch = master
[submodule "src/IISIntegration/test/gtest/googletest"]
path = src/IISIntegration/test/gtest/googletest
url = https://github.com/google/googletest

View File

@ -0,0 +1,8 @@
<Project>
<PropertyGroup>
<VsTestConsole>$(VCIDEInstallDir)..\CommonExtensions\Microsoft\TestWindow\vstest.console.exe</VsTestConsole>
</PropertyGroup>
<Target Name="Test" DependsOnTargets="Build">
<Exec Command="&quot;$(TargetPath)&quot;" />
</Target>
</Project>

@ -0,0 +1 @@
Subproject commit 879ac092fde0a19e1b3a61b2546b2a422b1528bc