Nate McMaster 451c7036a6 Merge branch 'release/2.1' into dev		2018-06-04 13:05:46 -07:00
..
docker	…
lineups	Merge branch 'release/2.0' into release/2.1	2018-06-01 17:08:08 -07:00
tasks	Fix compiler error introduced by merge conflict	2018-06-04 10:39:30 -07:00
tools	Merge branch 'release/2.1' into dev	2018-06-04 13:05:46 -07:00
AzureIntegration.targets	…
GenerateCode.targets	…
Key.snk	…
PackageArchive.targets	…
Publish.targets	Merge branch 'release/2.1' into dev	2018-06-04 13:05:46 -07:00
RepositoryBuild.targets	Merge branch 'release/2.0' into release/2.1	2018-06-01 17:08:08 -07:00
SharedFx.props	Merge branch 'release/2.1' into dev	2018-05-31 17:56:48 -07:00
SharedFx.targets	Merge branch 'release/2.1' into dev	2018-05-31 12:42:06 -07:00
SharedFxInstaller.targets	Merge branch 'release/2.1' into dev	2018-05-31 17:56:48 -07:00
Templating.targets	…
artifacts.props	[2.1.x] Remove WebHooks and Proxy from servicing (#1189)	2018-05-30 15:16:22 -07:00
buildorder.props	Remove Proxy and WebHooks from explicit build order list	2018-05-30 18:06:07 -07:00
common.props	…
dependencies.props	Upgrade to .NET Core 2.2.0-preview1-26604-01	2018-06-04 08:42:14 -07:00
external-dependencies.props	…
repo.beforecommon.props	…
repo.props	Merge branch 'release/2.1' into dev	2018-05-31 15:13:55 -07:00
repo.targets	Merge branch 'release/2.1' into dev	2018-06-04 13:05:46 -07:00
sources.props	Add trailing slash to <DotNetAssetRootUrl>	2018-05-30 17:13:42 -07:00
submodules.props	[2.1.x] Remove WebHooks and Proxy from servicing (#1189)	2018-05-30 15:16:22 -07:00