Fix Antares specific behaviors in site extensions (#136)

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}

build/repo.props

@@ -8,8 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.AzureAppServices.TestBundle\Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj" PackageName="AspNetCoreTestBundle" />
+    <SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.Runtime.SiteExtension\Microsoft.AspNetCore.Runtime.SiteExtension.csproj" PackageName="AspNetCoreRuntime" />
-    <SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.Runtime.SiteExtension\Microsoft.AspNetCore.Runtime.SiteExtension.csproj" PackageName="Microsoft.AspNetCore.Runtime.SiteExtension" />
     <SiteExtensions Include="$(RepositoryRoot)extensions\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj" PackageName="Microsoft.AspNetCore.AzureAppServices.SiteExtension" />
   </ItemGroup>
 

extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/Microsoft.AspNetCore.AzureAppServices.TestBundle.csproj

@@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Title>ASP.NET Core Test Bundle Extensions</Title>
-    <Description>This extension enables testing functionality of ASP.NET Core on Azure WebSites.</Description>
-    <TargetFramework>net461</TargetFramework>
-    <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <PackageTags>aspnet;logging;aspnetcore;AzureSiteExtension</PackageTags>
-    <PackageType>AzureSiteExtension</PackageType>
-    <NoPackageAnalysis>true</NoPackageAnalysis>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
-    <IncludeSymbols>false</IncludeSymbols>
-    <IncludeSource>false</IncludeSource>
-    <ContentTargetFolders>content</ContentTargetFolders>
-    <PackageId>AspNetCoreTestBundle</PackageId>
-    <!-- These need to be set manually because this is not marked as a shipping (to nuget.org) package. https://github.com/aspnet/AzureIntegration/issues/38 -->
-    <PackageLicenseUrl>https://github.com/aspnet/AzureIntegration/blob/rel/2.0.0-preview1/LICENSE.txt</PackageLicenseUrl>
-    <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>
-    <PackageProjectUrl>https://www.asp.net/</PackageProjectUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Content Include="applicationHost.xdt" />
-    <Content Include="install.cmd" />
-    <Content Include="dotnet.cmd" />
-    <Content Include="$(OutputPath)\Microsoft.Web.Xdt.Extensions.dll" PackagePath="content" />
-    <Content Include="$(DotnetHomeDirectory)**\*.*" Condition="$(DotnetHomeDirectory) != ''" PackagePath="content\%(RecursiveDir)%(FileName)%(Extension)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Microsoft.Web.Xdt.Extensions\Microsoft.Web.Xdt.Extensions.csproj" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
-

extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/applicationHost.xdt

@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-
-  <xdt:Import path="%XDT_EXTENSIONPATH%\Microsoft.Web.Xdt.Extensions.dll"
-              namespace="Microsoft.Web.Xdt.Extensions" />
-
-    <system.webServer xdt:Transform="InsertIfMissing">
-      <runtime xdt:Transform="InsertIfMissing" >
-        <environmentVariables xdt:Transform="InsertIfMissing">
-          <add name="PATH" value="%XDT_EXTENSIONPATH%;%PATH%" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing"  />
-          <!-- Uncomment when when there a need to test 1.x patch prerelease  -->
-          <!--<add name="DOTNET_HOSTING_OPTIMIZATION_CACHE" value="%XDT_EXTENSIONPATH%\DotNetCache" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing"  />-->
-        </environmentVariables>
-      </runtime>
-    </system.webServer>
-</configuration>

extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/dotnet.cmd

@@ -1 +0,0 @@
-D:\home\SiteExtensions\AspNetCoreTestBundle\dotnet.exe %*

extensions/Microsoft.AspNetCore.AzureAppServices.TestBundle/install.cmd

@@ -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

extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj

@@ -11,7 +11,7 @@
     <IncludeSymbols>false</IncludeSymbols>
     <IncludeSource>false</IncludeSource>
     <ContentTargetFolders>content</ContentTargetFolders>
-    <PackageId>Microsoft.AspNetCore.Runtime.SiteExtension</PackageId>
+    <PackageId>AspNetCoreRuntime</PackageId>
     <!-- These need to be set manually because this is not marked as a shipping (to nuget.org) package. https://github.com/aspnet/AzureIntegration/issues/38 -->
     <PackageLicenseUrl>https://github.com/aspnet/AzureIntegration/blob/rel/2.0.0-preview1/LICENSE.txt</PackageLicenseUrl>
     <PackageIconUrl>https://go.microsoft.com/fwlink/?LinkID=288859</PackageIconUrl>

extensions/Microsoft.AspNetCore.Runtime.SiteExtension/applicationHost.xdt

@@ -7,7 +7,8 @@
     <system.webServer xdt:Transform="InsertIfMissing">
       <runtime xdt:Transform="InsertIfMissing" >
         <environmentVariables xdt:Transform="InsertIfMissing">
-          <add name="PATH" value="%XDT_EXTENSIONPATH%;%PATH%" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing"  />
+          <add name="PATH" value="%XDT_EXTENSIONPATH%;%USERPROFILE%\.dotnet\tools;%PATH%" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing"  />
+          <add name="DOTNET_SKIP_FIRST_TIME_EXPERIENCE" value="0" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing"  />
         </environmentVariables>
       </runtime>
     </system.webServer>

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

extensions/Microsoft.AspNetCore.Runtime.SiteExtension/scmApplicationHost.xdt

@@ -1,3 +0,0 @@
-<?xml version="1.0"?>
-<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
-</configuration>