diff --git a/ApplicationInsights.AspNet.sln b/ApplicationInsights.AspNet.sln index 6900729..afcb55a 100644 --- a/ApplicationInsights.AspNet.sln +++ b/ApplicationInsights.AspNet.sln @@ -1,17 +1,21 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22823.1 +VisualStudioVersion = 14.0.23016.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2E6DDE9E-8C75-4F9C-8906-08EBDD6E73EF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{62AD20FD-640F-4F99-94EF-96A7581F1CF9}" ProjectSection(SolutionItems) = preProject + buildDebug.cmd = buildDebug.cmd Common.targets = Common.targets + dirs.proj = dirs.proj global.json = global.json NuGet.config = NuGet.config Readme.md = Readme.md RunTests.ps1 = RunTests.ps1 + SetEnv.targets = SetEnv.targets + build\SetEnv.tasks = build\SetEnv.tasks EndProjectSection EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.ApplicationInsights.AspNet", "src\Microsoft.ApplicationInsights.AspNet\Microsoft.ApplicationInsights.AspNet.xproj", "{95EC3635-22E4-4C3A-A066-F5823A0648DA}" diff --git a/Common.targets b/Common.targets index cc055d8..991737f 100644 --- a/Common.targets +++ b/Common.targets @@ -5,9 +5,9 @@ $(RuntimeToolingDirectory)\bin\dnu.cmd - - - + + + diff --git a/NuGet.config b/NuGet.config index 770d704..57317b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,8 +1,8 @@ - + - + diff --git a/SetEnv.targets b/SetEnv.targets new file mode 100644 index 0000000..d3fad5c --- /dev/null +++ b/SetEnv.targets @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/build/SetEnv.tasks b/build/SetEnv.tasks new file mode 100644 index 0000000..c8c355f --- /dev/null +++ b/build/SetEnv.tasks @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/buildDebug.cmd b/buildDebug.cmd new file mode 100644 index 0000000..cd6b6e9 --- /dev/null +++ b/buildDebug.cmd @@ -0,0 +1,15 @@ +@echo off + +call "%VS140COMNTOOLS%\VsDevCmd.bat" + +rem SET PATH=%PATH%;%systemdrive%\Windows\Microsoft.NET\Framework\v4.0.30319\; +SET ProjectName=Msbuild.All +rem SET TF_BUILD_BUILDNUMBER=Release +SET Configuration=Debug +SET Platform=Any CPU +SET NugetOrg_Feed=https://www.nuget.org/api/v2/ +SET IsOfficialBuild=False +SET DefaultFeed=https://www.myget.org/F/aspnetvnext/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=False /p:TF_BUILD_BUILDNUMBER=22222 +PAUSE + diff --git a/dirs.proj b/dirs.proj new file mode 100644 index 0000000..017c437 --- /dev/null +++ b/dirs.proj @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/global.json b/global.json index 4f61463..7164e82 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,9 @@ { "sources": [ "src", "test" ], "sdk": { - "version": "1.0.0-beta6-12100", - "architecture": "x86", - "runtime": "clr" + "version": "1.0.0-beta6-12114", + "architecture": "x86", + "runtime": "clr" } + } diff --git a/src/Microsoft.ApplicationInsights.AspNet/Microsoft.ApplicationInsights.AspNet.xproj b/src/Microsoft.ApplicationInsights.AspNet/Microsoft.ApplicationInsights.AspNet.xproj index edec8b7..44f9628 100644 --- a/src/Microsoft.ApplicationInsights.AspNet/Microsoft.ApplicationInsights.AspNet.xproj +++ b/src/Microsoft.ApplicationInsights.AspNet/Microsoft.ApplicationInsights.AspNet.xproj @@ -1,23 +1,24 @@  - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - 95ec3635-22e4-4c3a-a066-f5823a0648da - Microsoft.ApplicationInsights.AspNet - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ - - - - Microsoft.ApplicationInsights.AspNet - 2.0 - - - True - - - + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + 95ec3635-22e4-4c3a-a066-f5823a0648da + Microsoft.ApplicationInsights.AspNet + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin\$(MSBuildProjectName)\ + + + + Microsoft.ApplicationInsights.AspNet + 2.0 + + + True + + + \ No newline at end of file diff --git a/src/Microsoft.ApplicationInsights.AspNet/project.json b/src/Microsoft.ApplicationInsights.AspNet/project.json index e758077..d30ff58 100644 --- a/src/Microsoft.ApplicationInsights.AspNet/project.json +++ b/src/Microsoft.ApplicationInsights.AspNet/project.json @@ -2,7 +2,10 @@ "title": "Application Insights for ASP.NET 5 Web Applications", "description": "Application Insights for ASP.NET 5 web applications. See http://go.microsoft.com/fwlink/?LinkID=510752 for more information.", "authors": [ "Microsoft" ], - "version": "1.0.0-beta6", + "version": "1.0.0-beta6-*", + "compilationOptions": { + "warningsAsErrors": true + }, "copyright": "Copyright © Microsoft. All Rights Reserved.", "projectUrl": "https://github.com/Microsoft/ApplicationInsights-aspnet5", "licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=510709", @@ -15,10 +18,10 @@ "Microsoft.AspNet.Http.Abstractions": "1.0.0-beta6-*", "Microsoft.AspNet.Http.Features": "1.0.0-beta6-*", "Microsoft.AspNet.Mvc": "6.0.0-beta6-*", - "Microsoft.Framework.Logging.Abstractions": "1.0.0-beta6-*", - "Microsoft.Framework.Configuration": "1.0.0-beta6-*" + "Microsoft.Framework.Configuration": "1.0.0-beta6-*", + "Microsoft.Framework.Logging.Abstractions": "1.0.0-beta6-*" }, - + "frameworks": { "dnx451": { }, "dnxcore50": { @@ -26,8 +29,8 @@ "define": [ "dnxcore50" ] }, "dependencies": { - "System.Net.NameResolution": "4.0.0-beta-22816", - "System.Reflection": "4.0.10-beta-22816" + "System.Net.NameResolution": "4.0.0-beta-22816", + "System.Reflection": "4.0.10-beta-22816" } } } diff --git a/test/Mvc6Framework45.FunctionalTests/Models/IdentityModels.cs b/test/Mvc6Framework45.FunctionalTests/Models/IdentityModels.cs index 58065ac..8bda727 100644 --- a/test/Mvc6Framework45.FunctionalTests/Models/IdentityModels.cs +++ b/test/Mvc6Framework45.FunctionalTests/Models/IdentityModels.cs @@ -24,7 +24,8 @@ namespace Mvc6Framework45.FunctionalTests.Models // Create the database and schema if it doesn't exist if (!_created) { - Database.AsRelational().ApplyMigrations(); + Database.ApplyMigrations(); + //Database.AsRelational().ApplyMigrations(); _created = true; } } diff --git a/test/Mvc6Framework45.FunctionalTests/project.json b/test/Mvc6Framework45.FunctionalTests/project.json index 69c4f99..a6c6bf9 100644 --- a/test/Mvc6Framework45.FunctionalTests/project.json +++ b/test/Mvc6Framework45.FunctionalTests/project.json @@ -1,67 +1,63 @@ { - "webroot": "wwwroot", - "userSecretsId": "aspnet5-Mvc6Framework45.FunctionalTests-42f45116-363a-40d3-9c44-bc58885d6e96", - "version": "1.0.0-beta6", + "webroot": "wwwroot", + "userSecretsId": "aspnet5-Mvc6Framework45.FunctionalTests-42f45116-363a-40d3-9c44-bc58885d6e96", + "version": "1.0.0-beta6-*", - "dependencies": { - "EntityFramework.SqlServer": "7.0.0-beta6-*", - "EntityFramework.Commands": "7.0.0-beta6-*", - "FunctionalTestUtils": "1.0.0-beta6-*", - "Microsoft.ApplicationInsights.AspNet": "1.0.0-beta6", - "Microsoft.AspNet.Mvc": "6.0.0-beta6-*", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta6-*", - "Microsoft.AspNet.Authentication.Cookies": "1.0.0-beta6-*", - "Microsoft.AspNet.Authentication.Facebook": "1.0.0-beta6-*", - "Microsoft.AspNet.Authentication.Google": "1.0.0-beta6-*", - "Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-beta6-*", - "Microsoft.AspNet.Authentication.Twitter": "1.0.0-beta6-*", - "Microsoft.AspNet.Diagnostics": "1.0.0-beta6-*", - "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-beta6-*", - "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta6-*", - "Microsoft.AspNet.Server.IIS": "1.0.0-beta6-*", - "Microsoft.AspNet.Server.WebListener": "1.0.0-beta6-*", - "Microsoft.AspNet.StaticFiles": "1.0.0-beta6-*", - "Microsoft.AspNet.Tooling.Razor": "1.0.0-beta6-*", - "Microsoft.Framework.Configuration.Json": "1.0.0-beta6-*", - "Microsoft.Framework.Configuration.UserSecrets": "1.0.0-beta6-*", - "Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta6-*", - "Microsoft.Framework.Logging": "1.0.0-beta6-*", - "Microsoft.Framework.Logging.Console": "1.0.0-beta6-*", - "xunit.runner.aspnet": "2.0.0-aspnet-beta6-*" - }, + "dependencies": { + "EntityFramework.Commands": "7.0.0-beta6-*", + "FunctionalTestUtils": "1.0.0-beta6-*", + "Microsoft.ApplicationInsights.AspNet": "1.0.0-beta6", + "Microsoft.AspNet.Mvc": "6.0.0-beta6-*", + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta6-*", + "Microsoft.AspNet.Authentication.Cookies": "1.0.0-beta6-*", + "Microsoft.AspNet.Authentication.Facebook": "1.0.0-beta6-*", + "Microsoft.AspNet.Authentication.Google": "1.0.0-beta6-*", + "Microsoft.AspNet.Authentication.MicrosoftAccount": "1.0.0-beta6-*", + "Microsoft.AspNet.Authentication.Twitter": "1.0.0-beta6-*", + "Microsoft.AspNet.Diagnostics": "1.0.0-beta6-*", + "Microsoft.AspNet.Diagnostics.Entity": "7.0.0-beta6-*", + "Microsoft.AspNet.Identity.EntityFramework": "3.0.0-beta6-*", + "Microsoft.AspNet.Server.IIS": "1.0.0-beta6-*", + "Microsoft.AspNet.Server.WebListener": "1.0.0-beta6-*", + "Microsoft.AspNet.StaticFiles": "1.0.0-beta6-*", + "Microsoft.AspNet.Tooling.Razor": "1.0.0-beta6-*", + "Microsoft.Framework.Configuration.Json": "1.0.0-beta6-*", + "Microsoft.Framework.Configuration.UserSecrets": "1.0.0-beta6-*", + "Microsoft.Framework.CodeGenerators.Mvc": "1.0.0-beta6-*", + "Microsoft.Framework.Logging": "1.0.0-beta6-*", + "Microsoft.Framework.Logging.Console": "1.0.0-beta6-*", + "xunit.runner.aspnet": "2.0.0-aspnet-beta6-*", + "EntityFramework.SqlServer": "7.0.0-beta6-*" + }, - "commands": { - "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000", - "gen": "Microsoft.Framework.CodeGeneration", - "ef": "EntityFramework.Commands", - "test": "xunit.runner.aspnet" - }, + "commands": { + "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.urls http://localhost:5000", + "gen": "Microsoft.Framework.CodeGeneration", + "ef": "EntityFramework.Commands", + "test": "xunit.runner.aspnet" + }, - "frameworks": { - "dnx451": { }, - "dnxcore50": { } - }, + "frameworks": { + "dnx451": { }, + "dnxcore50": { } + }, - "exclude": [ - "wwwroot", - "node_modules", - "bower_components" - ], - "publishExclude": [ - "node_modules", - "bower_components", - "**.xproj", - "**.user", - "**.vspscc" - ], - "scripts": { - "postrestore": [ - "npm install", - "node_modules/.bin/flatten-packages", - "node_modules/.bin/bower install" + "exclude": [ + "wwwroot", + "node_modules", + "bower_components" ], - "prepare": [ - "node_modules/.bin/gulp copy" - ] - } + "publishExclude": [ + "node_modules", + "bower_components", + "**.xproj", + "**.user", + "**.vspscc" + ], + "scripts": { + "postrestore": [ + ], + "prepare": [ + ] + } } diff --git a/test/WebApiShimFw46.FunctionalTests/project.json b/test/WebApiShimFw46.FunctionalTests/project.json index 6fc88cf..5f1db2a 100644 --- a/test/WebApiShimFw46.FunctionalTests/project.json +++ b/test/WebApiShimFw46.FunctionalTests/project.json @@ -3,15 +3,16 @@ "version": "1.0.0-beta6", "dependencies": { - "FunctionalTestUtils": "1.0.0-beta6", + "FunctionalTestUtils": "1.0.0-beta6", "Microsoft.ApplicationInsights.AspNet": "1.0.0-beta6", "Microsoft.AspNet.Mvc": "6.0.0-beta6-*", "Microsoft.AspNet.Server.IIS": "1.0.0-beta6-*", "Microsoft.AspNet.Server.WebListener": "1.0.0-beta6-*", "Microsoft.AspNet.StaticFiles": "1.0.0-beta6-*", - "Microsoft.AspNet.Mvc.WebApiCompatShim": "6.0.0-beta6-*", "Microsoft.Framework.Configuration.Json": "1.0.0-beta6-*", - "xunit.runner.aspnet": "2.0.0-aspnet-beta6-*" + "xunit.runner.aspnet": "2.0.0-aspnet-beta6-*", + "Microsoft.AspNet.Mvc.WebApiCompatShim": "6.0.0-beta6-*", + "Microsoft.AspNet.WebApi.Client": "5.2.0" }, "commands": {