Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-08-28 18:22:46 -07:00
commit cdd68dd401
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 2 additions and 1 deletions

View File

@ -21,6 +21,7 @@
<PackageArtifact Include="dotnet-aspnet-codegenerator" Category="ship" />
<PackageArtifact Include="dotnet-dev-certs" Category="ship" />
<PackageArtifact Include="dotnet-ef" Category="ship" />
<PackageArtifact Include="dotnet-httprepl" Category="ship" />
<PackageArtifact Include="dotnet-sql-cache" Category="ship" />
<PackageArtifact Include="dotnet-user-secrets" Category="ship" />
<PackageArtifact Include="dotnet-watch" Category="ship" />

@ -1 +1 @@
Subproject commit 4ced217d23a398f391d331360fed11cbd1bda268
Subproject commit 03e73cc8060ad167056d66ee0bf625dfe6943d82