diff --git a/AzureIntegration.sln b/AzureIntegration.sln
index 36089d7bd8..c67ddfd03c 100644
--- a/AzureIntegration.sln
+++ b/AzureIntegration.sln
@@ -44,8 +44,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsights.Hosting
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.FunctionalTests", "test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\Microsoft.AspNetCore.AzureAppServices.FunctionalTests.csproj", "{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.TestBundle", "extensions\Microsoft.AspNetCore.AzureAppServices.TestBundle\Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj", "{1EC31DA1-131D-4257-B001-BE8391E6077E}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.Xdt.Extensions.Tests", "test\Microsoft.Web.Xdt.Extensions.Tests\Microsoft.Web.Xdt.Extensions.Tests.csproj", "{809AEE05-1B28-4E31-8959-776B249BD725}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests", "test\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests\Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj", "{491A857A-3529-4375-985D-D748F9F01476}"
@@ -108,10 +106,6 @@ Global
{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Release|Any CPU.Build.0 = Release|Any CPU
- {1EC31DA1-131D-4257-B001-BE8391E6077E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1EC31DA1-131D-4257-B001-BE8391E6077E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1EC31DA1-131D-4257-B001-BE8391E6077E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1EC31DA1-131D-4257-B001-BE8391E6077E}.Release|Any CPU.Build.0 = Release|Any CPU
{809AEE05-1B28-4E31-8959-776B249BD725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{809AEE05-1B28-4E31-8959-776B249BD725}.Debug|Any CPU.Build.0 = Debug|Any CPU
{809AEE05-1B28-4E31-8959-776B249BD725}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -152,7 +146,6 @@ Global
{1CE2D76B-39E6-46C0-8F6F-C63E370955A9} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
{0899A101-E451-40A4-81B0-7AA18202C25D} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0}
{2B2C37FF-9249-4EA4-9A7F-038B55A15C2C} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0}
- {1EC31DA1-131D-4257-B001-BE8391E6077E} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
{809AEE05-1B28-4E31-8959-776B249BD725} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0}
{491A857A-3529-4375-985D-D748F9F01476} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0}
{F0CABFE8-A5B1-487B-A451-A486D26742D3} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435}
diff --git a/build/repo.props b/build/repo.props
index c9355ddba7..7008591480 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -8,8 +8,7 @@
-
-
+
diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj b/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj
deleted file mode 100644
index 60ab8e7772..0000000000
--- a/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
- ASP.NET Core Test Bundle Extensions
- This extension enables testing functionality of ASP.NET Core on Azure WebSites.
- net461
- false
- aspnet;logging;aspnetcore;AzureSiteExtension
- AzureSiteExtension
- true
- false
- false
- false
- content
- AspNetCoreTestBundle
-
- https://github.com/aspnet/AzureIntegration/blob/rel/2.0.0-preview1/LICENSE.txt
- https://go.microsoft.com/fwlink/?LinkID=288859
- https://www.asp.net/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt b/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt
deleted file mode 100644
index 76419b69f2..0000000000
--- a/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/dotnet.cmd b/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/dotnet.cmd
deleted file mode 100644
index b1f5d0c075..0000000000
--- a/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/dotnet.cmd
+++ /dev/null
@@ -1 +0,0 @@
-D:\home\SiteExtensions\AspNetCoreTestBundle\dotnet.exe %*
\ No newline at end of file
diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd b/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd
deleted file mode 100644
index 494a61f9ee..0000000000
--- a/extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd
+++ /dev/null
@@ -1,24 +0,0 @@
-SET DOTNET=D:\Program Files (x86)\dotnet
-SET DOTNETCACHE=D:\DotNetCache
-SET RUNTIMES=%DOTNET%\shared\Microsoft.NETCore.App
-
-for /R %%x in (*.nupkg_) do ren "%%x" "*.nupkg"
-
-robocopy "%DOTNET%" "." /E /XC /XN /XO /NFL /NDL ^
- /XD "%DOTNET%\sdk" ^
- /XD "%RUNTIMES%\1.0.3" ^
- /XD "%RUNTIMES%\1.0.4" ^
- /XD "%RUNTIMES%\1.1.0" ^
- /XD "%RUNTIMES%\1.1.0-preview1-001100-00" ^
- /XD "%RUNTIMES%\1.1.1" ^
- /XD "%RUNTIMES%\2.0.0-preview1-002111-00" ^
- /XD "%RUNTIMES%\2.0.0-preview2-25407-01"
-
-rem don't need this untill we test new cache
-rem robocopy "%DOTNETCACHE%" "DotNetCache" /E /XC /XN /XO /NFL /NDL
-
-rem force first time experience
-dotnet msbuild /version
-
-if %errorlevel% geq 8 exit /b 1
-exit /b 0
\ No newline at end of file
diff --git a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj
index 42858f9924..e95ba73830 100644
--- a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj
+++ b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj
@@ -11,7 +11,7 @@
false
false
content
- Microsoft.AspNetCore.Runtime.SiteExtension
+ AspNetCoreRuntime
https://github.com/aspnet/AzureIntegration/blob/rel/2.0.0-preview1/LICENSE.txt
https://go.microsoft.com/fwlink/?LinkID=288859
diff --git a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/applicationHost.xdt b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/applicationHost.xdt
index 3384d1f485..463eb907ad 100644
--- a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/applicationHost.xdt
+++ b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/applicationHost.xdt
@@ -7,7 +7,8 @@
-
+
+
diff --git a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/install.cmd b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/install.cmd
index f2dfec66bc..bdca3efa75 100644
--- a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/install.cmd
+++ b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/install.cmd
@@ -1,5 +1,16 @@
+FOR /R %%x IN (*.nupkg_) DO REN "%%x" "*.nupkg"
+
+
SET DOTNET=D:\Program Files (x86)\dotnet
+SET RUNTIMES=%DOTNET%\shared\Microsoft.NETCore.App
-for /R %%x in (*.nupkg_) do ren "%%x" "*.nupkg"
+IF "%ASPNETCORE_COPY_EXISTING_RUNTIMES%" NEQ "1" EXIT /b 0
-dotnet msbuild /version
+robocopy "%DOTNET%" "." /E /XC /XN /XO /NFL /NDL ^
+ /XD "%DOTNET%\sdk" ^
+ /XD "%RUNTIMES%\1.0.8" ^
+ /XD "%RUNTIMES%\1.1.5" ^
+ /XD "%RUNTIMES%\2.0.3"
+
+IF %errorlevel% geq 8 EXIT /b 1
+EXIT /b 0
\ No newline at end of file
diff --git a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/scmApplicationHost.xdt b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/scmApplicationHost.xdt
deleted file mode 100644
index eacdb6a917..0000000000
--- a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/scmApplicationHost.xdt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file