From b64aae0353001bbf607dd37a3d48b12f5b1db49e Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 21 Sep 2018 16:47:37 -0700 Subject: [PATCH 1/9] Do not build runtime site extension (#228) --- build/repo.props | 2 -- build/repo.targets | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build/repo.props b/build/repo.props index b57455e22a..a24704a3c4 100644 --- a/build/repo.props +++ b/build/repo.props @@ -13,8 +13,6 @@ - - diff --git a/build/repo.targets b/build/repo.targets index 4095bb0f38..4f6c94e8f2 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -90,9 +90,8 @@ - - - + + From 6f8c2e385c64a92fcc06745b76e5c43d1301d49a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 30 Sep 2018 12:06:27 -0700 Subject: [PATCH 2/9] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index d45b697c8f..53bdad1935 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,39 +3,39 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180918.1 - 2.2.0-preview1-20180918.1 + 2.2.0-preview1-20180928.5 + 2.2.0-preview1-20180928.5 2.1.1 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 2.1.0-preview2-30187 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 0.6.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 0.6.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 1.1.3 1.0.1 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 2.0.9 2.1.3 - 2.2.0-preview2-26905-02 - 2.2.0-preview3-35301 + 2.2.0-preview3-26927-02 + 2.2.0-preview3-35359 15.6.1 1.4.0 4.7.49 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 649bf2ba0b..26697a21fa 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180918.1 -commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 +version:2.2.0-preview1-20180928.5 +commithash:43faa29f679f47b88689d645b39e6be5e0055d70 From 373faa5d3b34704a41cd1c490dc3f612af3ea3d8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 7 Oct 2018 19:06:34 +0000 Subject: [PATCH 3/9] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 54 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 53bdad1935..4825e01b5e 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,39 +3,39 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180928.5 - 2.2.0-preview1-20180928.5 + 2.2.0-preview2-20181004.6 + 2.2.0-preview2-20181004.6 2.1.1 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 2.1.0-preview2-30187 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 0.6.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 0.6.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 1.1.3 1.0.1 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 - 2.2.0-preview3-35359 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 + 2.2.0-preview3-35425 2.0.9 2.1.3 - 2.2.0-preview3-26927-02 - 2.2.0-preview3-35359 + 2.2.0-preview3-27001-02 + 2.2.0-preview3-35425 15.6.1 1.4.0 4.7.49 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 26697a21fa..96fe3217ef 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180928.5 -commithash:43faa29f679f47b88689d645b39e6be5e0055d70 +version:2.2.0-preview2-20181004.6 +commithash:c04c4b2f5018632647f96210ab01876661302dac From 904aac36123e7d62081eb4f0e50c86a50aab9a66 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 16 Oct 2018 08:14:16 -0700 Subject: [PATCH 4/9] Embed version into 2.1 logging site extensions name (#238) --- build/repo.props | 2 +- .../Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/repo.props b/build/repo.props index a24704a3c4..9c56de94ff 100644 --- a/build/repo.props +++ b/build/repo.props @@ -13,7 +13,7 @@ - + diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 725847a797..0db7d43804 100644 --- a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -1,6 +1,7 @@  + $(VersionPrefix.Substring(0, $(VersionPrefix.LastIndexOf('.')))) ASP.NET Core Extensions This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging. net461 @@ -8,6 +9,7 @@ aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection content $(MicrosoftNETCoreApp21PackageVersion) + AspNetCoreRuntime.$(TrimmedVersion) From 77669ddfc279d9d9b8ddd5491b3278d11febebc5 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 16 Oct 2018 10:35:29 -0700 Subject: [PATCH 5/9] Remove SDK from runtim site extension (#237) --- build/repo.targets | 53 +--------------------------------------------- 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/build/repo.targets b/build/repo.targets index e0d691a40e..32d781fdad 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -27,12 +27,6 @@ - - - - - - - - - - - - <_CleanupFiles - Include="$(SiteExtensionWorkingDirectory)additionalDeps;$(SiteExtensionWorkingDirectory)store" /> - - <_CleanupFiles - Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)shared\Microsoft.NETCore.App\'))" - Exclude="$(SiteExtensionWorkingDirectory)shared\Microsoft.NETCore.App\$(SiteExtensionNETCoreAppPackageVersion)" /> - - <_CleanupFiles - Condition="Exists('$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.App\')" - Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.App\'))" - Exclude="$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.App\$(PackageVersion)" /> - - <_CleanupFiles - Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.All\'))" - Exclude="$(SiteExtensionWorkingDirectory)shared\Microsoft.AspNetCore.All\$(PackageVersion)" /> - - <_CleanupFiles - Include="$([System.IO.Directory]::GetDirectories('$(SiteExtensionWorkingDirectory)host\fxr'))" - Exclude="$(SiteExtensionWorkingDirectory)host\fxr\$(SiteExtensionNETCoreAppPackageVersion)" /> - - - - - - - - - - - - - - - - + @@ -92,11 +47,6 @@ - - - - - @@ -104,7 +54,6 @@ - From 74aefc855d463574c2bffd3d2c473b29417f2537 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 16 Oct 2018 10:44:07 -0700 Subject: [PATCH 6/9] Set DOTNET_ROOT in runtime site extension (#240) --- .../applicationHost.xdt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/applicationHost.xdt b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/applicationHost.xdt index a352272dfc..159bc8d646 100644 --- a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/applicationHost.xdt +++ b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/applicationHost.xdt @@ -9,8 +9,7 @@ - - + From a68e40c2ca6128b2790d66ad5edad5748c510e5f Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 16 Oct 2018 11:02:05 -0700 Subject: [PATCH 7/9] Fix package name (#241) --- .../Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj index 0db7d43804..9bfa429b7d 100644 --- a/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj +++ b/extensions/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj @@ -9,7 +9,7 @@ aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection content $(MicrosoftNETCoreApp21PackageVersion) - AspNetCoreRuntime.$(TrimmedVersion) + Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion) From 8c58d65b242e04394a263a1e8cbe3b83b3b0bd82 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 16 Oct 2018 12:48:11 -0700 Subject: [PATCH 8/9] Update package branding for 2.2 RTM --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 704cac087b..4889a26987 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ 2.2.0 - preview3 + rtm $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From c6f978367199763fef1a642a1e31fb6e2959d5b3 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 25 Oct 2018 11:06:23 -0700 Subject: [PATCH 9/9] Add AspNetCore runtime back into the runtime site extension (#244) --- build/repo.targets | 1 + 1 file changed, 1 insertion(+) diff --git a/build/repo.targets b/build/repo.targets index 32d781fdad..eb3c49d6b1 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -39,6 +39,7 @@ +