diff --git a/ApplicationInsights.AspNetCore.sln b/ApplicationInsights.AspNetCore.sln index 8335989dec..52c4bc6974 100644 --- a/ApplicationInsights.AspNetCore.sln +++ b/ApplicationInsights.AspNetCore.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.14 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}" EndProject @@ -12,7 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution CHANGELOG.md = CHANGELOG.md Common.targets = Common.targets dirs.proj = dirs.proj - global.json = global.json NuGet.config = NuGet.config Readme.md = Readme.md RunTestsCore.ps1 = RunTestsCore.ps1 @@ -20,24 +19,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Signing.props = Signing.props EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.ApplicationInsights.AspNetCore", "src\Microsoft.ApplicationInsights.AspNetCore\Microsoft.ApplicationInsights.AspNetCore.xproj", "{95EC3635-22E4-4C3A-A066-F5823A0648DA}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B5230E5-8138-44D6-839F-DF9248F195EE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.ApplicationInsights.AspNetCore.Tests", "test\Microsoft.ApplicationInsights.AspNetCore.Tests\Microsoft.ApplicationInsights.AspNetCore.Tests.xproj", "{2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FunctionalTestUtils", "test\FunctionalTestUtils\FunctionalTestUtils.xproj", "{B7217A00-66FA-49A8-8EF3-39C07E1F7E33}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "WebApiShimFw46.FunctionalTests", "test\WebApiShimFw46.FunctionalTests\WebApiShimFw46.FunctionalTests.xproj", "{11FB2EE6-7199-4AFF-BC73-25F35675F233}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StartupPerf", "StartupPerf", "{16B44D67-6214-4DDE-B419-93EF073E2E69}" ProjectSection(SolutionItems) = preProject test\StartupPerf\startupPerf.ps1 = test\StartupPerf\startupPerf.ps1 EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "EmptyApp.FunctionalTests", "test\EmptyApp.FunctionalTests\EmptyApp.FunctionalTests.xproj", "{71CE2DB2-C7AA-4454-B5F2-774BC575E321}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.AspNetCore", "src\Microsoft.ApplicationInsights.AspNetCore\Microsoft.ApplicationInsights.AspNetCore.csproj", "{95EC3635-22E4-4C3A-A066-F5823A0648DA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ApplicationInsights.AspNetCore.Tests", "test\Microsoft.ApplicationInsights.AspNetCore.Tests\Microsoft.ApplicationInsights.AspNetCore.Tests.csproj", "{2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MVCFramework45.FunctionalTests", "test\MVCFramework45.FunctionalTests\MVCFramework45.FunctionalTests.xproj", "{9F83564A-F84D-494A-9658-B080757EA82C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTestUtils", "test\FunctionalTestUtils\FunctionalTestUtils.csproj", "{B7217A00-66FA-49A8-8EF3-39C07E1F7E33}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApiShimFw46.FunctionalTests", "test\WebApiShimFw46.FunctionalTests\WebApiShimFw46.FunctionalTests.csproj", "{11FB2EE6-7199-4AFF-BC73-25F35675F233}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EmptyApp.FunctionalTests", "test\EmptyApp.FunctionalTests\EmptyApp.FunctionalTests.csproj", "{71CE2DB2-C7AA-4454-B5F2-774BC575E321}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MVCFramework45.FunctionalTests", "test\MVCFramework45.FunctionalTests\MVCFramework45.FunctionalTests.csproj", "{9F83564A-F84D-494A-9658-B080757EA82C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -74,11 +73,11 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution + {16B44D67-6214-4DDE-B419-93EF073E2E69} = {8B5230E5-8138-44D6-839F-DF9248F195EE} {95EC3635-22E4-4C3A-A066-F5823A0648DA} = {2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF} {2766D8AF-C20B-4F3A-8260-6C2D39B7A8A0} = {8B5230E5-8138-44D6-839F-DF9248F195EE} {B7217A00-66FA-49A8-8EF3-39C07E1F7E33} = {8B5230E5-8138-44D6-839F-DF9248F195EE} {11FB2EE6-7199-4AFF-BC73-25F35675F233} = {8B5230E5-8138-44D6-839F-DF9248F195EE} - {16B44D67-6214-4DDE-B419-93EF073E2E69} = {8B5230E5-8138-44D6-839F-DF9248F195EE} {71CE2DB2-C7AA-4454-B5F2-774BC575E321} = {8B5230E5-8138-44D6-839F-DF9248F195EE} {9F83564A-F84D-494A-9658-B080757EA82C} = {8B5230E5-8138-44D6-839F-DF9248F195EE} EndGlobalSection diff --git a/build.cmd b/build.cmd index 4cb83f603a..ed15ebcf33 100644 --- a/build.cmd +++ b/build.cmd @@ -10,6 +10,6 @@ SET NugetOrg_Feed=https://www.nuget.org/api/v2/ SET IsOfficialBuild=False SET DefaultFeed=https://www.nuget.org/api/v2/ -msbuild dirs.proj /nologo /m:1 /fl /flp:logfile="%ProjectName%.%Platform%.log";v=d /flp1:logfile="%ProjectName%.%Platform%.wrn";warningsonly /flp2:logfile="%ProjectName%.%Platform%.err";errorsonly /p:Configuration=%Configuration% /p:Platform="%Platform%" /p:RunCodeAnalysis="False" /flp3:logfile="%ProjectName%.%Platform%.prf";performancesummary /flp4:logfile="%ProjectName%.%Platform%.exec.log";showcommandline /p:BuildSingleFilePackage=true /p:IsOfficialBuild=%IsOfficialBuild% +msbuild dirs.proj /nologo /m:1 /fl /flp:logfile="%ProjectName%.%Platform%.log";v=d /flp1:logfile="%ProjectName%.%Platform%.wrn";warningsonly /flp2:logfile="%ProjectName%.%Platform%.err";errorsonly /p:Configuration=%Configuration% /p:Platform="%Platform%" /p:RunCodeAnalysis="False" /flp3:logfile="%ProjectName%.%Platform%.prf";performancesummary /flp4:logfile="%ProjectName%.%Platform%.exec.log";showcommandline /p:BuildSingleFilePackage=true /p:IsOfficialBuild=%IsOfficialBuild% /p:RunTests=True pause \ No newline at end of file diff --git a/clean.cmd b/clean.cmd new file mode 100644 index 0000000000..50fe3bda6b --- /dev/null +++ b/clean.cmd @@ -0,0 +1,2 @@ +del /q %TEMP%\VisualStudioTestExplorerExtensions\* +for /d %%x in (%TEMP%\VisualStudioTestExplorerExtensions\*) do @rd /s /q "%%x" \ No newline at end of file diff --git a/dirs.proj b/dirs.proj index c45614439b..ccca898b26 100644 --- a/dirs.proj +++ b/dirs.proj @@ -3,10 +3,10 @@ - $(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-dev-win-x64.latest.zip - $(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-dev-win-x64.latest + $(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-dev-win-x64.1.0.4.zip + $(BUILD_ARTIFACTSTAGINGDIRECTORY)\dotnet-dev-win-x64.1.0.4.latest - .\src\Microsoft.ApplicationInsights.AspNetCore\project.json + .\src\Microsoft.ApplicationInsights.AspNetCore\Microsoft.ApplicationInsights.AspNetCore.csproj @@ -160,7 +160,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -180,8 +180,8 @@ - - + + diff --git a/global.json b/global.json deleted file mode 100644 index 9d09ab54cb..0000000000 --- a/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "projects": [ "src", "test" ], - "sdk": { - "version": "1.0.0-preview2-003131" - } -} diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj new file mode 100644 index 0000000000..0e921ae9ab --- /dev/null +++ b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj @@ -0,0 +1,84 @@ + + + + Application Insights for ASP.NET Core web applications. See https://azure.microsoft.com/documentation/articles/app-insights-asp-net-five/ for more information. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156 + Copyright © Microsoft. All Rights Reserved. + Application Insights for ASP.NET Core Web Applications + 2.1.1 + Microsoft + net451;netstandard1.6 + true + true + Microsoft.ApplicationInsights.AspNetCore + ../../keys/35MSSharedLib1024.snk + true + true + Microsoft.ApplicationInsights.AspNetCore + Analytics;ApplicationInsights;Telemetry;AppInsights;aspnetcore + https://appanacdn.blob.core.windows.net/cdn/icons/aic.png + https://go.microsoft.com/fwlink/?LinkId=392727 + https://go.microsoft.com/fwlink/?LinkID=510709 + true + git + https://github.com/Microsoft/ApplicationInsights-aspnetcore.git + 1.6.1 + ..\..\artifacts\src\$(MSBuildProjectName) + + + + + All + + + All + + + + + + + + All + + + All + + + All + + + All + + + All + + + All + + + All + + + All + + + + All + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.xproj b/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.xproj deleted file mode 100644 index ce8963ac1c..0000000000 --- a/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.xproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 95ec3635-22e4-4c3a-a066-f5823a0648da - Microsoft.ApplicationInsights.AspNetCore - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - - - Microsoft.ApplicationInsights.AspNetCore - 2.0 - - - True - - - - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.ApplicationInsights.AspNetCore/project.json b/src/Microsoft.ApplicationInsights.AspNetCore/project.json deleted file mode 100644 index e2d116ae64..0000000000 --- a/src/Microsoft.ApplicationInsights.AspNetCore/project.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "title": "Application Insights for ASP.NET Core Web Applications", - "summary": "Application Insights for ASP.NET Core web applications.", - "description": "Application Insights for ASP.NET Core web applications. See https://azure.microsoft.com/en-us/documentation/articles/app-insights-asp-net-five/ for more information. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156", - "authors": ["Microsoft"], - "version": "2.1.1", - "copyright": "Copyright © Microsoft. All Rights Reserved.", - "packOptions": { - "projectUrl": "https://go.microsoft.com/fwlink/?LinkId=392727", - "licenseUrl": "https://go.microsoft.com/fwlink/?LinkID=510709", - "requireLicenseAcceptance": true, - "iconUrl": "https://appanacdn.blob.core.windows.net/cdn/icons/aic.png", - "tags": ["Analytics", "ApplicationInsights", "Telemetry", "AppInsights", "aspnetcore"], - "repository": { - "type": "git", - "url": "https://github.com/Microsoft/ApplicationInsights-aspnetcore.git" - } - }, - "buildOptions": { - "keyFile": "../../keys/35MSSharedLib1024.snk", - "delaySign": true, - "xmlDoc": true - }, - "dependencies": { - "Desktop.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - "Microsoft.ApiDesignGuidelines.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - "Microsoft.AspNetCore.Hosting": "1.0.0", - "Microsoft.Extensions.Configuration": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.DiagnosticAdapter": "1.0.0", - "Microsoft.Extensions.Logging.Abstractions": "1.0.0", - "Microsoft.CodeAnalysis.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - "Microsoft.Composition.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - "Microsoft.Maintainability.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - "Microsoft.QualityGuidelines.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - "Roslyn.Diagnostics.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - "System.Collections.Immutable.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - //"System.Resources.Analyzers": { - // "version": "1.2.0-beta2", - // "type": "build" - //}, - "System.Runtime.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - "System.Runtime.InteropServices.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - //"System.Security.Cryptography.Hashing.Algorithms.Analyzers": { - // "version": "1.2.0-beta2", - // "type": "build" - //}, - "System.Text.Encodings.Web": "4.3.1", - "System.Threading.Tasks.Analyzers": { - "version": "1.2.0-beta2", - "type": "build" - }, - "Microsoft.ApplicationInsights": "2.4.0", - "Microsoft.ApplicationInsights.DependencyCollector": "2.4.1" - //"Text.Analyzers": { - // "version": "1.2.0-beta2", - // "type": "build" - //}, - //"XmlDocumentationComments.Analyzers": { - // "version": "1.2.0-beta2", - // "type": "build" - //}, - }, - "frameworks": { - "net451": { - "dependencies": { - "System.Net.Http": "4.3.1", - "Microsoft.ApplicationInsights.PerfCounterCollector": "2.4.1", - "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.4.0" - } - }, - "netstandard1.6": { - "dependencies": { - "NETStandard.Library": "1.6.1", - "System.Net.NameResolution": "4.3.0" - } - } - } -} \ No newline at end of file diff --git a/test/EmptyApp.FunctionalTests/App.config b/test/EmptyApp.FunctionalTests/App.config new file mode 100644 index 0000000000..380c07bcb1 --- /dev/null +++ b/test/EmptyApp.FunctionalTests/App.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj b/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj new file mode 100644 index 0000000000..da2c91b0d4 --- /dev/null +++ b/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.csproj @@ -0,0 +1,42 @@ + + + + 2.0.0 + net451;netcoreapp1.0 + win7-x86 + true + true + EmptyApp.FunctionalTests + ../../keys/35MSSharedLib1024.snk + true + true + EmptyApp.FunctionalTests + true + 1.1.1 + ..\..\artifacts\test\$(MSBuildProjectName) + + + + + + + + + + + + + + + + + + + + + Always + SettingsSingleFileGenerator + + + + diff --git a/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.xproj b/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.xproj deleted file mode 100644 index 4536709b9a..0000000000 --- a/test/EmptyApp.FunctionalTests/EmptyApp.FunctionalTests.xproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 71ce2db2-c7aa-4454-b5f2-774bc575e321 - EmptyApp.FunctionalTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - - - 2.0 - 6556 - - - - - - - - - - - - \ No newline at end of file diff --git a/test/EmptyApp.FunctionalTests/project.json b/test/EmptyApp.FunctionalTests/project.json deleted file mode 100644 index fe13c291a3..0000000000 --- a/test/EmptyApp.FunctionalTests/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "2.0.0", - "webroot": "wwwroot", - "buildOptions": { - "keyFile": "../../keys/35MSSharedLib1024.snk", - "delaySign": true, - "preserveCompilationContext": true - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "FunctionalTestUtils": { "target": "project" }, - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "xunit": "2.2.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - }, - "net451": { - } - } -} diff --git a/test/FunctionalTestUtils/FunctionalTestUtils.csproj b/test/FunctionalTestUtils/FunctionalTestUtils.csproj new file mode 100644 index 0000000000..21de57f6c0 --- /dev/null +++ b/test/FunctionalTestUtils/FunctionalTestUtils.csproj @@ -0,0 +1,31 @@ + + + + 1.0.2 + net451;netstandard1.6 + true + true + FunctionalTestUtils + ../../keys/35MSSharedLib1024.snk + true + true + FunctionalTestUtils + 1.6.1 + ..\..\artifacts\test\$(MSBuildProjectName) + + + + + + + + + + + + + + + + + diff --git a/test/FunctionalTestUtils/FunctionalTestUtils.xproj b/test/FunctionalTestUtils/FunctionalTestUtils.xproj deleted file mode 100644 index 6eb859e810..0000000000 --- a/test/FunctionalTestUtils/FunctionalTestUtils.xproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b7217a00-66fa-49a8-8ef3-39c07e1f7e33 - FunctionalTestUtils - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - - - 2.0 - - - - - - - - - \ No newline at end of file diff --git a/test/FunctionalTestUtils/project.json b/test/FunctionalTestUtils/project.json deleted file mode 100644 index e9193feee4..0000000000 --- a/test/FunctionalTestUtils/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.2", - "buildOptions": { - "keyFile": "../../keys/35MSSharedLib1024.snk", - "delaySign": true, - "preserveCompilationContext": true - }, - "dependencies": { - "Microsoft.ApplicationInsights.AspNetCore": { - "target": "project" - }, - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", - "NETStandard.Library": "1.6.1", - "xunit": "2.2.0-*" - }, - "frameworks": { - "net451": { }, - "netstandard1.6": { } - } -} \ No newline at end of file diff --git a/test/MVCFramework45.FunctionalTests/App.config b/test/MVCFramework45.FunctionalTests/App.config new file mode 100644 index 0000000000..380c07bcb1 --- /dev/null +++ b/test/MVCFramework45.FunctionalTests/App.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.csproj b/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.csproj new file mode 100644 index 0000000000..6be2617b11 --- /dev/null +++ b/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.csproj @@ -0,0 +1,71 @@ + + + + 2.0.0 + net451;netcoreapp1.0 + win7-x86 + true + true + MVCFramework45.FunctionalTests + ../../keys/35MSSharedLib1024.snk + true + true + MVCFramework45.FunctionalTests + true + aspnet-MVCFramework45.FunctionalTests-60cfc765-2dc9-454c-bb34-dc379ed92cd0 + 1.1.1 + ..\..\artifacts\test\$(MSBuildProjectName) + true + true + + + + + Always + SettingsSingleFileGenerator + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.xproj b/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.xproj deleted file mode 100644 index 414e1cb19d..0000000000 --- a/test/MVCFramework45.FunctionalTests/MVCFramework45.FunctionalTests.xproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9f83564a-f84d-494a-9658-b080757ea82c - MVCFramework45.FunctionalTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - - - - - - - \ No newline at end of file diff --git a/test/MVCFramework45.FunctionalTests/Views/_ViewImports.cshtml b/test/MVCFramework45.FunctionalTests/Views/_ViewImports.cshtml index 6a5f5f13fa..4ebe7e8d5d 100644 --- a/test/MVCFramework45.FunctionalTests/Views/_ViewImports.cshtml +++ b/test/MVCFramework45.FunctionalTests/Views/_ViewImports.cshtml @@ -2,5 +2,4 @@ @using MVCFramework45.FunctionalTests.Models @using MVCFramework45.FunctionalTests.Models.AccountViewModels @using MVCFramework45.FunctionalTests.Models.ManageViewModels -@using Microsoft.AspNetCore.Identity @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/test/MVCFramework45.FunctionalTests/project.json b/test/MVCFramework45.FunctionalTests/project.json deleted file mode 100644 index 1eb5047bd0..0000000000 --- a/test/MVCFramework45.FunctionalTests/project.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "version": "2.0.0", - "userSecretsId": "aspnet-MVCFramework45.FunctionalTests-60cfc765-2dc9-454c-bb34-dc379ed92cd0", - "buildOptions": { - "keyFile": "../../keys/35MSSharedLib1024.snk", - "delaySign": true, - "preserveCompilationContext": true, - "copyToOutput": { - "includeFiles": [ - "appsettings.json", - "web.config" - ], - "include": [ - "wwwroot", - "Views" - ] - } - }, - - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "FunctionalTestUtils": { "target": "project" }, - "Microsoft.ApplicationInsights.AspNetCore": { "target": "project" }, - "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0", - "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Identity": "1.0.0", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.1", - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.1", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.EntityFrameworkCore.SqlServer": "1.0.1", - "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "Microsoft.Extensions.Logging.Console": "1.0.0", - "Microsoft.Extensions.Logging.Debug": "1.0.0", - "xunit": "2.2.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - }, - "net451": { - } - }, - - "tools": { - "Microsoft.AspNetCore.Razor.Tools": { - "version": "1.0.0-preview3-final", - "imports": [ - "portable-net45+win8+dnxcore50" - ] - } - } -} diff --git a/test/MVCFramework45.FunctionalTests/xunit.runner.json b/test/MVCFramework45.FunctionalTests/xunit.runner.json new file mode 100644 index 0000000000..78c070e832 --- /dev/null +++ b/test/MVCFramework45.FunctionalTests/xunit.runner.json @@ -0,0 +1,3 @@ +{ + "shadowCopy": false +} \ No newline at end of file diff --git a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/App.config b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/App.config new file mode 100644 index 0000000000..380c07bcb1 --- /dev/null +++ b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/App.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj new file mode 100644 index 0000000000..0acc2b4acc --- /dev/null +++ b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj @@ -0,0 +1,54 @@ + + + + 2.0.0 + net451;netcoreapp1.0 + true + true + Microsoft.ApplicationInsights.AspNetCore.Tests + ../../keys/35MSSharedLib1024.snk + true + true + Microsoft.ApplicationInsights.AspNetCore.Tests + true + 1.1.1 + ..\..\artifacts\test\$(MSBuildProjectName) + + + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always + SettingsSingleFileGenerator + + + + diff --git a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.xproj b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.xproj deleted file mode 100644 index 7e3307bae6..0000000000 --- a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.xproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 2766d8af-c20b-4f3a-8260-6c2d39b7a8a0 - Microsoft.ApplicationInsights.AspNetCore.Tests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - - - Microsoft.ApplicationInsights.AspNetCore.Tests - True - 2.0 - - - - - - - - - - - - \ No newline at end of file diff --git a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/project.json b/test/Microsoft.ApplicationInsights.AspNetCore.Tests/project.json deleted file mode 100644 index fddbb4673a..0000000000 --- a/test/Microsoft.ApplicationInsights.AspNetCore.Tests/project.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "version": "2.0.0", - "buildOptions": { - "keyFile": "../../keys/35MSSharedLib1024.snk", - "delaySign": true, - "preserveCompilationContext": true, - "copyToOutput": { - "include": [ "content/*" ] - } - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.ApplicationInsights.AspNetCore": { "target": "project" }, - "Microsoft.AspNetCore.Hosting": "1.0.0", - "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Http.Extensions": "1.0.0", - "Microsoft.AspNetCore.Http.Features": "1.0.0", - "Microsoft.AspNetCore.Mvc.Core": "1.0.1", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "Microsoft.Extensions.Logging": "1.0.0", - "xunit": "2.2.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - }, - "net451": { - } - } -} diff --git a/test/WebApiShimFw46.FunctionalTests/App.config b/test/WebApiShimFw46.FunctionalTests/App.config new file mode 100644 index 0000000000..380c07bcb1 --- /dev/null +++ b/test/WebApiShimFw46.FunctionalTests/App.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.csproj b/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.csproj new file mode 100644 index 0000000000..5dda920751 --- /dev/null +++ b/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.csproj @@ -0,0 +1,51 @@ + + + + 2.0.0 + net451;netcoreapp1.0 + win7-x86 + true + true + WebApiShimFw46.FunctionalTests + ../../keys/35MSSharedLib1024.snk + true + true + WebApiShimFw46.FunctionalTests + true + $(PackageTargetFallback);portable-net45+win8 + 1.1.1 + ..\..\artifacts\test\$(MSBuildProjectName) + + + + + SettingsSingleFileGenerator + Always + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.xproj b/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.xproj deleted file mode 100644 index 18b18f686e..0000000000 --- a/test/WebApiShimFw46.FunctionalTests/WebApiShimFw46.FunctionalTests.xproj +++ /dev/null @@ -1,29 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 11fb2ee6-7199-4aff-bc73-25f35675f233 - SampleWebAPIIntegration - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - - - 2.0 - 12865 - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/WebApiShimFw46.FunctionalTests/project.json b/test/WebApiShimFw46.FunctionalTests/project.json deleted file mode 100644 index 6a8bfa201d..0000000000 --- a/test/WebApiShimFw46.FunctionalTests/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "2.0.0", - "webroot": "wwwroot", - "buildOptions": { - "keyFile": "../../keys/35MSSharedLib1024.snk", - "delaySign": true, - "preserveCompilationContext": true, - "copyToOutput": { - "includeFiles": [ "config.json", "xunit.runner.json" ] - } - }, - "testRunner": "xunit", - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "FunctionalTestUtils": { "target": "project" }, - "Microsoft.ApplicationInsights.AspNetCore": { "target": "project" }, - "Microsoft.AspNetCore.Mvc": "1.0.1", - "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.0.1", - "Microsoft.AspNetCore.StaticFiles": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - }, - "net451": { - } - } -}