Commit Graph

32543 Commits

Author SHA1 Message Date
Ajay Bhargav Baaskaran 913217f61a
Merge pull request #2713 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2
[automated] Merge branch 'release/2.1' => 'release/2.2'
2018-11-07 18:20:47 -08:00
Nate McMaster e0bdbb59f7
Reorganize source code in src/DataProtection
* Pair implementations and unit tests side by side in src/ and test/ folders
* Update .sln and project paths
* Rename unit test projects from Test.csproj => Tests.csproj
* Update KoreBuild properties to allow building projects, not solutions
2018-11-07 17:33:30 -08:00
Stephen Halter a1c1083798
[2.2] Fix race conditions in HTTP/2 tests (#3078) 2018-11-07 17:09:44 -08:00
Nate McMaster 975011071b
Bump version to 2.1.7 2018-11-07 14:51:28 -08:00
Ajay Bhargav Baaskaran 9749c90fc7
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2018-11-07 14:50:27 -08:00
Nate McMaster 3f26b56fef
Bump version to 2.1.7 2018-11-07 14:33:47 -08:00
Justin Kotalik 263fb650be
Detect shared configuration in ANCM installers and fail if enabled (#3962) 2018-11-07 13:19:27 -08:00
Andrew Stanton-Nurse f4d3ebe09a
Add docs blurb to Readme (#3276) 2018-11-07 12:10:48 -08:00
ASP.NET CI 9ff91eb615 Updating submodule(s)
SignalR => a03b8f85a8

[auto-updated: submodules]
2018-11-07 12:03:39 -08:00
BrennanConroy a03b8f85a8
Add docker retry to stackexchange redis tests (#3270) 2018-11-07 08:48:49 -08:00
Nate McMaster 302d8d59dd
Remove the aspnet/Caching submodule 2018-11-06 21:20:06 -08:00
ASP.NET CI 5faea3ff7b Updating submodule(s)
MvcPrecompilation => 032768b063
SignalR => 56f78b4593

[auto-updated: submodules]
2018-11-06 18:16:25 -08:00
Nate McMaster d81128de11
Fix CodeSign.props to include the .dll in the file name for logging files 2018-11-06 18:07:54 -08:00
Nate McMaster 17ee447d26
Upgrade to Extensions 2.2.0-rtm-181106-10 2018-11-06 17:32:06 -08:00
Nate McMaster 3cf8a41e4a
Remove the aspnet/Logging submodule 2018-11-06 17:30:26 -08:00
ASP.NET CI a3902573a5 Updating submodule(s)
Razor => fd4572874e

[auto-updated: submodules]
2018-11-06 17:12:19 -08:00
Pranav K 032768b063
Merge pull request #301 from aspnet/prkrishn/merge/2.2
Prkrishn/merge/2.2
2018-11-06 15:38:58 -08:00
BrennanConroy 56f78b4593
Retry redis docker (#3265) 2018-11-06 15:23:03 -08:00
ASP.NET CI 2d46064467 Updating submodule(s)
MvcPrecompilation => 617586a984

[auto-updated: submodules]
2018-11-06 15:15:25 -08:00
Pranav K 174e53d45c
Merge remote-tracking branch 'origin/release/2.1' into release/2.2
# Conflicts:
#	test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs
#	test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs
#	test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs
#	test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs
#	test/FunctionalTests/DesktopTests/SimpleAppTestWithPlatformx86_Desktop.cs
2018-11-06 15:14:43 -08:00
Pranav K 617586a984 Keep a couple of tests and remove most tests from 2.1
Fixes https://github.com/aspnet/MvcPrecompilation/issues/293
2018-11-06 15:10:33 -08:00
Pavel Krymets 9d570d791f
Remove obsolete logging API usage (#3953) 2018-11-06 14:50:35 -08:00
Pavel Krymets 7ae4cb0fb6
Remove obsolete logging API usage (#3267) 2018-11-06 14:30:09 -08:00
BrennanConroy bbdf95e449
Skip flaky java test (#3266) 2018-11-06 14:15:53 -08:00
Pavel Krymets 7819c2f950
Remove obsolete API usage (#1784) 2018-11-06 14:10:24 -08:00
John Luo 7ef549416f Add prerelease label to deb installer package version 2018-11-06 14:02:48 -08:00
Pavel Krymets f66b074402
Remove obsolete logging API usage (#299) 2018-11-06 13:52:39 -08:00
ASP.NET CI 850688a197 Updating submodule(s)
SignalR => ffd4bcd850

[auto-updated: submodules]
2018-11-06 21:33:55 +00:00
Nate McMaster 355c6d3a83
Remove the aspnet/Options submodule 2018-11-06 12:28:45 -08:00
Nate McMaster 67c3a099ec
Remove the aspnet/Configuration submodule (#3948) 2018-11-06 12:04:36 -08:00
BrennanConroy ffd4bcd850
Server per test (#3253) 2018-11-06 09:33:15 -08:00
Nate McMaster 4f887e5cd4
Merge branch 'release/2.1' into release/2.2 2018-11-06 09:23:17 -08:00
Nate McMaster 17cccade43
Add IsFinalBuild switch to Windows installer script (#3892) 2018-11-06 09:06:10 -08:00
ASP.NET CI 4059e28a3b Updating BuildTools from 2.2.0-preview2-20181104.4 to 2.2.0-preview2-20181105.3
[auto-updated: buildtools]
2018-11-06 00:04:32 -08:00
Ajay Bhargav Baaskaran fd4572874e Increase timeout for msbuild processes and added better logging 2018-11-05 18:14:45 -08:00
ASP.NET CI 8558942d97 Updating BuildTools from 2.1.3-rtm-15838 to 2.1.3-rtm-15839
[auto-updated: buildtools]
2018-11-05 16:14:04 -08:00
Nate McMaster 5eac0befd0
Include assemblies from aspnet/FileSystem in the list of assemblies to code-signing 2018-11-05 15:21:03 -08:00
Nate McMaster 62b24f930e
Remove the aspnet/FileSystem submodule (#3884) 2018-11-05 14:19:19 -08:00
ASP.NET CI f454ec3b16 Updating BuildTools from 2.2.0-preview2-20181101.2 to 2.2.0-preview2-20181104.4
[auto-updated: buildtools]
2018-11-05 12:03:59 -08:00
dotnet-maestro-bot 9d794af34d Update to .NET Core 2.2.0-rtm-27105-02 and Extensions 2.2.0-rtm-181105-01 2018-11-05 10:12:15 -08:00
Justin Kotalik 90b11de8f1
Get IISIntegration CI working (#3875) 2018-11-05 08:45:11 -08:00
ASP.NET CI dc240c52f9 Updating BuildTools from 2.1.3-rtm-15837 to 2.1.3-rtm-15838
[auto-updated: buildtools]
2018-11-04 14:50:26 -08:00
ASP.NET CI 10f415bb55 Updating BuildTools from 2.1.3-rtm-15836 to 2.1.3-rtm-15837
[auto-updated: buildtools]
2018-11-04 11:46:42 -08:00
ASP.NET CI f3809a8b97 Updating submodule(s)
EntityFrameworkCore => 1032daf61fae290f9139d07fb9f6c2b847a48d60
Identity => 99f352a92f

[auto-updated: submodules]
2018-11-03 00:05:09 -07:00
John Luo e8fec8eb52
Enable symbols generation for crossgen'ed assemblies on linux-arm (#3877) 2018-11-02 18:06:04 -07:00
John Luo d36a480253 Build and crossgen linux-arm shared framework in Docker container 2018-11-02 15:14:19 -07:00
Javier Calvarro Nelson 99f352a92f
javiercn/check-integrity-validation (#2052) 2018-11-02 14:48:06 -07:00
Justin Kotalik dcece2090c
Remove IISIntegration submodule, add CI (#3867) 2018-11-02 14:34:31 -07:00
ASP.NET CI 341a648511 Updating submodule(s)
EntityFrameworkCore => c3eb2b04453ded94799ccd83ff32168b559379a7
KestrelHttpServer => 40a9b18c43

[auto-updated: submodules]
2018-11-02 12:05:26 -07:00
Nate McMaster 0e24161d42
Ensure Microsoft.AspNetCore.Server.IntegrationTesting.IIS doesn't produce a finalized version 2018-11-02 11:07:45 -07:00