diff --git a/build/artifacts.props b/build/artifacts.props index 8e693df702..05028ca8bb 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -160,7 +160,6 @@ - @@ -174,7 +173,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index 47cc8e8f97..4e44ced9e1 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -10,7 +10,6 @@ - diff --git a/build/submodules.props b/build/submodules.props index c32ed63753..a7f9ba0e39 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -45,9 +45,7 @@ - - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index ed463e7dbb..7c4b8ae105 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -35,6 +35,37 @@ + + + 2.1.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2.1.1 @@ -170,6 +201,30 @@ + + + 2.1.1 + + + + + + + + + + + + + + + + 2.1.1 + + + + + 2.1.3 @@ -422,16 +477,6 @@ - - - 2.1.6 - - - - - - - 2.1.6 @@ -463,6 +508,16 @@ + + + 2.1.6 + + + + + + + 2.1.1 @@ -968,25 +1023,6 @@ - - - 2.1.6 - - - - - - - - - - 2.1.6 - - - - - - 2.1.6 @@ -1024,6 +1060,25 @@ + + + 2.1.6 + + + + + + + + + + 2.1.6 + + + + + + 2.1.1 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 38fee0ed0c..01206c3926 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -10,6 +10,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + @@ -26,6 +27,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + + @@ -53,10 +56,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + @@ -105,10 +108,10 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - - + + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index bb3a234022..27a4004454 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -119,7 +119,10 @@ + + + diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs b/src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsLoggerStartupFilter.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsLoggerStartupFilter.cs rename to src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsLoggerStartupFilter.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs b/src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsStartupLoader.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/ApplicationInsightsStartupLoader.cs rename to src/Azure/ApplicationInsights.HostingStartup/src/ApplicationInsightsStartupLoader.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/JavaScriptSnippetTagHelperComponent.cs b/src/Azure/ApplicationInsights.HostingStartup/src/JavaScriptSnippetTagHelperComponent.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/JavaScriptSnippetTagHelperComponent.cs rename to src/Azure/ApplicationInsights.HostingStartup/src/JavaScriptSnippetTagHelperComponent.cs diff --git a/src/Azure/ApplicationInsights.HostingStartup/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj b/src/Azure/ApplicationInsights.HostingStartup/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj new file mode 100644 index 0000000000..f70ddb284f --- /dev/null +++ b/src/Azure/ApplicationInsights.HostingStartup/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj @@ -0,0 +1,22 @@ + + + + + + ASP.NET Core lightup integration with Application Insights. + netcoreapp2.1;netcoreapp2.0;net461 + true + aspnetcore;ApplicationInsights;Analytics;Telemetry;AppInsights + + + + + + + + + + + + + diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netcore.json b/src/Azure/ApplicationInsights.HostingStartup/src/baseline.netcore.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netcore.json rename to src/Azure/ApplicationInsights.HostingStartup/src/baseline.netcore.json diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netframework.json b/src/Azure/ApplicationInsights.HostingStartup/src/baseline.netframework.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/baseline.netframework.json rename to src/Azure/ApplicationInsights.HostingStartup/src/baseline.netframework.json diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/AfterScript.html b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/AfterScript.html similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/AfterScript.html rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/AfterScript.html diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/BeforeScript.html b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/BeforeScript.html similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/BeforeScript.html rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/BeforeScript.html diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/FunctionalTest.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/FunctionalTest.cs similarity index 94% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/FunctionalTest.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/FunctionalTest.cs index b3e5f175fb..ca784e1740 100644 --- a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/FunctionalTest.cs +++ b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/FunctionalTest.cs @@ -19,7 +19,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest var current = new DirectoryInfo(AppContext.BaseDirectory); while (current != null) { - if (File.Exists(Path.Combine(current.FullName, "AzureIntegration.sln"))) + if (File.Exists(Path.Combine(current.FullName, "Azure.sln"))) { break; } @@ -31,7 +31,7 @@ namespace ApplicationInsightsJavaScriptSnippetTest throw new InvalidOperationException("Could not find the solution directory"); } - return Path.GetFullPath(Path.Combine(current.FullName, "sample", "ApplicationInsightsHostingStartupSample")); + return Path.GetFullPath(Path.Combine(current.FullName, "ApplicationInsights.HostingStartup", "test", "testassets", "ApplicationInsightsHostingStartupSample")); } protected static bool PreservePublishedApplicationForDebugging @@ -63,4 +63,4 @@ namespace ApplicationInsightsJavaScriptSnippetTest return configuration; } } -} \ No newline at end of file +} diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/JavaScriptSnippetTest.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/JavaScriptSnippetTest.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/JavaScriptSnippetTest.cs diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/LoggingTest.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/LoggingTest.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/LoggingTest.cs diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/ApplicationInsights.HostingStartup.Tests.csproj b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests.csproj similarity index 51% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/ApplicationInsights.HostingStartup.Tests.csproj rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests.csproj index 7926ac5ecd..97343abfcf 100644 --- a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/ApplicationInsights.HostingStartup.Tests.csproj +++ b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.Tests.csproj @@ -17,12 +17,9 @@ - - - - - - + + + diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Properties/AssemblyInfo.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Properties/AssemblyInfo.cs similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Properties/AssemblyInfo.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Properties/AssemblyInfo.cs diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Rendered.html b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Rendered.html similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Rendered.html rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Rendered.html diff --git a/src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Validator.cs b/src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Validator.cs similarity index 100% rename from src/AzureIntegration/test/ApplicationInsights.HostingStartup.Tests/Validator.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/UnitTests/Validator.cs diff --git a/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj new file mode 100644 index 0000000000..7eab7f389e --- /dev/null +++ b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.1;netcoreapp2.0;net461 + win7-x86;win7-x64;linux-x64;osx-x64 + + + + + + + + + + + + + + + diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Controllers/HomeController.cs diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/CurrentResponseTelemetryChannel.cs diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Startup.cs b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Startup.cs similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Startup.cs rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Startup.cs diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Home/ScriptCheck.cshtml diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/Shared/_Layout.cshtml diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewImports.cshtml diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/Views/_ViewStart.cshtml diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.Development.json b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.Development.json similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.Development.json rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.Development.json diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.json b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.json similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/appsettings.json rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/appsettings.json diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json b/src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json similarity index 100% rename from src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json rename to src/Azure/ApplicationInsights.HostingStartup/test/testassets/ApplicationInsightsHostingStartupSample/home/site/diagnostics/ApplicationInsights.settings.json diff --git a/src/Azure/Azure.sln b/src/Azure/Azure.sln index 56ef0ae6f2..224a27d2cc 100644 --- a/src/Azure/Azure.sln +++ b/src/Azure/Azure.sln @@ -49,6 +49,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "..\Mvc\src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{9593691E-1B65-4EB1-97AA-F8B292B0082A}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApplicationInsights.HostingStartup", "ApplicationInsights.HostingStartup", "{EE98F905-C0E0-4A09-8B0E-5F8728EB14CF}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.ApplicationInsights.HostingStartup", "ApplicationInsights.HostingStartup\src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj", "{12544BE3-B7B9-42EA-A6BD-C354C9F39568}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{D9A5379C-EA5B-4AAE-8C84-46FAF40E4EEB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApplicationInsightsHostingStartupSample", "ApplicationInsights.HostingStartup\test\testassets\ApplicationInsightsHostingStartupSample\ApplicationInsightsHostingStartupSample.csproj", "{B76BE944-681D-4887-9F90-5A24AD5924CB}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServices.HostingStartup", "AzureAppServices.HostingStartup", "{9EC158BE-EB9C-4627-931D-B1B95D3210B6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.AzureAppServices.HostingStartup", "AzureAppServices.HostingStartup\src\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj", "{4209F2B4-0388-47DF-A054-C974ABE78723}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureAppServicesIntegration", "AzureAppServicesIntegration", "{C6E2B73F-137E-4C37-84DE-0863B1C30D23}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "AzureAppServicesIntegration\src\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj", "{215BC7AA-7275-44CA-A7B5-D62AEC7D4752}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "AzureAppServicesIntegration\test\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj", "{15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -251,6 +271,66 @@ Global {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x64.Build.0 = Release|Any CPU {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.ActiveCfg = Release|Any CPU {9593691E-1B65-4EB1-97AA-F8B292B0082A}.Release|x86.Build.0 = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x64.ActiveCfg = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x64.Build.0 = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x86.ActiveCfg = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Debug|x86.Build.0 = Debug|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|Any CPU.Build.0 = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x64.ActiveCfg = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x64.Build.0 = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x86.ActiveCfg = Release|Any CPU + {12544BE3-B7B9-42EA-A6BD-C354C9F39568}.Release|x86.Build.0 = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x64.ActiveCfg = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x64.Build.0 = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x86.ActiveCfg = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Debug|x86.Build.0 = Debug|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|Any CPU.Build.0 = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x64.ActiveCfg = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x64.Build.0 = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x86.ActiveCfg = Release|Any CPU + {B76BE944-681D-4887-9F90-5A24AD5924CB}.Release|x86.Build.0 = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x64.ActiveCfg = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x64.Build.0 = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x86.ActiveCfg = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Debug|x86.Build.0 = Debug|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|Any CPU.Build.0 = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x64.ActiveCfg = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x64.Build.0 = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x86.ActiveCfg = Release|Any CPU + {4209F2B4-0388-47DF-A054-C974ABE78723}.Release|x86.Build.0 = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|Any CPU.Build.0 = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x64.ActiveCfg = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x64.Build.0 = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x86.ActiveCfg = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Debug|x86.Build.0 = Debug|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|Any CPU.ActiveCfg = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|Any CPU.Build.0 = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x64.ActiveCfg = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x64.Build.0 = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x86.ActiveCfg = Release|Any CPU + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752}.Release|x86.Build.0 = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x64.ActiveCfg = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x64.Build.0 = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x86.ActiveCfg = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Debug|x86.Build.0 = Debug|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|Any CPU.Build.0 = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x64.ActiveCfg = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x64.Build.0 = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x86.ActiveCfg = Release|Any CPU + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -277,6 +357,13 @@ Global {240BBDB1-3501-4637-8A17-996EA4EBB20B} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} {88EF760A-99A2-48C8-920F-78632A3BB57A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} {9593691E-1B65-4EB1-97AA-F8B292B0082A} = {84622717-F98A-4DE2-806E-1EF89C45C0EB} + {12544BE3-B7B9-42EA-A6BD-C354C9F39568} = {EE98F905-C0E0-4A09-8B0E-5F8728EB14CF} + {9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32} = {EE98F905-C0E0-4A09-8B0E-5F8728EB14CF} + {D9A5379C-EA5B-4AAE-8C84-46FAF40E4EEB} = {9F1C63CA-BBE9-468A-B8E1-1C28A7D09F32} + {B76BE944-681D-4887-9F90-5A24AD5924CB} = {D9A5379C-EA5B-4AAE-8C84-46FAF40E4EEB} + {4209F2B4-0388-47DF-A054-C974ABE78723} = {9EC158BE-EB9C-4627-931D-B1B95D3210B6} + {215BC7AA-7275-44CA-A7B5-D62AEC7D4752} = {C6E2B73F-137E-4C37-84DE-0863B1C30D23} + {15FAF776-E564-4ADF-9F10-20F3C0A8BA7C} = {C6E2B73F-137E-4C37-84DE-0863B1C30D23} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {81AADD49-473B-43ED-8A08-F6B7A058AA39} diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AssemblyInfo.cs b/src/Azure/AzureAppServices.HostingStartup/src/AssemblyInfo.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AssemblyInfo.cs rename to src/Azure/AzureAppServices.HostingStartup/src/AssemblyInfo.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AzureAppServicesHostingStartup.cs b/src/Azure/AzureAppServices.HostingStartup/src/AzureAppServicesHostingStartup.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/AzureAppServicesHostingStartup.cs rename to src/Azure/AzureAppServices.HostingStartup/src/AzureAppServicesHostingStartup.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/HostingStartupConfigurationExtensions.cs b/src/Azure/AzureAppServices.HostingStartup/src/HostingStartupConfigurationExtensions.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/HostingStartupConfigurationExtensions.cs rename to src/Azure/AzureAppServices.HostingStartup/src/HostingStartupConfigurationExtensions.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj similarity index 50% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj rename to src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj index ef7e900325..2bd0da75c0 100644 --- a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj +++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj @@ -1,6 +1,6 @@  - + ASP.NET Core lightup integration with Azure AppServices. @@ -10,11 +10,8 @@ - - - - - + + diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netcore.json b/src/Azure/AzureAppServices.HostingStartup/src/baseline.netcore.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netcore.json rename to src/Azure/AzureAppServices.HostingStartup/src/baseline.netcore.json diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netframework.json b/src/Azure/AzureAppServices.HostingStartup/src/baseline.netframework.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup/baseline.netframework.json rename to src/Azure/AzureAppServices.HostingStartup/src/baseline.netframework.json diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/AppServicesWebHostBuilderExtensions.cs b/src/Azure/AzureAppServicesIntegration/src/AppServicesWebHostBuilderExtensions.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/AppServicesWebHostBuilderExtensions.cs rename to src/Azure/AzureAppServicesIntegration/src/AppServicesWebHostBuilderExtensions.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj similarity index 63% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj rename to src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj index 09377e396b..444f87a42e 100644 --- a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj +++ b/src/Azure/AzureAppServicesIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Properties/AssemblyInfo.cs b/src/Azure/AzureAppServicesIntegration/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/Properties/AssemblyInfo.cs rename to src/Azure/AzureAppServicesIntegration/src/Properties/AssemblyInfo.cs diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/baseline.netcore.json b/src/Azure/AzureAppServicesIntegration/src/baseline.netcore.json similarity index 100% rename from src/AzureIntegration/src/Microsoft.AspNetCore.AzureAppServicesIntegration/baseline.netcore.json rename to src/Azure/AzureAppServicesIntegration/src/baseline.netcore.json diff --git a/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/AppServicesWebHostBuilderExtensionsTest.cs b/src/Azure/AzureAppServicesIntegration/test/AppServicesWebHostBuilderExtensionsTest.cs similarity index 100% rename from src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/AppServicesWebHostBuilderExtensionsTest.cs rename to src/Azure/AzureAppServicesIntegration/test/AppServicesWebHostBuilderExtensionsTest.cs diff --git a/src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj b/src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj new file mode 100644 index 0000000000..278ad9b30e --- /dev/null +++ b/src/Azure/AzureAppServicesIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + diff --git a/src/AzureIntegration/build/hostingstartup.targets b/src/Azure/hostingstartup.targets similarity index 100% rename from src/AzureIntegration/build/hostingstartup.targets rename to src/Azure/hostingstartup.targets diff --git a/src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj b/src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj new file mode 100644 index 0000000000..c26ee03cb6 --- /dev/null +++ b/src/Azure/samples/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj @@ -0,0 +1,15 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + + diff --git a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Startup.cs b/src/Azure/samples/AzureAppServicesHostingStartupSample/Startup.cs similarity index 100% rename from src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Startup.cs rename to src/Azure/samples/AzureAppServicesHostingStartupSample/Startup.cs diff --git a/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj b/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj new file mode 100644 index 0000000000..6f9d5b17ff --- /dev/null +++ b/src/Azure/samples/AzureAppServicesSample/AzureAppServicesSample.csproj @@ -0,0 +1,15 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + + diff --git a/src/AzureIntegration/sample/AzureAppServicesSample/Startup.cs b/src/Azure/samples/AzureAppServicesSample/Startup.cs similarity index 100% rename from src/AzureIntegration/sample/AzureAppServicesSample/Startup.cs rename to src/Azure/samples/AzureAppServicesSample/Startup.cs diff --git a/src/AzureIntegration/AzureIntegration.sln b/src/AzureIntegration/AzureIntegration.sln index 5ef2360204..5ca7e2c54a 100644 --- a/src/AzureIntegration/AzureIntegration.sln +++ b/src/AzureIntegration/AzureIntegration.sln @@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27016.1 MinimumVisualStudioVersion = 15.0.26730.03 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration", "src\Microsoft.AspNetCore.AzureAppServicesIntegration\Microsoft.AspNetCore.AzureAppServicesIntegration.csproj", "{5916BEB5-0969-469B-976C-A392E015DFAC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FF9B744E-6C59-40CC-9E41-9D2EBD292435}" ProjectSection(SolutionItems) = preProject src\Directory.Build.props = src\Directory.Build.props @@ -17,41 +15,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution NuGet.config = NuGet.config EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesSample", "sample\AzureAppServicesSample\AzureAppServicesSample.csproj", "{05A4D308-B162-4194-BC5E-88CCB4DBD318}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{37237C93-6855-40D9-9E60-418B093EF49A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{CD650B4B-81C2-4A44-AEF2-A251A877C1F0}" ProjectSection(SolutionItems) = preProject test\Directory.Build.props = test\Directory.Build.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServicesIntegration.Tests", "test\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests\Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj", "{9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.HostingStartup", "src\Microsoft.AspNetCore.AzureAppServices.HostingStartup\Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj", "{AC023B45-7995-4D4A-8108-E512AE8E5734}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureAppServicesHostingStartupSample", "sample\AzureAppServicesHostingStartupSample\AzureAppServicesHostingStartupSample.csproj", "{939EA897-CA31-4F2E-BA51-22B570B64671}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ApplicationInsights.HostingStartup", "src\Microsoft.AspNetCore.ApplicationInsights.HostingStartup\Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj", "{2849A2D9-7C08-4198-BF2B-8BFB4B13554D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsightsHostingStartupSample", "sample\ApplicationInsightsHostingStartupSample\ApplicationInsightsHostingStartupSample.csproj", "{33E245F0-2566-4B5B-BA7C-8895B7A697AE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Web.Xdt.Extensions", "src\Microsoft.Web.Xdt.Extensions\Microsoft.Web.Xdt.Extensions.csproj", "{9B22E525-FEC9-4C7C-9F9C-598C15BD0250}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.AzureAppServices.SiteExtension", "extensions\Microsoft.AspNetCore.AzureAppServices.SiteExtension\Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj", "{1CE2D76B-39E6-46C0-8F6F-C63E370955A9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationInsights.HostingStartup.Tests", "test\ApplicationInsights.HostingStartup.Tests\ApplicationInsights.HostingStartup.Tests.csproj", "{0899A101-E451-40A4-81B0-7AA18202C25D}" -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.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}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApplicationModelDetection", "src\Microsoft.Extensions.ApplicationModelDetection\Microsoft.Extensions.ApplicationModelDetection.csproj", "{F0CABFE8-A5B1-487B-A451-A486D26742D3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.ApplicationModelDetection.Tests", "test\Microsoft.Extensions.ApplicationModelDetection.Tests\Microsoft.Extensions.ApplicationModelDetection.Tests.csproj", "{15664836-2B94-4D2D-AC18-6DED01FCCCBD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Runtime.SiteExtension", "extensions\Microsoft.AspNetCore.Runtime.SiteExtension\Microsoft.AspNetCore.Runtime.SiteExtension.csproj", "{E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}" EndProject Global @@ -60,34 +38,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5916BEB5-0969-469B-976C-A392E015DFAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5916BEB5-0969-469B-976C-A392E015DFAC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5916BEB5-0969-469B-976C-A392E015DFAC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5916BEB5-0969-469B-976C-A392E015DFAC}.Release|Any CPU.Build.0 = Release|Any CPU - {05A4D308-B162-4194-BC5E-88CCB4DBD318}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05A4D308-B162-4194-BC5E-88CCB4DBD318}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05A4D308-B162-4194-BC5E-88CCB4DBD318}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05A4D308-B162-4194-BC5E-88CCB4DBD318}.Release|Any CPU.Build.0 = Release|Any CPU - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA}.Release|Any CPU.Build.0 = Release|Any CPU - {AC023B45-7995-4D4A-8108-E512AE8E5734}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC023B45-7995-4D4A-8108-E512AE8E5734}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC023B45-7995-4D4A-8108-E512AE8E5734}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC023B45-7995-4D4A-8108-E512AE8E5734}.Release|Any CPU.Build.0 = Release|Any CPU - {939EA897-CA31-4F2E-BA51-22B570B64671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {939EA897-CA31-4F2E-BA51-22B570B64671}.Debug|Any CPU.Build.0 = Debug|Any CPU - {939EA897-CA31-4F2E-BA51-22B570B64671}.Release|Any CPU.ActiveCfg = Release|Any CPU - {939EA897-CA31-4F2E-BA51-22B570B64671}.Release|Any CPU.Build.0 = Release|Any CPU - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D}.Release|Any CPU.Build.0 = Release|Any CPU - {33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33E245F0-2566-4B5B-BA7C-8895B7A697AE}.Release|Any CPU.Build.0 = Release|Any CPU {9B22E525-FEC9-4C7C-9F9C-598C15BD0250}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9B22E525-FEC9-4C7C-9F9C-598C15BD0250}.Debug|Any CPU.Build.0 = Debug|Any CPU {9B22E525-FEC9-4C7C-9F9C-598C15BD0250}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -96,10 +46,6 @@ Global {1CE2D76B-39E6-46C0-8F6F-C63E370955A9}.Debug|Any CPU.Build.0 = Debug|Any CPU {1CE2D76B-39E6-46C0-8F6F-C63E370955A9}.Release|Any CPU.ActiveCfg = Release|Any CPU {1CE2D76B-39E6-46C0-8F6F-C63E370955A9}.Release|Any CPU.Build.0 = Release|Any CPU - {0899A101-E451-40A4-81B0-7AA18202C25D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0899A101-E451-40A4-81B0-7AA18202C25D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0899A101-E451-40A4-81B0-7AA18202C25D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0899A101-E451-40A4-81B0-7AA18202C25D}.Release|Any CPU.Build.0 = Release|Any CPU {2B2C37FF-9249-4EA4-9A7F-038B55A15C2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {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 @@ -112,14 +58,6 @@ Global {491A857A-3529-4375-985D-D748F9F01476}.Debug|Any CPU.Build.0 = Debug|Any CPU {491A857A-3529-4375-985D-D748F9F01476}.Release|Any CPU.ActiveCfg = Release|Any CPU {491A857A-3529-4375-985D-D748F9F01476}.Release|Any CPU.Build.0 = Release|Any CPU - {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0CABFE8-A5B1-487B-A451-A486D26742D3}.Release|Any CPU.Build.0 = Release|Any CPU - {15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {15664836-2B94-4D2D-AC18-6DED01FCCCBD}.Release|Any CPU.Build.0 = Release|Any CPU {E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}.Debug|Any CPU.Build.0 = Debug|Any CPU {E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -129,21 +67,11 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {5916BEB5-0969-469B-976C-A392E015DFAC} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} - {05A4D308-B162-4194-BC5E-88CCB4DBD318} = {37237C93-6855-40D9-9E60-418B093EF49A} - {9BA1B692-B313-4E22-A864-F0ADBBE3C3FA} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} - {AC023B45-7995-4D4A-8108-E512AE8E5734} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} - {939EA897-CA31-4F2E-BA51-22B570B64671} = {37237C93-6855-40D9-9E60-418B093EF49A} - {2849A2D9-7C08-4198-BF2B-8BFB4B13554D} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} - {33E245F0-2566-4B5B-BA7C-8895B7A697AE} = {37237C93-6855-40D9-9E60-418B093EF49A} {9B22E525-FEC9-4C7C-9F9C-598C15BD0250} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} {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} {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} - {15664836-2B94-4D2D-AC18-6DED01FCCCBD} = {CD650B4B-81C2-4A44-AEF2-A251A877C1F0} {E1E9BC7A-6951-4B60-8DFB-DBB9AC3CDEB0} = {FF9B744E-6C59-40CC-9E41-9D2EBD292435} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj b/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj deleted file mode 100644 index bf8548b179..0000000000 --- a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/ApplicationInsightsHostingStartupSample.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - netcoreapp2.1;netcoreapp2.0;net461 - win7-x86;win7-x64;linux-x64;osx-x64 - - - - - - - - - - - - - - - - - - - diff --git a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json b/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json deleted file mode 100644 index beabdcaf51..0000000000 --- a/src/AzureIntegration/sample/ApplicationInsightsHostingStartupSample/Properties/launchSettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:22071/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup;Microsoft.AspNetCore.Server.IISIntegration" - } - }, - "ApplicationInsightsHostingStartupSample": { - "commandName": "project", - "launchBrowser": true, - "launchUrl": "http://localhost:5000/", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.ApplicationInsights.HostingStartup" - } - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj b/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj deleted file mode 100644 index 02512aaff6..0000000000 --- a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/AzureAppServicesHostingStartupSample.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp2.1;net461 - - - - - - - - - - - - - - diff --git a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json b/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json deleted file mode 100644 index 731d8620e9..0000000000 --- a/src/AzureIntegration/sample/AzureAppServicesHostingStartupSample/Properties/launchSettings.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:22071/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.AzureAppServices.HostingStartup;Microsoft.AspNetCore.Server.IISIntegration" - } - }, - "AzureAppServicesHostingStartupSample": { - "commandName": "IISExpress", - "launchBrowser": true - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/sample/AzureAppServicesSample/AzureAppServicesSample.csproj b/src/AzureIntegration/sample/AzureAppServicesSample/AzureAppServicesSample.csproj deleted file mode 100644 index ef66ac77d1..0000000000 --- a/src/AzureIntegration/sample/AzureAppServicesSample/AzureAppServicesSample.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp2.1;net461 - - - - - - - - - - - - - - diff --git a/src/AzureIntegration/sample/AzureAppServicesSample/Properties/launchSettings.json b/src/AzureIntegration/sample/AzureAppServicesSample/Properties/launchSettings.json deleted file mode 100644 index 93ebc1db03..0000000000 --- a/src/AzureIntegration/sample/AzureAppServicesSample/Properties/launchSettings.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:64358/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.Server.IISIntegration" - } - }, - "AzureAppServicesSample": { - "commandName": "IISExpress", - "launchBrowser": true - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj b/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj deleted file mode 100644 index a5d6941581..0000000000 --- a/src/AzureIntegration/src/Microsoft.AspNetCore.ApplicationInsights.HostingStartup/Microsoft.AspNetCore.ApplicationInsights.HostingStartup.csproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - ASP.NET Core lightup integration with Application Insights. - netcoreapp2.1;netcoreapp2.0;net461 - true - aspnetcore;ApplicationInsights;Analytics;Telemetry;AppInsights - - - - - - - - - - - - - diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetectionResult.cs b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetectionResult.cs deleted file mode 100644 index 96e53dc52d..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetectionResult.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.Extensions.ApplicationModelDetection -{ - public class AppModelDetectionResult - { - public RuntimeFramework? Framework { get; set; } - public string FrameworkVersion { get; set; } - public string AspNetCoreVersion { get; set; } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetector.cs b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetector.cs deleted file mode 100644 index e42a8f2918..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/AppModelDetector.cs +++ /dev/null @@ -1,250 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Linq; -using System.Reflection.Metadata; -using System.Reflection.PortableExecutable; -using System.Xml.Linq; -using Newtonsoft.Json; -using Newtonsoft.Json.Linq; - -namespace Microsoft.Extensions.ApplicationModelDetection -{ - public class AppModelDetector - { - // We use Hosting package to detect AspNetCore version - // it contains light-up implemenation that we care about and - // would have to be used by aspnet core web apps - private const string AspNetCoreAssembly = "Microsoft.AspNetCore.Hosting"; - - /// - /// Reads the following sources - /// - web.config to detect dotnet framework kind - /// - *.runtimeconfig.json to detect target framework version - /// - *.deps.json to detect Asp.Net Core version - /// - Microsoft.AspNetCore.Hosting.dll to detect Asp.Net Core version - /// - /// The application directory - /// The instance containing information about application - public AppModelDetectionResult Detect(DirectoryInfo directory) - { - string entryPoint = null; - - // Try reading web.config and resolving framework and app path - var webConfig = directory.GetFiles("web.config").FirstOrDefault(); - - bool webConfigExists = webConfig != null; - bool? usesDotnetExe = null; - - if (webConfigExists && - TryParseWebConfig(webConfig, out var dotnetExe, out entryPoint)) - { - usesDotnetExe = dotnetExe; - } - - // If we found entry point let's look for .deps.json - // in some cases it exists in desktop too - FileInfo depsJson = null; - FileInfo runtimeConfig = null; - - if (!string.IsNullOrWhiteSpace(entryPoint)) - { - depsJson = new FileInfo(Path.ChangeExtension(entryPoint, ".deps.json")); - runtimeConfig = new FileInfo(Path.ChangeExtension(entryPoint, ".runtimeconfig.json")); - } - - if (depsJson == null || !depsJson.Exists) - { - depsJson = directory.GetFiles("*.deps.json").FirstOrDefault(); - } - - if (runtimeConfig == null || !runtimeConfig.Exists) - { - runtimeConfig = directory.GetFiles("*.runtimeconfig.json").FirstOrDefault(); - } - - string aspNetCoreVersionFromDeps = null; - string aspNetCoreVersionFromDll = null; - - - // Try to detect ASP.NET Core version from .deps.json - if (depsJson != null && - depsJson.Exists && - TryParseDependencies(depsJson, out var aspNetCoreVersion)) - { - aspNetCoreVersionFromDeps = aspNetCoreVersion; - } - - // Try to detect ASP.NET Core version from .deps.json - var aspNetCoreDll = directory.GetFiles(AspNetCoreAssembly + ".dll").FirstOrDefault(); - if (aspNetCoreDll != null && - TryParseAssembly(aspNetCoreDll, out aspNetCoreVersion)) - { - aspNetCoreVersionFromDll = aspNetCoreVersion; - } - - // Try to detect dotnet core runtime version from runtimeconfig.json - string runtimeVersionFromRuntimeConfig = null; - if (runtimeConfig != null && - runtimeConfig.Exists) - { - TryParseRuntimeConfig(runtimeConfig, out runtimeVersionFromRuntimeConfig); - } - - var result = new AppModelDetectionResult(); - if (usesDotnetExe == true) - { - result.Framework = RuntimeFramework.DotNetCore; - result.FrameworkVersion = runtimeVersionFromRuntimeConfig; - } - else - { - if (depsJson?.Exists == true && - runtimeConfig?.Exists == true) - { - result.Framework = RuntimeFramework.DotNetCoreStandalone; - } - else - { - result.Framework = RuntimeFramework.DotNetFramework; - } - } - - result.AspNetCoreVersion = aspNetCoreVersionFromDeps ?? aspNetCoreVersionFromDll; - - return result; - } - - private bool TryParseAssembly(FileInfo aspNetCoreDll, out string aspNetCoreVersion) - { - aspNetCoreVersion = null; - try - { - using (var stream = aspNetCoreDll.OpenRead()) - using (var peReader = new PEReader(stream)) - { - var metadataReader = peReader.GetMetadataReader(); - var assemblyDefinition = metadataReader.GetAssemblyDefinition(); - aspNetCoreVersion = assemblyDefinition.Version.ToString(); - return true; - } - } - catch (Exception) - { - return false; - } - } - - /// - /// Search for Microsoft.AspNetCore.Hosting entry in deps.json and get it's version number - /// - private bool TryParseDependencies(FileInfo depsJson, out string aspnetCoreVersion) - { - aspnetCoreVersion = null; - try - { - using (var streamReader = depsJson.OpenText()) - using (var jsonReader = new JsonTextReader(streamReader)) - { - var json = JObject.Load(jsonReader); - - var libraryPrefix = AspNetCoreAssembly+ "/"; - - var library = json.Descendants().OfType().FirstOrDefault(property => property.Name.StartsWith(libraryPrefix)); - if (library != null) - { - aspnetCoreVersion = library.Name.Substring(libraryPrefix.Length); - return true; - } - } - } - catch (Exception) - { - } - return false; - } - - private bool TryParseRuntimeConfig(FileInfo runtimeConfig, out string frameworkVersion) - { - frameworkVersion = null; - try - { - using (var streamReader = runtimeConfig.OpenText()) - using (var jsonReader = new JsonTextReader(streamReader)) - { - var json = JObject.Load(jsonReader); - frameworkVersion = (string)json?["runtimeOptions"] - ?["framework"] - ?["version"]; - - return true; - } - } - catch (Exception) - { - return false; - } - } - - private bool TryParseWebConfig(FileInfo webConfig, out bool usesDotnetExe, out string entryPoint) - { - usesDotnetExe = false; - entryPoint = null; - - try - { - var xdocument = XDocument.Load(webConfig.FullName); - var aspNetCoreHandler = xdocument.Root? - .Element("system.webServer") - .Element("aspNetCore"); - - if (aspNetCoreHandler == null) - { - return false; - } - - var processPath = (string) aspNetCoreHandler.Attribute("processPath"); - var arguments = (string) aspNetCoreHandler.Attribute("arguments"); - - if (processPath.EndsWith("dotnet", StringComparison.OrdinalIgnoreCase) || - processPath.EndsWith("dotnet.exe", StringComparison.OrdinalIgnoreCase) && - !string.IsNullOrWhiteSpace(arguments)) - { - usesDotnetExe = true; - var entryPointPart = arguments.Split(new[] {" "}, StringSplitOptions.RemoveEmptyEntries).FirstOrDefault(); - - if (!string.IsNullOrWhiteSpace(entryPointPart)) - { - try - { - entryPoint = Path.GetFullPath(Path.Combine(webConfig.DirectoryName, entryPointPart)); - } - catch (Exception) - { - } - } - } - else - { - usesDotnetExe = false; - - try - { - entryPoint = Path.GetFullPath(Path.Combine(webConfig.DirectoryName, processPath)); - } - catch (Exception) - { - } - } - } - catch (Exception) - { - return false; - } - - return true; - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/Microsoft.Extensions.ApplicationModelDetection.csproj b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/Microsoft.Extensions.ApplicationModelDetection.csproj deleted file mode 100644 index aae6b8bf52..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/Microsoft.Extensions.ApplicationModelDetection.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - ASP.NET Core integration with Azure AppServices. - netstandard2.0 - $(NoWarn);CS1591 - true - true - aspnetcore;azure;appservices - - - - - - - \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/RuntimeFramework.cs b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/RuntimeFramework.cs deleted file mode 100644 index b182c79eec..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/RuntimeFramework.cs +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -namespace Microsoft.Extensions.ApplicationModelDetection -{ - public enum RuntimeFramework - { - DotNetCore, - DotNetCoreStandalone, - DotNetFramework - } -} \ No newline at end of file diff --git a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/baseline.netcore.json b/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/baseline.netcore.json deleted file mode 100644 index d94df11f0a..0000000000 --- a/src/AzureIntegration/src/Microsoft.Extensions.ApplicationModelDetection/baseline.netcore.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "AssemblyIdentity": "Microsoft.Extensions.ApplicationModelDetection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60", - "Types": [ - { - "Name": "Microsoft.Extensions.ApplicationModelDetection.AppModelDetectionResult", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "get_Framework", - "Parameters": [], - "ReturnType": "System.Nullable", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_Framework", - "Parameters": [ - { - "Name": "value", - "Type": "System.Nullable" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_FrameworkVersion", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_FrameworkVersion", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "get_AspNetCoreVersion", - "Parameters": [], - "ReturnType": "System.String", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Method", - "Name": "set_AspNetCoreVersion", - "Parameters": [ - { - "Name": "value", - "Type": "System.String" - } - ], - "ReturnType": "System.Void", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.ApplicationModelDetection.AppModelDetector", - "Visibility": "Public", - "Kind": "Class", - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Method", - "Name": "Detect", - "Parameters": [ - { - "Name": "directory", - "Type": "System.IO.DirectoryInfo" - } - ], - "ReturnType": "Microsoft.Extensions.ApplicationModelDetection.AppModelDetectionResult", - "Visibility": "Public", - "GenericParameter": [] - }, - { - "Kind": "Constructor", - "Name": ".ctor", - "Parameters": [], - "Visibility": "Public", - "GenericParameter": [] - } - ], - "GenericParameters": [] - }, - { - "Name": "Microsoft.Extensions.ApplicationModelDetection.RuntimeFramework", - "Visibility": "Public", - "Kind": "Enumeration", - "Sealed": true, - "ImplementedInterfaces": [], - "Members": [ - { - "Kind": "Field", - "Name": "DotNetCore", - "Parameters": [], - "GenericParameter": [], - "Literal": "0" - }, - { - "Kind": "Field", - "Name": "DotNetCoreStandalone", - "Parameters": [], - "GenericParameter": [], - "Literal": "1" - }, - { - "Kind": "Field", - "Name": "DotNetFramework", - "Parameters": [], - "GenericParameter": [], - "Literal": "2" - } - ], - "GenericParameters": [] - } - ] -} \ No newline at end of file diff --git a/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj b/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj deleted file mode 100644 index 424386bd43..0000000000 --- a/src/AzureIntegration/test/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests/Microsoft.AspNetCore.AzureAppServicesIntegration.Tests.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - diff --git a/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/AppModelTests.cs b/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/AppModelTests.cs deleted file mode 100644 index 02e420d2e4..0000000000 --- a/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/AppModelTests.cs +++ /dev/null @@ -1,229 +0,0 @@ -// // Copyright (c) .NET Foundation. All rights reserved. -// // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using Microsoft.AspNetCore.Hosting; -using Xunit; - -namespace Microsoft.Extensions.ApplicationModelDetection.Tests -{ - public class AppModelTests - { - private const string EmptyWebConfig = @""; - - [Theory] - [InlineData("dotnet")] - [InlineData("dotnet.exe")] - [InlineData("%HOME%/dotnet")] - [InlineData("%HOME%/dotnet.exe")] - [InlineData("DoTNeT.ExE")] - public void DetectsCoreFrameworkFromWebConfig(string processPath) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config",GenerateWebConfig(processPath, ".\\app.dll"))) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - } - } - - [Theory] - [InlineData("app")] - [InlineData("app.exe")] - [InlineData("%HOME%/app")] - [InlineData("%HOME%/app.exe")] - public void DetectsFullFrameworkFromWebConfig(string processPath) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig(processPath, ".\\app.dll"))) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetFramework, result.Framework); - } - } - - [Theory] - [InlineData("2.0.0")] - [InlineData("2.0.0-preview1")] - [InlineData("1.1.3")] - public void DetectsRuntimeVersionFromRuntimeConfig(string runtimeVersion) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("dotnet", ".\\app.dll")) - .WithFile("app.runtimeconfig.json", @"{ - ""runtimeOptions"": { - ""tfm"": ""netcoreapp2.0"", - ""framework"": { - ""name"": ""Microsoft.NETCore.App"", - ""version"": """+ runtimeVersion + @""" - }, - ""configProperties"": { - ""System.GC.Server"": true - } - } -}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - Assert.Equal(runtimeVersion, result.FrameworkVersion); - } - } - - - [Theory] - [InlineData("2.0.0")] - [InlineData("2.0.0-preview1")] - [InlineData("1.1.3")] - public void DetectsRuntimeVersionFromRuntimeConfigWitoutEntryPoint(string runtimeVersion) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("dotnet", "%HOME%\\app.dll")) - .WithFile("app.runtimeconfig.json", @"{ - ""runtimeOptions"": { - ""tfm"": ""netcoreapp2.0"", - ""framework"": { - ""name"": ""Microsoft.NETCore.App"", - ""version"": """+ runtimeVersion + @""" - }, - ""configProperties"": { - ""System.GC.Server"": true - } - } -}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - Assert.Equal(runtimeVersion, result.FrameworkVersion); - } - } - - [Theory] - [InlineData("2.0.0")] - [InlineData("2.0.0-preview1")] - [InlineData("1.1.3")] - public void DetectsAspNetCoreVersionFromDepsFile(string runtimeVersion) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("dotnet", "app.dll")) - .WithFile("app.deps.json", @"{ - ""targets"": { - "".NETCoreApp,Version=v2.7"": { - ""Microsoft.AspNetCore.Hosting/" + runtimeVersion + @""": { } - } - } -}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - Assert.Equal(runtimeVersion, result.AspNetCoreVersion); - } - } - - [Theory] - [InlineData("2.0.0")] - [InlineData("2.0.0-preview1")] - [InlineData("1.1.3")] - public void DetectsAspNetCoreVersionFromDepsFileWithoutEntryPoint(string runtimeVersion) - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("dotnet", "%HOME%\\app.dll")) - .WithFile("app.deps.json", @"{ - ""targets"": { - "".NETCoreApp,Version=v2.7"": { - ""Microsoft.AspNetCore.Hosting/" + runtimeVersion + @""": { } - } - } -}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCore, result.Framework); - Assert.Equal(runtimeVersion, result.AspNetCoreVersion); - } - } - - [Fact] - public void DetectsFullFrameworkWhenWebConfigExists() - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", EmptyWebConfig)) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetFramework, result.Framework); - } - } - - [Fact] - public void DetectsStandalone_WhenBothDepsAndRuntimeConfigExist() - { - using (var temp = new TemporaryDirectory() - .WithFile("web.config", GenerateWebConfig("app.exe", "")) - .WithFile("app.runtimeconfig.json", "{}") - .WithFile("app.deps.json", "{}")) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(RuntimeFramework.DotNetCoreStandalone, result.Framework); - } - } - - [Fact] - public void DetectsAspNetCoreVersionFromHostingDll() - { - using (var temp = new TemporaryDirectory() - .WithFile(typeof(WebHostBuilder).Assembly.Location)) - { - var result = new AppModelDetector().Detect(temp.Directory); - Assert.Equal(typeof(WebHostBuilder).Assembly.GetName().Version.ToString(), result.AspNetCoreVersion); - } - } - - private static string GenerateWebConfig(string processPath, string arguments) - { - return $@" - - - - - - - - -"; - } - - private class TemporaryDirectory: IDisposable - { - public TemporaryDirectory() - { - Directory = new DirectoryInfo(Path.GetTempPath()) - .CreateSubdirectory(Guid.NewGuid().ToString("N")); - } - - public DirectoryInfo Directory { get; } - - public void Dispose() - { - try - { - Directory.Delete(true); - } - catch (IOException) - { - } - } - - public TemporaryDirectory WithFile(string name, string value) - { - File.WriteAllText(Path.Combine(Directory.FullName, name), value); - return this; - } - - - public TemporaryDirectory WithFile(string name) - { - File.Copy(name, Path.Combine(Directory.FullName, Path.GetFileName(name))); - return this; - } - } - } -} \ No newline at end of file diff --git a/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/Microsoft.Extensions.ApplicationModelDetection.Tests.csproj b/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/Microsoft.Extensions.ApplicationModelDetection.Tests.csproj deleted file mode 100644 index b68825fcc0..0000000000 --- a/src/AzureIntegration/test/Microsoft.Extensions.ApplicationModelDetection.Tests/Microsoft.Extensions.ApplicationModelDetection.Tests.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - netcoreapp2.0;net461 - netcoreapp2.0 - - - - - - - \ No newline at end of file