From 2fb65200ee368a0724654f4bef6ea0c69cafe1e9 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Wed, 14 Mar 2018 15:33:04 -0700 Subject: [PATCH 1/5] Set 2.0 baselines --- build/dependencies.props | 2 +- korebuild-lock.txt | 4 +- .../baseline.netcore.json | 91 +++++++++++++++++++ .../baseline.netframework.json | 91 +++++++++++++++++++ .../baseline.netcore.json | 39 ++++++++ .../baseline.netframework.json | 39 ++++++++ .../baseline.netcore.json | 32 +++++++ .../baseline.netframework.json | 53 +++++++++++ 8 files changed, 348 insertions(+), 3 deletions(-) create mode 100644 src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netcore.json create mode 100644 src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netframework.json create mode 100644 src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netcore.json create mode 100644 src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netframework.json create mode 100644 src/Microsoft.AspNetCore.AzureAppServicesIntegration/baseline.netcore.json create mode 100644 src/Microsoft.Web.Xdt.Extensions/baseline.netframework.json diff --git a/build/dependencies.props b/build/dependencies.props index d14d1d3d51..017e0e0bb4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,7 +3,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview2-15742 + 2.1.0-preview2-15743 2.1.0-preview2-15741 2.1.1 2.1.0-preview2-30355 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index e40ef6651b..58dd4d4306 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15742 -commithash:21fbb0f2c3fe4a9216e2d59632b98cfd7d685962 +version:2.1.0-preview2-15743 +commithash:9e15cb6062ab5b9790d3fa699e018543a6950713 diff --git a/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netcore.json b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netcore.json new file mode 100644 index 0000000000..3414811912 --- /dev/null +++ b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netcore.json @@ -0,0 +1,91 @@ +{ + "AssemblyIdentity": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "Types": [ + { + "Name": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup.ApplicationInsightsHostingStartup", + "Visibility": "Public", + "Kind": "Class", + "ImplementedInterfaces": [ + "Microsoft.AspNetCore.Hosting.IHostingStartup" + ], + "Members": [ + { + "Kind": "Method", + "Name": "Configure", + "Parameters": [ + { + "Name": "builder", + "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder" + } + ], + "ReturnType": "System.Void", + "Sealed": true, + "Virtual": true, + "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingStartup", + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [], + "Visibility": "Public", + "GenericParameter": [] + } + ], + "GenericParameters": [] + }, + { + "Name": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup.JavaScriptSnippetTagHelperComponent", + "Visibility": "Public", + "Kind": "Class", + "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperComponent", + "ImplementedInterfaces": [], + "Members": [ + { + "Kind": "Method", + "Name": "get_Order", + "Parameters": [], + "ReturnType": "System.Int32", + "Virtual": true, + "Override": true, + "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent", + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "Process", + "Parameters": [ + { + "Name": "context", + "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext" + }, + { + "Name": "output", + "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput" + } + ], + "ReturnType": "System.Void", + "Virtual": true, + "Override": true, + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [ + { + "Name": "javaScriptSnippet", + "Type": "Microsoft.ApplicationInsights.AspNetCore.JavaScriptSnippet" + } + ], + "Visibility": "Public", + "GenericParameter": [] + } + ], + "GenericParameters": [] + } + ] +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netframework.json b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netframework.json new file mode 100644 index 0000000000..3414811912 --- /dev/null +++ b/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netframework.json @@ -0,0 +1,91 @@ +{ + "AssemblyIdentity": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "Types": [ + { + "Name": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup.ApplicationInsightsHostingStartup", + "Visibility": "Public", + "Kind": "Class", + "ImplementedInterfaces": [ + "Microsoft.AspNetCore.Hosting.IHostingStartup" + ], + "Members": [ + { + "Kind": "Method", + "Name": "Configure", + "Parameters": [ + { + "Name": "builder", + "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder" + } + ], + "ReturnType": "System.Void", + "Sealed": true, + "Virtual": true, + "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingStartup", + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [], + "Visibility": "Public", + "GenericParameter": [] + } + ], + "GenericParameters": [] + }, + { + "Name": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup.JavaScriptSnippetTagHelperComponent", + "Visibility": "Public", + "Kind": "Class", + "BaseType": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperComponent", + "ImplementedInterfaces": [], + "Members": [ + { + "Kind": "Method", + "Name": "get_Order", + "Parameters": [], + "ReturnType": "System.Int32", + "Virtual": true, + "Override": true, + "ImplementedInterface": "Microsoft.AspNetCore.Razor.TagHelpers.ITagHelperComponent", + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "Process", + "Parameters": [ + { + "Name": "context", + "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext" + }, + { + "Name": "output", + "Type": "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput" + } + ], + "ReturnType": "System.Void", + "Virtual": true, + "Override": true, + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [ + { + "Name": "javaScriptSnippet", + "Type": "Microsoft.ApplicationInsights.AspNetCore.JavaScriptSnippet" + } + ], + "Visibility": "Public", + "GenericParameter": [] + } + ], + "GenericParameters": [] + } + ] +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netcore.json b/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netcore.json new file mode 100644 index 0000000000..e294148f6c --- /dev/null +++ b/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netcore.json @@ -0,0 +1,39 @@ +{ + "AssemblyIdentity": "Microsoft.AspNetCore.AzureAppServices.HostingStartup, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "Types": [ + { + "Name": "Microsoft.AspNetCore.AzureAppServices.HostingStartup.AzureAppServicesHostingStartup", + "Visibility": "Public", + "Kind": "Class", + "ImplementedInterfaces": [ + "Microsoft.AspNetCore.Hosting.IHostingStartup" + ], + "Members": [ + { + "Kind": "Method", + "Name": "Configure", + "Parameters": [ + { + "Name": "builder", + "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder" + } + ], + "ReturnType": "System.Void", + "Sealed": true, + "Virtual": true, + "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingStartup", + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [], + "Visibility": "Public", + "GenericParameter": [] + } + ], + "GenericParameters": [] + } + ] +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netframework.json b/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netframework.json new file mode 100644 index 0000000000..e294148f6c --- /dev/null +++ b/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netframework.json @@ -0,0 +1,39 @@ +{ + "AssemblyIdentity": "Microsoft.AspNetCore.AzureAppServices.HostingStartup, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "Types": [ + { + "Name": "Microsoft.AspNetCore.AzureAppServices.HostingStartup.AzureAppServicesHostingStartup", + "Visibility": "Public", + "Kind": "Class", + "ImplementedInterfaces": [ + "Microsoft.AspNetCore.Hosting.IHostingStartup" + ], + "Members": [ + { + "Kind": "Method", + "Name": "Configure", + "Parameters": [ + { + "Name": "builder", + "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder" + } + ], + "ReturnType": "System.Void", + "Sealed": true, + "Virtual": true, + "ImplementedInterface": "Microsoft.AspNetCore.Hosting.IHostingStartup", + "Visibility": "Public", + "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [], + "Visibility": "Public", + "GenericParameter": [] + } + ], + "GenericParameters": [] + } + ] +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.AzureAppServicesIntegration/baseline.netcore.json b/src/Microsoft.AspNetCore.AzureAppServicesIntegration/baseline.netcore.json new file mode 100644 index 0000000000..f38ef43d21 --- /dev/null +++ b/src/Microsoft.AspNetCore.AzureAppServicesIntegration/baseline.netcore.json @@ -0,0 +1,32 @@ +{ + "AssemblyIdentity": "Microsoft.AspNetCore.AzureAppServicesIntegration, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "Types": [ + { + "Name": "Microsoft.AspNetCore.Hosting.AppServicesWebHostBuilderExtensions", + "Visibility": "Public", + "Kind": "Class", + "Abstract": true, + "Static": true, + "Sealed": true, + "ImplementedInterfaces": [], + "Members": [ + { + "Kind": "Method", + "Name": "UseAzureAppServices", + "Parameters": [ + { + "Name": "hostBuilder", + "Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder" + } + ], + "ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder", + "Static": true, + "Extension": true, + "Visibility": "Public", + "GenericParameter": [] + } + ], + "GenericParameters": [] + } + ] +} \ No newline at end of file diff --git a/src/Microsoft.Web.Xdt.Extensions/baseline.netframework.json b/src/Microsoft.Web.Xdt.Extensions/baseline.netframework.json new file mode 100644 index 0000000000..6b11c408ac --- /dev/null +++ b/src/Microsoft.Web.Xdt.Extensions/baseline.netframework.json @@ -0,0 +1,53 @@ +{ + "AssemblyIdentity": "Microsoft.Web.Xdt.Extensions, Version=2.0.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", + "Types": [ + { + "Name": "Microsoft.Web.Xdt.Extensions.InsertOrAppendAttribute", + "Visibility": "Public", + "Kind": "Class", + "BaseType": "Microsoft.Web.XmlTransform.Transform", + "ImplementedInterfaces": [], + "Members": [ + { + "Kind": "Method", + "Name": "get_AttributeName", + "Parameters": [], + "ReturnType": "System.String", + "Visibility": "Protected", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "GetArgumentValue", + "Parameters": [ + { + "Name": "name", + "Type": "System.String" + } + ], + "ReturnType": "System.String", + "Visibility": "Protected", + "GenericParameter": [] + }, + { + "Kind": "Method", + "Name": "Apply", + "Parameters": [], + "ReturnType": "System.Void", + "Virtual": true, + "Override": true, + "Visibility": "Protected", + "GenericParameter": [] + }, + { + "Kind": "Constructor", + "Name": ".ctor", + "Parameters": [], + "Visibility": "Public", + "GenericParameter": [] + } + ], + "GenericParameters": [] + } + ] +} \ No newline at end of file From 7323e7c3c2829f826ae50f87ef9cc44008828052 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 27 Mar 2018 14:00:57 -0700 Subject: [PATCH 2/5] Build x64 and x86 versions of site extensions with 2.1 in name (#166) --- build/repo.props | 3 ++- build/repo.targets | 22 +++++++++++++------ ...ft.AspNetCore.Runtime.SiteExtension.csproj | 7 +++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/build/repo.props b/build/repo.props index 47e46e4d51..8e7cd8da94 100644 --- a/build/repo.props +++ b/build/repo.props @@ -8,7 +8,8 @@ - + + diff --git a/build/repo.targets b/build/repo.targets index f439b699ae..4917e5f392 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -9,10 +9,10 @@ <_SdkFeed Condition="'$(_SdkFeed)' == ''">$(DefaultDotNetAssetFeed) $(RepositoryRoot).test-dotnet\ $(RepositoryRoot)artifacts\apps - $(TestDotNetPath)extension\ + $(TestDotNetPath)extension\$(SiteExtensionArch)\ $(RepositoryRoot)artifacts\build $(RepositoryRoot)\test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\ - https://dotnet.myget.org/F/aspnetcore-dev/ + https://dotnet.myget.org/F/aspnetcore-release/ @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ @@ -76,13 +76,21 @@ - + - + + + + + + + + + + Properties="%(SiteExtensions.BuildProperties);DotnetHomeDirectory=$(SiteExtensionWorkingDirectory);BuildNumber=$(BuildNumber);PackageOutputPath=$(SiteExtensionOutputDirectory)" /> 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 2e52e98955..6c52b68215 100644 --- a/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj +++ b/extensions/Microsoft.AspNetCore.Runtime.SiteExtension/Microsoft.AspNetCore.Runtime.SiteExtension.csproj @@ -1,10 +1,11 @@  - ASP.NET Core Runtime Extensions + $(VersionPrefix.Substring(0, $(VersionPrefix.LastIndexOf('.')))) + ASP.NET Core $(TrimmedVersion) ($(RuntimeArch)) Runtime This site extension installs Microsoft.AspNetCore.All, Microsoft.AspNetCore.App and Microsoft.NetCore.App shared runtimes. aspnetcore;AzureSiteExtension - AspNetCoreRuntime + AspNetCoreRuntime.$(TrimmedVersion).$(RuntimeArch) @@ -12,7 +13,7 @@ - + From 37976e5c2041b1baad9f0de5bb773c06a7492cba Mon Sep 17 00:00:00 2001 From: "Nate McMaster (automated)" Date: Wed, 28 Mar 2018 10:32:01 -0700 Subject: [PATCH 3/5] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 56 ++++++++++++++++++++-------------------- korebuild-lock.txt | 4 +-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 017e0e0bb4..9394f6788a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,41 +3,41 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-preview2-15743 - 2.1.0-preview2-15741 + 2.1.0-preview2-15749 + 2.1.0-preview2-15749 2.1.1 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 2.1.0-preview2-30187 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 0.5.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 0.5.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 1.1.3 1.1.0-preview - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 - 2.1.0-preview2-30355 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 + 2.1.0-preview2-30478 2.0.0 - 2.1.0-preview2-26314-02 - 15.6.0 + 2.1.0-preview2-26326-03 + 15.6.1 1.4.0 4.7.49 - 10.0.1 - 1.6.0-preview2-26313-01 + 11.0.2 + 1.6.0-preview2-26326-04 8.1.4 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 58dd4d4306..b8e036fe2c 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15743 -commithash:9e15cb6062ab5b9790d3fa699e018543a6950713 +version:2.1.0-preview2-15749 +commithash:5544c9ab20fa5e24b9e155d8958a3c3b6f5f9df9 From 2a64c1953da8d851df5c688e614bcd185c7fc052 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 29 Mar 2018 10:59:27 -0700 Subject: [PATCH 4/5] Skip broken tests --- .../JavaScriptSnippetTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ApplicationInsights.HostingStartup.Tests/JavaScriptSnippetTest.cs b/test/ApplicationInsights.HostingStartup.Tests/JavaScriptSnippetTest.cs index 087c4b9c8e..1555325f0b 100644 --- a/test/ApplicationInsights.HostingStartup.Tests/JavaScriptSnippetTest.cs +++ b/test/ApplicationInsights.HostingStartup.Tests/JavaScriptSnippetTest.cs @@ -17,16 +17,16 @@ namespace ApplicationInsightsJavaScriptSnippetTest { } - [Fact] + [Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")] public Task ScriptIsInjected_ForNetCoreApp20_Standalone() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.0", ApplicationType.Standalone); - [Fact] + [Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")] public Task ScriptIsInjected_ForNetCoreApp20_Portable() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.0", ApplicationType.Portable); - [Fact] + [Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")] public Task ScriptIsInjected_ForNetCoreApp21_Standalone() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.1", ApplicationType.Standalone); - [Fact] + [Fact(Skip="https://github.com/aspnet/AzureIntegration/issues/171")] public Task ScriptIsInjected_ForNetCoreApp21_Portable() => JavaScriptSnippetInjectionTestSuite("netcoreapp2.1", ApplicationType.Portable); private async Task JavaScriptSnippetInjectionTestSuite(string targetFramework, ApplicationType applicationType) From 3dcf01ee65817ee8da6b2815463a32a25e209812 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 16 Apr 2018 12:18:21 -0700 Subject: [PATCH 5/5] Revert feed name --- build/repo.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/repo.targets b/build/repo.targets index 4917e5f392..2e2fb83da6 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -12,7 +12,7 @@ $(TestDotNetPath)extension\$(SiteExtensionArch)\ $(RepositoryRoot)artifacts\build $(RepositoryRoot)\test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\ - https://dotnet.myget.org/F/aspnetcore-release/ + https://dotnet.myget.org/F/aspnetcore-dev/