From 736083c2f2fc8d0c325fcd0ea18555b5a5cef2ae Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Tue, 4 Dec 2018 16:44:07 -0800 Subject: [PATCH 01/12] Make HttpSys use ProjectReference and move HttpSys into Servers folder (#4335) --- build/SharedFx.targets | 2 +- build/artifacts.props | 4 +- build/buildorder.props | 1 - build/external-dependencies.props | 2 - build/repo.props | 5 + build/repo.targets | 5 +- build/submodules.props | 1 - eng/Baseline.Designer.props | 11 ++ eng/Baseline.xml | 1 + eng/Dependencies.props | 1 + eng/ProjectReferences.props | 1 + src/HttpSysServer/Directory.Build.props | 20 -- src/HttpSysServer/Directory.Build.targets | 7 - src/HttpSysServer/HttpSysServer.sln | 176 ------------------ src/HttpSysServer/build/Key.snk | Bin 596 -> 0 bytes src/HttpSysServer/build/dependencies.props | 31 --- src/HttpSysServer/build/repo.props | 15 -- src/HttpSysServer/build/sources.props | 17 -- .../samples/HotAddSample/HotAddSample.csproj | 16 -- .../Properties/launchSettings.json | 13 -- .../Properties/launchSettings.json | 12 -- .../SelfHostServer/SelfHostServer.csproj | 16 -- src/HttpSysServer/src/Directory.Build.props | 7 - ...Microsoft.AspNetCore.Server.HttpSys.csproj | 24 --- ...Core.Server.HttpSys.FunctionalTests.csproj | 15 -- src/HttpSysServer/version.props | 12 -- ...ft.AspNetCore.Server.IISIntegration.csproj | 6 +- .../NativeMethods.cs | 1 - src/MetaPackages/korebuild-lock.txt | 2 + src/ServerTests/korebuild-lock.txt | 2 + .../HttpSys}/.gitignore | 0 src/Servers/HttpSys/HttpSysServer.sln | 139 ++++++++++++++ .../HttpSys}/NuGetPackageVerifier.json | 0 .../HttpSys}/README.md | 0 .../samples/HotAddSample/HotAddSample.csproj | 13 ++ .../HttpSys}/samples/HotAddSample/Startup.cs | 0 .../samples/SelfHostServer/App.config | 0 .../samples/SelfHostServer/Public/1kb.txt | 0 .../SelfHostServer/SelfHostServer.csproj | 13 ++ .../samples/SelfHostServer/Startup.cs | 0 .../HttpSys}/samples/TestClient/App.config | 0 .../HttpSys}/samples/TestClient/Program.cs | 0 .../TestClient/Properties/AssemblyInfo.cs | 0 .../samples/TestClient/TestClient.csproj | 5 +- .../HttpSys/src}/AsyncAcceptContext.cs | 0 .../HttpSys/src}/AuthenticationHandler.cs | 0 .../HttpSys/src}/AuthenticationManager.cs | 0 .../HttpSys/src}/AuthenticationSchemes.cs | 0 .../HttpSys/src}/FeatureContext.cs | 0 .../HttpSys/src}/Helpers.cs | 0 .../HttpSys/src}/Http503VerbosityLevel .cs | 0 .../HttpSys/src}/HttpSysDefaults.cs | 0 .../HttpSys/src}/HttpSysException.cs | 0 .../HttpSys/src}/HttpSysListener.cs | 0 .../HttpSys/src}/HttpSysOptions.cs | 0 .../HttpSys/src}/LogHelper.cs | 0 .../HttpSys/src}/MessagePump.cs | 0 ...Microsoft.AspNetCore.Server.HttpSys.csproj | 24 +++ .../HttpSys/src}/NativeInterop/ComNetOS.cs | 0 .../src}/NativeInterop/DisconnectListener.cs | 0 .../HttpSys/src}/NativeInterop/HttpApi.cs | 0 .../NativeInterop/HttpRequestQueueV2Handle.cs | 0 .../NativeInterop/HttpServerSessionHandle.cs | 0 .../src}/NativeInterop/HttpSysSettings.cs | 0 .../src}/NativeInterop/IntPtrHelper.cs | 0 .../src}/NativeInterop/RequestQueue.cs | 0 .../src}/NativeInterop/ServerSession.cs | 0 .../src}/NativeInterop/TokenBindingUtil.cs | 0 .../HttpSys/src}/NativeInterop/UrlGroup.cs | 0 .../HttpSys/src}/Properties/AssemblyInfo.cs | 0 .../src}/Properties/Resources.Designer.cs | 0 .../src}/RequestProcessing/BoundaryType.cs | 0 .../RequestProcessing/ClientCertLoader.cs | 0 .../RequestProcessing/HttpReasonPhrase.cs | 0 .../src}/RequestProcessing/OpaqueStream.cs | 0 .../HttpSys/src}/RequestProcessing/Request.cs | 0 .../src}/RequestProcessing/RequestContext.cs | 0 .../RequestHeaders.Generated.tt | 0 .../src}/RequestProcessing/RequestStream.cs | 0 .../RequestStreamAsyncResult.cs | 0 .../src}/RequestProcessing/Response.cs | 0 .../src}/RequestProcessing/ResponseBody.cs | 0 .../ResponseStreamAsyncResult.cs | 0 .../HttpSys/src}/Resources.resx | 0 .../HttpSys/src}/ResponseStream.cs | 0 .../HttpSys/src}/StandardFeatureCollection.cs | 0 .../HttpSys/src}/TimeoutManager.cs | 0 .../HttpSys/src}/UrlPrefix.cs | 0 .../HttpSys/src}/UrlPrefixCollection.cs | 0 .../HttpSys/src}/ValidationHelper.cs | 0 .../src}/WebHostBuilderHttpSysExtensions.cs | 0 .../HttpSys/src}/baseline.netcore.json | 0 .../HttpSys}/test/Directory.Build.props | 6 +- .../FunctionalTests}/AuthenticationTests.cs | 0 .../test/FunctionalTests}/DummyApplication.cs | 0 .../test/FunctionalTests}/HttpsTests.cs | 0 .../Listener/AuthenticationTests.cs | 0 .../FunctionalTests}/Listener/HttpsTests.cs | 0 .../Listener/OpaqueUpgradeTests.cs | 0 .../Listener/RequestBodyTests.cs | 0 .../Listener/RequestHeaderTests.cs | 0 .../FunctionalTests}/Listener/RequestTests.cs | 0 .../Listener/ResponseBodyTests.cs | 0 .../Listener/ResponseCachingTests.cs | 0 .../Listener/ResponseHeaderTests.cs | 0 .../Listener/ResponseSendFileTests.cs | 0 .../Listener/ResponseTests.cs | 0 .../FunctionalTests}/Listener/ServerTests.cs | 0 .../FunctionalTests}/Listener/Utilities.cs | 0 .../test/FunctionalTests}/MessagePumpTests.cs | 0 ...Core.Server.HttpSys.FunctionalTests.csproj | 13 ++ .../OSDontSkipConditionAttribute.cs | 0 .../FunctionalTests}/OpaqueUpgradeTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../FunctionalTests}/RequestBodyLimitTests.cs | 0 .../test/FunctionalTests}/RequestBodyTests.cs | 0 .../FunctionalTests}/RequestHeaderTests.cs | 0 .../test/FunctionalTests}/RequestTests.cs | 0 .../FunctionalTests}/ResponseBodyTests.cs | 0 .../FunctionalTests}/ResponseCachingTests.cs | 0 .../FunctionalTests}/ResponseHeaderTests.cs | 0 .../FunctionalTests}/ResponseSendFileTests.cs | 0 .../test/FunctionalTests}/ResponseTests.cs | 0 .../test/FunctionalTests}/ServerTests.cs | 0 .../test/FunctionalTests}/Utilities.cs | 0 ...oft.AspNetCore.Server.HttpSys.Tests.csproj | 2 +- .../HttpSys/test/Tests}/UrlPrefixTests.cs | 0 .../Buffers.Testing/Directory.Build.props | 6 + src/Shared/Diagnostics/Directory.Build.props | 8 +- src/Shared/Directory.Build.props | 6 + .../Directory.Build.props | 6 + .../HttpSys}/Constants.cs | 0 src/Shared/HttpSys/Directory.Build.props | 7 + .../HttpSys}/NativeInterop/CookedUrl.cs | 0 .../HttpSys}/NativeInterop/HeapAllocHandle.cs | 0 .../HttpSys}/NativeInterop/HttpApiTypes.cs | 0 .../NativeInterop/HttpSysRequestHeader.cs | 0 .../NativeInterop/HttpSysResponseHeader.cs | 0 .../HttpSys}/NativeInterop/NclUtilities.cs | 0 .../SafeLocalFreeChannelBinding.cs | 0 .../NativeInterop/SafeLocalMemHandle.cs | 0 .../NativeInterop/SafeNativeOverlapped.cs | 0 .../HttpSys}/NativeInterop/SocketAddress.cs | 0 .../NativeInterop/UnsafeNativeMethods.cs | 0 .../RequestProcessing/HeaderCollection.cs | 0 .../RequestProcessing/HeaderEncoding.cs | 0 .../RequestProcessing/HeaderParser.cs | 0 .../RequestProcessing/HttpKnownHeaderNames.cs | 0 .../RequestProcessing/NativeRequestContext.cs | 0 .../RequestProcessing/RawUrlHelper.cs | 0 .../RequestHeaders.Generated.cs | 0 .../RequestProcessing/RequestHeaders.cs | 0 .../RequestProcessing/RequestUriBuilder.cs | 0 .../HttpSys}/RequestProcessing/SslStatus.cs | 0 src/Templating/korebuild-lock.txt | 2 + 155 files changed, 274 insertions(+), 402 deletions(-) delete mode 100644 src/HttpSysServer/Directory.Build.props delete mode 100644 src/HttpSysServer/Directory.Build.targets delete mode 100644 src/HttpSysServer/HttpSysServer.sln delete mode 100644 src/HttpSysServer/build/Key.snk delete mode 100644 src/HttpSysServer/build/dependencies.props delete mode 100644 src/HttpSysServer/build/repo.props delete mode 100644 src/HttpSysServer/build/sources.props delete mode 100644 src/HttpSysServer/samples/HotAddSample/HotAddSample.csproj delete mode 100644 src/HttpSysServer/samples/HotAddSample/Properties/launchSettings.json delete mode 100644 src/HttpSysServer/samples/SelfHostServer/Properties/launchSettings.json delete mode 100644 src/HttpSysServer/samples/SelfHostServer/SelfHostServer.csproj delete mode 100644 src/HttpSysServer/src/Directory.Build.props delete mode 100644 src/HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys/Microsoft.AspNetCore.Server.HttpSys.csproj delete mode 100644 src/HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj delete mode 100644 src/HttpSysServer/version.props create mode 100644 src/MetaPackages/korebuild-lock.txt create mode 100644 src/ServerTests/korebuild-lock.txt rename src/{HttpSysServer => Servers/HttpSys}/.gitignore (100%) create mode 100644 src/Servers/HttpSys/HttpSysServer.sln rename src/{HttpSysServer => Servers/HttpSys}/NuGetPackageVerifier.json (100%) rename src/{HttpSysServer => Servers/HttpSys}/README.md (100%) create mode 100644 src/Servers/HttpSys/samples/HotAddSample/HotAddSample.csproj rename src/{HttpSysServer => Servers/HttpSys}/samples/HotAddSample/Startup.cs (100%) rename src/{HttpSysServer => Servers/HttpSys}/samples/SelfHostServer/App.config (100%) rename src/{HttpSysServer => Servers/HttpSys}/samples/SelfHostServer/Public/1kb.txt (100%) create mode 100644 src/Servers/HttpSys/samples/SelfHostServer/SelfHostServer.csproj rename src/{HttpSysServer => Servers/HttpSys}/samples/SelfHostServer/Startup.cs (100%) rename src/{HttpSysServer => Servers/HttpSys}/samples/TestClient/App.config (100%) rename src/{HttpSysServer => Servers/HttpSys}/samples/TestClient/Program.cs (100%) rename src/{HttpSysServer => Servers/HttpSys}/samples/TestClient/Properties/AssemblyInfo.cs (100%) rename src/{HttpSysServer => Servers/HttpSys}/samples/TestClient/TestClient.csproj (97%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/AsyncAcceptContext.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/AuthenticationHandler.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/AuthenticationManager.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/AuthenticationSchemes.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/FeatureContext.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/Helpers.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/Http503VerbosityLevel .cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/HttpSysDefaults.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/HttpSysException.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/HttpSysListener.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/HttpSysOptions.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/LogHelper.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/MessagePump.cs (100%) create mode 100644 src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/ComNetOS.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/DisconnectListener.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/HttpApi.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/HttpRequestQueueV2Handle.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/HttpServerSessionHandle.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/HttpSysSettings.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/IntPtrHelper.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/RequestQueue.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/ServerSession.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/TokenBindingUtil.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/NativeInterop/UrlGroup.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/Properties/AssemblyInfo.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/Properties/Resources.Designer.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/BoundaryType.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/ClientCertLoader.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/HttpReasonPhrase.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/OpaqueStream.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/Request.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/RequestContext.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/RequestHeaders.Generated.tt (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/RequestStream.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/RequestStreamAsyncResult.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/Response.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/ResponseBody.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/RequestProcessing/ResponseStreamAsyncResult.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/Resources.resx (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/ResponseStream.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/StandardFeatureCollection.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/TimeoutManager.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/UrlPrefix.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/UrlPrefixCollection.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/ValidationHelper.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/WebHostBuilderHttpSysExtensions.cs (100%) rename src/{HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys => Servers/HttpSys/src}/baseline.netcore.json (100%) rename src/{HttpSysServer => Servers/HttpSys}/test/Directory.Build.props (57%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/AuthenticationTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/DummyApplication.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/HttpsTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/AuthenticationTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/HttpsTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/OpaqueUpgradeTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/RequestBodyTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/RequestHeaderTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/RequestTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/ResponseBodyTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/ResponseCachingTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/ResponseHeaderTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/ResponseSendFileTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/ResponseTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/ServerTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Listener/Utilities.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/MessagePumpTests.cs (100%) create mode 100644 src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/OSDontSkipConditionAttribute.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/OpaqueUpgradeTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Properties/AssemblyInfo.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/RequestBodyLimitTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/RequestBodyTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/RequestHeaderTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/RequestTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/ResponseBodyTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/ResponseCachingTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/ResponseHeaderTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/ResponseSendFileTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/ResponseTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/ServerTests.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests => Servers/HttpSys/test/FunctionalTests}/Utilities.cs (100%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.Tests => Servers/HttpSys/test/Tests}/Microsoft.AspNetCore.Server.HttpSys.Tests.csproj (58%) rename src/{HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.Tests => Servers/HttpSys/test/Tests}/UrlPrefixTests.cs (100%) create mode 100644 src/Shared/Buffers.Testing/Directory.Build.props create mode 100644 src/Shared/Directory.Build.props create mode 100644 src/Shared/Hosting.WebHostBuilderFactory/Directory.Build.props rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/Constants.cs (100%) create mode 100644 src/Shared/HttpSys/Directory.Build.props rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/CookedUrl.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/HeapAllocHandle.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/HttpApiTypes.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/HttpSysRequestHeader.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/HttpSysResponseHeader.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/NclUtilities.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/SafeLocalFreeChannelBinding.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/SafeLocalMemHandle.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/SafeNativeOverlapped.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/SocketAddress.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/NativeInterop/UnsafeNativeMethods.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/HeaderCollection.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/HeaderEncoding.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/HeaderParser.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/HttpKnownHeaderNames.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/NativeRequestContext.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/RawUrlHelper.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/RequestHeaders.Generated.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/RequestHeaders.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/RequestUriBuilder.cs (100%) rename src/{HttpSysServer/shared/Microsoft.AspNetCore.HttpSys.Sources => Shared/HttpSys}/RequestProcessing/SslStatus.cs (100%) create mode 100644 src/Templating/korebuild-lock.txt diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 2ab73526341a..07ed04ad4f63 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -33,7 +33,7 @@ - + $(_MetapackageSrcRoot)$(MetapackageName)\ $(_WorkRoot)pkg\$(MetapackageName)\ diff --git a/build/artifacts.props b/build/artifacts.props index 65cd508d4b3a..5e6e21bed355 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -83,7 +83,6 @@ - @@ -194,6 +193,9 @@ + + + diff --git a/build/buildorder.props b/build/buildorder.props index ad4b49f520c8..4dcc51c6d8bc 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -9,7 +9,6 @@ - diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 3211909c6eb0..fa23f8968687 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -91,8 +91,6 @@ - - diff --git a/build/repo.props b/build/repo.props index a1b4241fbba4..2c9111294dc9 100644 --- a/build/repo.props +++ b/build/repo.props @@ -13,8 +13,13 @@ $(RepositoryRoot).deps\build\ $(RepositoryRoot).deps\Signed\Packages\ + $(RepositoryRoot)src\Shared\ + + + + diff --git a/build/repo.targets b/build/repo.targets index 2187d49b1805..2a7778a14f7d 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -18,13 +18,14 @@ $(PrepareDependsOn);VerifyPackageArtifactConfig;VerifyExternalDependencyConfig;PrepareOutputPaths $(CleanDependsOn);CleanArtifacts;CleanRepoArtifacts $(RestoreDependsOn);InstallDotNet;RestoreProjects - $(CompileDependsOn);BuildProjects + $(CompileDependsOn);BuildProjects;PackSharedSources $(CompileDependsOn);PackProjects;BuildRepositories $(PackageDependsOn);PackProjects $(PackageDependsOn);BuildMetapackages;CheckExpectedPackagesExist $(TestDependsOn);TestProjects $(TestDependsOn);_TestRepositories $(GetArtifactInfoDependsOn);GetProjectArtifactInfo + $(GetArtifactInfoDependsOn);ResolveSharedSourcesPackageInfo $(GetArtifactInfoDependsOn);ResolveRepoInfo @@ -255,7 +256,7 @@ - + - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 7935aed56a88..c949b4b702e3 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -426,6 +426,17 @@ + + + 2.1.1 + + + + + + + + 2.1.1 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index a85c9189ce4f..5b87da3ce898 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -43,6 +43,7 @@ + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 0d3c00dfeead..011eeb7b52ce 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -45,6 +45,7 @@ + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index c3409a224368..5552823cf62c 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -28,6 +28,7 @@ + diff --git a/src/HttpSysServer/Directory.Build.props b/src/HttpSysServer/Directory.Build.props deleted file mode 100644 index f1986d9953cf..000000000000 --- a/src/HttpSysServer/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - true - - diff --git a/src/HttpSysServer/Directory.Build.targets b/src/HttpSysServer/Directory.Build.targets deleted file mode 100644 index 53b3f6e1daba..000000000000 --- a/src/HttpSysServer/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/HttpSysServer/HttpSysServer.sln b/src/HttpSysServer/HttpSysServer.sln deleted file mode 100644 index adc3b6d3513b..000000000000 --- a/src/HttpSysServer/HttpSysServer.sln +++ /dev/null @@ -1,176 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26730.10 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{99D5E5F3-88F5-4CCF-8D8C-717C8925DF09}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E183C826-1360-4DFF-9994-F33CED5C8525}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{3A1E31E3-2794-4CA3-B8E2-253E96BDE514}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5E9B546C-17AC-4BDF-BCB3-5955D4755ED8}" - ProjectSection(SolutionItems) = preProject - .appveyor.yml = .appveyor.yml - .travis.yml = .travis.yml - build.cmd = build.cmd - build.ps1 = build.ps1 - build.sh = build.sh - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - NuGet.config = NuGet.config - version.xml = version.xml - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "samples\TestClient\TestClient.csproj", "{8B828433-B333-4C19-96AE-00BFFF9D8841}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfHostServer", "samples\SelfHostServer\SelfHostServer.csproj", "{1236F93A-AC5C-4A77-9477-C88F040151CA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys.FunctionalTests", "test\Microsoft.AspNetCore.Server.HttpSys.FunctionalTests\Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj", "{4492FF4C-9032-411D-853F-46B01755E504}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "src\Microsoft.AspNetCore.Server.HttpSys\Microsoft.AspNetCore.Server.HttpSys.csproj", "{B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotAddSample", "samples\HotAddSample\HotAddSample.csproj", "{8BFA392A-8B67-4454-916B-67C545EDFAEF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys.Tests", "test\Microsoft.AspNetCore.Server.HttpSys.Tests\Microsoft.AspNetCore.Server.HttpSys.Tests.csproj", "{E837249E-E666-4DF2-AFC3-7A4D70234F9F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{85914BA9-4168-48C5-9C3F-E2E8B1479A6E}" - ProjectSection(SolutionItems) = preProject - build\dependencies.props = build\dependencies.props - build\Key.snk = build\Key.snk - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shared", "shared", "{AB6964C9-A7AF-4FAC-BEA1-C8A538EC989E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AspNetCore.HttpSys.Sources", "Microsoft.AspNetCore.HttpSys.Sources", "{4AB1E069-2A8A-4D46-98AE-CC82E3497038}" - ProjectSection(SolutionItems) = preProject - shared\Microsoft.AspNetCore.HttpSys.Sources\Constants.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\Constants.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NativeInterop", "NativeInterop", "{94AD33C9-1BDD-4385-A850-4B24FD5D5012}" - ProjectSection(SolutionItems) = preProject - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\CookedUrl.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\CookedUrl.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\HeapAllocHandle.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\HeapAllocHandle.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\HttpApiTypes.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\HttpApiTypes.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\HttpSysRequestHeader.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\HttpSysRequestHeader.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\HttpSysResponseHeader.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\HttpSysResponseHeader.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\NativeRequestInput.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\NativeRequestInput.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\NclUtilities.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\NclUtilities.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\SafeLocalFreeChannelBinding.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\SafeLocalFreeChannelBinding.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\SafeLocalMemHandle.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\SafeLocalMemHandle.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\SafeNativeOverlapped.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\SafeNativeOverlapped.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\SocketAddress.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\SocketAddress.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\UnsafeNativeMethods.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\NativeInterop\UnsafeNativeMethods.cs - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RequestProcessing", "RequestProcessing", "{AA8C91BD-D558-468B-9258-1E186884F78D}" - ProjectSection(SolutionItems) = preProject - shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\HeaderCollection.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\HeaderCollection.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\HeaderEncoding.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\HeaderEncoding.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\HeaderParser.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\HeaderParser.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\HttpKnownHeaderNames.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\HttpKnownHeaderNames.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\NativeRequestContext.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\NativeRequestContext.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\RequestHeaders.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\RequestHeaders.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\RequestHeaders.Generated.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\RequestHeaders.Generated.cs - shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\SslStatus.cs = shared\Microsoft.AspNetCore.HttpSys.Sources\RequestProcessing\SslStatus.cs - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|x86.ActiveCfg = Debug|Any CPU - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Any CPU.Build.0 = Release|Any CPU - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|x86.ActiveCfg = Release|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|x86.ActiveCfg = Debug|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|Any CPU.Build.0 = Release|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|x86.ActiveCfg = Release|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Debug|x86.ActiveCfg = Debug|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Release|Any CPU.Build.0 = Release|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4492FF4C-9032-411D-853F-46B01755E504}.Release|x86.ActiveCfg = Release|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Debug|x86.ActiveCfg = Debug|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|Any CPU.Build.0 = Release|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92}.Release|x86.ActiveCfg = Release|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|x86.ActiveCfg = Debug|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|x86.Build.0 = Debug|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|Any CPU.Build.0 = Release|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|x86.ActiveCfg = Release|Any CPU - {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|x86.Build.0 = Release|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Debug|x86.ActiveCfg = Debug|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Debug|x86.Build.0 = Debug|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Release|Any CPU.Build.0 = Release|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Release|x86.ActiveCfg = Release|Any CPU - {E837249E-E666-4DF2-AFC3-7A4D70234F9F}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {8B828433-B333-4C19-96AE-00BFFF9D8841} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} - {1236F93A-AC5C-4A77-9477-C88F040151CA} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} - {4492FF4C-9032-411D-853F-46B01755E504} = {E183C826-1360-4DFF-9994-F33CED5C8525} - {B9F45F9D-D206-47F0-8E5F-54CE2F0BDF92} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09} - {8BFA392A-8B67-4454-916B-67C545EDFAEF} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} - {E837249E-E666-4DF2-AFC3-7A4D70234F9F} = {E183C826-1360-4DFF-9994-F33CED5C8525} - {85914BA9-4168-48C5-9C3F-E2E8B1479A6E} = {5E9B546C-17AC-4BDF-BCB3-5955D4755ED8} - {4AB1E069-2A8A-4D46-98AE-CC82E3497038} = {AB6964C9-A7AF-4FAC-BEA1-C8A538EC989E} - {94AD33C9-1BDD-4385-A850-4B24FD5D5012} = {4AB1E069-2A8A-4D46-98AE-CC82E3497038} - {AA8C91BD-D558-468B-9258-1E186884F78D} = {4AB1E069-2A8A-4D46-98AE-CC82E3497038} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {34B42B42-FA09-41AB-9216-14073990C504} - EndGlobalSection -EndGlobal diff --git a/src/HttpSysServer/build/Key.snk b/src/HttpSysServer/build/Key.snk deleted file mode 100644 index e10e4889c125d3120cd9e81582243d70f7cbb806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsnz~#iVhm& zj%TU(_THUee?3yHBjk$37ysB?i5#7WD$={H zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U zEk(hLzk1H)0yXj{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZWCk2+9bX4YP);~fj-BU*R zQPvWv$89!{Rl9wM+zR>_TSkn^voYxA?2G iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ diff --git a/src/HttpSysServer/build/dependencies.props b/src/HttpSysServer/build/dependencies.props deleted file mode 100644 index 0a90c83355d2..000000000000 --- a/src/HttpSysServer/build/dependencies.props +++ /dev/null @@ -1,31 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.3-rtm-15802 - 2.0.0 - 2.1.2 - 15.6.1 - 4.5.0 - 2.0.3 - 4.5.0 - 4.5.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 2.1.1 - 2.1.1 - 2.1.0 - 2.1.1 - 2.1.1 - - \ No newline at end of file diff --git a/src/HttpSysServer/build/repo.props b/src/HttpSysServer/build/repo.props deleted file mode 100644 index dab1601c8832..000000000000 --- a/src/HttpSysServer/build/repo.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - - - - - - diff --git a/src/HttpSysServer/build/sources.props b/src/HttpSysServer/build/sources.props deleted file mode 100644 index 9215df9751b4..000000000000 --- a/src/HttpSysServer/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/src/HttpSysServer/samples/HotAddSample/HotAddSample.csproj b/src/HttpSysServer/samples/HotAddSample/HotAddSample.csproj deleted file mode 100644 index caf6da74fede..000000000000 --- a/src/HttpSysServer/samples/HotAddSample/HotAddSample.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp2.1;net461 - Exe - true - - - - - - - - - - diff --git a/src/HttpSysServer/samples/HotAddSample/Properties/launchSettings.json b/src/HttpSysServer/samples/HotAddSample/Properties/launchSettings.json deleted file mode 100644 index 5df19c13271d..000000000000 --- a/src/HttpSysServer/samples/HotAddSample/Properties/launchSettings.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "profiles": { - "HotAddSample": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "http://localhost:12345", - "environmentVariables": { - "ASPNETCORE_URLS": "http://localhost:12345", - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/HttpSysServer/samples/SelfHostServer/Properties/launchSettings.json b/src/HttpSysServer/samples/SelfHostServer/Properties/launchSettings.json deleted file mode 100644 index 54fa81676252..000000000000 --- a/src/HttpSysServer/samples/SelfHostServer/Properties/launchSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "profiles": { - "SelfHostServer": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "http://localhost:5000/", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/src/HttpSysServer/samples/SelfHostServer/SelfHostServer.csproj b/src/HttpSysServer/samples/SelfHostServer/SelfHostServer.csproj deleted file mode 100644 index caf6da74fede..000000000000 --- a/src/HttpSysServer/samples/SelfHostServer/SelfHostServer.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp2.1;net461 - Exe - true - - - - - - - - - - diff --git a/src/HttpSysServer/src/Directory.Build.props b/src/HttpSysServer/src/Directory.Build.props deleted file mode 100644 index 4b89a431e7f2..000000000000 --- a/src/HttpSysServer/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys/Microsoft.AspNetCore.Server.HttpSys.csproj b/src/HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys/Microsoft.AspNetCore.Server.HttpSys.csproj deleted file mode 100644 index 9be8bad15e0d..000000000000 --- a/src/HttpSysServer/src/Microsoft.AspNetCore.Server.HttpSys/Microsoft.AspNetCore.Server.HttpSys.csproj +++ /dev/null @@ -1,24 +0,0 @@ - - - - ASP.NET Core HTTP server that uses the Windows HTTP Server API. - netstandard2.0 - $(NoWarn);CS1591 - true - true - aspnetcore;weblistener;httpsys - - - - - - - - - - - - - - - diff --git a/src/HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj b/src/HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj deleted file mode 100644 index dd4dc97dbc4b..000000000000 --- a/src/HttpSysServer/test/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - diff --git a/src/HttpSysServer/version.props b/src/HttpSysServer/version.props deleted file mode 100644 index 669c874829da..000000000000 --- a/src/HttpSysServer/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj index 9ec5253b3937..a3814f318b95 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj @@ -9,6 +9,11 @@ true + + + + + @@ -21,7 +26,6 @@ - diff --git a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs index 4ecb5018a27e..02fc967f1ae1 100644 --- a/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs +++ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs @@ -3,7 +3,6 @@ using System; using System.Runtime.InteropServices; -using Microsoft.AspNetCore.HttpSys.Internal; namespace Microsoft.AspNetCore.Server.IISIntegration { diff --git a/src/MetaPackages/korebuild-lock.txt b/src/MetaPackages/korebuild-lock.txt new file mode 100644 index 000000000000..d38b7a9c0e74 --- /dev/null +++ b/src/MetaPackages/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.1.3-rtm-15847 +commithash:08641cb93aa5a9d52dc56c7516828b73aa448690 diff --git a/src/ServerTests/korebuild-lock.txt b/src/ServerTests/korebuild-lock.txt new file mode 100644 index 000000000000..d38b7a9c0e74 --- /dev/null +++ b/src/ServerTests/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.1.3-rtm-15847 +commithash:08641cb93aa5a9d52dc56c7516828b73aa448690 diff --git a/src/HttpSysServer/.gitignore b/src/Servers/HttpSys/.gitignore similarity index 100% rename from src/HttpSysServer/.gitignore rename to src/Servers/HttpSys/.gitignore diff --git a/src/Servers/HttpSys/HttpSysServer.sln b/src/Servers/HttpSys/HttpSysServer.sln new file mode 100644 index 000000000000..00d95c3e60a8 --- /dev/null +++ b/src/Servers/HttpSys/HttpSysServer.sln @@ -0,0 +1,139 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26730.10 +MinimumVisualStudioVersion = 15.0.26730.03 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{99D5E5F3-88F5-4CCF-8D8C-717C8925DF09}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E183C826-1360-4DFF-9994-F33CED5C8525}" + ProjectSection(SolutionItems) = preProject + test\Directory.Build.props = test\Directory.Build.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{3A1E31E3-2794-4CA3-B8E2-253E96BDE514}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5E9B546C-17AC-4BDF-BCB3-5955D4755ED8}" + ProjectSection(SolutionItems) = preProject + .appveyor.yml = .appveyor.yml + .travis.yml = .travis.yml + build.cmd = build.cmd + build.ps1 = build.ps1 + build.sh = build.sh + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + NuGet.config = NuGet.config + version.xml = version.xml + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestClient", "samples\TestClient\TestClient.csproj", "{8B828433-B333-4C19-96AE-00BFFF9D8841}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfHostServer", "samples\SelfHostServer\SelfHostServer.csproj", "{1236F93A-AC5C-4A77-9477-C88F040151CA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HotAddSample", "samples\HotAddSample\HotAddSample.csproj", "{8BFA392A-8B67-4454-916B-67C545EDFAEF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{85914BA9-4168-48C5-9C3F-E2E8B1479A6E}" + ProjectSection(SolutionItems) = preProject + build\dependencies.props = build\dependencies.props + build\Key.snk = build\Key.snk + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys.FunctionalTests", "test\FunctionalTests\Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj", "{E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys.Tests", "test\Tests\Microsoft.AspNetCore.Server.HttpSys.Tests.csproj", "{4F202E87-2496-471C-8161-CFB7446EB96F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.HttpSys", "src\Microsoft.AspNetCore.Server.HttpSys.csproj", "{339FECED-134D-4222-9876-C78B1CA4428A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|Mixed Platforms = Debug|Mixed Platforms + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|Mixed Platforms = Release|Mixed Platforms + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Debug|x86.ActiveCfg = Debug|Any CPU + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Any CPU.Build.0 = Release|Any CPU + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8B828433-B333-4C19-96AE-00BFFF9D8841}.Release|x86.ActiveCfg = Release|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Debug|x86.ActiveCfg = Debug|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|Any CPU.Build.0 = Release|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1236F93A-AC5C-4A77-9477-C88F040151CA}.Release|x86.ActiveCfg = Release|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|x86.ActiveCfg = Debug|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Debug|x86.Build.0 = Debug|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|Any CPU.Build.0 = Release|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|x86.ActiveCfg = Release|Any CPU + {8BFA392A-8B67-4454-916B-67C545EDFAEF}.Release|x86.Build.0 = Release|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Debug|x86.ActiveCfg = Debug|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Debug|x86.Build.0 = Debug|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Release|Any CPU.Build.0 = Release|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Release|x86.ActiveCfg = Release|Any CPU + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A}.Release|x86.Build.0 = Release|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Debug|x86.ActiveCfg = Debug|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Debug|x86.Build.0 = Debug|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Release|Any CPU.Build.0 = Release|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Release|x86.ActiveCfg = Release|Any CPU + {4F202E87-2496-471C-8161-CFB7446EB96F}.Release|x86.Build.0 = Release|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Debug|x86.ActiveCfg = Debug|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Debug|x86.Build.0 = Debug|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Release|Any CPU.Build.0 = Release|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Release|x86.ActiveCfg = Release|Any CPU + {339FECED-134D-4222-9876-C78B1CA4428A}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {8B828433-B333-4C19-96AE-00BFFF9D8841} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} + {1236F93A-AC5C-4A77-9477-C88F040151CA} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} + {8BFA392A-8B67-4454-916B-67C545EDFAEF} = {3A1E31E3-2794-4CA3-B8E2-253E96BDE514} + {85914BA9-4168-48C5-9C3F-E2E8B1479A6E} = {5E9B546C-17AC-4BDF-BCB3-5955D4755ED8} + {E6EA8535-BC62-49F2-960F-4FDB9FF37B9A} = {E183C826-1360-4DFF-9994-F33CED5C8525} + {4F202E87-2496-471C-8161-CFB7446EB96F} = {E183C826-1360-4DFF-9994-F33CED5C8525} + {339FECED-134D-4222-9876-C78B1CA4428A} = {99D5E5F3-88F5-4CCF-8D8C-717C8925DF09} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {34B42B42-FA09-41AB-9216-14073990C504} + EndGlobalSection +EndGlobal diff --git a/src/HttpSysServer/NuGetPackageVerifier.json b/src/Servers/HttpSys/NuGetPackageVerifier.json similarity index 100% rename from src/HttpSysServer/NuGetPackageVerifier.json rename to src/Servers/HttpSys/NuGetPackageVerifier.json diff --git a/src/HttpSysServer/README.md b/src/Servers/HttpSys/README.md similarity index 100% rename from src/HttpSysServer/README.md rename to src/Servers/HttpSys/README.md diff --git a/src/Servers/HttpSys/samples/HotAddSample/HotAddSample.csproj b/src/Servers/HttpSys/samples/HotAddSample/HotAddSample.csproj new file mode 100644 index 000000000000..19ff7285813a --- /dev/null +++ b/src/Servers/HttpSys/samples/HotAddSample/HotAddSample.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp2.1;net461 + Exe + true + + + + + + + diff --git a/src/HttpSysServer/samples/HotAddSample/Startup.cs b/src/Servers/HttpSys/samples/HotAddSample/Startup.cs similarity index 100% rename from src/HttpSysServer/samples/HotAddSample/Startup.cs rename to src/Servers/HttpSys/samples/HotAddSample/Startup.cs diff --git a/src/HttpSysServer/samples/SelfHostServer/App.config b/src/Servers/HttpSys/samples/SelfHostServer/App.config similarity index 100% rename from src/HttpSysServer/samples/SelfHostServer/App.config rename to src/Servers/HttpSys/samples/SelfHostServer/App.config diff --git a/src/HttpSysServer/samples/SelfHostServer/Public/1kb.txt b/src/Servers/HttpSys/samples/SelfHostServer/Public/1kb.txt similarity index 100% rename from src/HttpSysServer/samples/SelfHostServer/Public/1kb.txt rename to src/Servers/HttpSys/samples/SelfHostServer/Public/1kb.txt diff --git a/src/Servers/HttpSys/samples/SelfHostServer/SelfHostServer.csproj b/src/Servers/HttpSys/samples/SelfHostServer/SelfHostServer.csproj new file mode 100644 index 000000000000..19ff7285813a --- /dev/null +++ b/src/Servers/HttpSys/samples/SelfHostServer/SelfHostServer.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp2.1;net461 + Exe + true + + + + + + + diff --git a/src/HttpSysServer/samples/SelfHostServer/Startup.cs b/src/Servers/HttpSys/samples/SelfHostServer/Startup.cs similarity index 100% rename from src/HttpSysServer/samples/SelfHostServer/Startup.cs rename to src/Servers/HttpSys/samples/SelfHostServer/Startup.cs diff --git a/src/HttpSysServer/samples/TestClient/App.config b/src/Servers/HttpSys/samples/TestClient/App.config similarity index 100% rename from src/HttpSysServer/samples/TestClient/App.config rename to src/Servers/HttpSys/samples/TestClient/App.config diff --git a/src/HttpSysServer/samples/TestClient/Program.cs b/src/Servers/HttpSys/samples/TestClient/Program.cs similarity index 100% rename from src/HttpSysServer/samples/TestClient/Program.cs rename to src/Servers/HttpSys/samples/TestClient/Program.cs diff --git a/src/HttpSysServer/samples/TestClient/Properties/AssemblyInfo.cs b/src/Servers/HttpSys/samples/TestClient/Properties/AssemblyInfo.cs similarity index 100% rename from src/HttpSysServer/samples/TestClient/Properties/AssemblyInfo.cs rename to src/Servers/HttpSys/samples/TestClient/Properties/AssemblyInfo.cs diff --git a/src/HttpSysServer/samples/TestClient/TestClient.csproj b/src/Servers/HttpSys/samples/TestClient/TestClient.csproj similarity index 97% rename from src/HttpSysServer/samples/TestClient/TestClient.csproj rename to src/Servers/HttpSys/samples/TestClient/TestClient.csproj index 781a1870524f..c92be92bc82e 100644 --- a/src/HttpSysServer/samples/TestClient/TestClient.csproj +++ b/src/Servers/HttpSys/samples/TestClient/TestClient.csproj @@ -1,4 +1,4 @@ - + @@ -53,7 +53,8 @@ - + + From 0588b13f5b1be03e120d1ccb3f8062ab0b07409c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Wed, 5 Dec 2018 17:01:02 -0800 Subject: [PATCH 05/12] Fix 2.1 build issues and remove obsolete build code (#4443) - Stop producing the 'Universe' lineup package - Removes all PackageLineup code - Use full msbuild on Windows - Fix invalid reference to internal.aspnetcore.sdk in 2.1.x - Fix shared folder references for PackageArchive task. --- build/PackageArchive.targets | 2 +- build/RepositoryBuild.targets | 3 +- build/artifacts.props | 1 - build/external-dependencies.props | 143 ++++----- ...Internal.AspNetCore.Universe.Lineup.nuspec | 16 - build/repo.beforecommon.props | 10 - build/repo.props | 8 +- build/repo.targets | 65 +--- build/tasks/AnalyzeBuildGraph.cs | 299 ------------------ build/tasks/BuildGraph/ExternalDependency.cs | 12 - build/tasks/BuildGraph/GraphBuilder.cs | 74 ----- build/tasks/BuildGraph/GraphNode.cs | 18 -- build/tasks/BuildGraph/Project.cs | 28 -- build/tasks/BuildGraph/Repository.cs | 33 -- build/tasks/BuildGraph/TopologicalSort.cs | 46 --- build/tasks/CheckRepoGraph.cs | 223 ------------- build/tasks/Logger/FlowLogger.cs | 61 ---- .../ProjectModel/DotNetCliReferenceInfo.cs | 24 -- build/tasks/ProjectModel/PackageInfo.cs | 44 --- .../ProjectModel/PackageReferenceInfo.cs | 27 -- build/tasks/ProjectModel/PatchPolicy.cs | 31 -- .../ProjectModel/ProjectFrameworkInfo.cs | 22 -- build/tasks/ProjectModel/ProjectInfo.cs | 47 --- .../tasks/ProjectModel/ProjectInfoFactory.cs | 137 -------- build/tasks/ProjectModel/SolutionInfo.cs | 44 --- .../tasks/ProjectModel/SolutionInfoFactory.cs | 136 -------- build/tasks/RepoTasks.csproj | 7 +- build/tasks/Utilities/ArtifactInfo.cs | 70 ---- korebuild.json | 14 + scripts/GenerateTags.ps1 | 128 -------- scripts/GetPackageVersion.targets | 5 - scripts/ListRepoVersions.ps1 | 23 -- scripts/PatchVersionPrefix.ps1 | 111 ------- scripts/TagRepos.ps1 | 66 ---- scripts/UpdateDependenciesCoreFx.ps1 | 134 -------- scripts/UpdateRepos.ps1 | 147 --------- scripts/requirements.txt | 2 - scripts/update_travis_appveyor_yml.py | 100 ------ src/AADIntegration/build/repo.props | 7 - src/Antiforgery/build/repo.props | 6 - src/AuthSamples/build/repo.props | 7 - src/AzureIntegration/build/repo.props | 5 - src/CORS/build/repo.props | 7 - src/IISIntegration/build/repo.props | 7 - src/Identity/build/repo.props | 6 - src/JavaScriptServices/build/repo.props | 7 - src/MetaPackages/build/repo.props | 7 - src/MusicStore/build/repo.props | 7 - src/Mvc/build/repo.props | 6 - src/MvcPrecompilation/build/repo.props | 7 - src/PackageArchive/Directory.Build.props | 5 +- src/Razor/build/VSIX.targets | 4 +- src/Razor/build/repo.props | 7 - src/ResponseCaching/build/repo.props | 7 - src/Routing/build/repo.props | 7 - src/Security/build/repo.props | 6 - src/ServerTests/build/repo.props | 6 - src/Session/build/repo.props | 7 - src/SignalR/build/repo.props | 6 - .../clients/ts/common/package-lock.json | 28 +- .../package-lock.json | 2 +- .../clients/ts/signalr/package-lock.json | 2 +- src/StaticFiles/build/repo.props | 7 - src/Templating/build/repo.props | 7 - 64 files changed, 125 insertions(+), 2416 deletions(-) delete mode 100644 build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec delete mode 100644 build/repo.beforecommon.props delete mode 100644 build/tasks/AnalyzeBuildGraph.cs delete mode 100644 build/tasks/BuildGraph/ExternalDependency.cs delete mode 100644 build/tasks/BuildGraph/GraphBuilder.cs delete mode 100644 build/tasks/BuildGraph/GraphNode.cs delete mode 100644 build/tasks/BuildGraph/Project.cs delete mode 100644 build/tasks/BuildGraph/Repository.cs delete mode 100644 build/tasks/BuildGraph/TopologicalSort.cs delete mode 100644 build/tasks/CheckRepoGraph.cs delete mode 100644 build/tasks/Logger/FlowLogger.cs delete mode 100644 build/tasks/ProjectModel/DotNetCliReferenceInfo.cs delete mode 100644 build/tasks/ProjectModel/PackageInfo.cs delete mode 100644 build/tasks/ProjectModel/PackageReferenceInfo.cs delete mode 100644 build/tasks/ProjectModel/PatchPolicy.cs delete mode 100644 build/tasks/ProjectModel/ProjectFrameworkInfo.cs delete mode 100644 build/tasks/ProjectModel/ProjectInfo.cs delete mode 100644 build/tasks/ProjectModel/ProjectInfoFactory.cs delete mode 100644 build/tasks/ProjectModel/SolutionInfo.cs delete mode 100644 build/tasks/ProjectModel/SolutionInfoFactory.cs delete mode 100644 build/tasks/Utilities/ArtifactInfo.cs delete mode 100755 scripts/GenerateTags.ps1 delete mode 100644 scripts/GetPackageVersion.targets delete mode 100644 scripts/ListRepoVersions.ps1 delete mode 100755 scripts/PatchVersionPrefix.ps1 delete mode 100644 scripts/TagRepos.ps1 delete mode 100644 scripts/UpdateDependenciesCoreFx.ps1 delete mode 100755 scripts/UpdateRepos.ps1 delete mode 100644 scripts/requirements.txt delete mode 100755 scripts/update_travis_appveyor_yml.py diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index c92c5455d3e4..049338f962bb 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -8,7 +8,7 @@ - + DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index 428b35b65d6d..6457bbf13bc7 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -83,7 +83,8 @@ $(RepositoryBuildArguments) /p:BuildNumber=$(BuildNumber) $(RepositoryBuildArguments) /p:Configuration=$(Configuration) $(RepositoryBuildArguments) /p:IsFinalBuild=$(IsFinalBuild) - $(RepositoryBuildArguments) /noconsolelogger '/l:RepoTasks.FlowLogger,$(MSBuildThisFileDirectory)tasks\bin\publish\RepoTasks.dll;Summary;FlowId=$(RepositoryToBuild)' + + $(RepositoryBuildArguments) /p:DisableCodeSigning=true $(RepositoryBuildArguments) '/p:DotNetAssetRootAccessTokenSuffix=$(DotNetAssetRootAccessTokenSuffix)' $(RepositoryBuildArguments) '/p:DotNetAssetRootUrl=$(DotNetAssetRootUrl)' $(RepositoryBuildArguments) /p:SkipAspNetCoreRuntimeInstall=true diff --git a/build/artifacts.props b/build/artifacts.props index 5e6e21bed355..debe7bdcd4df 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -24,7 +24,6 @@ - diff --git a/build/external-dependencies.props b/build/external-dependencies.props index fa23f8968687..7cb96166b253 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -10,93 +10,80 @@ false - - - - - - - false - - false - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - diff --git a/build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec b/build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec deleted file mode 100644 index 1209016b0456..000000000000 --- a/build/lineups/Internal.AspNetCore.Universe.Lineup.nuspec +++ /dev/null @@ -1,16 +0,0 @@ - - - - Internal.AspNetCore.Universe.Lineup - $version$ - Microsoft - This package used to unify ASP.NET Core package versions across all ASP.NET Core repos. Internal use only. - - - - - - - - - diff --git a/build/repo.beforecommon.props b/build/repo.beforecommon.props deleted file mode 100644 index f470e9b2a653..000000000000 --- a/build/repo.beforecommon.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - true - - diff --git a/build/repo.props b/build/repo.props index 2c9111294dc9..73cec397f5b4 100644 --- a/build/repo.props +++ b/build/repo.props @@ -54,7 +54,7 @@ + Exclude=" + @(ProjectToExclude); + $(RepositoryRoot)**\bin\**\*; + $(RepositoryRoot)**\obj\**\*; + $(RepositoryRoot)**\AutobahnTestApp\**\*;" /> diff --git a/build/repo.targets b/build/repo.targets index 2a7778a14f7d..340b8ff9a6b2 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -5,9 +5,7 @@ - - - + $(IntermediateDir)dependencies.g.props @@ -67,7 +65,7 @@ - + MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); @@ -154,18 +152,6 @@ - - - - NuGetPackage - Internal.AspNetCore.Universe.Lineup - $(PackageVersion) - noship - true - - - - <_LineupPackages Include="@(ExternalDependency)" /> @@ -209,13 +195,6 @@ - - - - @@ -223,26 +202,6 @@ - - <_RepositoriesToInclude Include="$(KOREBUILD_REPOSITORY_INCLUDE)" /> - - - - - - <_RepositoriesToExclude Include="$(KOREBUILD_REPOSITORY_EXCLUDE)" /> - - - - - @@ -252,36 +211,20 @@ - + - - <_UndeclaredPackageArtifact Include="%(ArtifactInfo.PackageId)" Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetPackage'" /> <_UndeclaredPackageArtifact Remove="@(PackageArtifact)" /> + - - - - - diff --git a/build/tasks/AnalyzeBuildGraph.cs b/build/tasks/AnalyzeBuildGraph.cs deleted file mode 100644 index c70d1d8a56c1..000000000000 --- a/build/tasks/AnalyzeBuildGraph.cs +++ /dev/null @@ -1,299 +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.Collections; -using System.Collections.Generic; -using System.Linq; -using System.IO; -using System.Text; -using System.Threading; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using NuGet.Frameworks; -using NuGet.Versioning; -using RepoTools.BuildGraph; -using RepoTasks.ProjectModel; -using RepoTasks.Utilities; - -namespace RepoTasks -{ - public class AnalyzeBuildGraph : Task, ICancelableTask - { - private readonly CancellationTokenSource _cts = new CancellationTokenSource(); - - /// - /// Repositories that we are building new versions of. - /// - [Required] - public ITaskItem[] Solutions { get; set; } - - [Required] - public ITaskItem[] Artifacts { get; set; } - - [Required] - public ITaskItem[] Repositories { get; set; } - - [Required] - public ITaskItem[] Dependencies { get; set; } - - [Required] - public string Properties { get; set; } - - public string StartGraphAt { get; set; } - - /// - /// The order in which to build repositories - /// - [Output] - public ITaskItem[] RepositoryBuildOrder { get; set; } - - public void Cancel() - { - _cts.Cancel(); - } - - public override bool Execute() - { - var packageArtifacts = Artifacts.Select(ArtifactInfo.Parse) - .OfType() - .Where(p => !p.IsSymbolsArtifact); - - var factory = new SolutionInfoFactory(Log, BuildEngine5); - var props = MSBuildListSplitter.GetNamedProperties(Properties); - - Log.LogMessage(MessageImportance.High, $"Beginning cross-repo analysis on {Solutions.Length} solutions. Hang tight..."); - - if (!props.TryGetValue("Configuration", out var defaultConfig)) - { - defaultConfig = "Debug"; - } - - var solutions = factory.Create(Solutions, props, defaultConfig, _cts.Token); - Log.LogMessage($"Found {solutions.Count} and {solutions.Sum(p => p.Projects.Count)} projects"); - - var policies = new Dictionary(); - foreach (var repo in Repositories) - { - policies.Add(repo.ItemSpec, Enum.Parse(repo.GetMetadata("PatchPolicy"))); - } - - foreach (var solution in solutions) - { - var repoName = Path.GetFileName(solution.Directory); - solution.PatchPolicy = policies[repoName]; - } - - if (_cts.IsCancellationRequested) - { - return false; - } - - EnsureConsistentGraph(packageArtifacts, solutions); - RepositoryBuildOrder = GetRepositoryBuildOrder(packageArtifacts, solutions.Where(s => s.ShouldBuild)); - - return !Log.HasLoggedErrors; - } - - private struct VersionMismatch - { - public SolutionInfo Solution; - public ProjectInfo Project; - public string PackageId; - public string ActualVersion; - public NuGetVersion ExpectedVersion; - } - - private void EnsureConsistentGraph(IEnumerable packages, IEnumerable solutions) - { - // ensure versions cascade - var buildPackageMap = packages.ToDictionary(p => p.PackageInfo.Id, p => p, StringComparer.OrdinalIgnoreCase); - var dependencyMap = new Dictionary>(StringComparer.OrdinalIgnoreCase); - foreach (var dep in Dependencies) - { - if (dep.GetMetadata("IsExtensionsPackage") == "true") - { - buildPackageMap.Add(dep.ItemSpec, new ArtifactInfo.Package - { - PackageInfo = new PackageInfo(dep.ItemSpec, new NuGetVersion(dep.GetMetadata("Version")), null, null), - }); - } - else - { - if (!dependencyMap.TryGetValue(dep.ItemSpec, out var versions)) - { - dependencyMap[dep.ItemSpec] = versions = new List(); - } - - versions.Add(new ExternalDependency - { - PackageId = dep.ItemSpec, - Version = dep.GetMetadata("Version"), - }); - } - } - - var inconsistentVersions = new List(); - - foreach (var solution in solutions) - foreach (var project in solution.Projects) - foreach (var tfm in project.Frameworks) - foreach (var dependency in tfm.Dependencies) - { - if (!buildPackageMap.TryGetValue(dependency.Key, out var package)) - { - var idx = -1; - // This dependency is not one of the packages that will be compiled by this run of Universe. - if (!dependencyMap.TryGetValue(dependency.Key, out var externalVersions) - || (idx = externalVersions.FindIndex(0, externalVersions.Count, i => i.Version == dependency.Value.Version)) < 0) - { - Log.LogKoreBuildError( - project.FullPath, - KoreBuildErrors.UndefinedExternalDependency, - message: $"Undefined external dependency on {dependency.Key}/{dependency.Value.Version}"); - } - - if (idx >= 0) - { - externalVersions[idx].IsReferenced = true; - } - continue; - } - - var refVersion = VersionRange.Parse(dependency.Value.Version); - if (refVersion.IsFloating && refVersion.Float.Satisfies(package.PackageInfo.Version)) - { - continue; - } - else if (package.PackageInfo.Version.Equals(refVersion.MinVersion)) - { - continue; - } - - var shouldCascade = (solution.PatchPolicy & PatchPolicy.CascadeVersions) != 0; - if (!solution.ShouldBuild && !solution.IsPatching && shouldCascade) - { - var repoName = Path.GetFileName(Path.GetDirectoryName(solution.FullPath)); - Log.LogError($"{repoName} should not be marked 'IsPatching=false'. Version changes in other repositories mean it should be patched to perserve cascading version upgrades."); - - } - - if (shouldCascade) - { - inconsistentVersions.Add(new VersionMismatch - { - Solution = solution, - Project = project, - PackageId = dependency.Key, - ActualVersion = dependency.Value.Version, - ExpectedVersion = package.PackageInfo.Version, - }); - } - } - - if (inconsistentVersions.Count != 0) - { - var sb = new StringBuilder(); - sb.AppendLine(); - sb.AppendLine($"Repos are inconsistent. The following projects have PackageReferences that should be updated"); - foreach (var solution in inconsistentVersions.GroupBy(p => p.Solution.FullPath)) - { - sb.Append(" - ").AppendLine(Path.GetFileName(solution.Key)); - foreach (var project in solution.GroupBy(p => p.Project.FullPath)) - { - sb.Append(" - ").AppendLine(Path.GetFileName(project.Key)); - foreach (var mismatchedReference in project) - { - sb.AppendLine($" + {mismatchedReference.PackageId}/{{{mismatchedReference.ActualVersion} => {mismatchedReference.ExpectedVersion}}}"); - } - } - } - sb.AppendLine(); - Log.LogMessage(MessageImportance.High, sb.ToString()); - Log.LogError("Package versions are inconsistent. See build log for details."); - } - - foreach (var versions in dependencyMap.Values) - { - foreach (var item in versions.Where(i => !i.IsReferenced)) - { - // See https://github.com/aspnet/Universe/wiki/Build-warning-and-error-codes#potentially-unused-external-dependency for details - Log.LogMessage(MessageImportance.Normal, $"Potentially unused external dependency: {item.PackageId}/{item.Version}. See https://github.com/aspnet/Universe/wiki/Build-warning-and-error-codes for details."); - } - } - } - - private ITaskItem[] GetRepositoryBuildOrder(IEnumerable artifacts, IEnumerable solutions) - { - var repositories = solutions.Select(s => - { - var repoName = Path.GetFileName(Path.GetDirectoryName(s.FullPath)); - var repo = new Repository(repoName) - { - RootDir = Path.GetDirectoryName(s.FullPath) - }; - - var packages = artifacts - .Where(a => string.Equals(a.RepoName, repoName, StringComparison.OrdinalIgnoreCase)) - .ToDictionary(p => p.PackageInfo.Id, p => p, StringComparer.OrdinalIgnoreCase); - - foreach (var proj in s.Projects) - { - IList projectGroup; - if (packages.ContainsKey(proj.PackageId)) - { - // this project is a package producer and consumer - packages.Remove(proj.PackageId); - projectGroup = repo.Projects; - } - else - { - // this project is a package consumer - projectGroup = repo.SupportProjects; - } - - - projectGroup.Add(new Project(proj.PackageId) - { - Repository = repo, - PackageReferences = new HashSet(proj - .Frameworks - .SelectMany(f => f.Dependencies.Keys) - .Concat(proj.Tools.Select(t => t.Id)), StringComparer.OrdinalIgnoreCase), - }); - } - - foreach (var packageId in packages.Keys) - { - // these packages are produced from something besides a csproj. e.g. .Sources packages - repo.Projects.Add(new Project(packageId) { Repository = repo }); - } - - return repo; - }).ToList(); - - var graph = GraphBuilder.Generate(repositories, StartGraphAt, Log); - var repositoriesWithOrder = new List<(ITaskItem repository, int order)>(); - foreach (var repository in repositories) - { - var graphNodeRepository = graph.FirstOrDefault(g => g.Repository.Name == repository.Name); - if (graphNodeRepository == null) - { - // StartGraphAt was specified so the graph is incomplete. - continue; - } - - var order = TopologicalSort.GetOrder(graphNodeRepository); - var repositoryTaskItem = new TaskItem(repository.Name); - repositoryTaskItem.SetMetadata("Order", order.ToString()); - repositoryTaskItem.SetMetadata("RootPath", repository.RootDir); - repositoriesWithOrder.Add((repositoryTaskItem, order)); - } - - return repositoriesWithOrder - .OrderBy(r => r.order) - .Select(r => r.repository) - .ToArray(); - } - } -} diff --git a/build/tasks/BuildGraph/ExternalDependency.cs b/build/tasks/BuildGraph/ExternalDependency.cs deleted file mode 100644 index 5bdc67d02793..000000000000 --- a/build/tasks/BuildGraph/ExternalDependency.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 RepoTools.BuildGraph -{ - internal class ExternalDependency - { - public string PackageId { get; set; } - public string Version { get; set; } - public bool IsReferenced { get; set; } - } -} diff --git a/build/tasks/BuildGraph/GraphBuilder.cs b/build/tasks/BuildGraph/GraphBuilder.cs deleted file mode 100644 index d70b1ba45d00..000000000000 --- a/build/tasks/BuildGraph/GraphBuilder.cs +++ /dev/null @@ -1,74 +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.Collections.Generic; -using System.IO; -using System.Linq; -using Microsoft.Build.Utilities; - -namespace RepoTools.BuildGraph -{ - public static class GraphBuilder - { - public static IList Generate(IList repositories, string root, TaskLoggingHelper log) - { - // Build global list of primary projects - var primaryProjects = repositories.SelectMany(c => c.Projects) - .ToDictionary(p => p.Name, StringComparer.OrdinalIgnoreCase); - var graphNodes = repositories.Select(r => new GraphNode { Repository = r }) - .ToDictionary(r => r.Repository); - - GraphNode searchRoot = null; - - foreach (var project in repositories.SelectMany(r => r.AllProjects)) - { - var thisProjectRepositoryNode = graphNodes[project.Repository]; - if (!string.IsNullOrEmpty(root) && string.Equals(root, project.Repository.Name, StringComparison.OrdinalIgnoreCase)) - { - searchRoot = thisProjectRepositoryNode; - } - - foreach (var packageDependency in project.PackageReferences) - { - if (primaryProjects.TryGetValue(packageDependency, out var dependencyProject)) - { - var dependencyRepository = dependencyProject.Repository; - var dependencyNode = graphNodes[dependencyRepository]; - - if (ReferenceEquals(thisProjectRepositoryNode, dependencyNode)) - { - log.LogWarning("{0} has a package reference to a package produced in the same repo. {1} -> {2}", project.Repository.Name, Path.GetFileName(project.Path), packageDependency); - } - else - { - thisProjectRepositoryNode.Incoming.Add(dependencyNode); - } - - dependencyNode.Outgoing.Add(thisProjectRepositoryNode); - } - } - } - - var results = new HashSet(); - if (searchRoot != null) - { - Visit(results, searchRoot); - return results.ToList(); - } - - return graphNodes.Values.ToList(); - } - - private static void Visit(HashSet results, GraphNode searchRoot) - { - if (results.Add(searchRoot)) - { - foreach (var node in searchRoot.Outgoing) - { - Visit(results, node); - } - } - } - } -} diff --git a/build/tasks/BuildGraph/GraphNode.cs b/build/tasks/BuildGraph/GraphNode.cs deleted file mode 100644 index b7197e8b38aa..000000000000 --- a/build/tasks/BuildGraph/GraphNode.cs +++ /dev/null @@ -1,18 +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.Collections.Generic; -using System.Diagnostics; - -namespace RepoTools.BuildGraph -{ - [DebuggerDisplay("{Repository.Name}")] - public class GraphNode - { - public Repository Repository { get; set; } - - public ISet Incoming { get; } = new HashSet(); - - public ISet Outgoing { get; } = new HashSet(); - } -} diff --git a/build/tasks/BuildGraph/Project.cs b/build/tasks/BuildGraph/Project.cs deleted file mode 100644 index ad03468a6131..000000000000 --- a/build/tasks/BuildGraph/Project.cs +++ /dev/null @@ -1,28 +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.Collections.Generic; -using System.Diagnostics; - -namespace RepoTools.BuildGraph -{ - [DebuggerDisplay("{Name}")] - public class Project - { - public Project(string name) - { - Name = name; - } - - public string Name { get; } - - public string Version { get; set; } - - public string Path { get; set; } - - public Repository Repository { get; set; } - - public ISet PackageReferences { get; set; } = new HashSet(StringComparer.OrdinalIgnoreCase); - } -} diff --git a/build/tasks/BuildGraph/Repository.cs b/build/tasks/BuildGraph/Repository.cs deleted file mode 100644 index e5bdaf414e91..000000000000 --- a/build/tasks/BuildGraph/Repository.cs +++ /dev/null @@ -1,33 +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.Collections.Generic; -using System.Diagnostics; -using System.Linq; - -namespace RepoTools.BuildGraph -{ - [DebuggerDisplay("{Name}")] - public class Repository : IEquatable - { - public Repository(string name) - { - Name = name; - } - - public string Name { get; private set; } - - public string RootDir { get; set; } - - public IList Projects { get; } = new List(); - - public IList SupportProjects { get; } = new List(); - - public IEnumerable AllProjects => Projects.Concat(SupportProjects); - - public bool Equals(Repository other) => string.Equals(Name, other.Name, StringComparison.OrdinalIgnoreCase); - - public override int GetHashCode() => StringComparer.OrdinalIgnoreCase.GetHashCode(Name); - } -} diff --git a/build/tasks/BuildGraph/TopologicalSort.cs b/build/tasks/BuildGraph/TopologicalSort.cs deleted file mode 100644 index 161a9913d7cf..000000000000 --- a/build/tasks/BuildGraph/TopologicalSort.cs +++ /dev/null @@ -1,46 +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.Collections.Generic; -using System.Linq; - -namespace RepoTools.BuildGraph -{ - public class TopologicalSort : IComparer - { - public static readonly TopologicalSort Instance = new TopologicalSort(); - - public int Compare(GraphNode x, GraphNode y) - { - var xScore = GetOrder(x); - var yScore = GetOrder(y); - return xScore.CompareTo(yScore); - } - - public static int GetOrder(GraphNode node) - { - var visited = new List(); - return GetOrder(node, visited); - } - - private static int GetOrder(GraphNode node, List visited) - { - if (visited.Contains(node)) - { - var cycle = string.Join(" -> ", visited.Select(v => v.Repository.Name)); - throw new Exception($"Cycle detected in the build graph: {cycle} -> {node.Repository.Name}."); - } - - var score = 0; - visited.Add(node); - foreach (var dependentNode in node.Incoming) - { - score = Math.Max(score, GetOrder(dependentNode, visited)); - } - visited.RemoveAt(visited.Count - 1); - - return score + 1; - } - } -} diff --git a/build/tasks/CheckRepoGraph.cs b/build/tasks/CheckRepoGraph.cs deleted file mode 100644 index eecd32580e30..000000000000 --- a/build/tasks/CheckRepoGraph.cs +++ /dev/null @@ -1,223 +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.Collections; -using System.Collections.Generic; -using System.Linq; -using System.IO; -using System.Text; -using System.Threading; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using NuGet.Frameworks; -using NuGet.Packaging.Core; -using NuGet.Versioning; -using RepoTools.BuildGraph; -using RepoTasks.ProjectModel; -using RepoTasks.Utilities; - -namespace RepoTasks -{ - public class CheckRepoGraph : Task, ICancelableTask - { - private readonly CancellationTokenSource _cts = new CancellationTokenSource(); - - [Required] - public ITaskItem[] Solutions { get; set; } - - [Required] - public ITaskItem[] Artifacts { get; set; } - - [Required] - public ITaskItem[] Repositories { get; set; } - - [Required] - public string Properties { get; set; } - - public void Cancel() - { - _cts.Cancel(); - } - - public override bool Execute() - { - var packageArtifacts = Artifacts.Select(ArtifactInfo.Parse) - .OfType() - .Where(p => !p.IsSymbolsArtifact) - .ToDictionary(p => p.PackageInfo.Id, p => p, StringComparer.OrdinalIgnoreCase); - - var factory = new SolutionInfoFactory(Log, BuildEngine5); - var props = MSBuildListSplitter.GetNamedProperties(Properties); - - if (!props.TryGetValue("Configuration", out var defaultConfig)) - { - defaultConfig = "Debug"; - } - - var solutions = factory.Create(Solutions, props, defaultConfig, _cts.Token).OrderBy(f => f.Directory).ToList(); - Log.LogMessage($"Found {solutions.Count} and {solutions.Sum(p => p.Projects.Count)} projects"); - - if (_cts.IsCancellationRequested) - { - return false; - } - - var repoGraph = new AdjacencyMatrix(solutions.Count); - var packageToProjectMap = new Dictionary(); - - for (var i = 0; i < solutions.Count; i++) - { - var sln = repoGraph[i] = solutions[i]; - - foreach (var proj in sln.Projects) - { - if (!proj.IsPackable - || proj.FullPath.Contains("samples") - || proj.FullPath.Contains("tools/Microsoft.VisualStudio.Web.CodeGeneration.Design")) - { - continue; - } - - var id = new PackageIdentity(proj.PackageId, new NuGetVersion(proj.PackageVersion)); - - if (packageToProjectMap.TryGetValue(id, out var otherProj)) - { - Log.LogError($"Both {proj.FullPath} and {otherProj.FullPath} produce {id}"); - continue; - } - - packageToProjectMap.Add(id, proj); - } - - var sharedSrc = Path.Combine(sln.Directory, "shared"); - if (Directory.Exists(sharedSrc)) - { - foreach (var dir in Directory.GetDirectories(sharedSrc, "*.Sources")) - { - var id = GetDirectoryName(dir); - var artifactInfo = packageArtifacts[id]; - var sharedSrcProj = new ProjectInfo(dir, - Array.Empty(), - Array.Empty(), - true, - artifactInfo.PackageInfo.Id, - artifactInfo.PackageInfo.Version.ToNormalizedString()); - sharedSrcProj.SolutionInfo = sln; - var identity = new PackageIdentity(artifactInfo.PackageInfo.Id, artifactInfo.PackageInfo.Version); - packageToProjectMap.Add(identity, sharedSrcProj); - } - } - } - - if (Log.HasLoggedErrors) - { - return false; - } - - for (var i = 0; i < solutions.Count; i++) - { - var src = repoGraph[i]; - - foreach (var proj in src.Projects) - { - if (!proj.IsPackable - || proj.FullPath.Contains("samples")) - { - continue; - } - - foreach (var dep in proj.Frameworks.SelectMany(f => f.Dependencies.Values)) - { - if (packageToProjectMap.TryGetValue(new PackageIdentity(dep.Id, new NuGetVersion(dep.Version)), out var target)) - { - var j = repoGraph.FindIndex(target.SolutionInfo); - repoGraph.SetLink(i, j); - } - } - - foreach (var toolDep in proj.Tools) - { - if (packageToProjectMap.TryGetValue(new PackageIdentity(toolDep.Id, new NuGetVersion(toolDep.Version)), out var target)) - { - var j = repoGraph.FindIndex(target.SolutionInfo); - repoGraph.SetLink(i, j); - } - } - } - } - - var repos = Repositories.ToDictionary(i => i.ItemSpec, i => i, StringComparer.OrdinalIgnoreCase); - - for (var i = 0; i < repoGraph.Count; i++) - { - var src = repoGraph[i]; - var repoName = GetDirectoryName(src.Directory); - var repo = repos[repoName]; - - var policy = Enum.Parse(repo.GetMetadata("PatchPolicy")); - - if ((policy & PatchPolicy.AlwaysUpdate) != 0 && !src.IsPatching) - { - Log.LogError($"{repoName} is not currently set to patch, but it should because the policy is set to always include this in servicing updates. Update the configuration in submodule.props."); - continue; - } - - var srcShouldCascade = (policy & PatchPolicy.CascadeVersions) != 0; - for (var j = 0; j < repoGraph.Count; j++) - { - if (j == i) continue; - if (repoGraph.HasLink(i, j)) - { - var target = repoGraph[j]; - var targetRepoName = GetDirectoryName(target.Directory); - var targetRepo = repos[targetRepoName]; - - if (srcShouldCascade && !src.IsPatching && target.IsPatching) - { - Log.LogError($"{repoName} should be patching because it depend on {targetRepoName} and its patch policy is to cascade version changes. Update the configuration in submodule.props."); - } - } - } - } - - return !Log.HasLoggedErrors; - } - - private static string GetDirectoryName(string path) - => Path.GetFileName(path.TrimEnd(new[] { '\\', '/' })); - - private class AdjacencyMatrix - { - private readonly bool[,] _matrix; - private readonly SolutionInfo[] _items; - - public AdjacencyMatrix(int size) - { - _matrix = new bool[size, size]; - _items = new SolutionInfo[size]; - Count = size; - } - - public SolutionInfo this[int idx] - { - get => _items[idx]; - set => _items[idx] = value; - } - - public int FindIndex(SolutionInfo item) - { - return Array.FindIndex(_items, t => t.Equals(item)); - } - - public int Count { get; } - - public bool HasLink(int source, int target) => _matrix[source, target]; - - public void SetLink(int source, int target) - { - _matrix[source, target] = true; - } - } - } -} diff --git a/build/tasks/Logger/FlowLogger.cs b/build/tasks/Logger/FlowLogger.cs deleted file mode 100644 index e6a214fdffa8..000000000000 --- a/build/tasks/Logger/FlowLogger.cs +++ /dev/null @@ -1,61 +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.Linq; -using Microsoft.Build.Framework; -using Microsoft.Build.Logging; - -namespace RepoTasks -{ - public class FlowLogger : ConsoleLogger - { - private volatile bool _initialized; - - public FlowLogger() - { - } - - public override void Initialize(IEventSource eventSource, int nodeCount) - { - PreInit(eventSource); - base.Initialize(eventSource, nodeCount); - } - - public override void Initialize(IEventSource eventSource) - { - PreInit(eventSource); - base.Initialize(eventSource); - } - - private void PreInit(IEventSource eventSource) - { - if (_initialized) return; - _initialized = true; - - var flowId = GetFlowId(); - var prefix = $"{flowId,-22}| "; - var write = WriteHandler; - WriteHandler = msg => write(prefix + msg); - - eventSource.BuildStarted += (o, e) => - { - WriteHandler(e.Message + Environment.NewLine); - }; - } - - private string GetFlowId() - { - var parameters = Parameters?.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); - if (parameters == null || parameters.Length == 0) - { - return null; - } - - const string flowIdParamName = "FlowId="; - return parameters - .FirstOrDefault(p => p.StartsWith(flowIdParamName, StringComparison.Ordinal)) - ?.Substring(flowIdParamName.Length); - } - } -} diff --git a/build/tasks/ProjectModel/DotNetCliReferenceInfo.cs b/build/tasks/ProjectModel/DotNetCliReferenceInfo.cs deleted file mode 100644 index c490dab999b6..000000000000 --- a/build/tasks/ProjectModel/DotNetCliReferenceInfo.cs +++ /dev/null @@ -1,24 +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; - -namespace RepoTasks.ProjectModel -{ - internal class DotNetCliReferenceInfo - { - public DotNetCliReferenceInfo(string id, string version) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentException(nameof(id)); - } - - Id = id; - Version = version; - } - - public string Id { get; } - public string Version { get; } - } -} diff --git a/build/tasks/ProjectModel/PackageInfo.cs b/build/tasks/ProjectModel/PackageInfo.cs deleted file mode 100644 index bb499a1b219e..000000000000 --- a/build/tasks/ProjectModel/PackageInfo.cs +++ /dev/null @@ -1,44 +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.Collections.Generic; -using System.IO; -using NuGet.Frameworks; -using NuGet.Packaging; -using NuGet.Versioning; - -namespace RepoTasks.ProjectModel -{ - internal class PackageInfo - { - public PackageInfo(string id, - NuGetVersion version, - IReadOnlyList dependencyGroups, - string source, - string packageType = "Dependency") - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentException(nameof(id)); - } - - Id = id; - Version = version ?? throw new ArgumentNullException(nameof(version)); - PackageType = packageType; - Source = source; - DependencyGroups = dependencyGroups ?? Array.Empty(); - } - - public string Id { get; } - public NuGetVersion Version { get; } - public string PackageType { get; } - /// - /// Can be a https feed or a file path. May be null. - /// - public string Source { get; } - public IReadOnlyList DependencyGroups { get; } - - public override string ToString() => $"{Id}/{Version}"; - } -} diff --git a/build/tasks/ProjectModel/PackageReferenceInfo.cs b/build/tasks/ProjectModel/PackageReferenceInfo.cs deleted file mode 100644 index cea7d566ef80..000000000000 --- a/build/tasks/ProjectModel/PackageReferenceInfo.cs +++ /dev/null @@ -1,27 +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.Collections.Generic; - -namespace RepoTasks.ProjectModel -{ - internal class PackageReferenceInfo - { - public PackageReferenceInfo(string id, string version, bool isImplicitlyDefined) - { - if (string.IsNullOrEmpty(id)) - { - throw new ArgumentException(nameof(id)); - } - - Id = id; - Version = version; - IsImplicitlyDefined = isImplicitlyDefined; - } - - public string Id { get; } - public string Version { get; } - public bool IsImplicitlyDefined { get; } - } -} diff --git a/build/tasks/ProjectModel/PatchPolicy.cs b/build/tasks/ProjectModel/PatchPolicy.cs deleted file mode 100644 index a28451cabb38..000000000000 --- a/build/tasks/ProjectModel/PatchPolicy.cs +++ /dev/null @@ -1,31 +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.Collections.Generic; -using System.Linq; -using NuGet.Frameworks; - -namespace RepoTasks.ProjectModel -{ - [Flags] - internal enum PatchPolicy - { - /// - /// Only produce new package versions if there were changes to product code. - /// - ProductChangesOnly = 1 << 0, - - /// - /// Packages should update in every patch. - /// - AlwaysUpdate = 1 << 1, - - /// - /// Produce new package versions if there were changes to product code, or if one of the package dependencies has updated. - /// - CascadeVersions = 1 << 2, - - AlwaysUpdateAndCascadeVersions = CascadeVersions | AlwaysUpdate, - } -} diff --git a/build/tasks/ProjectModel/ProjectFrameworkInfo.cs b/build/tasks/ProjectModel/ProjectFrameworkInfo.cs deleted file mode 100644 index 35a212f9a12a..000000000000 --- a/build/tasks/ProjectModel/ProjectFrameworkInfo.cs +++ /dev/null @@ -1,22 +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.Collections.Generic; -using System.Linq; -using NuGet.Frameworks; - -namespace RepoTasks.ProjectModel -{ - internal class ProjectFrameworkInfo - { - public ProjectFrameworkInfo(NuGetFramework targetFramework, IReadOnlyDictionary dependencies) - { - TargetFramework = targetFramework ?? throw new ArgumentNullException(nameof(targetFramework)); - Dependencies = dependencies ?? throw new ArgumentNullException(nameof(dependencies)); - } - - public NuGetFramework TargetFramework { get; } - public IReadOnlyDictionary Dependencies { get; } - } -} diff --git a/build/tasks/ProjectModel/ProjectInfo.cs b/build/tasks/ProjectModel/ProjectInfo.cs deleted file mode 100644 index 4f4b7a3a9c04..000000000000 --- a/build/tasks/ProjectModel/ProjectInfo.cs +++ /dev/null @@ -1,47 +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.Collections.Generic; -using System.IO; - -namespace RepoTasks.ProjectModel -{ - internal class ProjectInfo - { - public ProjectInfo(string fullPath, - IReadOnlyList frameworks, - IReadOnlyList tools, - bool isPackable, - string packageId, - string packageVersion) - { - if (!Path.IsPathRooted(fullPath)) - { - throw new ArgumentException("Path must be absolute", nameof(fullPath)); - } - - Frameworks = frameworks ?? throw new ArgumentNullException(nameof(frameworks)); - Tools = tools ?? throw new ArgumentNullException(nameof(tools)); - - FullPath = fullPath; - FileName = Path.GetFileName(fullPath); - Directory = Path.GetDirectoryName(FullPath); - IsPackable = isPackable; - PackageId = packageId; - PackageVersion = packageVersion; - } - - public string FullPath { get; } - public string FileName { get; } - public string Directory { get; } - public string PackageId { get; } - public string PackageVersion { get; } - public bool IsPackable { get; } - - public SolutionInfo SolutionInfo { get; set; } - - public IReadOnlyList Frameworks { get; } - public IReadOnlyList Tools { get; } - } -} diff --git a/build/tasks/ProjectModel/ProjectInfoFactory.cs b/build/tasks/ProjectModel/ProjectInfoFactory.cs deleted file mode 100644 index 40592f30faeb..000000000000 --- a/build/tasks/ProjectModel/ProjectInfoFactory.cs +++ /dev/null @@ -1,137 +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.Collections.Generic; -using System.IO; -using System.Linq; -using Microsoft.Build.Construction; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Execution; -using NuGet.Frameworks; -using RepoTasks.Utilities; -using Microsoft.Build.Utilities; - -namespace RepoTasks.ProjectModel -{ - internal class ProjectInfoFactory - { - private readonly TaskLoggingHelper _logger; - - public ProjectInfoFactory(TaskLoggingHelper logger) - { - _logger = logger ?? throw new ArgumentNullException(nameof(logger)); - } - - public ProjectInfo Create(string path, ProjectCollection projectCollection) - { - var project = GetProject(path, projectCollection); - var instance = project.CreateProjectInstance(ProjectInstanceSettings.ImmutableWithFastItemLookup); - - var targetFrameworks = instance.GetPropertyValue("TargetFrameworks"); - var targetFramework = instance.GetPropertyValue("TargetFramework"); - - var frameworks = new List(); - if (!string.IsNullOrEmpty(targetFrameworks) && string.IsNullOrEmpty(targetFramework)) - { - // multi targeting - foreach (var tfm in targetFrameworks.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) - { - project.SetGlobalProperty("TargetFramework", tfm); - var innerBuild = project.CreateProjectInstance(ProjectInstanceSettings.ImmutableWithFastItemLookup); - - var tfmInfo = new ProjectFrameworkInfo(NuGetFramework.Parse(tfm), GetDependencies(innerBuild)); - - frameworks.Add(tfmInfo); - } - - project.RemoveGlobalProperty("TargetFramework"); - } - else if (!string.IsNullOrEmpty(targetFramework)) - { - var tfmInfo = new ProjectFrameworkInfo(NuGetFramework.Parse(targetFramework), GetDependencies(instance)); - - frameworks.Add(tfmInfo); - } - - var projectDir = Path.GetDirectoryName(path); - - var tools = GetTools(instance).ToArray(); - bool.TryParse(instance.GetPropertyValue("IsPackable"), out var isPackable); - - if (isPackable) - { - // the default packable setting is disabled for projects referencing this package. - isPackable = !frameworks.SelectMany(f => f.Dependencies.Keys).Any(d => d.Equals("Microsoft.NET.Test.Sdk", StringComparison.OrdinalIgnoreCase)); - } - - var packageId = instance.GetPropertyValue("PackageId"); - var packageVersion = instance.GetPropertyValue("PackageVersion"); - - return new ProjectInfo(path, - frameworks, - tools, - isPackable, - packageId, - packageVersion); - } - - private static object _projLock = new object(); - - private static Project GetProject(string path, ProjectCollection projectCollection) - { - var projects = projectCollection.GetLoadedProjects(path); - foreach(var proj in projects) - { - if (proj.GetPropertyValue("DesignTimeBuild") == "true") - { - return proj; - } - } - - var xml = ProjectRootElement.Open(path, projectCollection); - var globalProps = new Dictionary() - { - ["DesignTimeBuild"] = "true", - // Isolate the project from post-restore side effects - ["ExcludeRestorePackageImports"] = "true", - }; - - var project = new Project(xml, - globalProps, - toolsVersion: "15.0", - projectCollection: projectCollection) - { - IsBuildEnabled = false - }; - - return project; - } - - private IReadOnlyDictionary GetDependencies(ProjectInstance project) - { - var references = new Dictionary(StringComparer.OrdinalIgnoreCase); - foreach (var item in project.GetItems("PackageReference")) - { - bool.TryParse(item.GetMetadataValue("IsImplicitlyDefined"), out var isImplicit); - - var info = new PackageReferenceInfo(item.EvaluatedInclude, item.GetMetadataValue("Version"), isImplicit); - - if (references.ContainsKey(info.Id)) - { - _logger.LogKoreBuildWarning(project.ProjectFileLocation.File, KoreBuildErrors.DuplicatePackageReference, $"Found a duplicate PackageReference for {info.Id}. Restore results may be unpredictable."); - } - - references[info.Id] = info; - } - - return references; - } - - private static IEnumerable GetTools(ProjectInstance project) - { - return project.GetItems("DotNetCliToolReference").Select(item => - new DotNetCliReferenceInfo(item.EvaluatedInclude, item.GetMetadataValue("Version"))); - } - } -} diff --git a/build/tasks/ProjectModel/SolutionInfo.cs b/build/tasks/ProjectModel/SolutionInfo.cs deleted file mode 100644 index cacc5213671c..000000000000 --- a/build/tasks/ProjectModel/SolutionInfo.cs +++ /dev/null @@ -1,44 +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.Collections.Generic; -using System.IO; - -namespace RepoTasks.ProjectModel -{ - internal class SolutionInfo - { - public SolutionInfo(string fullPath, string configName, IReadOnlyList projects, bool shouldBuild, bool isPatching) - { - if (string.IsNullOrEmpty(fullPath)) - { - throw new ArgumentException(nameof(fullPath)); - } - - if (string.IsNullOrEmpty(configName)) - { - throw new ArgumentException(nameof(configName)); - } - - FullPath = fullPath; - Directory = Path.GetDirectoryName(fullPath); - ConfigName = configName; - Projects = projects ?? throw new ArgumentNullException(nameof(projects)); - ShouldBuild = shouldBuild; - IsPatching = isPatching; - foreach (var proj in Projects) - { - proj.SolutionInfo = this; - } - } - - public string FullPath { get; } - public string Directory { get; } - public string ConfigName { get; } - public IReadOnlyList Projects { get; } - public bool ShouldBuild { get; } - public bool IsPatching { get; } - public PatchPolicy PatchPolicy { get; set; } - } -} diff --git a/build/tasks/ProjectModel/SolutionInfoFactory.cs b/build/tasks/ProjectModel/SolutionInfoFactory.cs deleted file mode 100644 index aac69cff0894..000000000000 --- a/build/tasks/ProjectModel/SolutionInfoFactory.cs +++ /dev/null @@ -1,136 +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.Collections.Concurrent; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Build.Construction; -using Microsoft.Build.Evaluation; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using RepoTasks.Utilities; - -namespace RepoTasks.ProjectModel -{ - internal class SolutionInfoFactory - { - private readonly TaskLoggingHelper _logger; - private readonly IBuildEngine4 _buildEngine; - - public SolutionInfoFactory(TaskLoggingHelper logger, IBuildEngine4 buildEngine) - { - _logger = logger; - _buildEngine = buildEngine; - } - - public IReadOnlyList Create(IEnumerable solutionItems, IDictionary properties, string defaultConfig, CancellationToken ct) - { - var timer = Stopwatch.StartNew(); - - var solutions = new ConcurrentBag(); - - Parallel.ForEach(solutionItems, solution => - { - if (ct.IsCancellationRequested) - { - return; - } - - var solutionFile = solution.ItemSpec.Replace('\\', '/'); - var solutionProps = new Dictionary(properties, StringComparer.OrdinalIgnoreCase); - foreach (var prop in MSBuildListSplitter.GetNamedProperties(solution.GetMetadata("AdditionalProperties"))) - { - solutionProps[prop.Key] = prop.Value; - } - - if (!solutionProps.TryGetValue("Configuration", out var configName)) - { - solutionProps["Configuration"] = configName = defaultConfig; - } - - var key = $"SlnInfo:{solutionFile}:{configName}"; - var obj = _buildEngine.GetRegisteredTaskObject(key, RegisteredTaskObjectLifetime.Build); - - if (obj is SolutionInfo cachedSlnInfo) - { - solutions.Add(cachedSlnInfo); - return; - } - - _logger.LogMessage($"Analyzing {solutionFile} ({configName})"); - var projects = new ConcurrentBag(); - var projectFiles = GetProjectsForSolutionConfig(solutionFile, configName); - using (var projCollection = new ProjectCollection(solutionProps) { IsBuildEnabled = false }) - { - Parallel.ForEach(projectFiles, projectFile => - { - if (ct.IsCancellationRequested) - { - return; - } - - try - { - projects.Add(new ProjectInfoFactory(_logger).Create(projectFile, projCollection)); - } - catch (Exception ex) - { - _logger.LogErrorFromException(ex); - } - }); - } - - bool.TryParse(solution.GetMetadata("Build"), out var shouldBuild); - bool.TryParse(solution.GetMetadata("IsPatching"), out var isPatching); - - var solutionInfo = new SolutionInfo( - solutionFile, - configName, - projects.ToArray(), - shouldBuild, - isPatching); - - _buildEngine.RegisterTaskObject(key, solutionInfo, RegisteredTaskObjectLifetime.Build, allowEarlyCollection: true); - - solutions.Add(solutionInfo); - }); - - timer.Stop(); - _logger.LogMessage(MessageImportance.High, $"Finished design-time build in {timer.ElapsedMilliseconds}ms"); - return solutions.ToArray(); - } - - private IList GetProjectsForSolutionConfig(string filePath, string configName) - { - var sln = SolutionFile.Parse(filePath); - - if (string.IsNullOrEmpty(configName)) - { - configName = sln.GetDefaultConfigurationName(); - } - - var projects = new List(); - - var config = sln.SolutionConfigurations.FirstOrDefault(c => c.ConfigurationName == configName); - if (config == null) - { - throw new InvalidOperationException($"A solution configuration by the name of '{configName}' was not found in '{filePath}'"); - } - - foreach (var project in sln.ProjectsInOrder - .Where(p => - p.ProjectType == SolutionProjectType.KnownToBeMSBuildFormat // skips solution folders - && p.ProjectConfigurations.TryGetValue(config.FullName, out var projectConfig) - && projectConfig.IncludeInBuild)) - { - projects.Add(project.AbsolutePath.Replace('\\', '/')); - } - - return projects; - } - } -} diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 20cbf6cce8ff..7f7ee6f701db 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -2,14 +2,15 @@ - netcoreapp2.0 + netcoreapp2.0 + net461 - - + + diff --git a/build/tasks/Utilities/ArtifactInfo.cs b/build/tasks/Utilities/ArtifactInfo.cs deleted file mode 100644 index 7116daae487f..000000000000 --- a/build/tasks/Utilities/ArtifactInfo.cs +++ /dev/null @@ -1,70 +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 NuGet.Frameworks; -using NuGet.Packaging; -using NuGet.Packaging.Core; -using NuGet.Versioning; -using Microsoft.Build.Framework; -using RepoTasks.ProjectModel; - -namespace RepoTasks.Utilities -{ - internal abstract class ArtifactInfo - { - public static ArtifactInfo Parse(ITaskItem item) - { - ArtifactInfo info; - switch (item.GetMetadata("ArtifactType").ToLowerInvariant()) - { - case "nugetpackage": - info = new Package { PackageInfo = GetPackageInfo(item) }; - break; - case "nugetsymbolspackage": - info = new Package { PackageInfo = GetPackageInfo(item), IsSymbolsArtifact = true }; - break; - default: - return UnknownType.Singleton; - } - - info.RepositoryRoot = item.GetMetadata("RepositoryRoot")?.TrimEnd(new [] { '\\', '/' }); - - if (!string.IsNullOrEmpty(info.RepositoryRoot)) - { - info.RepoName = Path.GetFileName(info.RepositoryRoot); - } - - return info; - } - - public string RepositoryRoot { get; private set; } - public string RepoName { get; private set; } - - public class UnknownType : ArtifactInfo - { - private UnknownType() { } - public static UnknownType Singleton { get; } = new UnknownType(); - } - - public class Package : ArtifactInfo - { - public PackageInfo PackageInfo { get; set; } - public bool IsSymbolsArtifact { get; set; } - } - - private static PackageInfo GetPackageInfo(ITaskItem item) - { - return new PackageInfo( - item.GetMetadata("PackageId"), - NuGetVersion.Parse(item.GetMetadata("Version")), - string.IsNullOrEmpty(item.GetMetadata("TargetFramework")) - ? MSBuildListSplitter.SplitItemList(item.GetMetadata("TargetFramework")).Select(s => new PackageDependencyGroup(NuGetFramework.Parse(s), Array.Empty())).ToArray() - : new [] { new PackageDependencyGroup(NuGetFramework.Parse(item.GetMetadata("TargetFramework")), Array.Empty()) }, - Path.GetDirectoryName(item.ItemSpec), - item.GetMetadata("PackageType")); - } - } -} diff --git a/korebuild.json b/korebuild.json index 7e75ef053ad7..4a2fc587c37c 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,10 +1,24 @@ { "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json", "channel": "release/2.1", + "msbuildType": "full", "toolsets": { "nodejs": { "minVersion": "8.0", "required": true + }, + "visualstudio": { + "required": [ + "Windows" + ], + "includePrerelease": true, + "versionRange": "[15.8, 16.0)", + "requiredWorkloads": [ + "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.ATL", + "Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop" + ] } } } diff --git a/scripts/GenerateTags.ps1 b/scripts/GenerateTags.ps1 deleted file mode 100755 index f0866ffcab6d..000000000000 --- a/scripts/GenerateTags.ps1 +++ /dev/null @@ -1,128 +0,0 @@ -#!/usr/bin/env pwsh - -<# -.SYNOPSIS - Generates a tag on this repo and adds a tag for each submodule that corresponds - to the value in version.props -.PARAMETER Push - Push the tag to origin -.PARAMETER OutFile - When specified, generate a .csv with repo names and tags -.PARAMETER WhatIf - Dry run -#> -[cmdletbinding(PositionalBinding = $false, SupportsShouldProcess = $true)] -param( - [switch]$Push, - [string]$OutFile -) - -$ErrorActionPreference = 'Stop' -Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" -Set-StrictMode -Version 1 - -function New-GitTag { - [cmdletbinding(SupportsShouldProcess = $true)] - param( - [Parameter(Mandatory = $true)] - [string]$Repo, - [Parameter(Mandatory = $true)] - [string]$Tag - ) - - Push-Location $Repo - try { - git show-ref --tags --verify "refs/tags/$Tag" -q - $existingTag = $? - - if ($existingTag) { - Write-Warning "${Repo}: Tag '$Tag' already exists. Skipped adding tag" - } - else { - if ($PSCmdlet.ShouldProcess($Repo, "Tag $Tag")) { - Invoke-Block { & git tag -m "v$Tag" $Tag HEAD } - Write-Host -f Magenta "${Repo}: added tag '$Tag'" - } - - if ($Push -and $PSCmdlet.ShouldProcess($Repo, "Push tag $Tag to origin")) { - Invoke-Block { & git push origin refs/tags/$Tag } - } - } - } - finally { - Pop-Location - } -} - -# -# Gets the package version by invoking KoreBuild on a repo with a custom target that spits out the package version -# -function Get-PackageVersion([string]$repoRoot) { - $buildScript = if (-not $IsCoreCLR -or $IsWindows) { 'build.ps1' } else { 'build.sh' } - $inspectTarget = "/p:CustomAfterKoreBuildTargets=$PSScriptRoot/GetPackageVersion.targets" - Write-Verbose "Running `"$repoRoot/$buildScript`" $inspectTarget /v:m /p:IsFinalBuild=true /t:Noop /t:GetPackageVersion" - # Add the /t:Noop target which may be used by the bootstrapper to skip unimportant initialization - $output = & "$repoRoot/$buildScript" $inspectTarget /v:m /p:IsFinalBuild=true /t:Noop /t:GetPackageVersion - $output | out-string | Write-Verbose - if (-not $? -or $LASTEXITCODE -ne 0) { - throw "$buildScript failed on $repoRoot. Exit code $LASTEXITCODE" - } - $packageVersion = $output | where-object { $_ -like '*PackageVersion=*' } | select-object -first 1 - $packageVersion = $packageVersion -replace 'PackageVersion=', '' - if ($packageVersion) { $packageVersion = $packageVersion.Trim() } - if (-not $packageVersion) { - throw "Could not determine final package version for $repoRoot" - } - return $packageVersion.Trim() -} - -$repoRoot = Resolve-Path "$PSScriptRoot/../" - -Write-Warning "Make sure you have run ``git submodule update`` first to pin the submodules to the correct commit" -if (-not $PSCmdlet.ShouldContinue("Continue?", "This will apply tags to all submodules")) { - Write-Host "Exiting" - exit 1 -} - - -$repoTag = Get-PackageVersion $repoRoot -New-GitTag $repoRoot $repoTag -WhatIf:$WhatIfPreference - -$tags = @([pscustomobject] @{ - repo = $(git config remote.origin.url) - tag = $repoTag - commit = $(git rev-parse HEAD) - }) - -Get-Submodules $repoRoot | ForEach-Object { - $modPath = $_.path - $module = $_.module - if (-not (Test-Path (Join-Path $_.path 'version.props'))) { - Write-Warning "$module does not have a version.props file. Skipping" - return - } - - try { - $tag = Get-PackageVersion $_.path - if ($tag -ne $repoTag) { - Write-Warning "${module}: version ($tag) does not match repo ($repoTag)" - } - $tags += [pscustomobject] @{ - repo = $_.remote - tag = $tag - commit = $_.commit - } - } - catch { - Write-Warning "${module}: Could not automatically determine tag for $modPath. Skipping" - return - } - - New-GitTag $_.path $tag -WhatIf:$WhatIfPreference -} - -$tags | Format-Table - -if ($OutFile) { - $tags | Select-Object -Property * | Export-Csv -Path $OutFile -WhatIf:$false -NoTypeInformation -} diff --git a/scripts/GetPackageVersion.targets b/scripts/GetPackageVersion.targets deleted file mode 100644 index 061c1140275b..000000000000 --- a/scripts/GetPackageVersion.targets +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/scripts/ListRepoVersions.ps1 b/scripts/ListRepoVersions.ps1 deleted file mode 100644 index 06ba39916684..000000000000 --- a/scripts/ListRepoVersions.ps1 +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env pwsh - -<# -.SYNOPSIS - Lists the version of all submodules and this repo -.PARAMETER Shipping - Only list repos that are shipping -#> -[cmdletbinding(SupportsShouldProcess = $true)] -param( - [switch]$Shipping = $false -) - -Set-StrictMode -Version 2 -$ErrorActionPreference = 'Stop' - -Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" - -Assert-Git - -$RepoRoot = Resolve-Path "$PSScriptRoot/../" - -Get-Submodules $RepoRoot -Shipping:$Shipping | Format-Table -Property 'module','versionPrefix' diff --git a/scripts/PatchVersionPrefix.ps1 b/scripts/PatchVersionPrefix.ps1 deleted file mode 100755 index d8cce864876e..000000000000 --- a/scripts/PatchVersionPrefix.ps1 +++ /dev/null @@ -1,111 +0,0 @@ -#!/usr/bin/env pwsh -c - -<# -.SYNOPSIS - Updates the version.props file in repos to a newer patch version -.PARAMETER Repos - A list of the repositories that should be patched -.PARAMETER Mode - Version bump options: Major, Minor, Patch -.PARAMETER VersionSuffix - The version suffix to use -#> -[cmdletbinding(SupportsShouldProcess = $true)] -param( - [Parameter(Mandatory = $true)] - [string[]]$Repos, - [Parameter(Mandatory = $true)] - [ValidateSet('Major', 'Minor', 'Patch')] - [string]$Mode, - [string]$VersionSuffix = $null, - [switch]$NoCommit -) - -$ErrorActionPreference = 'Stop' - -Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" - -function SetVersionSuffix([System.Xml.XmlNode]$node) { - if (-not $node) { - return - } - $node.InnerText = $VersionSuffix - return "Setting $($node.Name) to $VersionSuffix" -} - -function BumpVersion([System.Xml.XmlNode]$node) { - if (-not $node) { - return - } - [version] $version = $node.InnerText - - $experimental = $version.Major -eq 0 - - switch ($mode) { - { ($_ -ne 'Patch') -and $experimental} { - $node.InnerText = "{0}.{1}.{2}" -f $version.Major, ($version.Minor + 1), 0 - } - { ($_ -eq 'Major') -and -not $experimental } { - $node.InnerText = "{0}.{1}.{2}" -f ($version.Major + 1), 0, 0 - } - { ($_ -eq 'Minor') -and -not $experimental } { - $node.InnerText = "{0}.{1}.{2}" -f $version.Major, ($version.Minor + 1), 0 - } - 'Patch' { - $node.InnerText = "{0}.{1}.{2}" -f $version.Major, $version.Minor, ($version.Build + 1) - } - default { - throw "Could not figure out how to apply patch policy $mode" - } - } - return "Bumping version from $version to $($node.InnerText)" -} - -foreach ($repo in $Repos) { - $repoPath = "$PSScriptRoot/../modules/$repo" - Push-Location $repoPath - try - { - $path = "$repoPath/version.props" - Write-Host -ForegroundColor Magenta "Updating $repo" - if (-not (Test-Path $path)) { - Write-Warning "$path does not exist" - continue - } - $path = Resolve-Path $path - Write-Verbose "$path" - [xml] $xml = LoadXml $path - - $suffix = $xml.SelectSingleNode('/Project/PropertyGroup/VersionSuffix') - if (-not $suffix) { - write-error "$path does not have VersionSuffix" - } - - if ($VersionSuffix) { - SetVersionSuffix $xml.SelectSingleNode('/Project/PropertyGroup/VersionSuffix') | write-host - SetVersionSuffix $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalProjectVersionSuffix') | write-host - SetVersionSuffix $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalVersionSuffix') | write-host - } - - $versionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/VersionPrefix') - $epxVersionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalProjectVersionPrefix') - $exVersionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalVersionPrefix') - BumpVersion $epxVersionPrefix | write-host - BumpVersion $exVersionPrefix | write-host - $message = BumpVersion $versionPrefix - Write-Host $message - - if ($PSCmdlet.ShouldProcess("Update $path")) { - SaveXml $xml $path - if (-not $NoCommit) { - Invoke-Block { & git add $path } - Invoke-Block { & git commit -m $message } - } - } - } - finally - { - Pop-Location - } -} - diff --git a/scripts/TagRepos.ps1 b/scripts/TagRepos.ps1 deleted file mode 100644 index 2bb595027c6b..000000000000 --- a/scripts/TagRepos.ps1 +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env pwsh - -<# -.SYNOPSIS - Tags each repo according to VersionPrefix in version.props of that repo -.PARAMETER Push - Push all updated tags -.PARAMETER ForceUpdateTag - This will call git tag --force -#> -[cmdletbinding(SupportsShouldProcess = $true)] -param( - [switch]$Push = $false, - [switch]$ForceUpdateTag = $false -) - -Set-StrictMode -Version 2 -$ErrorActionPreference = 'Stop' - -Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" - -Assert-Git - -$RepoRoot = Resolve-Path "$PSScriptRoot/../" - -Get-Submodules $RepoRoot -Shipping | % { - Push-Location $_.path | Out-Null - try { - - if (-not $_.versionPrefix) { - Write-Warning "Could not determine tag version for $(_.path)" - } - else { - $tag = $_.versionPrefix - Write-Host "$($_.module) => $tag" - - $gitTagArgs = @() - if ($ForceUpdateTag) { - $gitTagArgs += '--force' - } - - Invoke-Block { & git tag @gitTagArgs $tag } - - if ($Push) { - $gitPushArgs = @() - if ($WhatIfPreference) { - $gitPushArgs += '--dry-run' - } - Invoke-Block { & git push @gitPushArgs origin "refs/tags/${tag}" } - } - - if ($WhatIfPreference) { - Invoke-Block { & git tag -d $tag } | Out-Null - } - } - } - catch { - Write-Host -ForegroundColor Red "Could not update $_" - throw - } - finally { - Pop-Location - } -} - - diff --git a/scripts/UpdateDependenciesCoreFx.ps1 b/scripts/UpdateDependenciesCoreFx.ps1 deleted file mode 100644 index 3a4e2b9903c9..000000000000 --- a/scripts/UpdateDependenciesCoreFx.ps1 +++ /dev/null @@ -1,134 +0,0 @@ - -[CmdletBinding()] -param( - [switch]$NoCommit, - [string]$GithubEmail, - [string]$GithubUsername, - [string]$GithubToken -) -# This script only works against dev/master at the moment because only master prod-con builds allow you to access their results before the entire chain is finished. - -$ErrorActionPreference = 'Stop' -Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" -Set-StrictMode -Version 1 -[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 - -$githubRaw = "https://raw.githubusercontent.com" -$versionsRepo = "dotnet/versions" -$versionsBranch = "master" - -$coreSetupRepo = "dotnet/core-setup" -$coreFxRepo = "dotnet/corefx" - -$coreSetupVersions = "$githubRaw/$versionsRepo/$versionsBranch/build-info/$coreSetupRepo/master/Latest_Packages.txt" - -$tempDir = "$PSScriptRoot/../obj" - -mkdir -Path $tempDir -ErrorAction Ignore - -$localCoreSetupVersions = "$tempDir/coresetup.packages" -Write-Host "Downloading $coreSetupVersions to $localCoreSetupVersions" -Invoke-WebRequest -OutFile $localCoreSetupVersions -Uri $coreSetupVersions - -$msNetCoreAppPackageVersion = $null -$msNetCoreAppPackageName = "Microsoft.NETCore.App" - -Set-GitHubInfo $GithubToken $GithubUsername $GithubEmail - -$variables = @{} - -foreach ($line in Get-Content $localCoreSetupVersions) { - if ($line.StartsWith("$msNetCoreAppPackageName ")) { - $msNetCoreAppPackageVersion = $line.Trim("$msNetCoreAppPackageName ") - } - $parts = $line.Split(' ') - $packageName = $parts[0] - - $varName = "$packageName" + "PackageVersion" - $varName = $varName.Replace('.', '') - - $packageVersion = $parts[1] - if ($variables[$varName]) { - if ($variables[$varName].Where( {$_ -eq $packageVersion}, 'First').Count -eq 0) { - $variables[$varName] += $packageVersion - } - } - else { - $variables[$varName] = @($packageVersion) - } -} - -if (!$msNetCoreAppPackageVersion) { - Throw "$msNetCoreAppPackageName was not in $coreSetupVersions" -} - -$coreAppDownloadLink = "https://dotnet.myget.org/F/dotnet-core/api/v2/package/$msNetCoreAppPackageName/$msNetCoreAppPackageVersion" -$netCoreAppNupkg = "$tempDir/microsoft.netcore.app.zip" -Invoke-WebRequest -OutFile $netCoreAppNupkg -Uri $coreAppDownloadLink -$expandedNetCoreApp = "$tempDir/microsoft.netcore.app/" -Expand-Archive -Path $netCoreAppNupkg -DestinationPath $expandedNetCoreApp -Force -$versionsTxt = "$expandedNetCoreApp/$msNetCoreAppPackageName.versions.txt" - -$versionsCoreFxCommit = $null -foreach ($line in Get-Content $versionsTxt) { - if ($line.StartsWith("dotnet/versions/corefx")) { - $versionsCoreFxCommit = $line.Split(' ')[1] - break - } -} - -if (!$versionsCoreFxCommit) { - Throw "no 'dotnet/versions/corefx' in versions.txt of Microsoft.NETCore.App" -} - -$coreFxVersionsUrl = "$githubRaw/$versionsRepo/$versionsCoreFxCommit/build-info/$coreFxRepo/$versionsBranch/Latest_Packages.txt" -$localCoreFxVersions = "$tempDir/$corefx.packages" -Invoke-WebRequest -OutFile $localCoreFxVersions -Uri $coreFxVersionsUrl - -foreach ($line in Get-Content $localCoreFxVersions) { - $parts = $line.Split(' ') - - $packageName = $parts[0] - - $varName = "$packageName" + "PackageVersion" - $varName = $varName.Replace('.', '') - $packageVersion = $parts[1] - if ($variables[$varName]) { - if ($variables[$varName].Where( {$_ -eq $packageVersion}, 'First').Count -eq 0) { - $variables[$varName] += $packageVersion - } - } - else { - $variables[$varName] = @($packageVersion) - } -} - -$depsPath = Resolve-Path "$PSScriptRoot/../build/dependencies.props" -Write-Host "Loading deps from $depsPath" -[xml] $dependencies = LoadXml $depsPath - -if (-not $NoCommit) { - $baseBranch = "release/2.1" - Invoke-Block { & git fetch origin } - - $currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD } - $destinationBranch = "dotnetbot/UpdateCoreFxDeps" - - Invoke-Block { & git checkout -tb $destinationBranch "origin/$baseBranch" } -} - -try { - $updatedVars = UpdateVersions $variables $dependencies $depsPath - if (-not $NoCommit) { - $body = CommitUpdatedVersions $updatedVars $dependencies $depsPath - - if ($body) { - CreatePR "aspnet" $GithubUsername $baseBranch $destinationBranch $body $GithubToken - } - } -} -finally { - if (-not $NoCommit) { - Invoke-Block { & git checkout $currentBranch } - } -} diff --git a/scripts/UpdateRepos.ps1 b/scripts/UpdateRepos.ps1 deleted file mode 100755 index d45002e144ef..000000000000 --- a/scripts/UpdateRepos.ps1 +++ /dev/null @@ -1,147 +0,0 @@ -#!/usr/bin/env pwsh - -<# -.SYNOPSIS - Updates each submodule this repo builds to new dependencies.props. -.PARAMETER Source - The NuGet package source to find the lineup on. -.PARAMETER LineupID - The ID of the Lineup to determine which versions to use. -.PARAMETER LineupVersion - The version of the Lineup to be used. -.PARAMETER NoPush - Make commits without pusing. -.PARAMETER GitAuthorName - The author name to use in the commit message. (Optional) -.PARAMETER GitAuthorEmail - The author email to use in the commit message. (Optional) -.PARAMETER Force - Specified this to push commits without prompting. -.PARAMETER GitCommitArgs - Any remaining arguments are passed as arguments to 'git commit' actions in each repo. -#> -[cmdletbinding(SupportsShouldProcess = $true)] -param( - [Parameter(Mandatory = $true)] - [string]$Source, - [Parameter(Mandatory = $true)] - [string]$LineupID, - [Parameter(Mandatory = $true)] - [string]$LineupVersion, - [switch]$NoPush, - [string]$GitAuthorName = $null, - [string]$GitAuthorEmail = $null, - [switch]$Force, - [string[]]$GitCommitArgs = @() -) - -$ErrorActionPreference = 'Stop' -Set-StrictMode -Version 2 - -Import-Module "$PSScriptRoot/common.psm1" -Scope Local -Force - -$RepoRoot = Resolve-Path "$PSScriptRoot\.." -$ModuleDirectory = Join-Path $RepoRoot "modules" - -$gitConfigArgs = @() -if ($GitAuthorName) { - $gitConfigArgs += '-c', "user.name=$GitAuthorName" -} - -if ($GitAuthorEmail) { - $gitConfigArgs += '-c', "user.email=$GitAuthorEmail" -} - -Push-Location $ModuleDirectory -try { - - $build_errors = @() - $submodules = Get-Submodules $RepoRoot - foreach ($submodule in $submodules) { - Push-Location $submodule.path - try { - Invoke-Block { & git fetch } - Invoke-Block { & git checkout origin/$($submodule.branch) } - $depsFile = Join-Path (Join-Path $($submodule.path) "build") "dependencies.props" - - if (!(Test-Path $depsFile)) { - Write-Warning "No build\dependencies.props file exists for '$($submodule.module)'." - continue - } - - $koreBuildLock = "korebuild-lock.txt" - - $repoKoreBuildLock = (Join-Path $RepoRoot $koreBuildLock) - $submoduleKoreBuildLock = (Join-Path $submodule.path $koreBuildLock) - - Copy-Item $repoKoreBuildLock $submoduleKoreBuildLock -Force - - Write-Verbose "About to update dependencies.props for $($submodule.module)" - & .\run.ps1 upgrade deps --source $Source --id $LineupID --version $LineupVersion --deps-file $depsFile - - Invoke-Block { & git @gitConfigArgs add $depsFile $koreBuildLock } - - # If there were any changes test and push. - & git diff --cached --quiet ./ - if ($LASTEXITCODE -ne 0) { - Invoke-Block { & git @gitConfigArgs commit --quiet -m "Update dependencies.props`n`n[auto-updated: dependencies]" @GitCommitArgs } - - # Prepare this submodule for push - $sshUrl = "git@github.com:aspnet/$($submodule.module)" - Invoke-Block { & git remote set-url --push origin $sshUrl } - - # Test the submodule - try { - Invoke-Block { & .\run.ps1 default-build /p:SkipTests=true } - } - catch { - Write-Warning "Error in $($submodule.module): $_" - $build_errors += @{ - Repo = $submodule.module - Message = $_ - } - continue - } - - # Push the changes - if (-not $NoPush -and ($Force -or ($PSCmdlet.ShouldContinue("Pushing updates to repos.", 'Push the changes to these repos?')))) { - try { - Invoke-Block { & git @gitConfigArgs push origin HEAD:$($submodule.branch)} - } - catch { - Write-Warning "Error in pushing $($submodule.module): $_" - $build_errors += @{ - Repo = $submodule.module - Message = $_ - } - continue - } - } - } - else { - Write-Host "No changes in $($submodule.module)" - } - } - catch { - Write-Warning "Error in $($submodule.module): $_" - $build_errors += @{ - Repo = $submodule.module - Message = $_ - } - } - finally { - Pop-Location - } - } - - if ($build_errors.Count -gt 0 ) { - Write-Warning "The following repos failed:" - foreach ($error in $build_errors) { - Write-Warning " - $($error.Repo)" - } - throw "Failed to build" - } -} -finally { - Pop-Location -} diff --git a/scripts/requirements.txt b/scripts/requirements.txt deleted file mode 100644 index a550da3e6492..000000000000 --- a/scripts/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -PyYAML==3.12 -termcolor==1.1.0 diff --git a/scripts/update_travis_appveyor_yml.py b/scripts/update_travis_appveyor_yml.py deleted file mode 100755 index e77bcc25c3d1..000000000000 --- a/scripts/update_travis_appveyor_yml.py +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env python3 - -import collections -import glob -import yaml -from os import path -from termcolor import colored, cprint -from yaml.constructor import Constructor - -def dump_format(dump, tag, mapping, flow_style=None): - """ - Better output formatting for YAML dictionaries - """ - value = [] - node = yaml.MappingNode(tag, value, flow_style=flow_style) - if dump.alias_key is not None: - dump.represented_objects[dump.alias_key] = node - best_style = True - if hasattr(mapping, 'items'): - mapping = mapping.items() - for item_key, item_value in mapping: - node_key = dump.represent_data(item_key) - node_value = dump.represent_data(item_value) - if not (isinstance(node_key, yaml.ScalarNode) and not node_key.style): - best_style = False - if not (isinstance(node_value, yaml.ScalarNode) and not node_value.style): - best_style = False - value.append((node_key, node_value)) - if flow_style is None: - if dump.default_flow_style is not None: - node.flow_style = dump.default_flow_style - else: - node.flow_style = best_style - return node - - -def add_bool_as_scalar(self, node): - """ - Don't auto-parse boolean values - """ - if node.value == 'true' or node.value == 'false' : - return self.construct_yaml_bool(node) - return self.construct_scalar(node) - -_mapping_tag = yaml.resolver.BaseResolver.DEFAULT_MAPPING_TAG - -def dict_representer(dumper, data): - return dumper.represent_mapping(_mapping_tag, data.iteritems()) - - -def dict_constructor(loader, node): - return collections.OrderedDict(loader.construct_pairs(node)) - -def update(pattern, updater): - print('\n\n\n') - cprint(pattern, 'magenta') - - for f in glob.glob(path.join(repo_root, "modules", "*", pattern)): - yml = path.join(repo_root, f) - - if not path.exists(yml): - cprint("File does not exist: {}".format(yml), 'red') - continue - - print("Updating {}".format(yml)) - document = yaml.load(open(yml, 'r')) - document = updater(document) - yml_file = open(yml, 'w') - yml_file.write(yaml.safe_dump(document, default_flow_style=False, indent=2)) - yml_file.close() - -# -# Config yaml parser -# - -# Do not reorder keys in yaml file -yaml.add_representer(collections.OrderedDict, dict_representer) -yaml.add_constructor(_mapping_tag, dict_constructor) -# Pretty print dictionaries -yaml.SafeDumper.add_representer(collections.OrderedDict, - lambda dumper, value: dump_format(dumper, u'tag:yaml.org,2002:map', value)) -# Don't parse booleans - treat them as scalars -yaml.Loader.add_constructor(u'tag:yaml.org,2002:bool', add_bool_as_scalar) -yaml.SafeLoader.add_constructor(u'tag:yaml.org,2002:bool', add_bool_as_scalar) - -# -# Main -# - -repo_root = path.dirname(path.dirname(path.abspath(__file__))) - -def transform_yaml_doc(document): - if not 'branches' in document: - document['branches'] = {} - document['branches']['only'] = [ - 'dev', '/^release\/.*$/', '/^(.*\/)?ci-.*$/'] - return document - -update(".travis.yml", transform_yaml_doc) -update(".appveyor.yml", transform_yaml_doc) diff --git a/src/AADIntegration/build/repo.props b/src/AADIntegration/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/AADIntegration/build/repo.props +++ b/src/AADIntegration/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/Antiforgery/build/repo.props b/src/Antiforgery/build/repo.props index 6c9c88ab01ba..1dc8b8100d75 100644 --- a/src/Antiforgery/build/repo.props +++ b/src/Antiforgery/build/repo.props @@ -1,12 +1,6 @@ - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/AuthSamples/build/repo.props b/src/AuthSamples/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/AuthSamples/build/repo.props +++ b/src/AuthSamples/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/AzureIntegration/build/repo.props b/src/AzureIntegration/build/repo.props index 9c56de94ffad..556970f5b29a 100644 --- a/src/AzureIntegration/build/repo.props +++ b/src/AzureIntegration/build/repo.props @@ -5,11 +5,6 @@ Microsoft $(RepositoryRoot)test\Microsoft.AspNetCore.AzureAppServices.FunctionalTests\Microsoft.AspNetCore.AzureAppServices.FunctionalTests.csproj - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json diff --git a/src/CORS/build/repo.props b/src/CORS/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/CORS/build/repo.props +++ b/src/CORS/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/IISIntegration/build/repo.props b/src/IISIntegration/build/repo.props index c3e3c1c2275b..780afe4e43b3 100644 --- a/src/IISIntegration/build/repo.props +++ b/src/IISIntegration/build/repo.props @@ -16,13 +16,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/Identity/build/repo.props b/src/Identity/build/repo.props index b4c0d5f738f8..07b7cc25b04e 100644 --- a/src/Identity/build/repo.props +++ b/src/Identity/build/repo.props @@ -5,12 +5,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - diff --git a/src/JavaScriptServices/build/repo.props b/src/JavaScriptServices/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/JavaScriptServices/build/repo.props +++ b/src/JavaScriptServices/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/MetaPackages/build/repo.props b/src/MetaPackages/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/MetaPackages/build/repo.props +++ b/src/MetaPackages/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/MusicStore/build/repo.props b/src/MusicStore/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/MusicStore/build/repo.props +++ b/src/MusicStore/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/Mvc/build/repo.props b/src/Mvc/build/repo.props index 53e1be33f03d..d672599d6ade 100644 --- a/src/Mvc/build/repo.props +++ b/src/Mvc/build/repo.props @@ -10,12 +10,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - diff --git a/src/MvcPrecompilation/build/repo.props b/src/MvcPrecompilation/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/MvcPrecompilation/build/repo.props +++ b/src/MvcPrecompilation/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/PackageArchive/Directory.Build.props b/src/PackageArchive/Directory.Build.props index 3a70818a8df3..f1b37df068ee 100644 --- a/src/PackageArchive/Directory.Build.props +++ b/src/PackageArchive/Directory.Build.props @@ -1,6 +1,9 @@ - + + + + true diff --git a/src/Razor/build/VSIX.targets b/src/Razor/build/VSIX.targets index febfc39d48b3..09b73d8b8912 100644 --- a/src/Razor/build/VSIX.targets +++ b/src/Razor/build/VSIX.targets @@ -1,6 +1,6 @@  - true + false $(RestoreDependsOn);RestoreVSIX $(PackageDependsOn);PackageVSIX $(GetArtifactInfoDependsOn);GetVSIXArtifactInfo @@ -18,7 +18,7 @@ Condition="'$(OS)'=='Windows_NT'" /> - + diff --git a/src/Razor/build/repo.props b/src/Razor/build/repo.props index ec177662e45b..82355a1443f5 100644 --- a/src/Razor/build/repo.props +++ b/src/Razor/build/repo.props @@ -18,13 +18,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/ResponseCaching/build/repo.props b/src/ResponseCaching/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/ResponseCaching/build/repo.props +++ b/src/ResponseCaching/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/Routing/build/repo.props b/src/Routing/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/Routing/build/repo.props +++ b/src/Routing/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/Security/build/repo.props b/src/Security/build/repo.props index a4f86fb2f689..2ae30982a62f 100644 --- a/src/Security/build/repo.props +++ b/src/Security/build/repo.props @@ -4,12 +4,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - diff --git a/src/ServerTests/build/repo.props b/src/ServerTests/build/repo.props index c8bd413e1ed8..96c127058569 100644 --- a/src/ServerTests/build/repo.props +++ b/src/ServerTests/build/repo.props @@ -4,12 +4,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - diff --git a/src/Session/build/repo.props b/src/Session/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/Session/build/repo.props +++ b/src/Session/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/SignalR/build/repo.props b/src/SignalR/build/repo.props index 38e1626110d7..f00e5ccca051 100644 --- a/src/SignalR/build/repo.props +++ b/src/SignalR/build/repo.props @@ -12,12 +12,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - diff --git a/src/SignalR/clients/ts/common/package-lock.json b/src/SignalR/clients/ts/common/package-lock.json index baf3d32bb783..3ec871bf5e2f 100644 --- a/src/SignalR/clients/ts/common/package-lock.json +++ b/src/SignalR/clients/ts/common/package-lock.json @@ -2656,12 +2656,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2676,17 +2678,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -2803,7 +2808,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -2815,6 +2821,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2829,6 +2836,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2836,12 +2844,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2860,6 +2870,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -2940,7 +2951,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -2952,6 +2964,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -3073,6 +3086,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/package-lock.json b/src/SignalR/clients/ts/signalr-protocol-msgpack/package-lock.json index 74b1c0b8eb8c..366fdca0d521 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/package-lock.json +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aspnet/signalr-protocol-msgpack", - "version": "1.0.3-rtm-t000", + "version": "1.0.4-rtm-t000", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/SignalR/clients/ts/signalr/package-lock.json b/src/SignalR/clients/ts/signalr/package-lock.json index 4782133c47cb..8c2bfa71f143 100644 --- a/src/SignalR/clients/ts/signalr/package-lock.json +++ b/src/SignalR/clients/ts/signalr/package-lock.json @@ -1,6 +1,6 @@ { "name": "@aspnet/signalr", - "version": "1.0.3-rtm-t000", + "version": "1.0.4-rtm-t000", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/src/StaticFiles/build/repo.props b/src/StaticFiles/build/repo.props index dab1601c8832..1dc8b8100d75 100644 --- a/src/StaticFiles/build/repo.props +++ b/src/StaticFiles/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - 2.1.0-rc1-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - diff --git a/src/Templating/build/repo.props b/src/Templating/build/repo.props index 8bc3037a4c10..c7f773eebc81 100644 --- a/src/Templating/build/repo.props +++ b/src/Templating/build/repo.props @@ -1,13 +1,6 @@ - - - Internal.AspNetCore.Universe.Lineup - $(VersionPrefix)-* - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json - - From 1b9a6b093d65b4867ab58a26c55f6be1f37be839 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 5 Dec 2018 17:55:10 -0800 Subject: [PATCH 06/12] Replace PackNuspec with a dummy .csproj file --- build/SharedFx.targets | 23 +++++--------- .../SharedFrameworkSymbols.csproj | 30 +++++++++++++++++++ .../SharedFrameworkSymbols.nuspec | 18 ----------- 3 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.csproj delete mode 100644 build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 07ed04ad4f63..d75fbdee8361 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -402,26 +402,19 @@ runtime.$(SharedFxRID).$(SymbolsNuspecIdSuffix) - - <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map;$(SymbolsWorkDir)**\*.dll" /> - - %(RecursiveDir)%(Filename)%(Extension) - - - - + + diff --git a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.csproj b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.csproj new file mode 100644 index 000000000000..47383a0d5ba6 --- /dev/null +++ b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.csproj @@ -0,0 +1,30 @@ + + + + + netcoreapp2.1 + Microsoft + Copyright © Microsoft Corporation + https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt + https://go.microsoft.com/fwlink/?LinkID=288859 + https://asp.net + true + false + aspnetcore + + true + + + + <_SymbolFiles Include="$(SymbolsWorkDir)**\*.pdb;$(SymbolsWorkDir)**\*.map;$(SymbolsWorkDir)**\*.dll" /> + + %(RecursiveDir)%(Filename)%(Extension) + + + + + + + + + diff --git a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec b/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec deleted file mode 100644 index 1ba4b6c85df1..000000000000 --- a/build/tools/templates/SharedFxSymbols/SharedFrameworkSymbols.nuspec +++ /dev/null @@ -1,18 +0,0 @@ - - - - $ID$ - $VERSION$ - $DESCRIPTION$ - Microsoft - Microsoft - Copyright © Microsoft Corporation - https://raw.githubusercontent.com/aspnet/Home/2.0.0/LICENSE.txt - https://go.microsoft.com/fwlink/?LinkID=288859 - https://asp.net - true - true - aspnetcore - - - From 50bea0591897230f79bcc66505c9c91abb13e571 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 5 Dec 2018 22:14:22 -0800 Subject: [PATCH 07/12] Refactor Routing to use ProjectReference and move into src/Http folder (#4441) Changes: * Stop producing Microsoft.AspNetCore.Routing.DecisionTree.Sources. I could not find any usages outside of the Microsoft.AspNetCore.Routing assembly, so I've moved this to be a subfolder of code in the Microsoft.AspNetCore.Routing project. * Stop building src/Routing as a submodule. Use ProjectReference instead * Move projects from src/Routing into src/Http/Routing/ and src/Http/Routing.Abstractions/ * Update package baselines and dependencies to support building routing projects and samples --- build/artifacts.props | 1 - build/buildorder.props | 1 - build/submodules.props | 1 - eng/Baseline.Designer.props | 18 ++ eng/Baseline.xml | 2 + eng/Dependencies.props | 9 +- eng/ProjectReferences.props | 2 + eng/dependencies.temp.props | 1 - .../src}/IRouteConstraint.cs | 0 .../src}/IRouteHandler.cs | 0 .../Routing.Abstractions/src}/IRouter.cs | 0 .../src}/IRoutingFeature.cs | 0 ...oft.AspNetCore.Routing.Abstractions.csproj | 4 +- .../src}/Properties/AssemblyInfo.cs | 0 .../src}/Properties/Resources.Designer.cs | 0 .../Routing.Abstractions/src}/Resources.resx | 0 .../Routing.Abstractions/src}/RouteContext.cs | 0 .../Routing.Abstractions/src}/RouteData.cs | 0 .../src}/RouteDirection.cs | 0 .../src}/RouteValueDictionary.cs | 0 .../src}/RoutingHttpContextExtensions.cs | 0 .../src}/VirtualPathContext.cs | 0 .../src}/VirtualPathData.cs | 0 .../src}/baseline.netcore.json | 0 ...Core.Mvc.Routing.Abstractions.Tests.csproj | 11 ++ .../test}/RouteDataTest.cs | 0 .../test}/RouteValueDictionaryTests.cs | 0 .../test}/VirtualPathDataTests.cs | 0 src/Http/Routing.sln | 137 +++++++++++++++ .../Routing/perf}/Configs/CoreConfig.cs | 0 ...soft.AspNetCore.Routing.Performance.csproj | 8 +- .../Routing/perf}/Program.cs | 0 .../Routing/perf}/RoutingBenchmark.cs | 0 .../Routing/perf}/readme.md | 0 .../src}/Constraints/AlphaRouteConstraint.cs | 0 .../src}/Constraints/BoolRouteConstraint.cs | 0 .../Constraints/CompositeRouteConstraint.cs | 0 .../Constraints/DateTimeRouteConstraint.cs | 0 .../Constraints/DecimalRouteConstraint.cs | 0 .../src}/Constraints/DoubleRouteConstraint.cs | 0 .../src}/Constraints/FloatRouteConstraint.cs | 0 .../src}/Constraints/GuidRouteConstraint.cs | 0 .../Constraints/HttpMethodRouteConstraint.cs | 0 .../src}/Constraints/IntRouteConstraint.cs | 0 .../src}/Constraints/LengthRouteConstraint.cs | 0 .../src}/Constraints/LongRouteConstraint.cs | 0 .../Constraints/MaxLengthRouteConstraint.cs | 0 .../src}/Constraints/MaxRouteConstraint.cs | 0 .../Constraints/MinLengthRouteConstraint.cs | 0 .../src}/Constraints/MinRouteConstraint.cs | 0 .../Constraints/OptionalRouteConstraint.cs | 0 .../src}/Constraints/RangeRouteConstraint.cs | 0 .../Constraints/RegexInlineRouteConstraint.cs | 0 .../src}/Constraints/RegexRouteConstraint.cs | 0 .../Constraints/RequiredRouteConstraint.cs | 0 .../src}/Constraints/StringRouteConstraint.cs | 0 .../src/DecisionTree}/DecisionCriterion.cs | 0 .../DecisionTree}/DecisionCriterionValue.cs | 0 .../DecisionCriterionValueEqualityComparer.cs | 0 .../src/DecisionTree}/DecisionTreeBuilder.cs | 0 .../src/DecisionTree}/DecisionTreeNode.cs | 0 .../Routing/src/DecisionTree}/IClassifier.cs | 0 .../src/DecisionTree}/ItemDescriptor.cs | 0 .../src}/DefaultInlineConstraintResolver.cs | 0 .../RoutingServiceCollectionExtensions.cs | 0 .../Routing/src}/IInlineConstraintResolver.cs | 0 .../Routing/src}/INamedRouter.cs | 0 .../Routing/src}/IRouteBuilder.cs | 0 .../Routing/src}/IRouteCollection.cs | 0 .../src}/InlineRouteParameterParser.cs | 0 .../Routing/src}/Internal/BufferValue.cs | 0 .../Internal/LinkGenerationDecisionTree.cs | 0 .../src}/Internal/OutboundMatchResult.cs | 0 .../Routing/src}/Internal/PathTokenizer.cs | 0 .../src}/Internal/RoutingMarkerService.cs | 0 .../Routing/src}/Internal/SegmentState.cs | 0 .../UriBuilderContextPooledObjectPolicy.cs | 0 .../src}/Internal/UriBuildingContext.cs | 0 .../RouteConstraintMatcherExtensions.cs | 0 .../RouterMiddlewareLoggerExtensions.cs | 0 .../Logging/TreeRouterLoggerExtensions.cs | 0 .../src}/MapRouteRouteBuilderExtensions.cs | 0 .../src/Microsoft.AspNetCore.Routing.csproj | 22 +++ .../Routing/src}/Properties/AssemblyInfo.cs | 0 .../src}/Properties/Resources.Designer.cs | 0 .../RequestDelegateRouteBuilderExtensions.cs | 0 .../Routing/src}/Resources.resx | 0 .../Routing/src}/Route.cs | 0 .../Routing/src}/RouteBase.cs | 0 .../Routing/src}/RouteBuilder.cs | 0 .../Routing/src}/RouteCollection.cs | 0 .../Routing/src}/RouteConstraintBuilder.cs | 0 .../Routing/src}/RouteConstraintMatcher.cs | 0 .../Routing/src}/RouteCreationException.cs | 0 .../Routing/src}/RouteHandler.cs | 0 .../Routing/src}/RouteOptions.cs | 0 .../src}/RouteValueEqualityComparer.cs | 0 .../Routing/src}/RouterMiddleware.cs | 0 .../Routing/src}/RoutingBuilderExtensions.cs | 0 .../Routing/src}/RoutingFeature.cs | 0 .../Routing/src}/Template/InlineConstraint.cs | 0 .../Routing/src}/Template/RoutePrecedence.cs | 0 .../Routing/src}/Template/RouteTemplate.cs | 0 .../Routing/src}/Template/TemplateBinder.cs | 0 .../Routing/src}/Template/TemplateMatcher.cs | 0 .../Routing/src}/Template/TemplateParser.cs | 0 .../Routing/src}/Template/TemplatePart.cs | 0 .../Routing/src}/Template/TemplateSegment.cs | 0 .../src}/Template/TemplateValuesResult.cs | 0 .../Routing/src}/Tree/InboundMatch.cs | 0 .../Routing/src}/Tree/InboundRouteEntry.cs | 0 .../Routing/src}/Tree/OutboundMatch.cs | 0 .../Routing/src}/Tree/OutboundRouteEntry.cs | 0 .../Routing/src}/Tree/TreeRouteBuilder.cs | 0 .../Routing/src}/Tree/TreeRouter.cs | 0 .../Routing/src}/Tree/UrlMatchingNode.cs | 0 .../Routing/src}/Tree/UrlMatchingTree.cs | 0 .../Routing/src}/baseline.netcore.json | 0 ....AspNetCore.Routing.FunctionalTests.csproj | 16 ++ .../FunctionalTests}/RoutingSampleTest.cs | 0 .../FunctionalTests}/RoutingTestFixture.cs | 0 .../WebHostBuilderExtensionsTest.cs | 0 .../test/UnitTests}/BuilderExtensionsTest.cs | 0 .../test/UnitTests}/ConstraintMatcherTest.cs | 0 .../Constraints/AlphaRouteConstraintTests.cs | 0 .../Constraints/BoolRouteConstraintTests.cs | 0 .../CompositeRouteConstraintTests.cs | 0 .../Constraints/ConstraintsTestHelper.cs | 0 .../DateTimeRouteConstraintTests.cs | 0 .../DecimalRouteConstraintTests.cs | 0 .../Constraints/DoubleRouteConstraintTests.cs | 0 .../Constraints/FloatRouteConstraintTests.cs | 0 .../Constraints/GuidRouteConstraintTests.cs | 0 .../HttpMethodRouteConstraintTests.cs | 0 .../Constraints/IntRouteConstraintsTests.cs | 0 .../Constraints/LengthRouteConstraintTests.cs | 0 .../Constraints/LongRouteConstraintTests.cs | 0 .../MaxLengthRouteConstraintTests.cs | 0 .../Constraints/MaxRouteConstraintTests.cs | 0 .../MinLengthRouteConstraintTests.cs | 0 .../Constraints/MinRouteConstraintTests.cs | 0 .../Constraints/RangeRouteConstraintTests.cs | 0 .../RegexInlineRouteConstraintTests.cs | 0 .../Constraints/RegexRouteConstraintTests.cs | 0 .../RequiredRouteConstraintTests.cs | 0 .../Constraints/StringRouteConstraintTest.cs | 0 .../UnitTests}/DecisionTreeBuilderTest.cs | 0 .../DefaultInlineConstraintResolverTest.cs | 0 .../InlineRouteParameterParserTests.cs | 0 .../LinkGenerationDecisionTreeTest.cs | 0 .../UnitTests}/Internal/PathTokenizerTest.cs | 0 .../test/UnitTests}/Logging/WriteContext.cs | 0 .../Microsoft.AspNetCore.Routing.Tests.csproj | 19 ++ ...questDelegateRouteBuilderExtensionsTest.cs | 0 .../test/UnitTests}/RouteBuilderTest.cs | 0 .../test/UnitTests}/RouteCollectionTest.cs | 0 .../UnitTests}/RouteConstraintBuilderTest.cs | 0 .../test/UnitTests}/RouteOptionsTests.cs | 0 .../Routing/test/UnitTests}/RouteTest.cs | 0 .../test/UnitTests}/RouterMiddlewareTest.cs | 0 .../RoutingBuilderExtensionsTest.cs | 0 .../Template/RoutePrecedenceTests.cs | 0 .../Template/TemplateBinderTests.cs | 0 .../Template/TemplateMatcherTests.cs | 0 .../Template/TemplateParserTests.cs | 0 .../TemplateParserDefaultValuesTests.cs | 0 .../UnitTests}/Tree/TreeRouteBuilderTest.cs | 0 .../test/UnitTests}/Tree/TreeRouterTest.cs | 0 .../RoutingSample.Web/PrefixRoute.cs | 0 .../testassets}/RoutingSample.Web/Program.cs | 0 .../RouteBuilderExtensions.cs | 0 .../RoutingSample.Web.csproj | 14 ++ src/Routing/.gitignore | 41 ----- src/Routing/Directory.Build.props | 20 --- src/Routing/Directory.Build.targets | 7 - src/Routing/NuGetPackageVerifier.json | 13 -- src/Routing/README.md | 10 -- src/Routing/Routing.sln | 165 ------------------ src/Routing/build/Key.snk | Bin 596 -> 0 bytes src/Routing/build/dependencies.props | 46 ----- src/Routing/build/repo.props | 8 - src/Routing/build/sources.props | 17 -- .../RoutingSample.Web.csproj | 17 -- src/Routing/src/Directory.Build.props | 7 - .../Microsoft.AspNetCore.Routing.csproj | 29 --- src/Routing/test/Directory.Build.props | 20 --- ...Core.Mvc.Routing.Abstractions.Tests.csproj | 11 -- ....Routing.DecisionTree.Sources.Tests.csproj | 15 -- ....AspNetCore.Routing.FunctionalTests.csproj | 16 -- .../Microsoft.AspNetCore.Routing.Tests.csproj | 19 -- src/Routing/version.props | 12 -- 191 files changed, 253 insertions(+), 486 deletions(-) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/IRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/IRouteHandler.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/IRouter.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/IRoutingFeature.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/Microsoft.AspNetCore.Routing.Abstractions.csproj (64%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/Properties/AssemblyInfo.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/Properties/Resources.Designer.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/Resources.resx (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/RouteContext.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/RouteData.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/RouteDirection.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/RouteValueDictionary.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/RoutingHttpContextExtensions.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/VirtualPathContext.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/VirtualPathData.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing.Abstractions => Http/Routing.Abstractions/src}/baseline.netcore.json (100%) create mode 100644 src/Http/Routing.Abstractions/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj rename src/{Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests => Http/Routing.Abstractions/test}/RouteDataTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests => Http/Routing.Abstractions/test}/RouteValueDictionaryTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests => Http/Routing.Abstractions/test}/VirtualPathDataTests.cs (100%) create mode 100644 src/Http/Routing.sln rename src/{Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance => Http/Routing/perf}/Configs/CoreConfig.cs (100%) rename src/{Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance => Http/Routing/perf}/Microsoft.AspNetCore.Routing.Performance.csproj (51%) rename src/{Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance => Http/Routing/perf}/Program.cs (100%) rename src/{Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance => Http/Routing/perf}/RoutingBenchmark.cs (100%) rename src/{Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance => Http/Routing/perf}/readme.md (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/AlphaRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/BoolRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/CompositeRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/DateTimeRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/DecimalRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/DoubleRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/FloatRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/GuidRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/HttpMethodRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/IntRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/LengthRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/LongRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/MaxLengthRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/MaxRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/MinLengthRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/MinRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/OptionalRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/RangeRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/RegexInlineRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/RegexRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/RequiredRouteConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Constraints/StringRouteConstraint.cs (100%) rename src/{Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources => Http/Routing/src/DecisionTree}/DecisionCriterion.cs (100%) rename src/{Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources => Http/Routing/src/DecisionTree}/DecisionCriterionValue.cs (100%) rename src/{Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources => Http/Routing/src/DecisionTree}/DecisionCriterionValueEqualityComparer.cs (100%) rename src/{Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources => Http/Routing/src/DecisionTree}/DecisionTreeBuilder.cs (100%) rename src/{Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources => Http/Routing/src/DecisionTree}/DecisionTreeNode.cs (100%) rename src/{Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources => Http/Routing/src/DecisionTree}/IClassifier.cs (100%) rename src/{Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources => Http/Routing/src/DecisionTree}/ItemDescriptor.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/DefaultInlineConstraintResolver.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/DependencyInjection/RoutingServiceCollectionExtensions.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/IInlineConstraintResolver.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/INamedRouter.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/IRouteBuilder.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/IRouteCollection.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/InlineRouteParameterParser.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Internal/BufferValue.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Internal/LinkGenerationDecisionTree.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Internal/OutboundMatchResult.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Internal/PathTokenizer.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Internal/RoutingMarkerService.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Internal/SegmentState.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Internal/UriBuilderContextPooledObjectPolicy.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Internal/UriBuildingContext.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Logging/RouteConstraintMatcherExtensions.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Logging/RouterMiddlewareLoggerExtensions.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Logging/TreeRouterLoggerExtensions.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/MapRouteRouteBuilderExtensions.cs (100%) create mode 100644 src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Properties/AssemblyInfo.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Properties/Resources.Designer.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RequestDelegateRouteBuilderExtensions.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Resources.resx (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Route.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouteBase.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouteBuilder.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouteCollection.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouteConstraintBuilder.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouteConstraintMatcher.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouteCreationException.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouteHandler.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouteOptions.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouteValueEqualityComparer.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RouterMiddleware.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RoutingBuilderExtensions.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/RoutingFeature.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Template/InlineConstraint.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Template/RoutePrecedence.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Template/RouteTemplate.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Template/TemplateBinder.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Template/TemplateMatcher.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Template/TemplateParser.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Template/TemplatePart.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Template/TemplateSegment.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Template/TemplateValuesResult.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Tree/InboundMatch.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Tree/InboundRouteEntry.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Tree/OutboundMatch.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Tree/OutboundRouteEntry.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Tree/TreeRouteBuilder.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Tree/TreeRouter.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Tree/UrlMatchingNode.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/Tree/UrlMatchingTree.cs (100%) rename src/{Routing/src/Microsoft.AspNetCore.Routing => Http/Routing/src}/baseline.netcore.json (100%) create mode 100644 src/Http/Routing/test/FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj rename src/{Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests => Http/Routing/test/FunctionalTests}/RoutingSampleTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests => Http/Routing/test/FunctionalTests}/RoutingTestFixture.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests => Http/Routing/test/FunctionalTests}/WebHostBuilderExtensionsTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/BuilderExtensionsTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/ConstraintMatcherTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/AlphaRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/BoolRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/CompositeRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/ConstraintsTestHelper.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/DateTimeRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/DecimalRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/DoubleRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/FloatRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/GuidRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/HttpMethodRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/IntRouteConstraintsTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/LengthRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/LongRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/MaxLengthRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/MaxRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/MinLengthRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/MinRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/RangeRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/RegexInlineRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/RegexRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/RequiredRouteConstraintTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Constraints/StringRouteConstraintTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests => Http/Routing/test/UnitTests}/DecisionTreeBuilderTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/DefaultInlineConstraintResolverTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/InlineRouteParameterParserTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Internal/LinkGenerationDecisionTreeTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Internal/PathTokenizerTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Logging/WriteContext.cs (100%) create mode 100644 src/Http/Routing/test/UnitTests/Microsoft.AspNetCore.Routing.Tests.csproj rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/RequestDelegateRouteBuilderExtensionsTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/RouteBuilderTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/RouteCollectionTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/RouteConstraintBuilderTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/RouteOptionsTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/RouteTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/RouterMiddlewareTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/RoutingBuilderExtensionsTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Template/RoutePrecedenceTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Template/TemplateBinderTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Template/TemplateMatcherTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Template/TemplateParserTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/TemplateParserDefaultValuesTests.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Tree/TreeRouteBuilderTest.cs (100%) rename src/{Routing/test/Microsoft.AspNetCore.Routing.Tests => Http/Routing/test/UnitTests}/Tree/TreeRouterTest.cs (100%) rename src/{Routing/samples => Http/Routing/test/testassets}/RoutingSample.Web/PrefixRoute.cs (100%) rename src/{Routing/samples => Http/Routing/test/testassets}/RoutingSample.Web/Program.cs (100%) rename src/{Routing/samples => Http/Routing/test/testassets}/RoutingSample.Web/RouteBuilderExtensions.cs (100%) create mode 100644 src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj delete mode 100644 src/Routing/.gitignore delete mode 100644 src/Routing/Directory.Build.props delete mode 100644 src/Routing/Directory.Build.targets delete mode 100644 src/Routing/NuGetPackageVerifier.json delete mode 100644 src/Routing/README.md delete mode 100644 src/Routing/Routing.sln delete mode 100644 src/Routing/build/Key.snk delete mode 100644 src/Routing/build/dependencies.props delete mode 100644 src/Routing/build/repo.props delete mode 100644 src/Routing/build/sources.props delete mode 100644 src/Routing/samples/RoutingSample.Web/RoutingSample.Web.csproj delete mode 100644 src/Routing/src/Directory.Build.props delete mode 100644 src/Routing/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj delete mode 100644 src/Routing/test/Directory.Build.props delete mode 100644 src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj delete mode 100644 src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj delete mode 100644 src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj delete mode 100644 src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj delete mode 100644 src/Routing/version.props diff --git a/build/artifacts.props b/build/artifacts.props index debe7bdcd4df..09e81d54248e 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -124,7 +124,6 @@ - diff --git a/build/buildorder.props b/build/buildorder.props index 4dcc51c6d8bc..d2c3796a2678 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -13,7 +13,6 @@ - diff --git a/build/submodules.props b/build/submodules.props index f6c0e55b495b..fb83300b4ef7 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -60,7 +60,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index c949b4b702e3..65c44f8d83c6 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -340,6 +340,24 @@ + + + 2.1.1 + + + + + + + 2.1.1 + + + + + + + + 2.1.3 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 5b87da3ce898..cbbaa33b9440 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -37,6 +37,8 @@ + + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 011eeb7b52ce..139d310165bd 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -17,25 +17,28 @@ - + + + + - + @@ -44,8 +47,8 @@ - + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 5552823cf62c..67cd71ef8d9b 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -25,6 +25,8 @@ + + diff --git a/eng/dependencies.temp.props b/eng/dependencies.temp.props index 0c9dbc1f376b..e1cf0cae8a6f 100644 --- a/eng/dependencies.temp.props +++ b/eng/dependencies.temp.props @@ -6,6 +6,5 @@ This is required to provide dependencies for samples and tests. - diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteConstraint.cs b/src/Http/Routing.Abstractions/src/IRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteConstraint.cs rename to src/Http/Routing.Abstractions/src/IRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteHandler.cs b/src/Http/Routing.Abstractions/src/IRouteHandler.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouteHandler.cs rename to src/Http/Routing.Abstractions/src/IRouteHandler.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouter.cs b/src/Http/Routing.Abstractions/src/IRouter.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRouter.cs rename to src/Http/Routing.Abstractions/src/IRouter.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRoutingFeature.cs b/src/Http/Routing.Abstractions/src/IRoutingFeature.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/IRoutingFeature.cs rename to src/Http/Routing.Abstractions/src/IRoutingFeature.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj b/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj similarity index 64% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj rename to src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj index 633a49d503ed..edb292bb22cc 100644 --- a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Microsoft.AspNetCore.Routing.Abstractions.csproj +++ b/src/Http/Routing.Abstractions/src/Microsoft.AspNetCore.Routing.Abstractions.csproj @@ -12,7 +12,7 @@ Microsoft.AspNetCore.Routing.RouteData - - + + diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/AssemblyInfo.cs b/src/Http/Routing.Abstractions/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/AssemblyInfo.cs rename to src/Http/Routing.Abstractions/src/Properties/AssemblyInfo.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/Resources.Designer.cs b/src/Http/Routing.Abstractions/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Properties/Resources.Designer.cs rename to src/Http/Routing.Abstractions/src/Properties/Resources.Designer.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Resources.resx b/src/Http/Routing.Abstractions/src/Resources.resx similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/Resources.resx rename to src/Http/Routing.Abstractions/src/Resources.resx diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteContext.cs b/src/Http/Routing.Abstractions/src/RouteContext.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteContext.cs rename to src/Http/Routing.Abstractions/src/RouteContext.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteData.cs b/src/Http/Routing.Abstractions/src/RouteData.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteData.cs rename to src/Http/Routing.Abstractions/src/RouteData.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteDirection.cs b/src/Http/Routing.Abstractions/src/RouteDirection.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteDirection.cs rename to src/Http/Routing.Abstractions/src/RouteDirection.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteValueDictionary.cs b/src/Http/Routing.Abstractions/src/RouteValueDictionary.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RouteValueDictionary.cs rename to src/Http/Routing.Abstractions/src/RouteValueDictionary.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RoutingHttpContextExtensions.cs b/src/Http/Routing.Abstractions/src/RoutingHttpContextExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/RoutingHttpContextExtensions.cs rename to src/Http/Routing.Abstractions/src/RoutingHttpContextExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathContext.cs b/src/Http/Routing.Abstractions/src/VirtualPathContext.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathContext.cs rename to src/Http/Routing.Abstractions/src/VirtualPathContext.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathData.cs b/src/Http/Routing.Abstractions/src/VirtualPathData.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/VirtualPathData.cs rename to src/Http/Routing.Abstractions/src/VirtualPathData.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netcore.json b/src/Http/Routing.Abstractions/src/baseline.netcore.json similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing.Abstractions/baseline.netcore.json rename to src/Http/Routing.Abstractions/src/baseline.netcore.json diff --git a/src/Http/Routing.Abstractions/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj b/src/Http/Routing.Abstractions/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj new file mode 100644 index 000000000000..b4f123d947cc --- /dev/null +++ b/src/Http/Routing.Abstractions/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj @@ -0,0 +1,11 @@ + + + + $(StandardTestTfms) + + + + + + + diff --git a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteDataTest.cs b/src/Http/Routing.Abstractions/test/RouteDataTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteDataTest.cs rename to src/Http/Routing.Abstractions/test/RouteDataTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs b/src/Http/Routing.Abstractions/test/RouteValueDictionaryTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/RouteValueDictionaryTests.cs rename to src/Http/Routing.Abstractions/test/RouteValueDictionaryTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/VirtualPathDataTests.cs b/src/Http/Routing.Abstractions/test/VirtualPathDataTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/VirtualPathDataTests.cs rename to src/Http/Routing.Abstractions/test/VirtualPathDataTests.cs diff --git a/src/Http/Routing.sln b/src/Http/Routing.sln new file mode 100644 index 000000000000..12dd032b9354 --- /dev/null +++ b/src/Http/Routing.sln @@ -0,0 +1,137 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing", "Routing", "{240298B6-6729-4844-9B30-B8BC0CD12772}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.Performance", "Routing\perf\Microsoft.AspNetCore.Routing.Performance.csproj", "{D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing", "Routing\src\Microsoft.AspNetCore.Routing.csproj", "{A69248B5-2ACE-4B52-B0B0-63AD54D52543}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{8B2D195B-4997-4CCE-9846-4A848A6F258D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.FunctionalTests", "Routing\test\FunctionalTests\Microsoft.AspNetCore.Routing.FunctionalTests.csproj", "{5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", "{CE4CDDA8-A319-4FD1-A31E-8765DC6BF8C5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RoutingSample.Web", "Routing\test\testassets\RoutingSample.Web\RoutingSample.Web.csproj", "{D411FC83-9EE6-401D-8242-47CD7347E42E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.Tests", "Routing\test\UnitTests\Microsoft.AspNetCore.Routing.Tests.csproj", "{3F9CEBB1-A50D-4869-B555-81E572E62D18}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Routing.Abstractions", "Routing.Abstractions", "{485B8E11-FC7C-464F-8CB2-A164DAB30D58}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Routing.Abstractions", "Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests", "Routing.Abstractions\test\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj", "{32C5C558-E104-4DC4-9311-890697DE8D65}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x64.ActiveCfg = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x64.Build.0 = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x86.ActiveCfg = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Debug|x86.Build.0 = Debug|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|Any CPU.Build.0 = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x64.ActiveCfg = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x64.Build.0 = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x86.ActiveCfg = Release|Any CPU + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F}.Release|x86.Build.0 = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x64.ActiveCfg = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x64.Build.0 = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x86.ActiveCfg = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Debug|x86.Build.0 = Debug|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|Any CPU.Build.0 = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x64.ActiveCfg = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x64.Build.0 = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x86.ActiveCfg = Release|Any CPU + {A69248B5-2ACE-4B52-B0B0-63AD54D52543}.Release|x86.Build.0 = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x64.ActiveCfg = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x64.Build.0 = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x86.ActiveCfg = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Debug|x86.Build.0 = Debug|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|Any CPU.Build.0 = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x64.ActiveCfg = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x64.Build.0 = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x86.ActiveCfg = Release|Any CPU + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22}.Release|x86.Build.0 = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x64.ActiveCfg = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x64.Build.0 = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x86.ActiveCfg = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Debug|x86.Build.0 = Debug|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|Any CPU.Build.0 = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x64.ActiveCfg = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x64.Build.0 = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x86.ActiveCfg = Release|Any CPU + {D411FC83-9EE6-401D-8242-47CD7347E42E}.Release|x86.Build.0 = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x64.ActiveCfg = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x64.Build.0 = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x86.ActiveCfg = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Debug|x86.Build.0 = Debug|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|Any CPU.Build.0 = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x64.ActiveCfg = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x64.Build.0 = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x86.ActiveCfg = Release|Any CPU + {3F9CEBB1-A50D-4869-B555-81E572E62D18}.Release|x86.Build.0 = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x64.ActiveCfg = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x64.Build.0 = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x86.ActiveCfg = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Debug|x86.Build.0 = Debug|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|Any CPU.Build.0 = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x64.ActiveCfg = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x64.Build.0 = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x86.ActiveCfg = Release|Any CPU + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0}.Release|x86.Build.0 = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x64.ActiveCfg = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x64.Build.0 = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x86.ActiveCfg = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Debug|x86.Build.0 = Debug|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|Any CPU.Build.0 = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x64.ActiveCfg = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x64.Build.0 = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x86.ActiveCfg = Release|Any CPU + {32C5C558-E104-4DC4-9311-890697DE8D65}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {D9A5185A-1697-4B6B-B845-C13AE6DA6D3F} = {240298B6-6729-4844-9B30-B8BC0CD12772} + {A69248B5-2ACE-4B52-B0B0-63AD54D52543} = {240298B6-6729-4844-9B30-B8BC0CD12772} + {8B2D195B-4997-4CCE-9846-4A848A6F258D} = {240298B6-6729-4844-9B30-B8BC0CD12772} + {5BD1EBCE-E05E-41FC-A1A8-BF36FA096F22} = {8B2D195B-4997-4CCE-9846-4A848A6F258D} + {CE4CDDA8-A319-4FD1-A31E-8765DC6BF8C5} = {8B2D195B-4997-4CCE-9846-4A848A6F258D} + {D411FC83-9EE6-401D-8242-47CD7347E42E} = {CE4CDDA8-A319-4FD1-A31E-8765DC6BF8C5} + {3F9CEBB1-A50D-4869-B555-81E572E62D18} = {8B2D195B-4997-4CCE-9846-4A848A6F258D} + {C9C9FAB5-0A0D-4334-9A7D-C83C38EB29B0} = {485B8E11-FC7C-464F-8CB2-A164DAB30D58} + {32C5C558-E104-4DC4-9311-890697DE8D65} = {485B8E11-FC7C-464F-8CB2-A164DAB30D58} + EndGlobalSection +EndGlobal diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Configs/CoreConfig.cs b/src/Http/Routing/perf/Configs/CoreConfig.cs similarity index 100% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Configs/CoreConfig.cs rename to src/Http/Routing/perf/Configs/CoreConfig.cs diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj b/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj similarity index 51% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj rename to src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj index 453925e5136f..61461ddc6e88 100644 --- a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Microsoft.AspNetCore.Routing.Performance.csproj +++ b/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj @@ -10,13 +10,13 @@ - + - - - + + + diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Program.cs b/src/Http/Routing/perf/Program.cs similarity index 100% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/Program.cs rename to src/Http/Routing/perf/Program.cs diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/RoutingBenchmark.cs b/src/Http/Routing/perf/RoutingBenchmark.cs similarity index 100% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/RoutingBenchmark.cs rename to src/Http/Routing/perf/RoutingBenchmark.cs diff --git a/src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/readme.md b/src/Http/Routing/perf/readme.md similarity index 100% rename from src/Routing/benchmarks/Microsoft.AspNetCore.Routing.Performance/readme.md rename to src/Http/Routing/perf/readme.md diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/AlphaRouteConstraint.cs b/src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/AlphaRouteConstraint.cs rename to src/Http/Routing/src/Constraints/AlphaRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/BoolRouteConstraint.cs b/src/Http/Routing/src/Constraints/BoolRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/BoolRouteConstraint.cs rename to src/Http/Routing/src/Constraints/BoolRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/CompositeRouteConstraint.cs b/src/Http/Routing/src/Constraints/CompositeRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/CompositeRouteConstraint.cs rename to src/Http/Routing/src/Constraints/CompositeRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DateTimeRouteConstraint.cs b/src/Http/Routing/src/Constraints/DateTimeRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DateTimeRouteConstraint.cs rename to src/Http/Routing/src/Constraints/DateTimeRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DecimalRouteConstraint.cs b/src/Http/Routing/src/Constraints/DecimalRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DecimalRouteConstraint.cs rename to src/Http/Routing/src/Constraints/DecimalRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DoubleRouteConstraint.cs b/src/Http/Routing/src/Constraints/DoubleRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/DoubleRouteConstraint.cs rename to src/Http/Routing/src/Constraints/DoubleRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/FloatRouteConstraint.cs b/src/Http/Routing/src/Constraints/FloatRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/FloatRouteConstraint.cs rename to src/Http/Routing/src/Constraints/FloatRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/GuidRouteConstraint.cs b/src/Http/Routing/src/Constraints/GuidRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/GuidRouteConstraint.cs rename to src/Http/Routing/src/Constraints/GuidRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/HttpMethodRouteConstraint.cs b/src/Http/Routing/src/Constraints/HttpMethodRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/HttpMethodRouteConstraint.cs rename to src/Http/Routing/src/Constraints/HttpMethodRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/IntRouteConstraint.cs b/src/Http/Routing/src/Constraints/IntRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/IntRouteConstraint.cs rename to src/Http/Routing/src/Constraints/IntRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/LengthRouteConstraint.cs b/src/Http/Routing/src/Constraints/LengthRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/LengthRouteConstraint.cs rename to src/Http/Routing/src/Constraints/LengthRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/LongRouteConstraint.cs b/src/Http/Routing/src/Constraints/LongRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/LongRouteConstraint.cs rename to src/Http/Routing/src/Constraints/LongRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MaxLengthRouteConstraint.cs b/src/Http/Routing/src/Constraints/MaxLengthRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MaxLengthRouteConstraint.cs rename to src/Http/Routing/src/Constraints/MaxLengthRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MaxRouteConstraint.cs b/src/Http/Routing/src/Constraints/MaxRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MaxRouteConstraint.cs rename to src/Http/Routing/src/Constraints/MaxRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MinLengthRouteConstraint.cs b/src/Http/Routing/src/Constraints/MinLengthRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MinLengthRouteConstraint.cs rename to src/Http/Routing/src/Constraints/MinLengthRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MinRouteConstraint.cs b/src/Http/Routing/src/Constraints/MinRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/MinRouteConstraint.cs rename to src/Http/Routing/src/Constraints/MinRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/OptionalRouteConstraint.cs b/src/Http/Routing/src/Constraints/OptionalRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/OptionalRouteConstraint.cs rename to src/Http/Routing/src/Constraints/OptionalRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RangeRouteConstraint.cs b/src/Http/Routing/src/Constraints/RangeRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RangeRouteConstraint.cs rename to src/Http/Routing/src/Constraints/RangeRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RegexInlineRouteConstraint.cs b/src/Http/Routing/src/Constraints/RegexInlineRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RegexInlineRouteConstraint.cs rename to src/Http/Routing/src/Constraints/RegexInlineRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RegexRouteConstraint.cs b/src/Http/Routing/src/Constraints/RegexRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RegexRouteConstraint.cs rename to src/Http/Routing/src/Constraints/RegexRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RequiredRouteConstraint.cs b/src/Http/Routing/src/Constraints/RequiredRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/RequiredRouteConstraint.cs rename to src/Http/Routing/src/Constraints/RequiredRouteConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/StringRouteConstraint.cs b/src/Http/Routing/src/Constraints/StringRouteConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Constraints/StringRouteConstraint.cs rename to src/Http/Routing/src/Constraints/StringRouteConstraint.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterion.cs b/src/Http/Routing/src/DecisionTree/DecisionCriterion.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterion.cs rename to src/Http/Routing/src/DecisionTree/DecisionCriterion.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValue.cs b/src/Http/Routing/src/DecisionTree/DecisionCriterionValue.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValue.cs rename to src/Http/Routing/src/DecisionTree/DecisionCriterionValue.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValueEqualityComparer.cs b/src/Http/Routing/src/DecisionTree/DecisionCriterionValueEqualityComparer.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionCriterionValueEqualityComparer.cs rename to src/Http/Routing/src/DecisionTree/DecisionCriterionValueEqualityComparer.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeBuilder.cs b/src/Http/Routing/src/DecisionTree/DecisionTreeBuilder.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeBuilder.cs rename to src/Http/Routing/src/DecisionTree/DecisionTreeBuilder.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeNode.cs b/src/Http/Routing/src/DecisionTree/DecisionTreeNode.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/DecisionTreeNode.cs rename to src/Http/Routing/src/DecisionTree/DecisionTreeNode.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/IClassifier.cs b/src/Http/Routing/src/DecisionTree/IClassifier.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/IClassifier.cs rename to src/Http/Routing/src/DecisionTree/IClassifier.cs diff --git a/src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/ItemDescriptor.cs b/src/Http/Routing/src/DecisionTree/ItemDescriptor.cs similarity index 100% rename from src/Routing/shared/Microsoft.AspNetCore.Routing.DecisionTree.Sources/ItemDescriptor.cs rename to src/Http/Routing/src/DecisionTree/ItemDescriptor.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/DefaultInlineConstraintResolver.cs b/src/Http/Routing/src/DefaultInlineConstraintResolver.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/DefaultInlineConstraintResolver.cs rename to src/Http/Routing/src/DefaultInlineConstraintResolver.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/DependencyInjection/RoutingServiceCollectionExtensions.cs b/src/Http/Routing/src/DependencyInjection/RoutingServiceCollectionExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/DependencyInjection/RoutingServiceCollectionExtensions.cs rename to src/Http/Routing/src/DependencyInjection/RoutingServiceCollectionExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/IInlineConstraintResolver.cs b/src/Http/Routing/src/IInlineConstraintResolver.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/IInlineConstraintResolver.cs rename to src/Http/Routing/src/IInlineConstraintResolver.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/INamedRouter.cs b/src/Http/Routing/src/INamedRouter.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/INamedRouter.cs rename to src/Http/Routing/src/INamedRouter.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/IRouteBuilder.cs b/src/Http/Routing/src/IRouteBuilder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/IRouteBuilder.cs rename to src/Http/Routing/src/IRouteBuilder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/IRouteCollection.cs b/src/Http/Routing/src/IRouteCollection.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/IRouteCollection.cs rename to src/Http/Routing/src/IRouteCollection.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/InlineRouteParameterParser.cs b/src/Http/Routing/src/InlineRouteParameterParser.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/InlineRouteParameterParser.cs rename to src/Http/Routing/src/InlineRouteParameterParser.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/BufferValue.cs b/src/Http/Routing/src/Internal/BufferValue.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/BufferValue.cs rename to src/Http/Routing/src/Internal/BufferValue.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationDecisionTree.cs b/src/Http/Routing/src/Internal/LinkGenerationDecisionTree.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/LinkGenerationDecisionTree.cs rename to src/Http/Routing/src/Internal/LinkGenerationDecisionTree.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/OutboundMatchResult.cs b/src/Http/Routing/src/Internal/OutboundMatchResult.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/OutboundMatchResult.cs rename to src/Http/Routing/src/Internal/OutboundMatchResult.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs b/src/Http/Routing/src/Internal/PathTokenizer.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/PathTokenizer.cs rename to src/Http/Routing/src/Internal/PathTokenizer.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/RoutingMarkerService.cs b/src/Http/Routing/src/Internal/RoutingMarkerService.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/RoutingMarkerService.cs rename to src/Http/Routing/src/Internal/RoutingMarkerService.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/SegmentState.cs b/src/Http/Routing/src/Internal/SegmentState.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/SegmentState.cs rename to src/Http/Routing/src/Internal/SegmentState.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/UriBuilderContextPooledObjectPolicy.cs b/src/Http/Routing/src/Internal/UriBuilderContextPooledObjectPolicy.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/UriBuilderContextPooledObjectPolicy.cs rename to src/Http/Routing/src/Internal/UriBuilderContextPooledObjectPolicy.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Internal/UriBuildingContext.cs b/src/Http/Routing/src/Internal/UriBuildingContext.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Internal/UriBuildingContext.cs rename to src/Http/Routing/src/Internal/UriBuildingContext.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Logging/RouteConstraintMatcherExtensions.cs b/src/Http/Routing/src/Logging/RouteConstraintMatcherExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Logging/RouteConstraintMatcherExtensions.cs rename to src/Http/Routing/src/Logging/RouteConstraintMatcherExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Logging/RouterMiddlewareLoggerExtensions.cs b/src/Http/Routing/src/Logging/RouterMiddlewareLoggerExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Logging/RouterMiddlewareLoggerExtensions.cs rename to src/Http/Routing/src/Logging/RouterMiddlewareLoggerExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Logging/TreeRouterLoggerExtensions.cs b/src/Http/Routing/src/Logging/TreeRouterLoggerExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Logging/TreeRouterLoggerExtensions.cs rename to src/Http/Routing/src/Logging/TreeRouterLoggerExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/MapRouteRouteBuilderExtensions.cs b/src/Http/Routing/src/MapRouteRouteBuilderExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/MapRouteRouteBuilderExtensions.cs rename to src/Http/Routing/src/MapRouteRouteBuilderExtensions.cs diff --git a/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj new file mode 100644 index 000000000000..a244399882b7 --- /dev/null +++ b/src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj @@ -0,0 +1,22 @@ + + + ASP.NET Core middleware for routing requests to application logic and for generating links. +Commonly used types: +Microsoft.AspNetCore.Routing.Route +Microsoft.AspNetCore.Routing.RouteCollection + netstandard2.0 + $(NoWarn);CS1591 + true + aspnetcore;routing + + + + + + + + + + + + diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Properties/AssemblyInfo.cs b/src/Http/Routing/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Properties/AssemblyInfo.cs rename to src/Http/Routing/src/Properties/AssemblyInfo.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs b/src/Http/Routing/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Properties/Resources.Designer.cs rename to src/Http/Routing/src/Properties/Resources.Designer.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RequestDelegateRouteBuilderExtensions.cs b/src/Http/Routing/src/RequestDelegateRouteBuilderExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RequestDelegateRouteBuilderExtensions.cs rename to src/Http/Routing/src/RequestDelegateRouteBuilderExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Resources.resx b/src/Http/Routing/src/Resources.resx similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Resources.resx rename to src/Http/Routing/src/Resources.resx diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Route.cs b/src/Http/Routing/src/Route.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Route.cs rename to src/Http/Routing/src/Route.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteBase.cs b/src/Http/Routing/src/RouteBase.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteBase.cs rename to src/Http/Routing/src/RouteBase.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteBuilder.cs b/src/Http/Routing/src/RouteBuilder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteBuilder.cs rename to src/Http/Routing/src/RouteBuilder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteCollection.cs b/src/Http/Routing/src/RouteCollection.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteCollection.cs rename to src/Http/Routing/src/RouteCollection.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteConstraintBuilder.cs b/src/Http/Routing/src/RouteConstraintBuilder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteConstraintBuilder.cs rename to src/Http/Routing/src/RouteConstraintBuilder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteConstraintMatcher.cs b/src/Http/Routing/src/RouteConstraintMatcher.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteConstraintMatcher.cs rename to src/Http/Routing/src/RouteConstraintMatcher.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteCreationException.cs b/src/Http/Routing/src/RouteCreationException.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteCreationException.cs rename to src/Http/Routing/src/RouteCreationException.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteHandler.cs b/src/Http/Routing/src/RouteHandler.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteHandler.cs rename to src/Http/Routing/src/RouteHandler.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteOptions.cs b/src/Http/Routing/src/RouteOptions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteOptions.cs rename to src/Http/Routing/src/RouteOptions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouteValueEqualityComparer.cs b/src/Http/Routing/src/RouteValueEqualityComparer.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouteValueEqualityComparer.cs rename to src/Http/Routing/src/RouteValueEqualityComparer.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RouterMiddleware.cs b/src/Http/Routing/src/RouterMiddleware.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RouterMiddleware.cs rename to src/Http/Routing/src/RouterMiddleware.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RoutingBuilderExtensions.cs b/src/Http/Routing/src/RoutingBuilderExtensions.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RoutingBuilderExtensions.cs rename to src/Http/Routing/src/RoutingBuilderExtensions.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/RoutingFeature.cs b/src/Http/Routing/src/RoutingFeature.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/RoutingFeature.cs rename to src/Http/Routing/src/RoutingFeature.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/InlineConstraint.cs b/src/Http/Routing/src/Template/InlineConstraint.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/InlineConstraint.cs rename to src/Http/Routing/src/Template/InlineConstraint.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/RoutePrecedence.cs b/src/Http/Routing/src/Template/RoutePrecedence.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/RoutePrecedence.cs rename to src/Http/Routing/src/Template/RoutePrecedence.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/RouteTemplate.cs b/src/Http/Routing/src/Template/RouteTemplate.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/RouteTemplate.cs rename to src/Http/Routing/src/Template/RouteTemplate.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateBinder.cs b/src/Http/Routing/src/Template/TemplateBinder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateBinder.cs rename to src/Http/Routing/src/Template/TemplateBinder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs b/src/Http/Routing/src/Template/TemplateMatcher.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateMatcher.cs rename to src/Http/Routing/src/Template/TemplateMatcher.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs b/src/Http/Routing/src/Template/TemplateParser.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateParser.cs rename to src/Http/Routing/src/Template/TemplateParser.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplatePart.cs b/src/Http/Routing/src/Template/TemplatePart.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplatePart.cs rename to src/Http/Routing/src/Template/TemplatePart.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateSegment.cs b/src/Http/Routing/src/Template/TemplateSegment.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateSegment.cs rename to src/Http/Routing/src/Template/TemplateSegment.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateValuesResult.cs b/src/Http/Routing/src/Template/TemplateValuesResult.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Template/TemplateValuesResult.cs rename to src/Http/Routing/src/Template/TemplateValuesResult.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/InboundMatch.cs b/src/Http/Routing/src/Tree/InboundMatch.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/InboundMatch.cs rename to src/Http/Routing/src/Tree/InboundMatch.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/InboundRouteEntry.cs b/src/Http/Routing/src/Tree/InboundRouteEntry.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/InboundRouteEntry.cs rename to src/Http/Routing/src/Tree/InboundRouteEntry.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/OutboundMatch.cs b/src/Http/Routing/src/Tree/OutboundMatch.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/OutboundMatch.cs rename to src/Http/Routing/src/Tree/OutboundMatch.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/OutboundRouteEntry.cs b/src/Http/Routing/src/Tree/OutboundRouteEntry.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/OutboundRouteEntry.cs rename to src/Http/Routing/src/Tree/OutboundRouteEntry.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteBuilder.cs b/src/Http/Routing/src/Tree/TreeRouteBuilder.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/TreeRouteBuilder.cs rename to src/Http/Routing/src/Tree/TreeRouteBuilder.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs b/src/Http/Routing/src/Tree/TreeRouter.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/TreeRouter.cs rename to src/Http/Routing/src/Tree/TreeRouter.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingNode.cs b/src/Http/Routing/src/Tree/UrlMatchingNode.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingNode.cs rename to src/Http/Routing/src/Tree/UrlMatchingNode.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingTree.cs b/src/Http/Routing/src/Tree/UrlMatchingTree.cs similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/Tree/UrlMatchingTree.cs rename to src/Http/Routing/src/Tree/UrlMatchingTree.cs diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/baseline.netcore.json b/src/Http/Routing/src/baseline.netcore.json similarity index 100% rename from src/Routing/src/Microsoft.AspNetCore.Routing/baseline.netcore.json rename to src/Http/Routing/src/baseline.netcore.json diff --git a/src/Http/Routing/test/FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj b/src/Http/Routing/test/FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj new file mode 100644 index 000000000000..9946534e6484 --- /dev/null +++ b/src/Http/Routing/test/FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj @@ -0,0 +1,16 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/RoutingSampleTest.cs b/src/Http/Routing/test/FunctionalTests/RoutingSampleTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/RoutingSampleTest.cs rename to src/Http/Routing/test/FunctionalTests/RoutingSampleTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/RoutingTestFixture.cs b/src/Http/Routing/test/FunctionalTests/RoutingTestFixture.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/RoutingTestFixture.cs rename to src/Http/Routing/test/FunctionalTests/RoutingTestFixture.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/WebHostBuilderExtensionsTest.cs b/src/Http/Routing/test/FunctionalTests/WebHostBuilderExtensionsTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/WebHostBuilderExtensionsTest.cs rename to src/Http/Routing/test/FunctionalTests/WebHostBuilderExtensionsTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/BuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/BuilderExtensionsTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/BuilderExtensionsTest.cs rename to src/Http/Routing/test/UnitTests/BuilderExtensionsTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/ConstraintMatcherTest.cs b/src/Http/Routing/test/UnitTests/ConstraintMatcherTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/ConstraintMatcherTest.cs rename to src/Http/Routing/test/UnitTests/ConstraintMatcherTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/AlphaRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/AlphaRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/AlphaRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/BoolRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/BoolRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/BoolRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/BoolRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/CompositeRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/CompositeRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/CompositeRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/ConstraintsTestHelper.cs b/src/Http/Routing/test/UnitTests/Constraints/ConstraintsTestHelper.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/ConstraintsTestHelper.cs rename to src/Http/Routing/test/UnitTests/Constraints/ConstraintsTestHelper.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/DateTimeRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DateTimeRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/DateTimeRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/DecimalRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DecimalRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/DecimalRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/DoubleRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/DoubleRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/DoubleRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/FloatRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/FloatRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/FloatRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/FloatRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/GuidRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/GuidRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/GuidRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/GuidRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/HttpMethodRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/HttpMethodRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/HttpMethodRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/HttpMethodRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/IntRouteConstraintsTests.cs b/src/Http/Routing/test/UnitTests/Constraints/IntRouteConstraintsTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/IntRouteConstraintsTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/IntRouteConstraintsTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LengthRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/LengthRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LengthRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/LengthRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LongRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/LongRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/LongRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/LongRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/MaxLengthRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxLengthRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/MaxLengthRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/MaxRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MaxRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/MaxRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/MinLengthRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinLengthRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/MinLengthRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/MinRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/MinRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/MinRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RangeRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/RangeRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RangeRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/RangeRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/RegexInlineRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexInlineRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/RegexInlineRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/RegexRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RegexRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/RegexRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs b/src/Http/Routing/test/UnitTests/Constraints/RequiredRouteConstraintTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/RequiredRouteConstraintTests.cs rename to src/Http/Routing/test/UnitTests/Constraints/RequiredRouteConstraintTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/StringRouteConstraintTest.cs b/src/Http/Routing/test/UnitTests/Constraints/StringRouteConstraintTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Constraints/StringRouteConstraintTest.cs rename to src/Http/Routing/test/UnitTests/Constraints/StringRouteConstraintTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/DecisionTreeBuilderTest.cs b/src/Http/Routing/test/UnitTests/DecisionTreeBuilderTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/DecisionTreeBuilderTest.cs rename to src/Http/Routing/test/UnitTests/DecisionTreeBuilderTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/DefaultInlineConstraintResolverTest.cs b/src/Http/Routing/test/UnitTests/DefaultInlineConstraintResolverTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/DefaultInlineConstraintResolverTest.cs rename to src/Http/Routing/test/UnitTests/DefaultInlineConstraintResolverTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs b/src/Http/Routing/test/UnitTests/InlineRouteParameterParserTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/InlineRouteParameterParserTests.cs rename to src/Http/Routing/test/UnitTests/InlineRouteParameterParserTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Internal/LinkGenerationDecisionTreeTest.cs b/src/Http/Routing/test/UnitTests/Internal/LinkGenerationDecisionTreeTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Internal/LinkGenerationDecisionTreeTest.cs rename to src/Http/Routing/test/UnitTests/Internal/LinkGenerationDecisionTreeTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs b/src/Http/Routing/test/UnitTests/Internal/PathTokenizerTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Internal/PathTokenizerTest.cs rename to src/Http/Routing/test/UnitTests/Internal/PathTokenizerTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Logging/WriteContext.cs b/src/Http/Routing/test/UnitTests/Logging/WriteContext.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Logging/WriteContext.cs rename to src/Http/Routing/test/UnitTests/Logging/WriteContext.cs diff --git a/src/Http/Routing/test/UnitTests/Microsoft.AspNetCore.Routing.Tests.csproj b/src/Http/Routing/test/UnitTests/Microsoft.AspNetCore.Routing.Tests.csproj new file mode 100644 index 000000000000..934cf34b664d --- /dev/null +++ b/src/Http/Routing/test/UnitTests/Microsoft.AspNetCore.Routing.Tests.csproj @@ -0,0 +1,19 @@ + + + + $(StandardTestTfms) + + + + + + + + + + + + + + + diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RequestDelegateRouteBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/RequestDelegateRouteBuilderExtensionsTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RequestDelegateRouteBuilderExtensionsTest.cs rename to src/Http/Routing/test/UnitTests/RequestDelegateRouteBuilderExtensionsTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteBuilderTest.cs b/src/Http/Routing/test/UnitTests/RouteBuilderTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteBuilderTest.cs rename to src/Http/Routing/test/UnitTests/RouteBuilderTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteCollectionTest.cs b/src/Http/Routing/test/UnitTests/RouteCollectionTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteCollectionTest.cs rename to src/Http/Routing/test/UnitTests/RouteCollectionTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs b/src/Http/Routing/test/UnitTests/RouteConstraintBuilderTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteConstraintBuilderTest.cs rename to src/Http/Routing/test/UnitTests/RouteConstraintBuilderTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteOptionsTests.cs b/src/Http/Routing/test/UnitTests/RouteOptionsTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteOptionsTests.cs rename to src/Http/Routing/test/UnitTests/RouteOptionsTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs b/src/Http/Routing/test/UnitTests/RouteTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouteTest.cs rename to src/Http/Routing/test/UnitTests/RouteTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouterMiddlewareTest.cs b/src/Http/Routing/test/UnitTests/RouterMiddlewareTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RouterMiddlewareTest.cs rename to src/Http/Routing/test/UnitTests/RouterMiddlewareTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RoutingBuilderExtensionsTest.cs b/src/Http/Routing/test/UnitTests/RoutingBuilderExtensionsTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/RoutingBuilderExtensionsTest.cs rename to src/Http/Routing/test/UnitTests/RoutingBuilderExtensionsTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/RoutePrecedenceTests.cs b/src/Http/Routing/test/UnitTests/Template/RoutePrecedenceTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/RoutePrecedenceTests.cs rename to src/Http/Routing/test/UnitTests/Template/RoutePrecedenceTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateBinderTests.cs b/src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateBinderTests.cs rename to src/Http/Routing/test/UnitTests/Template/TemplateBinderTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateMatcherTests.cs b/src/Http/Routing/test/UnitTests/Template/TemplateMatcherTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateMatcherTests.cs rename to src/Http/Routing/test/UnitTests/Template/TemplateMatcherTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs b/src/Http/Routing/test/UnitTests/Template/TemplateParserTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Template/TemplateParserTests.cs rename to src/Http/Routing/test/UnitTests/Template/TemplateParserTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/TemplateParserDefaultValuesTests.cs b/src/Http/Routing/test/UnitTests/TemplateParserDefaultValuesTests.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/TemplateParserDefaultValuesTests.cs rename to src/Http/Routing/test/UnitTests/TemplateParserDefaultValuesTests.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouteBuilderTest.cs b/src/Http/Routing/test/UnitTests/Tree/TreeRouteBuilderTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouteBuilderTest.cs rename to src/Http/Routing/test/UnitTests/Tree/TreeRouteBuilderTest.cs diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs b/src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs similarity index 100% rename from src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Tree/TreeRouterTest.cs rename to src/Http/Routing/test/UnitTests/Tree/TreeRouterTest.cs diff --git a/src/Routing/samples/RoutingSample.Web/PrefixRoute.cs b/src/Http/Routing/test/testassets/RoutingSample.Web/PrefixRoute.cs similarity index 100% rename from src/Routing/samples/RoutingSample.Web/PrefixRoute.cs rename to src/Http/Routing/test/testassets/RoutingSample.Web/PrefixRoute.cs diff --git a/src/Routing/samples/RoutingSample.Web/Program.cs b/src/Http/Routing/test/testassets/RoutingSample.Web/Program.cs similarity index 100% rename from src/Routing/samples/RoutingSample.Web/Program.cs rename to src/Http/Routing/test/testassets/RoutingSample.Web/Program.cs diff --git a/src/Routing/samples/RoutingSample.Web/RouteBuilderExtensions.cs b/src/Http/Routing/test/testassets/RoutingSample.Web/RouteBuilderExtensions.cs similarity index 100% rename from src/Routing/samples/RoutingSample.Web/RouteBuilderExtensions.cs rename to src/Http/Routing/test/testassets/RoutingSample.Web/RouteBuilderExtensions.cs diff --git a/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj b/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj new file mode 100644 index 000000000000..7d737c943980 --- /dev/null +++ b/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp2.1;netcoreapp2.0 + $(TargetFrameworks);net461 + + + + + + + + + diff --git a/src/Routing/.gitignore b/src/Routing/.gitignore deleted file mode 100644 index 5f8dfa9f4806..000000000000 --- a/src/Routing/.gitignore +++ /dev/null @@ -1,41 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -.vs/ -.build/ -.testPublish/ -bower_components/ -node_modules/ -**/wwwroot/lib/ -debugSettings.json -project.lock.json -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.settings -*.sln.ide -node_modules -**/[Cc]ompiler/[Rr]esources/**/*.js -*launchSettings.json -global.json -BenchmarkDotNet.Artifacts/ diff --git a/src/Routing/Directory.Build.props b/src/Routing/Directory.Build.props deleted file mode 100644 index f1986d9953cf..000000000000 --- a/src/Routing/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - true - - diff --git a/src/Routing/Directory.Build.targets b/src/Routing/Directory.Build.targets deleted file mode 100644 index 53b3f6e1daba..000000000000 --- a/src/Routing/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/Routing/NuGetPackageVerifier.json b/src/Routing/NuGetPackageVerifier.json deleted file mode 100644 index 9ed455034c0d..000000000000 --- a/src/Routing/NuGetPackageVerifier.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "adx-nonshipping": { - "rules": [], - "packages": { - "Microsoft.AspNetCore.Routing.DecisionTree.Sources": {} - } - }, - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/src/Routing/README.md b/src/Routing/README.md deleted file mode 100644 index 3c0794570b92..000000000000 --- a/src/Routing/README.md +++ /dev/null @@ -1,10 +0,0 @@ -ASP.NET Routing -=== - -AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/fe4o5h1s9ve86nyv/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/Routing/branch/dev) - -Travis: [![Travis](https://travis-ci.org/aspnet/Routing.svg?branch=dev)](https://travis-ci.org/aspnet/Routing) - -Contains routing middleware for routing requests to application logic. - -This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. diff --git a/src/Routing/Routing.sln b/src/Routing/Routing.sln deleted file mode 100644 index 13657187fa1c..000000000000 --- a/src/Routing/Routing.sln +++ /dev/null @@ -1,165 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27106.3000 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0E966C37-7334-4D96-AAF6-9F49FBD166E3}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{95359B4B-4C85-4B44-A75B-0621905C4CF6}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "src\Microsoft.AspNetCore.Routing\Microsoft.AspNetCore.Routing.csproj", "{1EE54D32-6CED-4206-ACF5-3DC1DD39D228}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Tests", "test\Microsoft.AspNetCore.Routing.Tests\Microsoft.AspNetCore.Routing.Tests.csproj", "{636D79ED-7B32-487C-BDA5-D2A1AAA97371}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RoutingSample.Web", "samples\RoutingSample.Web\RoutingSample.Web.csproj", "{DB94E647-C73A-4F52-A126-AA7544CCF33B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C430C499-382D-47BD-B351-CF8F89C08CD2}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - NuGet.config = NuGet.config - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests", "test\Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests\Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj", "{09C2933C-23AC-41B7-994D-E8A5184A629C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "src\Microsoft.AspNetCore.Routing.Abstractions\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{ED253B01-24F1-43D1-AA0B-079391E105A9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests", "test\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests\Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj", "{741B0B05-CE96-473B-B962-6B0A347DF79A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.FunctionalTests", "test\Microsoft.AspNetCore.Routing.FunctionalTests\Microsoft.AspNetCore.Routing.FunctionalTests.csproj", "{5C73140B-41F3-466F-A07B-3614E4D80DF9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6DC6B416-C8C4-4BFA-8C1E-A55A6D7EFD08}" - ProjectSection(SolutionItems) = preProject - build\dependencies.props = build\dependencies.props - build\Key.snk = build\Key.snk - build\repo.props = build\repo.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Performance", "benchmarks\Microsoft.AspNetCore.Routing.Performance\Microsoft.AspNetCore.Routing.Performance.csproj", "{F3D86714-4E64-41A6-9B36-A47B3683CF5D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{D5F39F59-5725-4127-82E7-67028D006185}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Debug|x86.ActiveCfg = Debug|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Any CPU.Build.0 = Release|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228}.Release|x86.ActiveCfg = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Any CPU.Build.0 = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Debug|x86.ActiveCfg = Debug|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Any CPU.ActiveCfg = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Any CPU.Build.0 = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {636D79ED-7B32-487C-BDA5-D2A1AAA97371}.Release|x86.ActiveCfg = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Debug|x86.ActiveCfg = Debug|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Any CPU.Build.0 = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DB94E647-C73A-4F52-A126-AA7544CCF33B}.Release|x86.ActiveCfg = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|x86.ActiveCfg = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Debug|x86.Build.0 = Debug|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|Any CPU.Build.0 = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|x86.ActiveCfg = Release|Any CPU - {09C2933C-23AC-41B7-994D-E8A5184A629C}.Release|x86.Build.0 = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|x86.ActiveCfg = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Debug|x86.Build.0 = Debug|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|Any CPU.Build.0 = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|x86.ActiveCfg = Release|Any CPU - {ED253B01-24F1-43D1-AA0B-079391E105A9}.Release|x86.Build.0 = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|x86.ActiveCfg = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Debug|x86.Build.0 = Debug|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|Any CPU.Build.0 = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|x86.ActiveCfg = Release|Any CPU - {741B0B05-CE96-473B-B962-6B0A347DF79A}.Release|x86.Build.0 = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|x86.ActiveCfg = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Debug|x86.Build.0 = Debug|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|Any CPU.Build.0 = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|x86.ActiveCfg = Release|Any CPU - {5C73140B-41F3-466F-A07B-3614E4D80DF9}.Release|x86.Build.0 = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|x86.ActiveCfg = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Debug|x86.Build.0 = Debug|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|Any CPU.Build.0 = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|x86.ActiveCfg = Release|Any CPU - {F3D86714-4E64-41A6-9B36-A47B3683CF5D}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {1EE54D32-6CED-4206-ACF5-3DC1DD39D228} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3} - {636D79ED-7B32-487C-BDA5-D2A1AAA97371} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} - {DB94E647-C73A-4F52-A126-AA7544CCF33B} = {C3ADD55B-B9C7-4061-8AD4-6A70D1AE3B2E} - {09C2933C-23AC-41B7-994D-E8A5184A629C} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} - {ED253B01-24F1-43D1-AA0B-079391E105A9} = {0E966C37-7334-4D96-AAF6-9F49FBD166E3} - {741B0B05-CE96-473B-B962-6B0A347DF79A} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} - {5C73140B-41F3-466F-A07B-3614E4D80DF9} = {95359B4B-4C85-4B44-A75B-0621905C4CF6} - {F3D86714-4E64-41A6-9B36-A47B3683CF5D} = {D5F39F59-5725-4127-82E7-67028D006185} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {36C8D815-B7F1-479D-894B-E606FB8DECDA} - EndGlobalSection -EndGlobal diff --git a/src/Routing/build/Key.snk b/src/Routing/build/Key.snk deleted file mode 100644 index e10e4889c125d3120cd9e81582243d70f7cbb806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsnz~#iVhm& zj%TU(_THUee?3yHBjk$37ysB?i5#7WD$={H zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U zEk(hLzk1H)0yXj{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZWCk2+9bX4YP);~fj-BU*R zQPvWv$89!{Rl9wM+zR>_TSkn^voYxA?2G iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ diff --git a/src/Routing/build/dependencies.props b/src/Routing/build/dependencies.props deleted file mode 100644 index 6aafe4467fcf..000000000000 --- a/src/Routing/build/dependencies.props +++ /dev/null @@ -1,46 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 0.10.13 - 2.1.3-rtm-15802 - 2.0.0 - 2.1.2 - 15.6.1 - 4.7.49 - 2.0.3 - 0.8.0 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.2 - 2.1.1 - 2.1.0 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - - \ No newline at end of file diff --git a/src/Routing/build/repo.props b/src/Routing/build/repo.props deleted file mode 100644 index 1dc8b8100d75..000000000000 --- a/src/Routing/build/repo.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/Routing/build/sources.props b/src/Routing/build/sources.props deleted file mode 100644 index 9215df9751b4..000000000000 --- a/src/Routing/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/src/Routing/samples/RoutingSample.Web/RoutingSample.Web.csproj b/src/Routing/samples/RoutingSample.Web/RoutingSample.Web.csproj deleted file mode 100644 index 9c3e55c557cb..000000000000 --- a/src/Routing/samples/RoutingSample.Web/RoutingSample.Web.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp2.1;netcoreapp2.0 - $(TargetFrameworks);net461 - - - - - - - - - - - - diff --git a/src/Routing/src/Directory.Build.props b/src/Routing/src/Directory.Build.props deleted file mode 100644 index 1e0980f66331..000000000000 --- a/src/Routing/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Routing/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj b/src/Routing/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj deleted file mode 100644 index f1e3d36a555e..000000000000 --- a/src/Routing/src/Microsoft.AspNetCore.Routing/Microsoft.AspNetCore.Routing.csproj +++ /dev/null @@ -1,29 +0,0 @@ - - - ASP.NET Core middleware for routing requests to application logic and for generating links. -Commonly used types: -Microsoft.AspNetCore.Routing.Route -Microsoft.AspNetCore.Routing.RouteCollection - netstandard2.0 - $(NoWarn);CS1591 - true - aspnetcore;routing - - - - - - - - - - - - - - - - - - - diff --git a/src/Routing/test/Directory.Build.props b/src/Routing/test/Directory.Build.props deleted file mode 100644 index 02caa062ac77..000000000000 --- a/src/Routing/test/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - $(StandardTestTfms);netcoreapp2.0 - $(StandardTestTfms);net461 - - - - - - - - - - - - diff --git a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj b/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj deleted file mode 100644 index fce9e366fc3b..000000000000 --- a/src/Routing/test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj b/src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj deleted file mode 100644 index 3d127f0370d0..000000000000 --- a/src/Routing/test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj b/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj deleted file mode 100644 index ee8a57c08f76..000000000000 --- a/src/Routing/test/Microsoft.AspNetCore.Routing.FunctionalTests/Microsoft.AspNetCore.Routing.FunctionalTests.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - diff --git a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj b/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj deleted file mode 100644 index ee389c233d3b..000000000000 --- a/src/Routing/test/Microsoft.AspNetCore.Routing.Tests/Microsoft.AspNetCore.Routing.Tests.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - $(StandardTestTfms) - - - - - - - - - - - - - - - diff --git a/src/Routing/version.props b/src/Routing/version.props deleted file mode 100644 index 669c874829da..000000000000 --- a/src/Routing/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - From fcfefd3908cabf54c42115829241fc21e2654b5f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 6 Dec 2018 08:03:46 +0000 Subject: [PATCH 08/12] Updating BuildTools from 2.2.1-build-20181203.2 to 2.2.1-build-20181205.2 [auto-updated: buildtools] --- global.json | 2 +- korebuild-lock.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index ca01a5bacd65..f4594afc79b3 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "2.2.100" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.1-build-20181203.2" + "Internal.AspNetCore.Sdk": "2.2.1-build-20181205.2" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index b7cdcc0ea5b4..babc9a9846b5 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.1-build-20181203.2 -commithash:b60a287e73c8564f2919f9612abca953b740a0f9 +version:2.2.1-build-20181205.2 +commithash:73f2bfbafd4024d2a644c813d7de9116797b6e9c From 5c2a701b38baf7ba073efca018ff49669adf89e5 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 6 Dec 2018 12:21:05 -0800 Subject: [PATCH 09/12] Remove conditional targetframeworks from routing projects (#4476) --- .../perf/Microsoft.AspNetCore.Routing.Performance.csproj | 6 +----- .../testassets/RoutingSample.Web/RoutingSample.Web.csproj | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj b/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj index 61461ddc6e88..f3c225958076 100644 --- a/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj +++ b/src/Http/Routing/perf/Microsoft.AspNetCore.Routing.Performance.csproj @@ -2,20 +2,16 @@ netcoreapp2.0;net461 - netcoreapp2.0 Exe true true false - - - - + diff --git a/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj b/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj index 7d737c943980..2802892c9acc 100644 --- a/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj +++ b/src/Http/Routing/test/testassets/RoutingSample.Web/RoutingSample.Web.csproj @@ -1,8 +1,7 @@  - netcoreapp2.1;netcoreapp2.0 - $(TargetFrameworks);net461 + netcoreapp2.1;netcoreapp2.0;net461 From de994e0a8b1a86ae9ae8a1142b6a2761ce8b1dc4 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 6 Dec 2018 12:41:37 -0800 Subject: [PATCH 10/12] Create temporary PR validation which just compiles, without tests (#4478) --- .../{fast-pr-validation.yml => ci.yml} | 19 ++++++------ .azure/pipelines/pr-validation-temp.yml | 30 +++++++++++++++++++ 2 files changed, 39 insertions(+), 10 deletions(-) rename .azure/pipelines/{fast-pr-validation.yml => ci.yml} (60%) create mode 100644 .azure/pipelines/pr-validation-temp.yml diff --git a/.azure/pipelines/fast-pr-validation.yml b/.azure/pipelines/ci.yml similarity index 60% rename from .azure/pipelines/fast-pr-validation.yml rename to .azure/pipelines/ci.yml index 216f257ef154..a0c24b2d1546 100644 --- a/.azure/pipelines/fast-pr-validation.yml +++ b/.azure/pipelines/ci.yml @@ -1,18 +1,17 @@ -trigger: -- master -- release/* +# Don't run CI for this config yet. We're not ready to move official builds on to Azure Pipelines +trigger: none + +# Run PR validation on all branches +pr: + branches: + include: + - '*' jobs: -- template: jobs/default-build.yml - parameters: - jobName: PR_FastCheck - jobDisplayName: Fast Check - agentOs: Windows - buildArgs: "/t:FastCheck" - template: jobs/default-build.yml parameters: jobName: Windows_Build - jobDisplayName: "Build: Windows" + jobDisplayName: "Build and test: Windows" agentOs: Windows beforeBuild: - powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1" diff --git a/.azure/pipelines/pr-validation-temp.yml b/.azure/pipelines/pr-validation-temp.yml new file mode 100644 index 000000000000..b190d7c0c49d --- /dev/null +++ b/.azure/pipelines/pr-validation-temp.yml @@ -0,0 +1,30 @@ +# This configuration is temporary while we work on getting all unit tests to pass on PR checks + +# Don't run CI for this config +trigger: none + +# Run PR validation on all branches +pr: + branches: + include: + - '*' + +jobs: +- template: jobs/default-build.yml + parameters: + jobName: Windows_Build + jobDisplayName: "Build only : Windows" + agentOs: Windows + buildArgs: '/p:SkipTests=true' +- template: jobs/default-build.yml + parameters: + jobName: macOs_Build + jobDisplayName: "Build only : macOS" + agentOs: macOS + buildArgs: '/p:SkipTests=true' +- template: jobs/default-build.yml + parameters: + jobName: Linux_Build + jobDisplayName: "Build only : Linux" + agentOs: Linux + buildArgs: '/p:SkipTests=true' From 5d777b2c662b1641c78022f500b7ba6e30ac7630 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 6 Dec 2018 14:06:42 -0800 Subject: [PATCH 11/12] Conditionally skip patch.zip files which way not be produced in servicing builds (#4481) --- build/Publish.targets | 8 ++++++-- korebuild-lock.txt | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 54e74b31072c..9c73f75d1525 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -81,12 +81,16 @@ ShipInstaller=dotnetcli - + + $(BlobBasePath)nuGetPackagesArchive-ci-server-$(PackageVersion).patch.zip ShipInstaller=dotnetcli - + + $(BlobBasePath)nuGetPackagesArchive-ci-server-compat-$(PackageVersion).patch.zip ShipInstaller=dotnetcli diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a3f63230bd6d..6f42fdc9d843 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15848 -commithash:2f914eafadb434837324c4b5b30f6fdbe9b70ab6 +version:2.1.3-rtm-15849 +commithash:9a772472eb5184f4fd609f6208102d3a716d5bed From 1670a2bd3040f4abe0a3ad025da38c478002b324 Mon Sep 17 00:00:00 2001 From: seancpeters Date: Fri, 7 Dec 2018 08:20:40 -0800 Subject: [PATCH 12/12] Updating scaffolding submodule (#4491) --- modules/Scaffolding | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Scaffolding b/modules/Scaffolding index 629bb9963377..446caddc4406 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 629bb9963377eb9e915013bd8b2f5c724833d82a +Subproject commit 446caddc44066c23e67873edcc7489a1310ffd05