Merge branch 'rel/1.1.0-preview1' into dev
Merges branches without bringing back in the change to add dotnet-publish-iis to the 1.1.0-preview1 release.
This commit is contained in:
commit
38e22cd648
|
|
@ -27,4 +27,6 @@ project.lock.json
|
||||||
*.ipch
|
*.ipch
|
||||||
*.vs/
|
*.vs/
|
||||||
.testPublish/
|
.testPublish/
|
||||||
.build/
|
.build/
|
||||||
|
*.nuget.props
|
||||||
|
*.nuget.targets
|
||||||
Loading…
Reference in New Issue