Commit Graph

26 Commits

Author SHA1 Message Date
Doug Bunting 82cb080502
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2 2019-09-10 19:39:46 -07:00
Mikael Mengistu dd212d7029 Merged PR 2184: rel/2.2 Bump version of Microsoft.Data.OData to 5.8.4
Bump version of Microsoft.Data.OData to 5.8.4 in the 2.2 branch

Work item: https://dev.azure.com/dnceng/internal/_workitems/edit/222/

Related work items: #222
2019-07-19 15:38:34 +00:00
Mikael Mengistu fd023a6698 Merged PR 2157: Bump version of Microsoft.Data.OData to 5.8.4
Bump version of Microsoft.Data.OData to 5.8.4

Work item: https://dev.azure.com/dnceng/internal/_workitems/edit/222/
2019-07-19 15:38:28 +00:00
Nate McMaster 5d16f97965
Remove netcoreapp2.0 test TFMs (#6461)
.NET Core 2.0 reached EOL last year. This removes multi-targeting our test projects and test assets to only use .NET Core 2.1 and .NET Framework 4.6.1.
2019-01-08 11:20:09 -08:00
Nate McMaster 61e505c894
Merge branch 'release/2.1' into release/2.2 2019-01-02 08:58:22 -08:00
Nate McMaster 3641761d18
Convert AADIntegration projects to ProjectRef (#6082) 2018-12-21 11:43:09 -08:00
Nate McMaster feb641ddda
Merge branch 'release/2.1' into release/2.2 2018-12-14 09:44:15 -08:00
Nate McMaster 13ae0057fb
Replace .Sources package references with local code (#4801)
Replaces package references the following packages with local code:

Microsoft.AspNetCore.Certificates.Generation.Sources
Microsoft.Extensions.CopyOnWriteDictionary.Sources 
Microsoft.Extensions.ClosedGenericMatcher.Sources
Microsoft.Extensions.ObjectMethodExecutor.Sources
Microsoft.Extensions.PropertyActivator.Sources
Microsoft.Extensions.PropertyHelper.Sources
Microsoft.Extensions.RazorViews.Sources
Microsoft.Extensions.SecurityHelper.Sources
Microsoft.Extensions.StackTrace.Sources
Microsoft.Extensions.WebEncoders.Sources
2018-12-14 08:36:36 -08:00
dotnet-maestro-bot 38785d0be9 [automated] Merge branch 'release/2.1' => 'release/2.2' (#4577)
* Workaround problems when opening solution files in Visual Studio (#4569)

Changes:

* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore

* Convert Session to use Reference and move to Middleware folder (#4576)

* Add RoutingSample.Web to HttpAbstractions.sln
2018-12-11 16:13:20 -08:00
Nate McMaster 5151e7b1ed
Workaround problems when opening solution files in Visual Studio (#4569)
Changes:

* Condense Routing.sln into HttpAbstractions.sln
* Workaround NU1105 by adding all ProjectReferences to the .sln
* Workaround exceptions in the ReferencesHostBridge by moving Reference items to a temporary item group
* Add a 'startvs.cmd' script for launching VS with the right env variables
* Remove RangeHelper test project
* Move RangeHelper tests into StaticFiles.Tests and add target for NPM restore
2018-12-11 14:05:21 -08:00
Nate McMaster c1c7d711b6
Merge branch 'release/2.1' into release/2.2 2018-11-14 09:27:23 -08:00
Nate McMaster ccd098ecad
Update DataProtection to use custom reference resolution
This changes DataProtection to build as projects instead of a pseudo-submodule. It replaces Package and ProjectReference with <Reference> items which custom targets then resolve.
2018-11-13 10:28:42 -08:00
Nate McMaster 59ed8df382
Add targets and tools for ensuring consistent package versions between servicing builds 2018-11-09 13:05:31 -08:00
Nate McMaster db0d3c333d
Fix NU1605 build error by ensuring package versions are set correctly in subfolder projects (#3987) 2018-11-08 23:40:14 -08:00
Nate McMaster 3918724616
Merge branch 'release/2.1' into release/2.2 2018-11-08 08:31:22 -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
Pavel Krymets 9d570d791f
Remove obsolete logging API usage (#3953) 2018-11-06 14:50:35 -08:00
Nate McMaster 36add43f11
Merge branch release/2.1 into release/2.2 2018-10-18 16:53:03 -07:00
dotnet-maestro-bot 31849575f1 Upgrade to .NET Core 2.1.6-servicing-27017-02 2018-10-18 13:48:06 -07:00
Nate McMaster 6366deb193
Update dataprotection to 2.2.0-rtm 2018-10-16 11:33:17 -07:00
Nate McMaster 6a14b47ccd
Add infrastructure changes to src/DataProtection can build on its own 2018-10-15 11:17:06 -07:00
Nate McMaster 489a88d21e
Merge aspnet/DataProtection release/2.2 into this repo 2018-10-15 10:21:02 -07:00
Nate McMaster a673bfd741
Add build script and CI config for the DataProtection folder 2018-10-15 10:13:04 -07:00
Nate McMaster 4dfd351c84
Remove DataProtection submodule and update path to DP source code to local folder 2018-10-15 09:46:20 -07:00
Nate McMaster f4026cc100
Reorganize source code from aspnet/DataProtection into a subfolder
Prior to reorg, this source existed at 3f5f419df8
2018-10-12 13:14:22 -07:00
Nate McMaster 4f14cda425
Reorganize source code from aspnet/DataProtection into a subfolder
Prior to reorg, this source existed at b62bb5778b
2018-10-12 10:07:51 -07:00